diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
index 65361e41..c216d83d 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
@@ -6,7 +6,7 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
+            <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
             <input id="name" class="form-control" @bind="@_name" />
@@ -14,7 +14,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
+            <Label For="type" HelpText="Enter the job type" ResourceKey="Type">Type: </Label>
         </td>
         <td>
             <input id="type" class="form-control" @bind="@_jobType" />
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+            <Label For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
         </td>
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
@@ -47,7 +47,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+            <Label For="starting" HelpText="What time do you want the job to start" ResourceKey="Starting">Starting: </Label>
         </td>
         <td>
             <input id="starting" class="form-control" @bind="@_startDate" />
@@ -55,7 +55,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+            <Label For="ending" HelpText="When do you want the job to end" ResourceKey="Ending">Ending: </Label>
         </td>
         <td>
             <input id="ending" class="form-control" @bind="@_endDate" />
@@ -63,7 +63,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
+            <Label For="retention-log" HelpText="What items do you want in the retention log" ResourceKey="RetentionLog">Retention Log (Items): </Label>
         </td>
         <td>
             <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 25d8e4fb..8fbed632 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
@@ -6,7 +6,7 @@
 <table class="table table-borderless">
     <tr>
         <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
+            <Label For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
         </td>
         <td>
             <input id="name" class="form-control" @bind="@_name" />
@@ -14,7 +14,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
+            <Label For="type" HelpText="Enter the job type" ResourceKey="Type">Type: </Label>
         </td>
         <td>
             <input id="type" class="form-control" @bind="@_jobType" />
@@ -22,7 +22,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
+            <Label For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
         </td>
         <td>
             <select id="enabled" class="form-control" @bind="@_isEnabled">
@@ -33,7 +33,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
+            <Label For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
         </td>
         <td>
             <input id="runs-every" class="form-control" @bind="@_interval" />
@@ -47,7 +47,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
+            <Label For="starting" HelpText="What time do you want the job to start" ResourceKey="Starting">Starting: </Label>
         </td>
         <td>
             <input id="starting" class="form-control" @bind="@_startDate" />
@@ -55,7 +55,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
+            <Label For="ending" HelpText="When do you want the job to end" ResourceKey="Ending">Ending: </Label>
         </td>
         <td>
             <input id="ending" class="form-control" @bind="@_endDate" />
@@ -63,7 +63,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="retention" HelpText="Number of log entries to retain for this job">Retention Log (Items): </Label>
+            <Label For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
         </td>
         <td>
             <input id="retention" class="form-control" @bind="@_retentionHistory" />
@@ -71,7 +71,7 @@
     </tr>
     <tr>
         <td>
-            <Label For="next" HelpText="Next execution for this job.">Next Execution: </Label>
+            <Label For="next" HelpText="Next execution for this job." ResourceKey="NextExecution">Next Execution: </Label>
         </td>
         <td>
             <input id="next" class="form-control" @bind="@_nextExecution" />
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 6ba8c69b..e99a09b0 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobService JobService
 
@@ -8,8 +8,8 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Job" />
-    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" />
+    <ActionLink Action="Add" Text="Add Job" ResourceKey="AddJob" />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
     <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">Refresh</button>
     <br /><br />
 
@@ -25,9 +25,9 @@ else
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" /></td>
-            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
+            <td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
+            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
             <td>@context.Name</td>
             <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
             <td>@DisplayFrequency(context.Interval, context.Frequency)</td>