diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor
index 9f19370d..df16cac8 100644
--- a/Oqtane.Client/Modules/Admin/Files/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Add.razor
@@ -1,31 +1,32 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @using System.IO
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IFolderService FolderService
+@inject IStringLocalizer<Add> Localizer
 
 <TabStrip>
-    <TabPanel Name="Upload" Heading="Upload Files">
+    <TabPanel Name="Upload" Heading="Upload Files" ResourceKey="Upload Files">
         <table class="table table-borderless">
             <tr>
                 <td>
-                    <Label For="upload" HelpText="Upload the file you want">Upload: </Label>
+                    <Label For="upload" HelpText="Upload the file you want" ResourceKey="Upload">Upload: </Label>
                 </td>
                 <td>
                     <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" />
                 </td>
             </tr>
         </table>
-        <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
     </TabPanel>
-    <TabPanel Name="Download" Heading="Download Files">
+    <TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles">
         @if (_folders != null)
         {
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label For="url" HelpText="Enter the url of the file you wish to download">Url: </Label>
+                        <Label For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label>
                     </td>
                     <td>
                         <input id="url" class="form-control" @bind="@url" />
@@ -33,7 +34,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="folder" HelpText="Select the folder to save the file in">Folder: </Label>
+                        <Label For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
                     </td>
                     <td>
                         <select id="folder" class="form-control" @bind="@_folderId">
@@ -46,8 +47,8 @@
                     </td>
                 </tr>
             </table>
-            <button type="button" class="btn btn-success" @onclick="Download">Download</button>
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+            <button type="button" class="btn btn-success" @onclick="Download">@Localizer["Download"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
         }
     </TabPanel>
 </TabStrip>
@@ -81,10 +82,10 @@
 
         if (!Constants.UploadableFiles.Split(',')
                 .Contains(Path.GetExtension(filename).ToLower().Replace(".", "")))
-            {
-                AddModuleMessage("File Could Not Be Downloaded From Url Due To Its File Extension", MessageType.Warning);
-                return ;
-            }
+        {
+            AddModuleMessage("File Could Not Be Downloaded From Url Due To Its File Extension", MessageType.Warning);
+            return;
+        }
 
         if (!filename.IsPathOrFileValid())
         {
diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor
index 6b4b14aa..1ec0107d 100644
--- a/Oqtane.Client/Modules/Admin/Files/Details.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Details.razor
@@ -1,15 +1,16 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject IFileService FileService
 @inject IFolderService FolderService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Details> Localizer
 
 @if (_folders != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <Label for="name" HelpText="The name of the file">Name: </Label>
+                <Label for="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
             </td>
             <td>
                 <input id="name" class="form-control" @bind="@_name" />
@@ -17,7 +18,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="parent" HelpText="The folder where the file is located">Folder: </Label>
+                <Label For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
             </td>
             <td>
                 <select id="parent" class="form-control" @bind="@_folderId">
@@ -30,15 +31,15 @@
         </tr>
         <tr>
             <td>
-                <Label for="size" HelpText="The size of the file (in bytes)">Size: </Label>
+                <Label for="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
             </td>
             <td>
                 <input id="size" class="form-control" @bind="@_size" readonly />
             </td>
         </tr>
     </table>
-    <button type="button" class="btn btn-success" @onclick="SaveFile">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveFile">@Localizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
     <br />
     <br />
     <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor
index 73cac84d..81829d3a 100644
--- a/Oqtane.Client/Modules/Admin/Files/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor
@@ -1,15 +1,16 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject IFolderService FolderService
 @inject IFileService FileService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
 
 @if (_folders != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <Label For="parent" HelpText="Select the parent folder">Parent: </Label>
+                <Label For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
             </td>
             <td>
                 <select id="parent" class="form-control" @bind="@_parentId">
@@ -26,7 +27,7 @@
         </tr>
         <tr>
             <td>
-                <Label for="name" HelpText="Enter the folder name">Name: </Label>
+                <Label for="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
             </td>
             <td>
                 <input id="name" class="form-control" @bind="@_name" />
@@ -34,19 +35,19 @@
         </tr>
         <tr>
             <td colspan="2" align="center">
-                <Label For="permissions" HelpText="Select the permissions you want for the folder">Permissions: </Label>
+                <Label For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label>
                 <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
             </td>
         </tr>
     </table>
     @if (!_isSystem)
     {
-        <button type="button" class="btn btn-success" @onclick="SaveFolder">Save</button>
+        <button type="button" class="btn btn-success" @onclick="SaveFolder">@Localizer["Save"]</button>
     }
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
     @if (!_isSystem && PageState.QueryString.ContainsKey("id"))
     {
-        <ActionDialog Header="Delete Folder" Message="@("Are You Sure You Wish To Delete This Folder?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" />
+        <ActionDialog Header="Delete Folder" Message="@("Are You Sure You Wish To Delete This Folder?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
     <br />
     <br />
diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor
index ccb8a135..bff90388 100644
--- a/Oqtane.Client/Modules/Admin/Files/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Files/Index.razor
@@ -1,15 +1,16 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFolderService FolderService
 @inject IFileService FileService
+@inject IStringLocalizer<Index> Localizer
 
 @if (_files != null)
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label  class="control-label">Folder: </label>
+                <label  class="control-label">@Localizer["Folder:"] </label>
             </td>
             <td>
                 <select class="form-control" @onchange="(e => FolderChanged(e))">
@@ -20,9 +21,9 @@
                 </select>
             </td>
             <td>
-                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" />&nbsp;
-                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" />&nbsp;
-                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" />
+                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
+                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />&nbsp;
+                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
             </td>
         </tr>
     </table>
@@ -30,23 +31,23 @@
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
-            <th>Modified</th>
-            <th>Type</th>
-            <th>Size</th>
+            <th>@Localizer["Name"]</th>
+            <th>@Localizer["Modified"]</th>
+            <th>@Localizer["Type"]</th>
+            <th>@Localizer["Size"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" /></td>
-            <td><ActionDialog Header="Delete File" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" /></td>
+            <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
+            <td><ActionDialog Header="Delete File" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
             <td><a href="@(ContentUrl(context.FileId))" target="_new">@context.Name</a></td>
             <td>@context.ModifiedOn</td>
-            <td>@context.Extension.ToUpper() File</td>
+            <td>@context.Extension.ToUpper() @Localizer["File"]</td>
             <td>@(context.Size / 1000) KB</td>
         </Row>
     </Pager>
     @if (_files.Count == 0)
     {
-        <div class="text-center">No Files Exist In Selected Folder</div>
+<div class="text-center">@Localizer["No Files Exist In Selected Folder"]</div>
     }
 }
 
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Add.razor b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
index 65361e41..fde389bf 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Add.razor
@@ -1,12 +1,13 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
+@inject IStringLocalizer<Add> Localizer
 
 <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 +15,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,32 +23,32 @@
     </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">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
             </select>
         </td>
     </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" />
             <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
+                <option value="m">@Localizer["Minute(s)"]</option>
+                <option value="H">@Localizer["Hour(s)"]</option>
+                <option value="d">@Localizer["Day(s)"]</option>
+                <option value="M">@Localizer["Month(s)"]</option>
             </select>
         </td>
     </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 +56,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,15 +64,15 @@
     </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" />
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveJob">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private string _name = string.Empty;
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
index 25d8e4fb..62929440 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor
@@ -1,12 +1,13 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
+@inject IStringLocalizer<Edit> Localizer
 
 <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 +15,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,32 +23,32 @@
     </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">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
             </select>
         </td>
     </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" />
             <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
+                <option value="m">@Localizer["Minute(s)"]</option>
+                <option value="H">@Localizer["Hour(s)"]</option>
+                <option value="d">@Localizer["Day(s)"]</option>
+                <option value="M">@Localizer["Month(s)"]</option>
             </select>
         </td>
     </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 +56,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 +64,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,15 +72,15 @@
     </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" />
         </td>
     </tr>
 </table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveJob">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private int _jobId;
@@ -158,7 +159,7 @@
             {
                 job.NextExecution = DateTime.Parse(_nextExecution);
             }
-            
+
             job.RetentionHistory = int.Parse(_retentionHistory);
 
             try
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Index.razor b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
index 6ba8c69b..cbc137f7 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Index.razor
@@ -1,15 +1,15 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobService JobService
 
 @if (_jobs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 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 />
 
@@ -18,16 +18,16 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
-            <th>Status</th>
-            <th>Frequency</th>
-            <th>Next Execution</th>
+            <th>@Localizer["Name"]</th>
+            <th>@Localizer["Status"]</th>
+            <th>@Localizer["Frequency"]</th>
+            <th>@Localizer["Next Execution"]</th>
             <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>
@@ -35,11 +35,11 @@ else
             <td>
                 @if (context.IsStarted)
                 {
-                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">Stop</button>
+                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
                 }
                 else
                 {
-                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">Start</button>
+                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
                 }
             </td>
         </Row>
diff --git a/Oqtane.Client/Modules/Admin/Jobs/Log.razor b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
index 2d4ef706..f5d8a391 100644
--- a/Oqtane.Client/Modules/Admin/Jobs/Log.razor
+++ b/Oqtane.Client/Modules/Admin/Jobs/Log.razor
@@ -1,19 +1,20 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobLogService JobLogService
+@inject IStringLocalizer<Log> Localizer
 
 @if (_jobLogs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
 <Pager Items="@_jobLogs">
     <Header>
-        <th>Name</th>
-        <th>Status</th>
-        <th>Started</th>
-        <th>Finished</th>
+        <th>@Localizer["Name"]</th>
+        <th>@Localizer["Status"]</th>
+        <th>@Localizer["Started"]</th>
+        <th>@Localizer["Finished"]</th>
     </Header>
     <Row>
         <td>@context.Job.Name</td>
diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 2a1b4793..25d5b2ae 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -3,6 +3,7 @@
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IServiceProvider ServiceProvider
+@inject IStringLocalizer<Index> Localizer
 
 @if (_message != string.Empty)
 {
@@ -18,23 +19,23 @@
     <NotAuthorized>
         <div class="container Oqtane-Modules-Admin-Login">
             <div class="form-group">
-                <label for="Username" class="control-label">Username: </label>
+                <label for="Username" class="control-label">@Localizer["Username:"] </label>
                 <input type="text" name="Username" class="form-control username" placeholder="Username" @bind="@_username" id="Username" />
             </div>
             <div class="form-group">
-                <label for="Password" class="control-label">Password: </label>
+                <label for="Password" class="control-label">@Localizer["Password:"] </label>
                 <input type="password" name="Password" class="form-control password" placeholder="Password" @bind="@_password" id="Password" />
             </div>
             <div class="form-group">
                 <div class="form-check form-check-inline">
-                    <label class="form-check-label" for="Remember">Remember Me?</label>&nbsp;
+                    <label class="form-check-label" for="Remember">@Localizer["Remember Me?"]</label>&nbsp;
                     <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
                 </div>
             </div>
-            <button type="button" class="btn btn-primary" @onclick="Login">Login</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+            <button type="button" class="btn btn-primary" @onclick="Login">@Localizer["Login"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
             <br /><br />
-            <button type="button" class="btn btn-secondary" @onclick="Forgot">Forgot Password</button>
+            <button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["Forgot Password"]</button>
         </div>
     </NotAuthorized>
 </AuthorizeView>
diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
index 1baac265..7c2c1303 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @using System.Globalization
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
@@ -6,134 +6,135 @@
 @inject IPageService PageService
 @inject IPageModuleService PageModuleService
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
 
-    <table class="table table-borderless">
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+        </td>
+        <td>
+            <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+        </td>
+        <td>
+            <input id="level" class="form-control" @bind="@_level" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+        </td>
+        <td>
+            <input id="feature" class="form-control" @bind="@_feature" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+        </td>
+        <td>
+            <input id="function" class="form-control" @bind="@_function" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+        </td>
+        <td>
+            <input id="category" class="form-control" @bind="@_category" readonly />
+        </td>
+    </tr>
+    @if (_pageName != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="dateTime" HelpText="The date and time of this log">Date/Time: </Label>
+                <Label For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
             </td>
             <td>
-                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+                <input id="page" class="form-control" @bind="@_pageName" readonly />
             </td>
         </tr>
+    }
+    @if (_moduleTitle != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="level" HelpText="The level of this log">Level: </Label>
+                <Label For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
             </td>
             <td>
-                <input id="level" class="form-control" @bind="@_level" readonly />
+                <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
             </td>
         </tr>
+    }
+    @if (_username != string.Empty)
+    {
         <tr>
             <td>
-                <Label For="feature" HelpText="The feature that was affected">Feature: </Label>
+                <Label For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
             </td>
             <td>
-                <input id="feature" class="form-control" @bind="@_feature" readonly />
+                <input id="user" class="form-control" @bind="@_username" readonly />
             </td>
         </tr>
+    }
+    <tr>
+        <td>
+            <Label For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+        </td>
+        <td>
+            <input id="url" class="form-control" @bind="@_url" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+        </td>
+        <td>
+            <input id="template" class="form-control" @bind="@_template" readonly />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="message" HelpText="The message that the system generated" class="control-label" ResourceKey="Message">Message: </Label>
+        </td>
+        <td>
+            <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
+        </td>
+    </tr>
+    @if (!string.IsNullOrEmpty(_exception))
+    {
         <tr>
             <td>
-                <Label For="function" HelpText="The function that was performed">Function: </Label>
+                <Label For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
             </td>
             <td>
-                <input id="function" class="form-control" @bind="@_function" readonly />
+                <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
             </td>
         </tr>
-        <tr>
-            <td>
-                <Label For="category" HelpText="The categories that were affected">Category: </Label>
-            </td>
-            <td>
-                <input id="category" class="form-control" @bind="@_category" readonly />
-            </td>
-        </tr>
-        @if (_pageName != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="page" HelpText="The page that was affected">Page: </Label>
-                </td>
-                <td>
-                    <input id="page" class="form-control" @bind="@_pageName" readonly />
-                </td>
-            </tr>
-        }
-        @if (_moduleTitle != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="module" HelpText="The module that was affected">Module: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-                </td>
-            </tr>
-        }
-        @if (_username != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="user" HelpText="The user that caused this log">User: </Label>
-                </td>
-                <td>
-                    <input id="user" class="form-control" @bind="@_username" readonly />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="url" HelpText="The url the log comes from">Url: </Label>
-            </td>
-            <td>
-                <input id="url" class="form-control" @bind="@_url" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="What the log is about">Template: </Label>
-            </td>
-            <td>
-                <input id="template" class="form-control" @bind="@_template" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="The message that the system generated"class="control-label">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_exception))
-        {
-            <tr>
-                <td>
-                    <Label For="exception" HelpText="The exceptions generated by the system">Exception: </Label>
-                </td>
-                <td>
-                    <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="properties" HelpText="The properties that were affected">Properties: </Label>
-            </td>
-            <td>
-                <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="server" HelpText="The server that was affected">Server: </Label>
-            </td>
-            <td>
-                <input id="server" class="form-control" @bind="@_server" readonly />
-            </td>
-        </tr>
-    </table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    }
+    <tr>
+        <td>
+            <Label For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+        </td>
+        <td>
+            <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+        </td>
+        <td>
+            <input id="server" class="form-control" @bind="@_server" readonly />
+        </td>
+    </tr>
+</table>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private int _logId;
@@ -167,7 +168,7 @@
                 _feature = log.Feature;
                 _function = log.Function;
                 _category = log.Category;
-                
+
                 if (log.PageId != null)
                 {
                     var page = await PageService.GetPageAsync(log.PageId.Value);
@@ -176,7 +177,7 @@
                         _pageName = page.Name;
                     }
                 }
-                
+
                 if (log.PageId != null && log.ModuleId != null)
                 {
                     var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
@@ -185,7 +186,7 @@
                         _moduleTitle = pagemodule.Title;
                     }
                 }
-                
+
                 if (log.UserId != null)
                 {
                     var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
@@ -194,7 +195,7 @@
                         _username = user.Username;
                     }
                 }
-                
+
                 _url = log.Url;
                 _template = log.MessageTemplate;
                 _message = log.Message;
diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 3fcb0fb5..59830a0d 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -1,17 +1,18 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject IStringLocalizer<Index> Localizer 
 
 @if (_logs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
     <table class="table table-borderless">
         <tr>
             <td>
-                <label>Level: </label>
+                <label>@Localizer["Level:"] </label>
                 <select class="form-control" @onchange="(e => LevelChanged(e))">
                     <option value="-">&lt;All Levels&gt;</option>
                     <option value="Trace">Trace</option>
@@ -23,19 +24,19 @@ else
                 </select>
             </td>
             <td>
-                <label>Function: </label>
+                <label>@Localizer["Function:"] </label>
                 <select class="form-control" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;All Functions&gt;</option>
-                    <option value="Create">Create</option>
-                    <option value="Read">Read</option>
-                    <option value="Update">Update</option>
-                    <option value="Delete">Delete</option>
-                    <option value="Security">Security</option>
-                    <option value="Other">Other</option>
+                    <option value="-">&lt;@Localizer["All Functions"]&gt;</option>
+                    <option value="Create">@Localizer["Create"]</option>
+                    <option value="Read">@Localizer["Read"]</option>
+                    <option value="Update">@Localizer["Update"]</option>
+                    <option value="Delete">@Localizer["Delete"]</option>
+                    <option value="Security">@Localizer["Security"]</option>
+                    <option value="Other">@Localizer["Other"]</option>
                 </select>
             </td>
             <td>
-                <label>Rows: </label>
+                <label>@Localizer["Rows:"] </label>
                 <select class="form-control" @onchange="(e => RowsChanged(e))">
                     <option value="10">10</option>
                     <option value="50">50</option>
@@ -50,13 +51,13 @@ else
         <Pager Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
-                <th>Date</th>
-                <th>Level</th>
-                <th>Feature</th>
-                <th>Function</th>
+                <th>@Localizer["Date"]</th>
+                <th>@Localizer["Level"]</th>
+                <th>@Localizer["Feature"]</th>
+                <th>@Localizer["Function"]</th>
             </Header>
             <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" /></td>
+                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
                 <td class="@GetClass(context.Function)">@context.LogDate</td>
                 <td class="@GetClass(context.Function)">@context.Level</td>
                 <td class="@GetClass(context.Function)">@context.Feature</td>
@@ -66,7 +67,7 @@ else
     }
     else
     {
-        <p><em>No Logs Match The Criteria Specified</em></p>
+        <p><em>@Localizer["No Logs Match The Criteria Specified"]</em></p>
     }
 }
 
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
index cafecf3b..2ad8f8ed 100644
--- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor
@@ -4,11 +4,12 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IModuleService ModuleService
 @inject ISystemService SystemService
+@inject IStringLocalizer<Index> Localizer 
 
     <table class="table table-borderless">
         <tr>
             <td>
-                <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.">Owner Name: </Label>
+                <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
             </td>
             <td>
                 <input id="owner" class="form-control" @bind="@_owner" />
@@ -16,7 +17,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation.">Module Name: </Label>
+                <Label For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
             </td>
             <td>
                 <input id="module" class="form-control" @bind="@_module" />
@@ -24,7 +25,7 @@
         </tr>
         <tr>
             <td>
-                <Label For="description" HelpText="Enter s short description for the module">Description: </Label>
+                <Label For="description" HelpText="Enter s short description for the module" ResourceKey="Description">Description: </Label>
             </td>
             <td>
                 <textarea id="description" class="form-control" @bind="@_description" rows="3"></textarea>
@@ -32,19 +33,19 @@
         </tr>
         <tr>
             <td>
-                <Label For="template" HelpText="Select a module template. Internal modules are created inside of the Oqtane solution. External modules are created outside of the Oqtane solution.">Template: </Label>
+                <Label For="template" HelpText="Select a module template. Internal modules are created inside of the Oqtane solution. External modules are created outside of the Oqtane solution." ResourceKey="Template">Template: </Label>
             </td>
             <td>
                 <select id="template" class="form-control" @onchange="(e => TemplateChanged(e))">
-                    <option value="-">&lt;Select Template&gt;</option>
-                    <option value="internal">Internal</option>
-                    <option value="external">External</option>
+                    <option value="-">&lt;@Localizer["Select Template"]&gt;</option>
+                    <option value="internal">@Localizer["Internal"]</option>
+                    <option value="external">@Localizer["External"]</option>
                 </select>
             </td>
         </tr>
         <tr>
             <td>
-                <Label For="reference" HelpText="Select a framework reference version">Framework Reference: </Label>
+                <Label For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
             </td>
             <td>
                 <select id="reference" class="form-control" @bind="@_reference">
@@ -55,7 +56,7 @@
                             <option value="@(version)">@(version)</option>
                         }
                     }
-                    <option value="local">Local Version</option>
+                <option value="local">@Localizer["Local Version"]</option>
                 </select>
             </td>
         </tr>
@@ -63,7 +64,7 @@
         {
             <tr>
                 <td>
-                    <Label For="location" HelpText="Location where the module will be created">Location: </Label>
+                    <Label For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
                 </td>
                 <td>
                     <input id="module" class="form-control" @bind="@_location" readonly />
@@ -72,7 +73,7 @@
         }
     </table>
 
-<button type="button" class="btn btn-success" @onclick="CreateModule">Create Module</button>
+<button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Create Module"]</button>
 
 @code {
     private string _owner = string.Empty;
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 526f1af4..23bc7a10 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -1,38 +1,39 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Add> Localizer
 
 @if (_packages != null)
 {
     <TabStrip>
         @if (_packages.Count > 0)
         {
-            <TabPanel Name="Download">
+            <TabPanel Name="Download" ResourceKey="Download">
                 <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
                 <Pager Items="@_packages">
                     <Header>
-                        <th>Name</th>
-                        <th>Version</th>
+                        <th>@Localizer["Name"]</th>
+                        <th>@Localizer["Version"]</th>
                         <th style="width: 1px"></th>
                     </Header>
                     <Row>
                         <td>@context.Name</td>
                         <td>@context.Version</td>
                         <td>
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>Download</button>
+                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@Localizer["Download"]</button>
                         </td>
                     </Row>
                 </Pager>
             </TabPanel>
         }
-        <TabPanel Name="Upload">
+        <TabPanel Name="Upload" ResourceKey="Upload">
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation.">Module: </Label>
+                        <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
                     </td>
                     <td>
                         <FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" UploadMultiple="true" />
@@ -42,8 +43,8 @@
         </TabPanel>
     </TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallModules">Install</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 }
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 51ed8992..b47700eb 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -1,14 +1,15 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
 
 <TabStrip>
-    <TabPanel Name="Definition">
+    <TabPanel Name="Definition" ResourceKey="Definition">
         <table class="table table-borderless">
             <tr>
                 <td>
-                    <Label For="name" HelpText="The name of the module">Name: </Label>
+                    <Label For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
                 </td>
                 <td>
                     <input id="name" class="form-control" @bind="@_name" />
@@ -16,7 +17,7 @@
             </tr>
             <tr>
                 <td>
-                    <Label For="description" HelpText="The description of the module">Description: </Label>
+                    <Label For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
                 </td>
                 <td>
                     <textarea id="description" class="form-control" @bind="@_description" rows="2"></textarea>
@@ -24,18 +25,18 @@
             </tr>
             <tr>
                 <td>
-                    <Label For="categories" HelpText="Comma delimited list of module categories">Categories: </Label>
+                    <Label For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
                 </td>
                 <td>
                     <input id="categories" class="form-control" @bind="@_categories" />
                 </td>
             </tr>
         </table>
-        <Section Name="Information">
+        <Section Name="Information" ResourceKey="Information">
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label For="moduledefinitionname" HelpText="The internal name of the module">Internal Name: </Label>
+                        <Label For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
                     </td>
                     <td>
                         <input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
@@ -43,7 +44,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="version" HelpText="The version of the module">Version: </Label>
+                        <Label For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
                     </td>
                     <td>
                         <input id="version" class="form-control" @bind="@_version" disabled />
@@ -51,7 +52,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="owner" HelpText="The owner or creator of the module">Owner: </Label>
+                        <Label For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
                     </td>
                     <td>
                         <input id="owner" class="form-control" @bind="@_owner" disabled />
@@ -59,7 +60,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="url" HelpText="The reference url of the module">Reference Url: </Label>
+                        <Label For="url" HelpText="The reference url of the module" resource="ReferenceUrl">Reference Url: </Label>
                     </td>
                     <td>
                         <input id="url" class="form-control" @bind="@_url" disabled />
@@ -67,7 +68,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="contact" HelpText="The contact for the module">Contact: </Label>
+                        <Label For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
                     </td>
                     <td>
                         <input id="contact" class="form-control" @bind="@_contact" disabled />
@@ -75,7 +76,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="license" HelpText="The module license terms">License: </Label>
+                        <Label For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
                     </td>
                     <td>
                         <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
@@ -83,7 +84,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="runtimes" HelpText="The Blazor runtimes which this module supports">Runtimes: </Label>
+                        <Label For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
                     </td>
                     <td>
                         <input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
@@ -92,7 +93,7 @@
             </table>
         </Section>
     </TabPanel>
-    <TabPanel Name="Permissions">
+    <TabPanel Name="Permissions" ResourceKey="Permissions">
         <table class="table table-borderless">
             <tr>
                 <td>
@@ -102,9 +103,10 @@
         </table>
     </TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br /><br />
+<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
+<br />
+<br />
 <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index fabf6973..7d5cbd90 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -1,40 +1,41 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Index> Localizer
 
 @if (_moduleDefinitions == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Module" />
+    <ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
 
     <Pager Items="@_moduleDefinitions">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
-            <th>Version</th>
+            <th>@Localizer["Name"]</th>
+            <th>@Localizer["Version"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" ResourceKey="EditModule" /></td>
             <td>
                 @if (context.AssemblyName != "Oqtane.Client")
-                    {
-                    <ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Module?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" />
-                    }
+                {
+                    <ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Module?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
+                }
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
                 @if (UpgradeAvailable(context.ModuleDefinitionName, context.Version))
-                    {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.ModuleDefinitionName, context.Version))>Upgrade</button>
-                    }
+                {
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.ModuleDefinitionName, context.Version))>@Localizer["Upgrade"]</button>
+                }
             </td>
         </Row>
     </Pager>
diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor
index eaa0bc92..80010036 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Export.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor
@@ -1,13 +1,14 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IStringLocalizer<Export> Localizer
 
 <table class="table table-borderless">
     <tbody>
         <tr>
             <td>
-                <Label For="content" HelpText="Enter the module content">Content: </Label>
+                <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
             </td>
             <td>
                 <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
@@ -15,8 +16,8 @@
         </tr>
     </tbody>
 </table>
-<button type="button" class="btn btn-success" @onclick="ExportModule">Export</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor
index 1d99bcb9..b3ace332 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Import.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor
@@ -1,13 +1,14 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IStringLocalizer<Import> Localizer
 
 <table class="table table-borderless">
     <tbody>
         <tr>
             <td>
-                <Label For="content" HelpText="Enter the module content">Content: </Label>
+                <Label For="content" HelpText="Enter the module content" ResourceKey="Content">Content: </Label>
             </td>
             <td>
                 <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
@@ -15,8 +16,8 @@
         </tr>
     </tbody>
 </table>
-<button type="button" class="btn btn-success" @onclick="ImportModule">Import</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 
 @code {
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index 31cedb01..95bb5cec 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -1,18 +1,19 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
+@inject IStringLocalizer<Settings> Localizer
 
 <TabStrip>
-    <TabPanel Name="Settings" Heading="Module Settings">
+    <TabPanel Name="Settings" Heading="Module Settings" ResourceKey="ModuleSettings">
         @if (_containers != null)
         {
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label For="title" HelpText="Enter the title of the module">Title: </Label>
+                        <Label For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
                     </td>
                     <td>
                         <input id="title" type="text" name="Title" class="form-control" @bind="@_title" />
@@ -20,11 +21,11 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="container" HelpText="Select the module's container">Container: </Label>
+                        <Label For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
                     </td>
                     <td>
                         <select id="container" class="form-control" @bind="@_containerType">
-                            <option value="-">&lt;Inherit From Page Or Site&gt;</option>
+                            <option value="-">&lt;@Localizer["Inherit From Page Or Site"]&gt;</option>
                             @foreach (var container in _containers)
                             {
                                 <option value="@container.TypeName">@container.Name</option>
@@ -34,18 +35,18 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages">Display On All Pages? </Label>
+                        <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
                     </td>
                     <td>
                         <select id="allpages" class="form-control" @bind="@_allPages">
-                            <option value="True">Yes</option>
-                            <option value="False">No</option>
+                            <option value="True">@Localizer["Yes"]</option>
+                            <option value="False">@Localizer["No"]</option>
                         </select>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <Label For="page" HelpText="The page that the module is on">Page: </Label>
+                        <Label For="page" HelpText="The page that the module is on" ResourceKey="Page">Page: </Label>
                     </td>
                     <td>
                         <select id="page" class="form-control" @bind="@_pageId">
@@ -62,7 +63,7 @@
             </table>
         }
     </TabPanel>
-    <TabPanel Name="Permissions">
+    <TabPanel Name="Permissions" ResourceKey="Permissions">
         @if (_permissions != null)
         {
             <table class="table table-borderless">
@@ -76,13 +77,13 @@
     </TabPanel>
     @if (_settingsModuleType != null)
     {
-        <TabPanel Name="ModuleSettings" Heading="@_settingstitle">
+        <TabPanel Name="ModuleSettings" Heading="@_settingstitle" ResourceKey="Module Settings">
             @DynamicComponent
         </TabPanel>
     }
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModule">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SaveModule">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private List<ThemeControl> _containers = new List<ThemeControl>();
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index f666441b..1d205ba5 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -1,17 +1,18 @@
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IThemeService  ThemeService
+@inject IStringLocalizer<Add> Localizer
 
 <TabStrip>
-    <TabPanel Name="Settings">
+    <TabPanel Name="Settings" ResourceKey="Settings">
         @if (_themeList != null)
         {
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label For="Name" HelpText="Enter the page name">Name: </Label>
+                        <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                     </td>
                     <td>
                         <input id="Name" class="form-control" @bind="@_name" />
@@ -19,11 +20,11 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy">Parent: </Label>
+                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                     </td>
                     <td>
                         <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;Site Root&gt;</option>
+                            <option value="-1">&lt;@Localizer["Site Root"]&gt;</option>
                             @foreach (Page page in _pageList)
                             {
                                 <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
@@ -33,22 +34,22 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages">Insert: </Label>
+                        <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
                     </td>
                     <td>
                         <select id="Insert" class="form-control" @bind="@_insert">
-                            <option value="<<">At Beginning</option>
+                            <option value="<<">@Localizer["At Beginning"]</option>
                             @if (_children != null && _children.Count > 0)
                             {
-                                <option value="<">Before</option>
-                                <option value=">">After</option>
+                                <option value="<">@Localizer["Before"]</option>
+                                <option value=">">@Localizer["After"]</option>
                             }
-                            <option value=">>">At End</option>
+                            <option value=">>">@Localizer["At End"]</option>
                         </select>
                         @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
                             <select class="form-control" @bind="@_childid">
-                                <option value="-1">&lt;Select Page&gt;</option>
+                                <option value="-1">&lt;@Localizer["Select Page"]&gt;</option>
                                 @foreach (Page page in _children)
                                 {
                                     <option value="@(page.PageId)">@(page.Name)</option>
@@ -59,18 +60,18 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden">Navigation? </Label>
+                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
                     </td>
                     <td>
                         <select id="Navigation" class="form-control" @bind="@_isnavigation">
-                            <option value="True">Yes</option>
-                            <option value="False">No</option>
+                            <option value="True">@Localizer["Yes"]</option>
+                            <option value="False">@Localizer["No"]</option>
                         </select>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.">Url Path: </Label>
+                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used." ResourceKey="UrlPath">Url Path: </Label>
                     </td>
                     <td>
                         <input id="Path" class="form-control" @bind="@_path" />
@@ -78,18 +79,18 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it">Redirect: </Label>
+                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it" ResourceKey="Redirect">Redirect: </Label>
                     </td>
                     <td>
                         <input id="Url" class="form-control" @bind="@_url" />
                     </td>
                 </tr>
             </table>
-            <Section Name="Appearance">
+            <Section Name="Appearance" ResourceKey="Appearance">
                 <table class="table table-borderless">
                     <tr>
                         <td>
-                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used.">Title: </Label>
+                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                         </td>
                         <td>
                             <input id="Title" class="form-control" @bind="@_title" />
@@ -97,11 +98,11 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Theme" HelpText="Select the theme for this page">Theme: </Label>
+                            <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
                             <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                                <option value="-">&lt;Inherit From Site&gt;</option>
+                                <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                 @foreach (var theme in _themes)
                                 {
                                     if (theme.TypeName == _themetype)
@@ -120,11 +121,11 @@
                     {
                         <tr>
                             <td>
-                                <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)">Layout: </Label>
+                                <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)" ResourceKey="Layout">Layout: </Label>
                             </td>
                             <td>
                                 <select id="Layout" class="form-control" @bind="@_layouttype">
-                                    <option value="-">&lt;Inherit From Site&gt;</option>
+                                    <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                     @foreach (var layout in _layouts)
                                     {
                                         if (layout.TypeName == _layouttype)
@@ -142,11 +143,11 @@
                     }
                     <tr>
                         <td>
-                            <Label For="defaultContainer" HelpText="Select the default container for the page">Default Container: </Label>
+                            <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
                         </td>
                         <td>
                             <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                                <option value="-">&lt;Inherit From Site&gt;</option>
+                                <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                 @foreach (var container in _containers)
                                 {
                                     <option value="@container.TypeName">@container.Name</option>
@@ -156,7 +157,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation">Icon: </Label>
+                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
                         </td>
                         <td>
                             <input id="Icon" class="form-control" @bind="@_icon" />
@@ -164,12 +165,12 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content">Personalizable? </Label>
+                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
                         </td>
                         <td>
                             <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
-                                <option value="True">Yes</option>
-                                <option value="False">No</option>
+                                <option value="True">@Localizer["Yes"]</option>
+                                <option value="False">@Localizer["No"]</option>
                             </select>
                         </td>
                     </tr>
@@ -177,7 +178,7 @@
             </Section>
         }
     </TabPanel>
-    <TabPanel Name="Permissions">
+    <TabPanel Name="Permissions" ResourceKey="Permissions">
         <table class="table table-borderless">
             <tr>
                 <td>
@@ -187,8 +188,8 @@
         </table>
     </TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SavePage">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private List<Theme> _themeList;
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index ee191dd8..19f58753 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -1,17 +1,18 @@
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IThemeService  ThemeService
+@inject IStringLocalizer<Edit> Localizer
 
 <TabStrip>
-    <TabPanel Name="Settings">
+    <TabPanel Name="Settings" ResourceKey="Settings">
         @if (_themeList != null)
         {
             <table class="table table-borderless">
                 <tr>
                     <td>
-                        <Label For="Name" HelpText="Enter the page name">Name: </Label>
+                        <Label For="Name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
                     </td>
                     <td>
                         <input id="Name" class="form-control" @bind="@_name" />
@@ -19,11 +20,11 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy">Parent: </Label>
+                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                     </td>
                     <td>
                         <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;Site Root&gt;</option>
+                            <option value="-1">&lt;@Localizer["Site Root"]&gt;</option>
                             @foreach (Page page in _pageList)
                             {
                                 if (page.PageId.ToString() == _parentid)
@@ -40,26 +41,26 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages">Move: </Label>
+                        <Label For="Move" HelpText="Select the location where you would like the page to be moved in relation to other pages" ResourceKey="Move">Move: </Label>
                     </td>
                     <td>
                         <select id="Move" class="form-control" @bind="@_insert">
                             @if (_parentid == _currentparentid)
                             {
-                                <option value="=">&lt;Maintain Current Location&gt;</option>
+                                <option value="=">&lt;@Localizer["Maintain Current Location"]&gt;</option>
                             }
-                            <option value="<<">To Beginning</option>
+                            <option value="<<">@Localizer["To Beginning"]</option>
                             @if (_children != null && _children.Count > 0)
                             {
-                                <option value="<">Before</option>
-                                <option value=">">After</option>
+                                <option value="<">@Localizer["Before"]</option>
+                                <option value=">">@Localizer["After"]</option>
                             }
-                            <option value=">>">To End</option>
+                            <option value=">>">@Localizer["To End"]</option>
                         </select>
                         @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                         {
                             <select class="form-control" @bind="@_childid">
-                                <option value="-1">&lt;Select Page&gt;</option>
+                                <option value="-1">&lt;@Localizer["Select Page"]&gt;</option>
                                 @foreach (Page page in _children)
                                 {
                                     <option value="@(page.PageId)">@(page.Name)</option>
@@ -70,18 +71,18 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden">Navigation? </Label>
+                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
                     </td>
                     <td>
                         <select id="Navigation" class="form-control" @bind="@_isnavigation">
-                            <option value="True">Yes</option>
-                            <option value="False">No</option>
+                            <option value="True">@Localizer["Yes"]</option>
+                            <option value="False">@Localizer["No"]</option>
                         </select>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.">Url Path: </Label>
+                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used." ResourceKey="UrlPath">Url Path: </Label>
                     </td>
                     <td>
                         <input id="Path" class="form-control" @bind="@_path" />
@@ -89,18 +90,18 @@
                 </tr>
                 <tr>
                     <td>
-                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it">Redirect: </Label>
+                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it" ResourceKey="Redirect">Redirect: </Label>
                     </td>
                     <td>
                         <input id="Url" class="form-control" @bind="@_url" />
                     </td>
                 </tr>
             </table>
-            <Section Name="Appearance">
+            <Section Name="Appearance" ResourceKey="Appearance">
                 <table class="table table-borderless">
                     <tr>
                         <td>
-                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used.">Title: </Label>
+                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
                         </td>
                         <td>
                             <input id="Title" class="form-control" @bind="@_title" />
@@ -108,7 +109,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Theme" HelpText="Select the theme for this page">Theme: </Label>
+                            <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
                             <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
@@ -131,11 +132,11 @@
                     {
                         <tr>
                             <td>
-                                <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)">Layout: </Label>
+                                <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)" ResourceKey="Layout">Layout: </Label>
                             </td>
                             <td>
                                 <select id="Layout" class="form-control" @bind="@_layouttype">
-                                    <option value="-">&lt;Inherit From Site&gt;</option>
+                                    <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                     @foreach (var layout in _layouts)
                                     {
                                         if (layout.TypeName == _layouttype)
@@ -153,11 +154,11 @@
                     }
                     <tr>
                         <td>
-                            <Label For="defaultContainer" HelpText="Select the default container for the page">Default Container: </Label>
+                            <Label For="defaultContainer" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
                         </td>
                         <td>
                             <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                                <option value="-">&lt;Inherit From Site&gt;</option>
+                                <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                 @foreach (var container in _containers)
                                 {
                                     <option value="@container.TypeName">@container.Name</option>
@@ -167,7 +168,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation">Icon: </Label>
+                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
                         </td>
                         <td>
                             <input id="Icon" class="form-control" @bind="@_icon" />
@@ -175,12 +176,12 @@
                     </tr>
                     <tr>
                         <td>
-                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content">Personalizable? </Label>
+                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
                         </td>
                         <td>
                             <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
-                                <option value="True">Yes</option>
-                                <option value="False">No</option>
+                                <option value="True">@Localizer["Yes"]</option>
+                                <option value="False">@Localizer["No"]</option>
                             </select>
                         </td>
                     </tr>
@@ -190,7 +191,7 @@
             <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
         }
     </TabPanel>
-    <TabPanel Name="Permissions">
+    <TabPanel Name="Permissions" ResourceKey="Permissions">
         @if (_permissions != null)
         {
             <table class="table table-borderless">
@@ -203,8 +204,8 @@
         }
     </TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<button type="button" class="btn btn-success" @onclick="SavePage">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private List<Theme> _themeList;
diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
index 02d1d14c..4e3966f9 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -1,21 +1,22 @@
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
+@inject IStringLocalizer<Index> Localizer 
 
 @if (PageState.Pages != null)
 {
-    <ActionLink Action="Add" Text="Add Page" />
+    <ActionLink Action="Add" Text="Add Page" ResourceKey="AddPage" />
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
+            <th>@Localizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
+            <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
         </Row>
     </Pager>
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
index 44843e8e..4eab45b9 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor
@@ -2,97 +2,98 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IProfileService ProfileService
+@inject IStringLocalizer<Edit> Localizer
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="name" HelpText="The name of this profile item">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="title" HelpText="The title of the profile item to display to the user">Title: </Label>
-            </td>
-            <td>
-                <input id="title" class="form-control" @bind="@_title" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="The help text displayed to the user for this profile item">Description: </Label>
-            </td>
-            <td>
-                <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="category" HelpText="The category of this profile item (for grouping)">Category: </Label>
-            </td>
-            <td>
-                <input id="category" class="form-control" @bind="@_category" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="order" HelpText="The index order of where this profile item should be displayed">Order: </Label>
-            </td>
-            <td>
-                <input id="order" class="form-control" @bind="@_vieworder" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)">Length: </Label>
-            </td>
-            <td>
-                <input id="length" class="form-control" @bind="@_maxlength" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultVal" HelpText="The default value for this profile item">Default Value: </Label>
-            </td>
-            <td>
-                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="options" HelpText="A comma delimited list of options the user can select from">Options: </Label>
-            </td>
-            <td>
-                <input id="options" class="form-control" @bind="@_options" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="required" HelpText="Should a user be required to provide a value for this profile item?">Required? </Label>
-            </td>
-            <td>
-                <select id="required" class="form-control" @bind="@_isrequired">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="private" HelpText="Should this profile item be visible to all users?">Private? </Label>
-            </td>
-            <td>
-                <select id="private" class="form-control" @bind="@_isprivate">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-    </table>
-<button type="button" class="btn btn-success" @onclick="SaveProfile">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <Label For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
+        </td>
+        <td>
+            <input id="name" class="form-control" @bind="@_name" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="title" HelpText="The title of the profile item to display to the user" ResourceKey="Title">Title: </Label>
+        </td>
+        <td>
+            <input id="title" class="form-control" @bind="@_title" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="description" HelpText="The help text displayed to the user for this profile item" ResourceKey="Description">Description: </Label>
+        </td>
+        <td>
+            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="category" HelpText="The category of this profile item (for grouping)" ResourceKey="Category">Category: </Label>
+        </td>
+        <td>
+            <input id="category" class="form-control" @bind="@_category" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="order" HelpText="The index order of where this profile item should be displayed" ResourceKey="Order">Order: </Label>
+        </td>
+        <td>
+            <input id="order" class="form-control" @bind="@_vieworder" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)" ResourceKey="Length">Length: </Label>
+        </td>
+        <td>
+            <input id="length" class="form-control" @bind="@_maxlength" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="defaultVal" HelpText="The default value for this profile item" ResourceKey="DefaultValue">Default Value: </Label>
+        </td>
+        <td>
+            <input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="options" HelpText="A comma delimited list of options the user can select from" ResourceKey="Options">Options: </Label>
+        </td>
+        <td>
+            <input id="options" class="form-control" @bind="@_options" />
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
+        </td>
+        <td>
+            <select id="required" class="form-control" @bind="@_isrequired">
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
+            </select>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <Label For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
+        </td>
+        <td>
+            <select id="private" class="form-control" @bind="@_isprivate">
+                <option value="True">@Localizer["Yes"]</option>
+                <option value="False">@Localizer["No"]</option>
+            </select>
+        </td>
+    </tr>
+</table>
+<button type="button" class="btn btn-success" @onclick="SaveProfile">@Localizer["Save"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private int _profileid = -1;
@@ -169,7 +170,8 @@
             if (_profileid != -1)
             {
                 profile = await ProfileService.UpdateProfileAsync(profile);
-            }else
+            }
+            else
             {
                 profile = await ProfileService.AddProfileAsync(profile);
             }
diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
index 36df1731..e7985f51 100644
--- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -1,24 +1,25 @@
-@namespace Oqtane.Modules.Admin.Profiles
+@namespace Oqtane.Modules.Admin.Profiles
 @inherits ModuleBase
 @inject IProfileService ProfileService
+@inject IStringLocalizer<Index> Localizer
 
 @if (_profiles == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@Localizer["Loading..."]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" />
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" ResourceKey="AddProfile" />
 
     <Pager Items="@_profiles">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>Name</th>
+            <th>@Localizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
+            <td><ActionDialog Header="Delete Profile" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 220f5ffe..beaa74c1 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -1,16 +1,17 @@
-@namespace Oqtane.Modules.Admin.RecycleBin
+@namespace Oqtane.Modules.Admin.RecycleBin
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageModuleService PageModuleService
 @inject IModuleService ModuleService
 @inject IPageService PageService
+@inject IStringLocalizer<Index> Localizer
 
 <TabStrip>
-    <TabPanel Name="Pages">
+    <TabPanel Name="Pages" ResourceKey="Pages">
         @if (_pages == null)
         {
             <br />
-            <p>No Deleted Pages</p>
+            <p>@Localizer["No Deleted Pages"]</p>
         }
         else
         {
@@ -19,12 +20,12 @@
                     <th style="width: 1px;">&nbsp;</th>
                     <th style="width: 1px;">&nbsp;</th>
                     <th>Name</th>
-                    <th>Deleted By</th>
-                    <th>Deleted On</th>
+                    <th>@Localizer["Deleted By"]</th>
+                    <th>@Localizer["Deleted On"]</th>
                 </Header>
                 <Row>
                     <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
+                    <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
                     <td>@context.Name</td>
                     <td>@context.DeletedBy</td>
                     <td>@context.DeletedOn</td>
@@ -32,11 +33,11 @@
             </Pager>
         }
     </TabPanel>
-    <TabPanel Name="Modules">
+    <TabPanel Name="Modules" ResourceKey="Modules">
         @if (_modules == null)
         {
             <br />
-            <p>No Deleted Modules</p>
+            <p>@Localizer["No Deleted Modules"]</p>
         }
         else
         {
@@ -44,14 +45,14 @@
                 <Header>
                     <th style="width: 1px;">&nbsp;</th>
                     <th style="width: 1px;">&nbsp;</th>
-                    <th>Page</th>
-                    <th>Module</th>
-                    <th>Deleted By</th>
-                    <th>Deleted On</th>
+                    <th>@Localizer["Page"]</th>
+                    <th>@Localizer["Module"]</th>
+                    <th>@Localizer["Deleted By"]</th>
+                    <th>@Localizer["Deleted On"]</th>
                 </Header>
                 <Row>
-                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" /></td>
+                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
+                    <td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
                     <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
                     <td>@context.Title</td>
                     <td>@context.DeletedBy</td>
@@ -150,12 +151,12 @@
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
             // check if there are any remaining module instances in the site
             _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-            
+
             if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
             }
-            
+
             await logger.LogInformation("Module Permanently Deleted {Module}", module);
             await Load();
             StateHasChanged();
diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
index 2ea64944..dfff44e0 100644
--- a/Oqtane.Client/Modules/Admin/Register/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -1,7 +1,8 @@
-@namespace Oqtane.Modules.Admin.Register
+@namespace Oqtane.Modules.Admin.Register
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
 
 @if (PageState.Site.AllowRegistration)
 {
@@ -17,27 +18,27 @@
 
             <div class="container">
                 <div class="form-group">
-                    <label for="Username" class="control-label">Username: </label>
+                    <label for="Username" class="control-label">@Localizer["Username:"] </label>
                     <input type="text" class="form-control" placeholder="Username" @bind="@_username" id="Username" />
                 </div>
                 <div class="form-group">
-                    <label for="Password" class="control-label">Password: </label>
+                    <label for="Password" class="control-label">@Localizer["Password:"] </label>
                     <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
                 </div>
                 <div class="form-group">
-                    <label for="Confirm" class="control-label">Confirm Password: </label>
+                    <label for="Confirm" class="control-label">@Localizer["Confirm Password:"] </label>
                     <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" />
                 </div>
                 <div class="form-group">
-                    <label for="Email" class="control-label">Email: </label>
+                    <label for="Email" class="control-label">@Localizer["Email:"] </label>
                     <input type="text" class="form-control" placeholder="Email" @bind="@_email" id="Email" />
                 </div>
                 <div class="form-group">
-                    <label for="DisplayName" class="control-label">Full Name: </label>
+                    <label for="DisplayName" class="control-label">@Localizer["Full Name:"] </label>
                     <input type="text" class="form-control" placeholder="Full Name" @bind="@_displayName" id="DisplayName" />
                 </div>
-                <button type="button" class="btn btn-primary" @onclick="Register">Register</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+                <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
             </div>
         </NotAuthorized>
     </AuthorizeView>
diff --git a/Oqtane.Client/Modules/Admin/Reset/Index.razor b/Oqtane.Client/Modules/Admin/Reset/Index.razor
index b6e4eb66..1a04eb46 100644
--- a/Oqtane.Client/Modules/Admin/Reset/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Reset/Index.razor
@@ -1,23 +1,24 @@
-@namespace Oqtane.Modules.Admin.Reset
+@namespace Oqtane.Modules.Admin.Reset
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
 
 <div class="container">
     <div class="form-group">
-        <label for="Username" class="control-label">Username: </label>
+        <label for="Username" class="control-label">@Localizer["Username:"] </label>
         <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username"/>
     </div>
     <div class="form-group">
-        <label for="Password" class="control-label">Password: </label>
+        <label for="Password" class="control-label">@Localizer["Password:"] </label>
         <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password"/>
     </div>
     <div class="form-group">
-        <label for="Confirm" class="control-label">Confirm Password: </label>
+        <label for="Confirm" class="control-label">@Localizer["Confirm Password:"] </label>
         <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm"/>
     </div>
-    <button type="button" class="btn btn-primary" @onclick="Reset">Reset Password</button>
-    <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Reset Password"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@Localizer["Cancel"]</button>
 </div>
 
 @code {
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 204aa21f..000f54be 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -1,7 +1,8 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
+@inject IStringLocalizer<PermissionGrid> Localizer 
 
 @if (_permissions != null)
 {
@@ -9,7 +10,7 @@
     <table class="table" style="width: 50%; min-width: 250px;">
         <tbody>
             <tr>
-                <th scope="col">Role</th>
+                <th scope="col">@Localizer["Role"]</th>
                 @foreach (PermissionString permission in _permissions)
                 {
                     <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
@@ -35,7 +36,7 @@
         <table class="table" style="width: 50%; min-width: 250px;">
             <thead>
                 <tr>
-                    <th scope="col">User</th>
+                    <th scope="col">@Localizer["User"]</th>
                     @foreach (PermissionString permission in _permissions)
                     {
                         <th style="text-align: center; width: 1px;">@permission.PermissionName</th>
@@ -65,7 +66,7 @@
             <tr>
                 <td class="input-group">
                     <input type="text" name="Username" class="form-control" placeholder="Enter Username" @bind="@_username" />
-                    <button type="button" class="btn btn-primary" @onclick="AddUser">Add</button>
+                    <button type="button" class="btn btn-primary" @onclick="AddUser">@Localizer["Add"]</button>
                 </td>
             </tr>
         </tbody>
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 3d7d2327..40af9497 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -1,5 +1,6 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
 @inherits ModuleControlBase
+@inject IStringLocalizer<RichTextEditor> Localizer 
 
 <div class="row" style="margin-bottom: 50px;">
     <div class="col">
@@ -12,12 +13,12 @@
                     <br />
                 }
                 <div class="row justify-content-center" style="margin-bottom: 20px;">
-                    <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">Synchronize Content</button>&nbsp;&nbsp;
-                    <button type="button" class="btn btn-primary" @onclick="InsertImage">Insert Image</button>
+                    <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["Synchronize Content"]</button>&nbsp;&nbsp;
+                    <button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["Insert Image"]</button>
                     @if (_filemanagervisible)
                     {
                         @((MarkupString)"&nbsp;&nbsp;")
-                        <button type="button" class="btn btn-secondary" @onclick="CloseFileManager">Close</button>
+                <button type="button" class="btn btn-secondary" @onclick="CloseFileManager">@Localizer["Close"]</button>
                     }
                 </div>
                 <div class="row">
@@ -61,9 +62,9 @@
                     </div>
                 </div>
             </TabPanel>
-            <TabPanel Name="Raw" Heading="Raw HTML Editor">
+            <TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
                 <div class="row justify-content-center" style="margin-bottom: 20px;">
-                    <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">Synchronize Content</button>
+                    <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["Synchronize Content"]</button>
                 </div>
                 @if (ReadOnly)
                 {
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index 0e15706f..25ef9b63 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -1,16 +1,17 @@
-@using Oqtane.Modules.HtmlText.Services
+@using Oqtane.Modules.HtmlText.Services
 @using Oqtane.Modules.HtmlText.Models
 @using Oqtane.Modules.Controls
 @namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject IHtmlTextService HtmlTextService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
 
 @if (_content != null)
 {
     <RichTextEditor Content="@_content" @ref="@RichTextEditorHtml"></RichTextEditor>
-    <button type="button" class="btn btn-success" @onclick="SaveContent">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <button type="button" class="btn btn-success" @onclick="SaveContent">@Localizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
     @if (!string.IsNullOrEmpty(_content))
     {
         <br />
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index 36e7c35c..c38009c5 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -1,4 +1,4 @@
-@using Oqtane.Modules.HtmlText.Services
+@using Oqtane.Modules.HtmlText.Services
 @namespace Oqtane.Modules.HtmlText
 @inherits ModuleBase
 @inject IHtmlTextService HtmlTextService
@@ -7,7 +7,7 @@
 
 @if (PageState.EditMode)
 {
-    <br /><ActionLink Action="Edit" EditMode="true" /><br /><br />
+    <br /><ActionLink Action="Edit" EditMode="true" ResourceKey="Edit" /><br /><br />
 }
 
 @code {
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 7629066b..02ae862c 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
 @inherits ThemeControlBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -9,6 +9,7 @@
 @inject IPageModuleService PageModuleService
 @inject ILogService logger
 @inject ISettingService SettingService
+@inject IStringLocalizer<ControlPanel> Localizer 
 
 @if (_moduleDefinitions != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
@@ -16,7 +17,7 @@
 
         <div class="@CardClass">
             <div class="@HeaderClass">
-                <span class="font-weight-bold">Control Panel</span>
+                <span class="font-weight-bold">@Localizer["Control Panel"]</span>
                 <button type="button" class="close" @onclick="HideControlPanel" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -27,7 +28,7 @@
                 {
                     <div class="row">
                         <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Admin"))>Admin Dashboard</button>
+                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Admin"))>@Localizer["Admin Dashboard"]</button>
                         </div>
                     </div>
 
@@ -35,18 +36,18 @@
 
                     <div class="row">
                         <div class="col text-center">
-                            <label class="control-label">Page Management: </label>
+                            <label class="control-label">@Localizer["Page Management:"] </label>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Add"))>Add</button>
+                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Add"))>@Localizer["Add"]</button>
                         </div>
                         <div class="col">
-                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Edit"))>Edit</button>
+                            <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Navigate("Edit"))>@Localizer["Edit"]</button>
                         </div>
                         <div class="col">
-                            <button class="btn btn-danger btn-block mx-auto" @onclick="ConfirmDelete">Delete</button>
+                            <button class="btn btn-danger btn-block mx-auto" @onclick="ConfirmDelete">@Localizer["Delete"]</button>
                         </div>
                     </div>
                     <br />
@@ -54,13 +55,13 @@
                         @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
                         {
                             <div class="col">
-                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>Unpublish Page</button>
+                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>@Localizer["Unpublish Page"]</button>
                             </div>
                         }
                         else
                         {
                             <div class="col">
-                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("publish"))>Publish Page</button>
+                                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("publish"))>@Localizer["Publish Page"]</button>
                             </div>
                         }
                     </div>
@@ -73,15 +74,15 @@
                             <div class="modal-dialog">
                                 <div class="modal-content">
                                     <div class="modal-header">
-                                        <h5 class="modal-title">Delete Page</h5>
+                                        <h5 class="modal-title">@Localizer["Delete Page"]</h5>
                                         <button type="button" class="close" @onclick="ConfirmDelete" aria-label="Close">&times;</button>
                                     </div>
                                     <div class="modal-body">
                                         <p>Are You Sure You Want To Delete This Page?</p>
                                     </div>
                                     <div class="modal-footer">
-                                        <button type="button" class="btn btn-danger" @onclick="DeletePage">Delete</button>
-                                        <button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">Cancel</button>
+                                        <button type="button" class="btn btn-danger" @onclick="DeletePage">@Localizer["Delete"]</button>
+                                        <button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@Localizer["Cancel"]</button>
                                     </div>
                                 </div>
                             </div>
@@ -92,10 +93,10 @@
 
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Module" class="control-label">Module Management: </label>
+                        <label for="Module" class="control-label">@Localizer["Module Management:"] </label>
                         <select class="form-control" @bind="@ModuleType">
-                            <option value="new">Add New Module</option>
-                            <option value="existing">Add Existing Module</option>
+                            <option value="new">@Localizer["Add New Module"]</option>
+                            <option value="existing">@Localizer["Add Existing Module"]</option>
                         </select>
                         @if (ModuleType == "new")
                         {
@@ -106,22 +107,22 @@
                                     {
                                         if (category == Category)
                                         {
-                                            <option value="@category" selected>@category Modules</option>
+                                            <option value="@category" selected>@category @Localizer["Modules"]</option>
                                         }
                                         else
                                         {
-                                            <option value="@category">@category Modules</option>
+                                            <option value="@category">@category @Localizer["Modules"]</option>
                                         }
                                     }
                                 </select>
                                 <select class="form-control" @onchange="(e => ModuleChanged(e))">
                                     @if (ModuleDefinitionName == "-")
                                     {
-                                        <option value="-" selected>&lt;Select Module&gt;</option>
+                                        <option value="-" selected>&lt;@Localizer["Select Module"]&gt;</option>
                                     }
                                     else
                                     {
-                                        <option value="-">&lt;Select Module&gt;</option>
+                                        <option value="-">&lt;@Localizer["Select Module"]&gt;</option>
                                     }
                                     @foreach (var moduledefinition in _moduleDefinitions)
                                     {
@@ -140,14 +141,14 @@
                         else
                         {
                             <select class="form-control" @onchange="(e => PageChanged(e))">
-                                <option value="-">&lt;Select Page&gt;</option>
+                                <option value="-">&lt;@Localizer["Select Page"]&gt;</option>
                                 @foreach (Page p in _pages)
                                 {
                                     <option value="@p.PageId">@p.Name</option>
                                 }
                             </select>
                             <select class="form-control" @bind="@ModuleId">
-                                <option value="-">&lt;Select Module&gt;</option>
+                                <option value="-">&lt;@Localizer["Select Module"]&gt;</option>
                                 @foreach (Module module in _modules)
                                 {
                                     <option value="@module.ModuleId">@module.Title</option>
@@ -158,7 +159,7 @@
                 </div>
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Title" class="control-label">Title: </label>
+                        <label for="Title" class="control-label">@Localizer["Title:"] </label>
                         <input type="text" name="Title" class="form-control" @bind="@Title" />
                     </div>
                 </div>
@@ -166,7 +167,7 @@
                 {
                     <div class="row">
                         <div class="col text-center">
-                            <label for="Pane" class="control-label">Pane: </label>
+                            <label for="Pane" class="control-label">@Localizer["Pane:"] </label>
                             <select class="form-control" @bind="@Pane">
                                 @foreach (string pane in PageState.Page.Panes)
                                 {
@@ -178,7 +179,7 @@
                 }
                 <div class="row">
                     <div class="col text-center">
-                        <label for="Container" class="control-label">Container: </label>
+                        <label for="Container" class="control-label">@Localizer["Container:"] </label>
                         <select class="form-control" @bind="@ContainerType">
                             @foreach (var container in _containers)
                             {
@@ -190,7 +191,7 @@
 
                 <br />
 
-                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick="@AddModule">Add Module To Page</button>
+                <button type="button" class="btn btn-primary btn-block mx-auto" @onclick="@AddModule">@Localizer["Add Module To Page"]</button>
                 @((MarkupString) Message)
             </div>
         </div>
diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
index 84ef808e..f4c415c9 100644
--- a/Oqtane.Client/Themes/Controls/Login.razor
+++ b/Oqtane.Client/Themes/Controls/Login.razor
@@ -1,5 +1,6 @@
-@namespace Oqtane.Themes.Controls
-@inherits LoginBase   
+@namespace Oqtane.Themes.Controls
+@inherits LoginBase
+@inject IStringLocalizer<Login> Localizer 
 
 <span class="app-login">
     <AuthorizeView>
@@ -7,10 +8,10 @@
             <text>...</text>
         </Authorizing>
         <Authorized>
-            <button type="button" class="btn btn-primary" @onclick="LogoutUser">Logout</button>
+            <button type="button" class="btn btn-primary" @onclick="LogoutUser">@Localizer["Logout"]</button>
         </Authorized>
         <NotAuthorized>
-            <button type="button" class="btn btn-primary" @onclick="LoginUser">Login</button>
+            <button type="button" class="btn btn-primary" @onclick="LoginUser">@Localizer["Login"]</button>
         </NotAuthorized>
     </AuthorizeView>
 </span>
\ No newline at end of file
diff --git a/Oqtane.Client/Themes/Controls/UserProfile.razor b/Oqtane.Client/Themes/Controls/UserProfile.razor
index a5d95aeb..e939d633 100644
--- a/Oqtane.Client/Themes/Controls/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/UserProfile.razor
@@ -1,5 +1,6 @@
-@namespace Oqtane.Themes.Controls
-@inherits ThemeControlBase   
+@namespace Oqtane.Themes.Controls
+@inherits ThemeControlBase
+@inject IStringLocalizer<UserProfile> Localizer 
 
 @inject NavigationManager NavigationManager
 
@@ -14,7 +15,7 @@
         <NotAuthorized>
             @if (PageState.Site.AllowRegistration)
             {
-                <button type="button" class="btn btn-primary" @onclick="RegisterUser">Register</button>
+            <button type="button" class="btn btn-primary" @onclick="RegisterUser">@Localizer["Register"]</button>
             }
         </NotAuthorized>
     </AuthorizeView>
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index 6ee0bba4..8c1fc95a 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -1,37 +1,38 @@
-@namespace Oqtane.UI
+@namespace Oqtane.UI
 @inject NavigationManager NavigationManager
 @inject IInstallationService InstallationService
 @inject ISiteService SiteService
 @inject IUserService UserService
 @inject IJSRuntime JSRuntime
+@inject IStringLocalizer<Installer> Localizer
 
 <div class="container">
     <div class="row">
         <div class="mx-auto text-center">
             <img src="oqtane-black.png" />
-            <div style="font-weight: bold">Version: @Constants.Version</div>
+            <div style="font-weight: bold">@Localizer["Version:"] @Constants.Version</div>
         </div>
     </div>
     <hr class="app-rule" />
     <div class="row justify-content-center">
         <div class="col text-center">
-            <h2>Database Configuration</h2><br />
+            <h2>@Localizer["Database Configuration"]</h2><br />
             <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Database Type: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Database Type:"] </label>
                         </td>
                         <td>
                             <select class="custom-select" @bind="@_databaseType">
-                                <option value="LocalDB">Local Database</option>
-                                <option value="SQLServer">SQL Server</option>
+                                <option value="LocalDB">@Localizer["Local Database"]</option>
+                                <option value="SQLServer">@Localizer["SQL Server"]</option>
                             </select>
                         </td>
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Server: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Server:"] </label>
                         </td>
                         <td>
                             <input type="text" class="form-control" @bind="@_serverName" />
@@ -39,7 +40,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Database: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Database:"] </label>
                         </td>
                         <td>
                             <input type="text" class="form-control" @bind="@_databaseName" />
@@ -47,18 +48,18 @@
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Integrated Security: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Integrated Security:"] </label>
                         </td>
                         <td>
                             <select class="custom-select" @onchange="SetIntegratedSecurity">
-                                <option value="true" selected>True</option>
-                                <option value="false">False</option>
+                                <option value="true" selected>@Localizer["True"]</option>
+                                <option value="false">@Localizer["False"]</option>
                             </select>
                         </td>
                     </tr>
                     <tr style="@_integratedSecurityDisplay">
                         <td>
-                            <label class="control-label" style="font-weight: bold">Username: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Username:"] </label>
                         </td>
                         <td>
                             <input type="text" class="form-control" @bind="@_username" />
@@ -66,7 +67,7 @@
                     </tr>
                     <tr style="@_integratedSecurityDisplay">
                         <td>
-                            <label class="control-label" style="font-weight: bold">Password: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Password:"] </label>
                         </td>
                         <td>
                             <input type="password" class="form-control" @bind="@_password" />
@@ -76,12 +77,12 @@
             </table>
         </div>
         <div class="col text-center">
-            <h2>Application Administrator</h2><br />
+            <h2>@Localizer["Application Administrator"]</h2><br />
             <table class="form-group" cellpadding="4" cellspacing="4" style="margin: auto;">
                 <tbody>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Username: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Username:"] </label>
                         </td>
                         <td>
                             <input type="text" class="form-control" @bind="@_hostUsername" readonly />
@@ -89,7 +90,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Password: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Password:"] </label>
                         </td>
                         <td>
                             <input type="password" class="form-control" @bind="@_hostPassword" />
@@ -97,7 +98,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Confirm: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Confirm:"] </label>
                         </td>
                         <td>
                             <input type="password" class="form-control" @bind="@_confirmPassword" />
@@ -105,7 +106,7 @@
                     </tr>
                     <tr>
                         <td>
-                            <label class="control-label" style="font-weight: bold">Email: </label>
+                            <label class="control-label" style="font-weight: bold">@Localizer["Email:"] </label>
                         </td>
                         <td>
                             <input type="text" class="form-control" @bind="@_hostEmail" />
@@ -118,7 +119,7 @@
     <hr class="app-rule" />
     <div class="row">
         <div class="mx-auto text-center">
-            <button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
+            <button type="button" class="btn btn-success" @onclick="Install">@Localizer["Install Now"]</button><br /><br />
             <ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
         </div>
         <div class="app-progress-indicator" style="@_loadingDisplay"></div>