diff --git a/Database/Seeders/json/language_strings.json b/Database/Seeders/json/language_strings.json
index a448c66c6..7896d73cb 100644
--- a/Database/Seeders/json/language_strings.json
+++ b/Database/Seeders/json/language_strings.json
@@ -1765,6 +1765,36 @@
         "name": "Heading",
         "content": "General Settings"
     },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general-setting",
+        "name": "Backend Home Page Link",
+        "content": "Backend Home Page Link"
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general-setting",
+        "name": "Allowed file size for upload",
+        "content": "Allowed file size for upload( in MB)"
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general-setting",
+        "name": "Max number of forgot password attempts",
+        "content": "Max number of forgot password attempts"
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general-setting",
+        "name": "Copyright Link",
+        "content": "Copyright Link"
+    },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general",
+        "name": "Settings Successful Saved",
+        "content": "Settings successful saved"
+    },
     {
         "locale_code_iso_639": "en",
         "category": "general-setting",
@@ -2162,6 +2192,12 @@
         "name": "Scripts Message",
         "content": "Add scripts of Google Analytics and other tracking scripts."
     },
+    {
+        "locale_code_iso_639": "en",
+        "category": "general-setting",
+        "name": "Cache Delete Message",
+        "content": "Cache was successfully deleted."
+    },
     {
         "locale_code_iso_639": "en",
         "category": "general-setting",
@@ -5421,6 +5457,36 @@
         "name": "Heading",
         "content": "Configuración general"
     },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general-setting",
+        "name": "Backend Home Page Link",
+        "content": "Enlace a la página de inicio del backend"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general-setting",
+        "name": "Allowed file size for upload",
+        "content": "Tamaño de archivo permitido para cargar (en MB)"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general-setting",
+        "name": "Max number of forgot password attempts",
+        "content": "Número máximo de intentos de olvido de contraseña"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general-setting",
+        "name": "Copyright Link",
+        "content": "Enlace de derechos de autor"
+    },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general",
+        "name": "Settings Successful Saved",
+        "content": "Configuración guardada correctamente"
+    },
     {
         "locale_code_iso_639": "es",
         "category": "general-setting",
@@ -5817,6 +5883,12 @@
         "name": "Scripts Message",
         "content": "Agregue scripts de Google Analytics y otros scripts de seguimiento."
     },
+    {
+        "locale_code_iso_639": "es",
+        "category": "general-setting",
+        "name": "Cache Delete Message",
+        "content": "\nLa caché se eliminó correctamente."
+    },
     {
         "locale_code_iso_639": "es",
         "category": "general-setting",
@@ -8917,6 +8989,36 @@
         "name": "Site Settings",
         "content": "Paramètres du site"
     },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general-setting",
+        "name": "Backend Home Page Link",
+        "content": "Lien vers la page d'accueil du back-end"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general-setting",
+        "name": "Allowed file size for upload",
+        "content": "Taille de fichier autorisée pour le téléchargement (en Mo)"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general-setting",
+        "name": "Max number of forgot password attempts",
+        "content": "Nombre maximum de tentatives d'oubli de mot de passe"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general-setting",
+        "name": "Copyright Link",
+        "content": "Lien de droit d\\'auteur"
+    },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general",
+        "name": "Settings Successful Saved",
+        "content": "Paramètres enregistrés avec succès"
+    },
     {
         "locale_code_iso_639": "fr",
         "category": "general-setting",
@@ -9295,6 +9397,12 @@
         "name": "Scripts Message",
         "content": "Ajoutez des scripts de Google Analytics et d\\'autres scripts de suivi."
     },
+    {
+        "locale_code_iso_639": "fr",
+        "category": "general-setting",
+        "name": "Cache Delete Message",
+        "content": "Le cache a été supprimé avec succès."
+    },
     {
         "locale_code_iso_639": "fr",
         "category": "general-setting",
diff --git a/Http/Controllers/Backend/Settings/GeneralController.php b/Http/Controllers/Backend/Settings/GeneralController.php
index 295285352..fb81a9742 100644
--- a/Http/Controllers/Backend/Settings/GeneralController.php
+++ b/Http/Controllers/Backend/Settings/GeneralController.php
@@ -42,6 +42,7 @@ public function getAssets(Request $request): JsonResponse
             $response['success'] = true;
             $response['data']['base_url'] = url('/');
             $response['data']['roles'] = $role_data;
+            $response['data']['language_strings'] = $this->getLanguageStrings();
             $response['data']['file_types'] = $vh_file_types_data;
             $response['data']['vh_meta_attributes'] = vh_meta_attributes();
             $response['data']['languages'] = Language::select('name', 'locale_code_iso_639')->get();
@@ -60,6 +61,63 @@ public function getAssets(Request $request): JsonResponse
         return response()->json($response);
     }
     //----------------------------------------------------------
+    public function getLanguageStrings() : array {
+
+        return  [
+            "general_settings_title" => trans("vaahcms-general-setting.heading"),
+            "expand_all" => trans("vaahcms-general-setting.expand_all"),
+            "collapse_all" => trans("vaahcms-general-setting.collapse_all"),
+            "site_settings" => trans("vaahcms-general-setting.site_settings"),
+            "site_settings_message" => trans("vaahcms-general-setting.site_settings_message"),
+            "securities" => trans("vaahcms-general-setting.securities"),
+            "securities_message" => trans("vaahcms-general-setting.securities_message"),
+            "date_and_time" => trans("vaahcms-general-setting.date_and_time"),
+            "global_date_and_time_settings" => trans("vaahcms-general-setting.global_date_and_time_settings"),
+            "social_media_and_links" => trans("vaahcms-general-setting.social_media_and_links"),
+            "static_links_management" => trans("vaahcms-general-setting.static_links_management"),
+            "scripts" => trans("vaahcms-general-setting.scripts"),
+            "scripts_message" => trans("vaahcms-general-setting.scripts_message"),
+            "meta_tags" => trans("vaahcms-general-setting.meta_tags"),
+            "global_meta_tags" => trans("vaahcms-general-setting.global_meta_tags"),
+            "site_title" => trans("vaahcms-general-setting.site_title"),
+            "default_site_language" => trans("vaahcms-general-setting.default_site_language"),
+            "redirect_after_frontend_login" => trans("vaahcms-general-setting.redirect_after_frontend_login"),
+            "meta_description" => trans("vaahcms-general-setting.meta_description"),
+            "search_engine_visibility" => trans("vaahcms-general-setting.search_engine_visibility"),
+            "assign_roles_on_registration" => trans("vaahcms-general-setting.assign_roles_on_registration"),
+            "allowed_file_types_for_upload" => trans("vaahcms-general-setting.allowed_file_types_for_upload"),
+            "is_logo_compressed_with_sidebar" => trans("vaahcms-general-setting.is_logo_compressed_with_sidebar"),
+            "copyright_text" => trans("vaahcms-general-setting.copyright_text"),
+            "copyright_year" => trans("vaahcms-general-setting.copyright_year"),
+            "maximum_number_of_login_attempts" => trans("vaahcms-general-setting.maximum_number_of_login_attempts"),
+            "password_protection" => trans("vaahcms-general-setting.password_protection"),
+            "laravel_queues" => trans("vaahcms-general-setting.laravel_queues"),
+            "maintenance_mode" => trans("vaahcms-general-setting.maintenance_mode"),
+            "signup_page" => trans("vaahcms-general-setting.signup_page"),
+            "redirect_after_backend_logout" => trans("vaahcms-general-setting.redirect_after_backend_logout"),
+            "save_settings_button" => trans("vaahcms-general-setting.save_settings_button"),
+            "clear_cache_button" => trans("vaahcms-general-setting.clear_cache_button"),
+            "allowed_file_size_for_upload" => trans("vaahcms-general-setting.allowed_file_size_for_upload"),
+            "copyright_link" => trans("vaahcms-general-setting.copyright_link"),
+            "max_number_of_forgot_password_attempts" => trans("vaahcms-general-setting.max_number_of_forgot_password_attempts"),
+            "backend_home_page_link" => trans("vaahcms-general-setting.backend_home_page_link"),
+            "localization_placeholder_select_a_language" => trans("vaahcms-localization-setting.localization_placeholder_select_a_language"),
+            "enter_custom_text" => trans("vaahcms-general-setting.enter_custom_text"),
+            "enter_custom_link" => trans("vaahcms-general-setting.enter_custom_link"),
+            "enter_redirection_link" => trans("vaahcms-general-setting.enter_redirection_link"),
+            "enable" => trans("vaahcms-general-setting.enable"),
+            "disable" => trans("vaahcms-general-setting.disable"),
+            "true" => trans("vaahcms-general-setting.true"),
+            "false" => trans("vaahcms-general-setting.false"),
+            "use_app_name" => trans("vaahcms-general-setting.use_app_name"),
+            "use_app_url" => trans("vaahcms-general-setting.use_app_url"),
+            "use_current_year" => trans("vaahcms-general-setting.use_current_year"),
+            "backend" => trans("vaahcms-general-setting.backend"),
+            "frontend" => trans("vaahcms-general-setting.frontend"),
+            "custom" => trans("vaahcms-general-setting.custom"),
+        ];
+    }
+    //----------------------------------------------------------
     public function getList(Request $request): JsonResponse
     {
         $permission_slug = 'has-access-of-setting-section';
@@ -128,7 +186,7 @@ public function storeSiteSettings(Request $request): JsonResponse
 
             $response['success'] = true;
             $response['data'][] = '';
-            $response['messages'][] = 'Settings successful saved';
+            $response['messages'][] = trans("vaahcms-general.settings_successful_saved");
         } catch (\Exception $e) {
             $response = [];
             $response['success'] = false;
@@ -204,7 +262,7 @@ public function storeLinks(Request $request): JsonResponse
             }
 
             $response['success'] = true;
-            $response['messages'][] = 'Saved';
+            $response['messages'][] = trans("vaahcms-general.saved");
             $response['data'] = $data;
         } catch (\Exception $e) {
             $response = [];
@@ -264,7 +322,7 @@ public function storeMetaTags(Request $request): JsonResponse
             }
 
             $response['success'] = true;
-            $response['messages'][] = 'Saved';
+            $response['messages'][] = trans("vaahcms-general.saved");
             $response['data'] = $data;
         } catch (\Exception $e) {
             $response = [];
diff --git a/Http/Controllers/Frontend/WelcomeController.php b/Http/Controllers/Frontend/WelcomeController.php
index 81e95301a..a59582acc 100644
--- a/Http/Controllers/Frontend/WelcomeController.php
+++ b/Http/Controllers/Frontend/WelcomeController.php
@@ -47,7 +47,7 @@ public function clearCache(Request $request)
             }
 
             $response['success'] = true;
-            $response['messages'][] = 'Cache was successfully deleted.';
+            $response['messages'][] = trans("vaahcms-general-setting.cache_delete_message");
 
         }catch(\Exception $e)
         {
diff --git a/Vue/vaahtwo/pages/settings/general/Index.vue b/Vue/vaahtwo/pages/settings/general/Index.vue
index dd2026d4f..71429b515 100644
--- a/Vue/vaahtwo/pages/settings/general/Index.vue
+++ b/Vue/vaahtwo/pages/settings/general/Index.vue
@@ -2,6 +2,7 @@
 import { onMounted } from "vue";
 import { useRoute } from 'vue-router';
 import { useGeneralStore } from "../../../stores/settings/store-general_setting";
+import { useRootStore } from "../../../stores/root";
 import { vaah } from '../../../vaahvue/pinia/vaah';
 import SiteSettings from './components/SiteSettings.vue';
 import Securities from './components/Securities.vue';
@@ -9,7 +10,7 @@ import DateTime from './components/DateTime.vue';
 import SocialMediaLink from './components/SocialMediaLink.vue';
 import Script from './components/Scripts.vue';
 import MetaTags from './components/MetaTags.vue'
-
+const root = useRootStore();
 const store = useGeneralStore();
 const route = useRoute();
 
@@ -34,20 +35,20 @@ onMounted(async () => {
 
 <template>
     <div>
-         <Panel class="is-small">
+         <Panel class="is-small" v-if="store.assets">
             <template class="p-1" #header>
                 <div class="flex flex-row">
-                    <div>
-                        <b class="mr-1">General Settings</b>
+                    <div v-if="store.assets && store.assets.language_strings">
+                        <b class="mr-1">{{store.assets.language_strings.general_settings_title}}</b>
                      </div>
                 </div>
             </template>
 
             <template #icons>
                 <div class="buttons">
-                    <Button label="Expand all" icon="pi pi-angle-double-down" class="p-button-sm mr-2"
+                    <Button :label="store.assets.language_strings.expand_all" icon="pi pi-angle-double-down" class="p-button-sm mr-2"
                             @click="store.expandAll"></Button>
-                    <Button label="Collapse all" icon="pi pi-angle-double-up" class="p-button-sm"
+                    <Button :label="store.assets.language_strings.collapse_all" icon="pi pi-angle-double-up" class="p-button-sm"
                             @click="store.collapseAll"></Button>
                 </div>
             </template>
@@ -57,9 +58,8 @@ onMounted(async () => {
                     <template #header>
                         <div class="w-full">
                             <div>
-                                <h5 class="font-semibold text-sm">Site Settings</h5>
-                                <p class="text-color-secondary text-xs">After a successful password update, you will be redirected to
-                                    the login page where you can log in with your new password.</p>
+                                <h5 class="font-semibold text-sm">{{ store.assets.language_strings.site_settings }}</h5>
+                                <p class="text-color-secondary text-xs">{{ store.assets.language_strings.site_settings_message }}</p>
                             </div>
                         </div>
                     </template>
@@ -70,8 +70,8 @@ onMounted(async () => {
                 <AccordionTab>
                     <template #header>
                         <div class="w-full">
-                            <h5 class="font-semibold text-sm">Securities</h5>
-                            <p class="text-color-secondary text-xs">Enable and choose multiple methods of authentication</p>
+                            <h5 class="font-semibold text-sm">{{ store.assets.language_strings.securities }}</h5>
+                            <p class="text-color-secondary text-xs">{{ store.assets.language_strings.securities_message }}</p>
                         </div>
                     </template>
 
@@ -81,8 +81,8 @@ onMounted(async () => {
                 <AccordionTab>
                     <template #header>
                         <div class="w-full">
-                            <h5 class="font-semibold text-sm">Date & Time</h5>
-                            <p class="text-color-secondary text-xs">Global date and time settings.</p>
+                            <h5 class="font-semibold text-sm">{{ store.assets.language_strings.date_and_time }}</h5>
+                            <p class="text-color-secondary text-xs">{{ store.assets.language_strings.global_date_and_time_settings }}</p>
                         </div>
                     </template>
 
@@ -92,8 +92,8 @@ onMounted(async () => {
                 <AccordionTab>
                     <template #header>
                         <div class="w-full">
-                            <h5 class="font-semibold text-sm">Social Media & Links</h5>
-                            <p class="text-color-secondary text-xs">Static links management.</p>
+                            <h5 class="font-semibold text-sm">{{ store.assets.language_strings.social_media_and_links }}</h5>
+                            <p class="text-color-secondary text-xs">{{ store.assets.language_strings.static_links_management }}</p>
                         </div>
                     </template>
 
@@ -103,8 +103,8 @@ onMounted(async () => {
                 <AccordionTab>
                     <template #header>
                         <div class="w-full">
-                            <h5 class="font-semibold text-sm">Scripts</h5>
-                            <p class="text-color-secondary text-xs">Add scripts of Google Analytics and other tracking scripts.</p>
+                            <h5 class="font-semibold text-sm">{{ store.assets.language_strings.scripts }}</h5>
+                            <p class="text-color-secondary text-xs">{{ store.assets.language_strings.scripts_message }}</p>
                         </div>
                     </template>
 
@@ -114,8 +114,8 @@ onMounted(async () => {
                 <AccordionTab>
                     <template #header>
                         <div class="w-full">
-                            <h5 class="font-semibold text-sm">Meta Tags</h5>
-                            <p class="text-color-secondary text-xs">Global meta tags.</p>
+                            <h5 class="font-semibold text-sm">{{ store.assets.language_strings.meta_tags }}</h5>
+                            <p class="text-color-secondary text-xs">{{ store.assets.language_strings.global_meta_tags }}</p>
                         </div>
                     </template>
 
diff --git a/Vue/vaahtwo/pages/settings/general/components/SiteSettings.vue b/Vue/vaahtwo/pages/settings/general/components/SiteSettings.vue
index 815bec278..629898df5 100644
--- a/Vue/vaahtwo/pages/settings/general/components/SiteSettings.vue
+++ b/Vue/vaahtwo/pages/settings/general/components/SiteSettings.vue
@@ -1,15 +1,16 @@
 <script setup>
 import { useGeneralStore } from "../../../../stores/settings/store-general_setting";
-
+import {useRootStore} from "../../../../stores/root";
+const root = useRootStore();
 const store = useGeneralStore();
 </script>
 
 <template>
-    <div v-if="store.list" class="grid justify-content-evenly">
+    <div v-if="store.list && store.assets && root.assets" class="grid justify-content-evenly">
         <div class="col-12 md:col-6 pr-4">
             <div class="grid p-fluid">
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Site Title</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.site_title }}</h5>
 
                     <div class="p-inputgroup">
                         <InputText v-model="store.list.site_title"
@@ -27,21 +28,21 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-6">
-                    <h5 class="p-1 text-xs mb-1">Default Site Language</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.default_site_language }}</h5>
 
                     <Dropdown v-model="store.list.language"
                               :options="store.languages"
                               optionLabel="name"
                               data-testid="general-site_language"
                               optionValue="locale_code_iso_639"
-                              placeholder="Select a Language"
+                              :placeholder="store.assets.language_strings.localization_placeholder_select_a_language"
                               inputClass="p-inputtext-sm"
                               class="is-small"
                     />
                 </div>
 
                 <div class="col-6">
-                    <h5 class="p-1 text-xs mb-1">Redirect after Frontend Login</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.redirect_after_frontend_login }}</h5>
 
                     <div class="p-inputgroup">
                         <InputText v-model="store.list.redirect_after_frontend_login"
@@ -58,7 +59,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Meta Description</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.meta_description }}</h5>
 
                     <div class="p-inputgroup">
                         <Textarea v-model="store.list.site_description"
@@ -74,7 +75,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Search Engine Visibility</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.search_engine_visibility }}</h5>
 
                     <div class="p-inputgroup">
                         <SelectButton v-model="store.list.search_engine_visibility"
@@ -95,20 +96,20 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Assign Role(s) on Registration</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.assign_roles_on_registration }}</h5>
 
                     <AutoComplete :multiple="true"
                                   v-model="store.list.registration_roles"
                                   :suggestions="store.filtered_registration_roles"
                                   @complete="store.searchRegistrationRoles($event)"
                                   data-testid="general-registration_roles"
-                                  placeholder="Search"
+                                  :placeholder="root.assets.language_strings.crud_actions.placeholder_search"
                                   class="p-inputtext-sm"
                     />
                 </div>
 
                 <div class="col-12 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Allowed file types for upload</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.allowed_file_types_for_upload }}</h5>
 
                     <AutoComplete :multiple="true"
                                   v-model="store.list.upload_allowed_files"
@@ -116,11 +117,11 @@ const store = useGeneralStore();
                                   @complete="store.searchAllowedFiles($event)"
                                   class="p-inputtext-sm"
                                   data-testid="general-allowed_files"
-                                  placeholder="Search"
+                                  :placeholder="root.assets.language_strings.crud_actions.placeholder_search"
                     />
                 </div>
                 <div class="col-12 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Allowed file size for upload( in MB)</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.allowed_file_size_for_upload }}</h5>
                     <div class="p-inputgroup col-6 p-0">
                         <InputNumber v-model="store.list.upload_allowed_file_size"
                                      class="p-inputtext-sm h-2rem"
@@ -134,7 +135,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-6 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Is Logo compressed with Sidebar</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.is_logo_compressed_with_sidebar }}</h5>
                     <div class="p-inputgroup">
                         <SelectButton v-model="store.list.is_logo_compressed"
                                       optionLabel="name"
@@ -157,7 +158,7 @@ const store = useGeneralStore();
         <div class="col-12 md:col-6 pl-4">
             <div class="grid">
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Copyright Text</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.copyright_text }}</h5>
                     <div class="p-inputgroup">
 
                         <SelectButton v-model="store.list.copyright_text"
@@ -179,13 +180,13 @@ const store = useGeneralStore();
                     <InputText class="w-full p-inputtext-sm mt-2" v-if="store.list.copyright_text === 'custom'"
                                data-testid="general-copyright_custom_filed"
                                v-model="store.list.copyright_text_custom"
-                               placeholder="Enter Custom Text"
+                               :placeholder="store.assets.language_strings.enter_custom_text"
 
                     />
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Copyright Link</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.copyright_link }}</h5>
 
                     <div class="p-inputgroup">
 
@@ -209,12 +210,12 @@ const store = useGeneralStore();
                                data-testid="general-copyright_custom_link_field"
                                v-if="store.list.copyright_link === 'custom'"
                                v-model="store.list.copyright_link_custom"
-                               placeholder="Enter Custom Link"
+                               :placeholder="store.assets.language_strings.enter_custom_link"
                     />
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Copyright Year</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.copyright_year }}</h5>
 
                     <div class="p-inputgroup">
 
@@ -237,7 +238,7 @@ const store = useGeneralStore();
 
                     <InputNumber v-model="store.list.copyright_year_custom"
                                  name="config-db_port"
-                                 placeholder="Copyright Year"
+                                 :placeholder="store.assets.language_strings.copyright_year"
                                  class="w-full p-inputtext-sm mt-2"
                                  inputId="withoutgrouping" :useGrouping="false"
                                  :pt="{
@@ -250,7 +251,7 @@ const store = useGeneralStore();
 
                 <div class="col-12">
                     <h5 class="p-1 text-xs mb-1">
-                        Max number of forgot password attempts
+                        {{ store.assets.language_strings.max_number_of_forgot_password_attempts }}
                     </h5>
 
                     <div class="p-inputgroup">
@@ -271,7 +272,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Maximum number of login attempts</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.maximum_number_of_login_attempts }}</h5>
                     <div class="p-inputgroup">
                         <InputNumber inputId="withoutgrouping"
                                      data-testid="general-login_attempts"
@@ -288,7 +289,7 @@ const store = useGeneralStore();
                     </div>
                 </div>
                 <div class="col-6 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Password Protection</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.password_protection }}</h5>
                     <div class="p-inputgroup">
                     <SelectButton v-model="store.list.password_protection"
                                   optionLabel="name"
@@ -307,7 +308,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-6 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Laravel Queues</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.laravel_queues }}</h5>
                     <div class="p-inputgroup">
                     <SelectButton v-model="store.list.laravel_queues"
                                   optionLabel="name"
@@ -326,7 +327,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-6 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Maintenance Mode</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.maintenance_mode }}</h5>
                     <div class="p-inputgroup">
                     <SelectButton v-model="store.list.maintenance_mode"
                                   optionLabel="name"
@@ -345,7 +346,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-6 p-fluid">
-                    <h5 class="p-1 text-xs mb-1">Signup Page</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.signup_page }}</h5>
                     <div class="p-inputgroup">
                     <SelectButton v-model="store.list.signup_page_visibility"
                                   optionLabel="name"
@@ -364,7 +365,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Redirect after Backend Logout</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.redirect_after_backend_logout }}</h5>
 
                     <div class="p-inputgroup">
                         <SelectButton v-model="store.list.redirect_after_backend_logout"
@@ -376,7 +377,7 @@ const store = useGeneralStore();
                                       class="p-button-sm"
                         />
 
-                        <InputText placeholder="Enter Redirection Link"
+                        <InputText :placeholder="store.assets.language_strings.enter_redirection_link"
                                    v-model="store.list.redirect_after_backend_logout_url"
                                    data-testid="general-redirect_logout_custom"
                                    :disabled="store.list.redirect_after_backend_logout !== 'custom'"
@@ -393,7 +394,7 @@ const store = useGeneralStore();
                 </div>
 
                 <div class="col-12">
-                    <h5 class="p-1 text-xs mb-1">Backend Home Page Link</h5>
+                    <h5 class="p-1 text-xs mb-1">{{ store.assets.language_strings.backend_home_page_link }}</h5>
 
                     <div class="p-inputgroup">
                         <SelectButton v-model="store.list.backend_homepage_link"
@@ -405,7 +406,7 @@ const store = useGeneralStore();
                                       class="p-button-sm"
                         />
 
-                        <InputText placeholder="Enter Redirection Link"
+                        <InputText :placeholder="store.assets.language_strings.enter_redirection_link"
                                    v-model="store.list.backend_homepage_link_url"
                                    data-testid="general-backend_homepage_link_custom"
                                    :disabled="store.list.backend_homepage_link !== 'custom'"
@@ -426,14 +427,14 @@ const store = useGeneralStore();
             <Divider class="m-0"/>
         </div>
         <div class="col-12">
-            <Button label="Save Settings"
+            <Button :label="store.assets.language_strings.save_settings_button"
                     icon="pi pi-save"
                     data-testid="general-save_site"
                     @click="store.storeSiteSettings"
                     class="mr-2 p-button-sm"
             />
 
-            <Button label="Clear Cache"
+            <Button :label="store.assets.language_strings.clear_cache_button"
                     icon="pi pi-trash"
                     data-testid="general-clear_cache"
                     @click="store.clearCache"
diff --git a/Vue/vaahtwo/stores/settings/store-general_setting.js b/Vue/vaahtwo/stores/settings/store-general_setting.js
index e4d410a25..9905e16ea 100644
--- a/Vue/vaahtwo/stores/settings/store-general_setting.js
+++ b/Vue/vaahtwo/stores/settings/store-general_setting.js
@@ -62,20 +62,16 @@ export const useGeneralStore = defineStore({
         custom_field_list:null,
         active_index:[],
         languages: null,
-        visibitlity_options: [{name:'Enable',value:"1"}, {name:'Disable',value:"0"}],
-        maintenanceModeOptions: [{name:'Enable',value:"1"}, {name:'Disable',value:"0"}],
-        compressedLogoOptions: [{name:'True',value:"1"}, {name:'False',value:"0"}],
-        redirect_after_logout_options: [
-            {name:'Backend',value:'backend'},
-            {name:'Frontend',value:'frontend'},
-            {name:'Custom',value:'custom'}
-        ],
-        password_protection_options: [{name:'Enable',value:"1"}, {name:'Disable',value:"0"}],
-        copyright_text_options: [{name:'Use App Name',value:"app_name"}, {name:'Custom',value:"custom"}],
-        copyright_link_options: [{name:'Use App Url',value:"app_url"}, {name:'Custom',value:"custom"}],
-        copyright_year_options: [{name:'Use Current year',value:"use_current_year"}, {name:'Custom',value:"custom"}],
-        laravel_queues_options: [{name:'Enable',value:"1"}, {name:'Disable',value:"0"}],
-        sign_up_options: [{name:'Enable',value:"1"}, {name:'Disable',value:"0"}],
+        visibitlity_options: null,
+        maintenanceModeOptions: null,
+        compressedLogoOptions: null,
+        redirect_after_logout_options: null,
+        password_protection_options: null,
+        copyright_text_options: null,
+        copyright_link_options: null,
+        copyright_year_options: null,
+        laravel_queues_options: null,
+        sign_up_options: null,
         social_media_links: null,
         add_link: null,
         show_link_input: true,
@@ -112,15 +108,34 @@ export const useGeneralStore = defineStore({
             }
         },
         //---------------------------------------------------------------------
-        afterGetAssets(data, res)
-        {
-            if(data)
-            {
+        afterGetAssets(data, res) {
+            if (data) {
                 this.assets = data;
                 this.languages = data.languages;
                 this.allowed_files = data.file_types;
+
+                const generateOptions = (enableKey, disableKey) => [
+                    { name: this.assets.language_strings[enableKey], value: "1" },
+                    { name: this.assets.language_strings[disableKey], value: "0" }
+                ];
+
+                this.visibitlity_options = generateOptions('enable', 'disable');
+                this.maintenanceModeOptions = generateOptions('enable', 'disable');
+                this.compressedLogoOptions = generateOptions('true', 'false');
+                this.redirect_after_logout_options = [
+                    { name: this.assets.language_strings.backend, value: 'backend' },
+                    { name: this.assets.language_strings.frontend, value: 'frontend' },
+                    { name: this.assets.language_strings.custom, value: 'custom' }
+                ];
+                this.password_protection_options = generateOptions('enable', 'disable');
+                this.copyright_text_options = generateOptions('use_app_name', 'custom');
+                this.copyright_link_options = generateOptions('use_app_url', 'custom');
+                this.copyright_year_options = generateOptions('use_current_year', 'custom');
+                this.laravel_queues_options = generateOptions('enable', 'disable');
+                this.sign_up_options = generateOptions('enable', 'disable');
             }
         },
+
         //---------------------------------------------------------------------
         async getList() {
             let options = {