From e9bed5903237ee247ad271aeb3e0152535265936 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh.pointer@outlook.com>
Date: Sat, 23 Sep 2023 10:42:39 +0200
Subject: [PATCH 1/2] Fix for  Site 'SMTP retention' is not in resource file
 (Issue #3301)

Fix for  Site 'SMTP retention' is not in resource file (Issue #3301)
---
 Oqtane.Client/Resources/Modules/Admin/Site/Index.resx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
index 5a05fd80..0d9b6c65 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
@@ -396,4 +396,10 @@
   <data name="SiteGuid.Text" xml:space="preserve">
     <value>ID:</value>
   </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of notifications to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
 </root>
\ No newline at end of file

From 8b23b386f7af60ed5ed07489e1cf0a79250181dc Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh.pointer@outlook.com>
Date: Sat, 23 Sep 2023 10:56:17 +0200
Subject: [PATCH 2/2] ImportUsers Added to Resx and Razor resource key

---
 Oqtane.Client/Modules/Admin/Users/Index.razor          | 2 +-
 Oqtane.Client/Resources/Modules/Admin/Users/Index.resx | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index c0334d6e..57f10221 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -21,7 +21,7 @@ else
 				<div class="row mb-1 align-items-center">
 					<div class="col-sm-4">
 						<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
-                        <ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" />                    
+                        <ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>                    
                     </div>
 					<div class="col-sm-4">
 						<input class="form-control" @bind="@_search" />
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
index fcfb9f8b..19757ae8 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
@@ -390,7 +390,7 @@
   <data name="RoleClaimType.Text" xml:space="preserve">
     <value>Role Claim:</value>
   </data>
-    <data name="ProfileClaimTypes.HelpText" xml:space="preserve">
+  <data name="ProfileClaimTypes.HelpText" xml:space="preserve">
     <value>Optionally provide a comma delimited list of user profile claims provided by the identity provider, as well as mappings to your user profile definition. For example if the identity provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'.</value>
   </data>
   <data name="ProfileClaimTypes.Text" xml:space="preserve">
@@ -405,4 +405,7 @@
   <data name="Email" xml:space="preserve">
     <value>Email</value>
   </data>
-</root>
+  <data name="ImportUsers.Text" xml:space="preserve">
+    <value>Import Users</value>
+  </data>
+</root>
\ No newline at end of file