diff --git a/packages/nc-gui/components/createOrEditProject.vue b/packages/nc-gui/components/createOrEditProject.vue
index bbb5babc4c..630dbb4b36 100644
--- a/packages/nc-gui/components/createOrEditProject.vue
+++ b/packages/nc-gui/components/createOrEditProject.vue
@@ -551,7 +551,7 @@
                                                       <x-btn
                                                         v-bind:tooltip="
                                                           $t(
-                                                            'projects.ext_db.credentials.advanced.ssl.option2.toolip'
+                                                            'projects.ext_db.credentials.advanced.ssl.client_cert.toolip'
                                                           )
                                                         "
                                                         small
@@ -581,7 +581,7 @@
                                                       <x-btn
                                                         v-bind:tooltip="
                                                           $t(
-                                                            'projects.ext_db.credentials.advanced.ssl.option1.toolip'
+                                                            'projects.ext_db.credentials.advanced.ssl.client_key.toolip'
                                                           )
                                                         "
                                                         small
@@ -611,7 +611,7 @@
                                                       <x-btn
                                                         v-bind:tooltip="
                                                           $t(
-                                                            'projects.ext_db.credentials.advanced.ssl.option3.toolip'
+                                                            'projects.ext_db.credentials.advanced.ssl.server_ca.toolip'
                                                           )
                                                         "
                                                         small
@@ -1120,9 +1120,9 @@ export default {
                 ui: {
                   setup: -1,
                   ssl: {
-                    key: this.$t('projects.ext_db.credentials.advanced.ssl.option1'), // Client Key
-                    cert: this.$t('projects.ext_db.credentials.advanced.ssl.option2'), // Client Cert
-                    ca: this.$t('projects.ext_db.credentials.advanced.ssl.option3'), // Server CA
+                    key: this.$t('projects.ext_db.credentials.advanced.ssl.client_key'), // Client Key
+                    cert: this.$t('projects.ext_db.credentials.advanced.ssl.client_cert'), // Client Cert
+                    ca: this.$t('projects.ext_db.credentials.advanced.ssl.server_ca'), // Server CA
                   },
                   sslUse: 'Preferred',
                 },
@@ -1297,7 +1297,7 @@ export default {
         type: 'primary',
       },
       // TODO: apply i18n for sslUsage
-      // See projects.ext_db.credentials.advanced.ssl.usage.option1 - 5 in en.json
+      // See projects.ext_db.credentials.advanced.ssl.usage.no - 5 in en.json
       sslUsage: {
         No: 'No',
         Preferred: 'Preferred',
@@ -1307,9 +1307,9 @@ export default {
       },
       sslUse: this.$t('projects.ext_db.credentials.advanced.ssl.preferred'), // Preferred
       ssl: {
-        key: this.$t('projects.ext_db.credentials.advanced.ssl.option1'), // Client Key
-        cert: this.$t('projects.ext_db.credentials.advanced.ssl.option2'), // Client Cert
-        ca: this.$t('projects.ext_db.credentials.advanced.ssl.option3'), // Server CA
+        key: this.$t('projects.ext_db.credentials.advanced.ssl.client_key'), // Client Key
+        cert: this.$t('projects.ext_db.credentials.advanced.ssl.client_cert'), // Client Cert
+        ca: this.$t('projects.ext_db.credentials.advanced.ssl.server_ca'), // Server CA
       },
       databaseNames: {
         MySQL: 'mysql2',
@@ -1349,10 +1349,10 @@ export default {
       },
 
       compErrorMessages: [
-        this.$t('projects.ext_db.error.message_1'), // Invalid character in folder path
-        this.$t('projects.ext_db.error.message_2'), // Invalid database credentials
-        this.$t('projects.ext_db.error.message_3'), // Unable to connect to database, please check your database is up
-        this.$t('projects.ext_db.error.message_4'), // User does not exist or have sufficient permission to create schema
+        this.$t('projects.ext_db.error.invalid_char_in_folder_path'), // Invalid character in folder path
+        this.$t('projects.ext_db.error.invalid_db_credentials'), // Invalid database credentials
+        this.$t('projects.ext_db.error.unable_to_connect_to_db'), // Unable to connect to database, please check your database is up
+        this.$t('projects.ext_db.error.user_doesnt_ve_sufficient_permission'), // User does not exist or have sufficient permission to create schema
       ],
       compErrorMessage: '',
     };
@@ -1583,9 +1583,9 @@ export default {
           Vue.set(db, 'ui', {
             setup: 0,
             ssl: {
-              key: this.$t('projects.ext_db.credentials.advanced.ssl.option1'), // Client Key
-              cert: this.$t('projects.ext_db.credentials.advanced.ssl.option2'), // Client Cert
-              ca: this.$t('projects.ext_db.credentials.advanced.ssl.option3'), // Server CA
+              key: this.$t('projects.ext_db.credentials.advanced.ssl.client_key'), // Client Key
+              cert: this.$t('projects.ext_db.credentials.advanced.ssl.client_cert'), // Client Cert
+              ca: this.$t('projects.ext_db.credentials.advanced.ssl.server_ca'), // Server CA
             },
             sslUse: this.$t('projects.ext_db.credentials.advanced.ssl.preferred'), // Preferred
           });
@@ -1714,9 +1714,9 @@ export default {
               ui: {
                 setup: 0,
                 ssl: {
-                  key: this.$t('projects.ext_db.credentials.advanced.ssl.option1'), // Client Key
-                  cert: this.$t('projects.ext_db.credentials.advanced.ssl.option2'), // Client Cert
-                  ca: this.$t('projects.ext_db.credentials.advanced.ssl.option3'), // Server CA
+                  key: this.$t('projects.ext_db.credentials.advanced.ssl.client_key'), // Client Key
+                  cert: this.$t('projects.ext_db.credentials.advanced.ssl.client_cert'), // Client Cert
+                  ca: this.$t('projects.ext_db.credentials.advanced.ssl.server_ca'), // Server CA
                 },
                 sslUse: this.$t('projects.ext_db.credentials.advanced.ssl.preferred'), // Preferred
               },
@@ -1764,9 +1764,9 @@ export default {
           setup: 0,
           sslUse: this.$t('projects.ext_db.credentials.advanced.ssl.preferred'), // Preferred
           ssl: {
-            key: this.$t('projects.ext_db.credentials.advanced.ssl.option1'), // Client Key
-            cert: this.$t('projects.ext_db.credentials.advanced.ssl.option2'), // Client Cert
-            ca: this.$t('projects.ext_db.credentials.advanced.ssl.option3'), // Server CA
+            key: this.$t('projects.ext_db.credentials.advanced.ssl.client_key'), // Client Key
+            cert: this.$t('projects.ext_db.credentials.advanced.ssl.client_cert'), // Client Cert
+            ca: this.$t('projects.ext_db.credentials.advanced.ssl.server_ca'), // Server CA
           },
         },
       });
diff --git a/packages/nc-gui/components/project/spreadsheet/components/extras.vue b/packages/nc-gui/components/project/spreadsheet/components/extras.vue
index cf6c6862d0..695708523e 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/extras.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/extras.vue
@@ -25,8 +25,8 @@
           <v-list-item-title>
             <v-icon class="mr-1" small :color="textColors[3]">mdi-calendar-month
             </v-icon>
-            <span class="caption" :title="$t('projects.show_community_message_2')">{{
-                $t('projects.show_community_message_2')
+            <span class="caption" :title="$t('projects.show_community_book_a_free_demo')">{{
+                $t('projects.show_community_book_a_free_demo')
               }}</span></v-list-item-title>
         </v-list-item>
         <v-divider></v-divider>
@@ -34,8 +34,8 @@
           <!-- Get your questions answered -->
           <v-list-item-title>
             <v-icon class="mr-1" small :color="textColors[0]">mdi-discord</v-icon>
-            <span class="caption" :title="$t('projects.show_community_message_3_short')">{{
-                $t('projects.show_community_message_3_short')
+            <span class="caption" :title="$t('projects.show_community_join_discord')">{{
+                $t('projects.show_community_join_discord')
               }}</span>
           </v-list-item-title>
         </v-list-item>
@@ -44,8 +44,8 @@
           <!-- Follow NocoDB -->
           <v-list-item-title>
             <v-icon class="mr-1" small :color="textColors[1]">mdi-twitter</v-icon>
-            <span class="caption" title="$t('projects.show_community_message_4')"> {{
-                $t('projects.show_community_message_4')
+            <span class="caption" title="$t('projects.show_community_follow_nocodb')"> {{
+                $t('projects.show_community_follow_nocodb')
               }}</span></v-list-item-title>
         </v-list-item>
       </v-list>
diff --git a/packages/nc-gui/pages/projects/index.vue b/packages/nc-gui/pages/projects/index.vue
index 8ece789f0c..6cda9ec04c 100644
--- a/packages/nc-gui/pages/projects/index.vue
+++ b/packages/nc-gui/pages/projects/index.vue
@@ -262,7 +262,7 @@
                         <!-- Stop Project -->
                         <x-icon
                           v-bind:tooltip="
-                            $t('projects.horizontal_option_1')
+                            $t('projects.stop_project')
                           "
                           class="pointer mr-2"
                           color="orange grey"
@@ -273,7 +273,7 @@
                         <!-- Start Project -->
                         <x-icon
                           v-bind:tooltip="
-                            $t('projects.horizontal_option_2')
+                            $t('projects.start_project')
                           "
                           class="pointer mr-2"
                           color="green grey"
@@ -293,7 +293,7 @@
                         <!-- Restart Project -->
                         <x-icon
                           v-bind:tooltip="
-                            $t('projects.horizontal_option_3')
+                            $t('projects.restart_project')
                           "
                           class="pointer mr-2"
                           color="primary grey"
@@ -304,7 +304,7 @@
                         <!-- Delete Project -->
                         <x-icon
                           v-bind:tooltip="
-                            $t('projects.horizontal_option_4')
+                            $t('projects.delete_project')
                           "
                           class="pointer mr-2"
                           color="red grey"
@@ -334,7 +334,7 @@
                               <v-list-item-title>
                                 <!-- Import Metadata -->
                                 <span class="caption font-weight-regular">{{
-                                $t('projects.vertical_option_1')
+                                $t('projects.import_metadata')
                                 }}</span>
                               </v-list-item-title>
                             </v-list-item>
@@ -348,7 +348,7 @@
                               <v-list-item-title>
                                 <!-- Export Metadata -->
                                 <span class="caption font-weight-regular">{{
-                                 $t('projects.vertical_option_2')
+                                 $t('projects.export_metadata')
                                  }}</span>
                               </v-list-item-title>
                             </v-list-item>
@@ -362,7 +362,7 @@
                               <v-list-item-title>
                                 <!-- Clear Metadata -->
                                 <span class="caption font-weight-regular">{{
-                                $t('projects.vertical_option_3')
+                                $t('projects.clear_metadata')
                                 }}</span>
                               </v-list-item-title>
                             </v-list-item>
@@ -378,7 +378,7 @@
                   :value="true"
                   color="error"
                   icon="warning"
-                >{{ $t('projects.search.no_result', { search }) }}
+                >{{ $t('projects.search.your_search_found_no_results', { search }) }}
                 </v-alert>
                 <!--                <template v-slot:no-data>-->
                 <!--                  <v-alert :value="true" outlined color="success" icon="mdi-information-outline">Create a new project-->
@@ -498,10 +498,10 @@
           </v-list-item-icon>
           <v-list-item-title>
             <!-- Star -->
-            {{ $t('projects.show_community_message_1_1') }}
+            {{ $t('projects.show_community_star') }}
             <v-icon small>mdi-star-outline</v-icon>
             <!-- us on Github -->
-            {{ $t('projects.show_community_message_1_2') }}
+            {{ $t('projects.show_community_us_on_Github') }}
           </v-list-item-title>
         </v-list-item>
         <v-divider></v-divider>
@@ -518,7 +518,7 @@
           </v-list-item-icon>
           <!-- Book a Free DEMO -->
           <v-list-item-title>{{
-          $t('projects.show_community_message_2')
+          $t('projects.show_community_book_a_free_demo')
           }}</v-list-item-title>
         </v-list-item>
         <v-divider></v-divider>
@@ -528,7 +528,7 @@
           </v-list-item-icon>
           <!-- Get your questions answered -->
           <v-list-item-title>{{
-          $t('projects.show_community_message_3')
+          $t('projects.show_community_get_your_questions_answered')
           }}</v-list-item-title>
         </v-list-item>
         <v-divider></v-divider>
@@ -538,7 +538,7 @@
           </v-list-item-icon>
           <!-- Follow NocoDB -->
           <v-list-item-title>{{
-          $t('projects.show_community_message_4')
+          $t('projects.show_community_follow_nocodb')
           }}</v-list-item-title>
         </v-list-item>
       </v-list>
diff --git a/packages/nc-gui/pages/user/authentication/signin.vue b/packages/nc-gui/pages/user/authentication/signin.vue
index 2b94ef4395..df94dbbd82 100644
--- a/packages/nc-gui/pages/user/authentication/signin.vue
+++ b/packages/nc-gui/pages/user/authentication/signin.vue
@@ -41,7 +41,7 @@
               >
                 <!-- Enter your work email -->
                 <v-text-field
-                  v-bind:label="$t('signin.input_1')"
+                  v-bind:label="$t('signin.enter_your_work_email')"
                   v-model="form.email"
                   :rules="formRules.email"
                   required
@@ -51,7 +51,7 @@
                 <!-- Enter your password -->
                 <v-text-field
                   name="input-10-2"
-                  v-bind:label="$t('signin.input_2')"
+                  v-bind:label="$t('signin.enter_your_password')"
                   min="8"
                   :append-icon="e3 ? 'visibility' : 'visibility_off'"
                   @click:append="() => (e3 = !e3)"
@@ -93,13 +93,13 @@
                 <br/>
                 <!-- Don't have an account ? -->
                 <p class="caption font-weight-light">
-                  {{ $t('signin.footer_text_1') }}
+                  {{ $t('signin.dont_ve_an_account') }}
                   <!-- Sign Up -->
                   <router-link
                     to="/user/authentication/signup"
                     v-ge="['Don\'t have an account ?', '']"
                   >
-                    {{ $t('signin.footer_text_2') }}
+                    {{ $t('signin.sign_up') }}
                   </router-link>
                 </p>
                 <div>
@@ -235,17 +235,17 @@ export default {
       formRules: {
         email: [
           // E-mail is required
-          (v) => !!v || this.$t('signin.form.rules.email_1'),
+          (v) => !!v || this.$t('signin.form.rules.email_is_reqd'),
           // E-mail must be valid
           (v) => isEmail(v) ||
-            this.$t('signin.form.rules.email_2'),
+            this.$t('signin.form.rules.email_must_be_valid'),
         ],
         password: [
           // Password is required
-          (v) => !!v || this.$t('signin.form.rules.password_1'),
+          (v) => !!v || this.$t('signin.form.rules.passwd_required'),
           // You password must be atleast 8 characters
           (v) =>
-            (v && v.length >= 8) || this.$t('signin.form.rules.password_2'),
+            (v && v.length >= 8) || this.$t('signin.form.rules.passwd_must_be_8_chars'),
         ],
       },
       formUtil: {
diff --git a/packages/nc-gui/static/lang/en.json b/packages/nc-gui/static/lang/en.json
index 558b1fe291..c583856e03 100644
--- a/packages/nc-gui/static/lang/en.json
+++ b/packages/nc-gui/static/lang/en.json
@@ -7,24 +7,24 @@
   "projects.create_new_project_button.subtext_2": "Create By Connecting <br>To An External Database",
   "projects.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite",
   "projects.search_project": "Search Project",
-  "projects.vertical_option_1": "Import Metadata",
-  "projects.vertical_option_2": "Export Metadata",
-  "projects.vertical_option_3": "Clear Metadata",
-  "projects.horizontal_option_1": "Stop Project",
-  "projects.horizontal_option_2": "Start Project",
-  "projects.horizontal_option_3": "Restart Project",
-  "projects.horizontal_option_4": "Delete Project",
+  "projects.import_metadata": "Import Metadata",
+  "projects.export_metadata": "Export Metadata",
+  "projects.clear_metadata": "Clear Metadata",
+  "projects.stop_project": "Stop Project",
+  "projects.start_project": "Start Project",
+  "projects.restart_project": "Restart Project",
+  "projects.delete_project": "Delete Project",
   "projects.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs",
   "projects.project_api_type_tooltip_rest": "Accessible via REST APIs",
   "projects.project_empty_message": "Get started by creating a new project",
   "projects.import_button.text": "Import NocoDB Project by uploading metadata zip file",
-  "projects.show_community_message_1_1": "Star",
-  "projects.show_community_message_1_2": "us on Github",
-  "projects.show_community_message_2": "Book a Free DEMO",
-  "projects.show_community_message_3": "Get your questions answered",
-  "projects.show_community_message_3_short": "Join Discord",
-  "projects.show_community_message_4": "Follow NocoDB",
-  "projects.search.no_result": "Your search for {search} found no results",
+  "projects.show_community_star": "Star",
+  "projects.show_community_us_on_Github": "us on Github",
+  "projects.show_community_book_a_free_demo": "Book a Free DEMO",
+  "projects.show_community_get_your_questions_answered": "Get your questions answered",
+  "projects.show_community_join_discord": "Join Discord",
+  "projects.show_community_follow_nocodb": "Follow NocoDB",
+  "projects.search.your_search_found_no_results": "Your search for {search} found no results",
   "projects.ext_db.title.edit": "Edit Project",
   "projects.ext_db.title.create": "Create Project",
   "projects.ext_db.project_name": "Enter Project Name",
@@ -44,40 +44,40 @@
   "projects.ext_db.credentials.button.test_db_conn": "Test Database Connection",
   "projects.ext_db.credentials.button.remove_db_from_env": "Remove Database from environment",
   "projects.ext_db.credentials.advanced": "SSL & Advanced parameters",
-  "projects.ext_db.credentials.advanced.ssl.option1": "Client Key",
-  "projects.ext_db.credentials.advanced.ssl.option2": "Client Cert",
-  "projects.ext_db.credentials.advanced.ssl.option3": "Server CA",
-  "projects.ext_db.credentials.advanced.ssl.option1.toolip": "Select .key file",
-  "projects.ext_db.credentials.advanced.ssl.option2.toolip": "Select .cert file",
-  "projects.ext_db.credentials.advanced.ssl.option3.toolip": "Select CA file",
+  "projects.ext_db.credentials.advanced.ssl.client_key": "Client Key",
+  "projects.ext_db.credentials.advanced.ssl.client_cert": "Client Cert",
+  "projects.ext_db.credentials.advanced.ssl.server_ca": "Server CA",
+  "projects.ext_db.credentials.advanced.ssl.client_key.toolip": "Select .key file",
+  "projects.ext_db.credentials.advanced.ssl.client_cert.toolip": "Select .cert file",
+  "projects.ext_db.credentials.advanced.ssl.server_ca.toolip": "Select CA file",
   "projects.ext_db.credentials.advanced.ssl.preferred": "Preferred",
-  "projects.ext_db.credentials.advanced.ssl.usage.option1": "No",
-  "projects.ext_db.credentials.advanced.ssl.usage.option2": "Preferred",
-  "projects.ext_db.credentials.advanced.ssl.usage.option3": "Required",
-  "projects.ext_db.credentials.advanced.ssl.usage.option4": "Required-CA",
-  "projects.ext_db.credentials.advanced.ssl.usage.option5": "Required-IDENTITY",
+  "projects.ext_db.credentials.advanced.ssl.usage.no": "No",
+  "projects.ext_db.credentials.advanced.ssl.usage.preferred": "Preferred",
+  "projects.ext_db.credentials.advanced.ssl.usage.required": "Required",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_ca": "Required-CA",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_identity": "Required-IDENTITY",
   "projects.ext_db.credentials.advanced.inflection.table_name": "Inflection - Table name",
   "projects.ext_db.credentials.advanced.inflection.column_name": "Inflection - Column name",
   "projects.ext_db.credentials.advanced.button.edit_conn_json": "Edit connection JSON",
-  "projects.ext_db.error.message_1": "Invalid character in folder path.",
-  "projects.ext_db.error.message_2": "Invalid database credentials.",
-  "projects.ext_db.error.message_3": "Unable to connect to database, please check your database is up.",
-  "projects.ext_db.error.message_4": "User does not exist or have sufficient permission to create schema.",
+  "projects.ext_db.error.invalid_char_in_folder_path": "Invalid character in folder path.",
+  "projects.ext_db.error.invalid_db_credentials": "Invalid database credentials.",
+  "projects.ext_db.error.unable_to_connect_to_db": "Unable to connect to database, please check your database is up.",
+  "projects.ext_db.error.user_doesnt_ve_sufficient_permission": "User does not exist or have sufficient permission to create schema.",
   "projects.ext_db.head.title": "Create Project | Noco",
   "projects.ext_db.dialog.success": "Connection was successful",
   "projects.ext_db.dialog.failure": "Connection Failure:",
   "projects.notifications.no_new": "No new notifications",
   "projects.notifications.clear": "Clear",
   "signin.title": "SIGN IN",
-  "signin.input_1": "Enter your work email",
-  "signin.input_2": "Enter your password",
+  "signin.enter_your_work_email": "Enter your work email",
+  "signin.enter_your_password": "Enter your password",
   "signin.forget_password": "Forgot your password ?",
-  "signin.footer_text_1": "Don't have an account ?",
-  "signin.footer_text_2": "Sign Up",
-  "signin.form.rules.email_1": "E-mail is required",
-  "signin.form.rules.email_2": "E-mail must be valid",
-  "signin.form.rules.password_1": "Password is required",
-  "signin.form.rules.password_2": "You password must be atleast 8 characters",
+  "signin.dont_ve_an_account": "Don't have an account ?",
+  "signin.sign_up": "Sign Up",
+  "signin.form.rules.email_is_reqd": "E-mail is required",
+  "signin.form.rules.email_must_be_valid": "E-mail must be valid",
+  "signin.form.rules.passwd_required": "Password is required",
+  "signin.form.rules.passwd_must_be_8_chars": "You password must be atleast 8 characters",
   "signin.head.title": "Log In | Noco",
   "signin.head.meta.hid": "Log In To Noco",
   "signin.head.meta.name": "Log In To Noco",
@@ -88,8 +88,8 @@
   "signin.password.recovery.success": "Please check your email to reset the password",
   "signin.password.recovery.button": "SEND EMAIL",
   "signup.title": "SIGN UP",
-  "signup.message_1": "You will be the 'Super Admin'",
-  "signup.message_2": "Already have an account ?",
+  "signup.you_will_be_the_super_admin": "You will be the 'Super Admin'",
+  "signup.already_ve_an_account": "Already have an account ?",
   "treeview.settings": "Settings",
   "treeview.settings.tooltip": "Only visible to Creator",
   "treeview.app_store": "App Store",
diff --git a/packages/nc-gui/static/lang/es.json b/packages/nc-gui/static/lang/es.json
index 45ae0e328b..55bcf86f35 100644
--- a/packages/nc-gui/static/lang/es.json
+++ b/packages/nc-gui/static/lang/es.json
@@ -7,24 +7,24 @@
   "projects.create_new_project_button.subtext_2": "Conectarse a una <br>base de datos externa",
   "projects.create_new_project_button.subtext_2_tooltip": "Soporta MySQL, PostgreSQL, SQL Server & SQLite",
   "projects.search_project": "Buscar proyecto",
-  "projects.vertical_option_1": "Importar Metadata",
-  "projects.vertical_option_2": "Exportar Metadata",
-  "projects.vertical_option_3": "Limpiar Metadata",
-  "projects.horizontal_option_1": "Detener proyecto",
-  "projects.horizontal_option_2": "Iniciar proyecto",
-  "projects.horizontal_option_3": "Reiniciar proyecto",
-  "projects.horizontal_option_4": "Borrar proyecto",
+  "projects.import_metadata": "Importar Metadata",
+  "projects.export_metadata": "Exportar Metadata",
+  "projects.clear_metadata": "Limpiar Metadata",
+  "projects.stop_project": "Detener proyecto",
+  "projects.start_project": "Iniciar proyecto",
+  "projects.restart_project": "Reiniciar proyecto",
+  "projects.delete_project": "Borrar proyecto",
   "projects.project_api_type_tooltip_graphql": "Accesible via GraphQL APIs",
   "projects.project_api_type_tooltip_rest": "Accesible via REST APIs",
   "projects.project_empty_message": "Comenzar creando un nuevo proyecto",
   "projects.import_button.text": "Importar el proyecto NocoDB cargando un archivo zip de metadatos",
-  "projects.show_community_message_1_1": "Síguenos",
-  "projects.show_community_message_1_2": "en Github",
-  "projects.show_community_message_2": "Agendar un DEMO Gratuito",
-  "projects.show_community_message_3": "Obtenga respuestas a sus preguntas",
-  "projects.show_community_message_3_short": "Ingresar a Discord",
-  "projects.show_community_message_4": "Seguir a NocoDB",
-  "projects.search.no_result": "Su búsqueda de {search} no encontró resultados",
+  "projects.show_community_star": "Síguenos",
+  "projects.show_community_us_on_Github": "en Github",
+  "projects.show_community_book_a_free_demo": "Agendar un DEMO Gratuito",
+  "projects.show_community_get_your_questions_answered": "Obtenga respuestas a sus preguntas",
+  "projects.show_community_join_discord": "Ingresar a Discord",
+  "projects.show_community_follow_nocodb": "Seguir a NocoDB",
+  "projects.search.your_search_found_no_results": "Su búsqueda de {search} no encontró resultados",
   "projects.ext_db.title.edit": "Editar proyecto",
   "projects.ext_db.title.create": "Crear proyecto",
   "projects.ext_db.project_name": "Ingresar nombre de proyecto",
@@ -44,40 +44,40 @@
   "projects.ext_db.credentials.button.test_db_conn": "Probar conexión a base de datos",
   "projects.ext_db.credentials.button.remove_db_from_env": "Eliminar base de datos del ambiente",
   "projects.ext_db.credentials.advanced": "SSL & parámetros avanzados",
-  "projects.ext_db.credentials.advanced.ssl.option1": "Clave de Cliente",
-  "projects.ext_db.credentials.advanced.ssl.option2": "Certificado de Cliente",
-  "projects.ext_db.credentials.advanced.ssl.option3": "Servodpr CA",
-  "projects.ext_db.credentials.advanced.ssl.option1.toolip": "Seleccionar archivo .key",
-  "projects.ext_db.credentials.advanced.ssl.option2.toolip": "Seleccionar archivo .cert",
-  "projects.ext_db.credentials.advanced.ssl.option3.toolip": "Seleccionar archivo CA",
+  "projects.ext_db.credentials.advanced.ssl.client_key": "Clave de Cliente",
+  "projects.ext_db.credentials.advanced.ssl.client_cert": "Certificado de Cliente",
+  "projects.ext_db.credentials.advanced.ssl.server_ca": "Servodpr CA",
+  "projects.ext_db.credentials.advanced.ssl.client_key.toolip": "Seleccionar archivo .key",
+  "projects.ext_db.credentials.advanced.ssl.client_cert.toolip": "Seleccionar archivo .cert",
+  "projects.ext_db.credentials.advanced.ssl.server_ca.toolip": "Seleccionar archivo CA",
   "projects.ext_db.credentials.advanced.ssl.preferred": "Privilegios",
-  "projects.ext_db.credentials.advanced.ssl.usage.option1": "No",
-  "projects.ext_db.credentials.advanced.ssl.usage.option2": "Privilegios",
-  "projects.ext_db.credentials.advanced.ssl.usage.option3": "Requerido",
-  "projects.ext_db.credentials.advanced.ssl.usage.option4": "Requerido-CA",
-  "projects.ext_db.credentials.advanced.ssl.usage.option5": "Requerido-IDENTITY",
+  "projects.ext_db.credentials.advanced.ssl.usage.no": "No",
+  "projects.ext_db.credentials.advanced.ssl.usage.preferred": "Privilegios",
+  "projects.ext_db.credentials.advanced.ssl.usage.required": "Requerido",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_ca": "Requerido-CA",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_identity": "Requerido-IDENTITY",
   "projects.ext_db.credentials.advanced.inflection.table_name": "Inflection - Nombre de tabla",
   "projects.ext_db.credentials.advanced.inflection.column_name": "Inflection - Nombre de columna",
   "projects.ext_db.credentials.advanced.button.edit_conn_json": "Editar conexión JSON",
-  "projects.ext_db.error.message_1": "Carácteres invalidos en la ruta de la carpeta.",
-  "projects.ext_db.error.message_2": "Credenciales de Base de datos incorrectas.",
-  "projects.ext_db.error.message_3": "Sin conexión a base de datos, por favor verifique qué su base de datos esté en línea.",
-  "projects.ext_db.error.message_4": "El usuario no existe o tiene permisos insuficientes para crear esquema.",
+  "projects.ext_db.error.invalid_char_in_folder_path": "Carácteres invalidos en la ruta de la carpeta.",
+  "projects.ext_db.error.invalid_db_credentials": "Credenciales de Base de datos incorrectas.",
+  "projects.ext_db.error.unable_to_connect_to_db": "Sin conexión a base de datos, por favor verifique qué su base de datos esté en línea.",
+  "projects.ext_db.error.user_doesnt_ve_sufficient_permission": "El usuario no existe o tiene permisos insuficientes para crear esquema.",
   "projects.ext_db.head.title": "Crear proyecto | Noco",
   "projects.ext_db.dialog.success": "Conexión correcta",
   "projects.ext_db.dialog.failure": "Conexión incorrecta:",
   "projects.notifications.no_new": "Sin notificaciones",
   "projects.notifications.clear": "Limpiar",
   "signin.title": "INICIAR SESIÓN",
-  "signin.input_1": "Ingrese su correo de trabajo",
-  "signin.input_2": "Ingrese su contraseña",
+  "signin.enter_your_work_email": "Ingrese su correo de trabajo",
+  "signin.enter_your_password": "Ingrese su contraseña",
   "signin.forget_password": "Olvidó su contraseña?",
-  "signin.footer_text_1": "No tiene una cuenta?",
-  "signin.footer_text_2": "Registrarse",
-  "signin.form.rules.email_1": "E-mail requerido",
-  "signin.form.rules.email_2": "E-mail debe ser correcto",
-  "signin.form.rules.password_1": "Contraseña requerida",
-  "signin.form.rules.password_2": "Su contraseña debe tener almenos 8 carácteres",
+  "signin.dont_ve_an_account": "No tiene una cuenta?",
+  "signin.sign_up": "Registrarse",
+  "signin.form.rules.email_is_reqd": "E-mail requerido",
+  "signin.form.rules.email_must_be_valid": "E-mail debe ser correcto",
+  "signin.form.rules.passwd_required": "Contraseña requerida",
+  "signin.form.rules.passwd_must_be_8_chars": "Su contraseña debe tener almenos 8 carácteres",
   "signin.head.title": "Acceder | Noco",
   "signin.head.meta.hid": "Acceder a Noco",
   "signin.head.meta.name": "Acceder a Noco",
@@ -88,8 +88,8 @@
   "signin.password.recovery.success": "Por favor revise el correo electrónico para cambiar la contraseña",
   "signin.password.recovery.button": "ENVIAR CORREO",
   "signup.title": "REGISTRARSE",
-  "signup.message_1": "Serás 'Super Admin'",
-  "signup.message_2": "Ya tiene una cuenta?",
+  "signup.you_will_be_the_super_admin": "Serás 'Super Admin'",
+  "signup.already_ve_an_account": "Ya tiene una cuenta?",
   "treeview.settings": "Configuraciones",
   "treeview.settings.tooltip": "Sólo visible por el creador",
   "treeview.app_store": "App Store",
diff --git a/packages/nc-gui/static/lang/fr.json b/packages/nc-gui/static/lang/fr.json
index bcc64a4fa7..f5e3b82971 100644
--- a/packages/nc-gui/static/lang/fr.json
+++ b/packages/nc-gui/static/lang/fr.json
@@ -7,24 +7,24 @@
   "projects.create_new_project_button.subtext_2": "Créer en se connectant<br>à une base de données",
   "projects.create_new_project_button.subtext_2_tooltip": "Base de données supportées MySQL, PostgreSQL, SQL Server & SQLite",
   "projects.search_project": "Rechercher un projet",
-  "projects.vertical_option_1": "Importer les métadonnées",
-  "projects.vertical_option_2": "Exporter les métadonnées",
-  "projects.vertical_option_3": "Effacer les métadonnées",
-  "projects.horizontal_option_1": "Arrêter le projet",
-  "projects.horizontal_option_2": "Démarrer le projet",
-  "projects.horizontal_option_3": "Redémarrer le projet",
-  "projects.horizontal_option_4": "Supprimer le projet",
+  "projects.import_metadata": "Importer les métadonnées",
+  "projects.export_metadata": "Exporter les métadonnées",
+  "projects.clear_metadata": "Effacer les métadonnées",
+  "projects.stop_project": "Arrêter le projet",
+  "projects.start_project": "Démarrer le projet",
+  "projects.restart_project": "Redémarrer le projet",
+  "projects.delete_project": "Supprimer le projet",
   "projects.project_api_type_tooltip_graphql": "Accessible via l'API GraphQL",
   "projects.project_api_type_tooltip_rest": "Accessible via l'API REST",
   "projects.project_empty_message": "Commencer par créer un nouveau projet",
   "projects.import_button.text": "Importer un projet NocoDB à partir d'un fichier ZIP de métadonnées",
-  "projects.show_community_message_1_1": "Donner nous une étoile",
-  "projects.show_community_message_1_2": "sur Github",
-  "projects.show_community_message_2": "Planifier une démo gratuite",
-  "projects.show_community_message_3": "Obtenir des réponses à vos questions",
-  "projects.show_community_message_3_short": "Join Discord",
-  "projects.show_community_message_4": "Suivre NocoDB",
-  "projects.search.no_result": "Votre recherche pour {search} n'a renvoyée aucun résultat",
+  "projects.show_community_star": "Donner nous une étoile",
+  "projects.show_community_us_on_Github": "sur Github",
+  "projects.show_community_book_a_free_demo": "Planifier une démo gratuite",
+  "projects.show_community_get_your_questions_answered": "Obtenir des réponses à vos questions",
+  "projects.show_community_join_discord": "Join Discord",
+  "projects.show_community_follow_nocodb": "Suivre NocoDB",
+  "projects.search.your_search_found_no_results": "Votre recherche pour {search} n'a renvoyée aucun résultat",
   "projects.ext_db.title.edit": "Editer le projet",
   "projects.ext_db.title.create": "Créer un projet",
   "projects.ext_db.project_name": "Saisir le nom du projet",
@@ -44,38 +44,38 @@
   "projects.ext_db.credentials.button.test_db_conn": "Test la connexion à la base de données",
   "projects.ext_db.credentials.button.remove_db_from_env": "Supprimer la base de données de l'environement",
   "projects.ext_db.credentials.advanced": "SSL et paramètres avancés",
-  "projects.ext_db.credentials.advanced.ssl.option1": "Clé Client",
-  "projects.ext_db.credentials.advanced.ssl.option2": "Certificat Client",
-  "projects.ext_db.credentials.advanced.ssl.option3": "serveur d'AC",
-  "projects.ext_db.credentials.advanced.ssl.option1.toolip": "Selectionner le fichier .key",
-  "projects.ext_db.credentials.advanced.ssl.option2.toolip": "Selectionner le fichier .cert",
-  "projects.ext_db.credentials.advanced.ssl.option3.toolip": "Selectionner le fichier CA",
+  "projects.ext_db.credentials.advanced.ssl.client_key": "Clé Client",
+  "projects.ext_db.credentials.advanced.ssl.client_cert": "Certificat Client",
+  "projects.ext_db.credentials.advanced.ssl.server_ca": "serveur d'AC",
+  "projects.ext_db.credentials.advanced.ssl.client_key.toolip": "Selectionner le fichier .key",
+  "projects.ext_db.credentials.advanced.ssl.client_cert.toolip": "Selectionner le fichier .cert",
+  "projects.ext_db.credentials.advanced.ssl.server_ca.toolip": "Selectionner le fichier CA",
   "projects.ext_db.credentials.advanced.ssl.preferred": "Préférée",
-  "projects.ext_db.credentials.advanced.ssl.usage.option1": "Non",
-  "projects.ext_db.credentials.advanced.ssl.usage.option2": "Préférée",
-  "projects.ext_db.credentials.advanced.ssl.usage.option3": "Requise",
-  "projects.ext_db.credentials.advanced.ssl.usage.option4": "AC requise",
-  "projects.ext_db.credentials.advanced.ssl.usage.option5": "Identité requise",
+  "projects.ext_db.credentials.advanced.ssl.usage.no": "Non",
+  "projects.ext_db.credentials.advanced.ssl.usage.preferred": "Préférée",
+  "projects.ext_db.credentials.advanced.ssl.usage.required": "Requise",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_ca": "AC requise",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_identity": "Identité requise",
   "projects.ext_db.credentials.advanced.inflection.table_name": "Inflection - Table name",
   "projects.ext_db.credentials.advanced.inflection.column_name": "Inflection - Column name",
   "projects.ext_db.credentials.advanced.button.edit_conn_json": "Editer le JSON de la connexion",
-  "projects.ext_db.error.message_1": "Caractère invalide dans le chemin du dossier.",
-  "projects.ext_db.error.message_2": "Identifiants de base de données invalides.",
-  "projects.ext_db.error.message_3": "Connexion impossible à la base de données, merci de vérifier que la base de données est démarrée et accessible.",
-  "projects.ext_db.error.message_4": "L’utilisateur n’existe pas ou n’a pas les permissions suffisantes pour créer le schéma.",
+  "projects.ext_db.error.invalid_char_in_folder_path": "Caractère invalide dans le chemin du dossier.",
+  "projects.ext_db.error.invalid_db_credentials": "Identifiants de base de données invalides.",
+  "projects.ext_db.error.unable_to_connect_to_db": "Connexion impossible à la base de données, merci de vérifier que la base de données est démarrée et accessible.",
+  "projects.ext_db.error.user_doesnt_ve_sufficient_permission": "L’utilisateur n’existe pas ou n’a pas les permissions suffisantes pour créer le schéma.",
   "projects.ext_db.head.title": "Créer un projet | Noco",
   "projects.ext_db.dialog.success": "Connexion réussi",
   "projects.ext_db.dialog.failure": "Echec de connexion :",
   "signin.title": "Connexion",
-  "signin.input_1": "Saisir votre adresse email professionnel",
-  "signin.input_2": "Saisir votre mot de passe",
+  "signin.enter_your_work_email": "Saisir votre adresse email professionnel",
+  "signin.enter_your_password": "Saisir votre mot de passe",
   "signin.forget_password": "Mot de passe oublié ?",
-  "signin.footer_text_1": "Vous n'avez pas de compte ?",
-  "signin.footer_text_2": "Déconnexion",
-  "signin.form.rules.email_1": "Adresse Email requise",
-  "signin.form.rules.email_2": "L'adresse Email doit être valide",
-  "signin.form.rules.password_1": "Mot de passe requis",
-  "signin.form.rules.password_2": "Votre mot de passe doit contenir au moins 8 caractères",
+  "signin.dont_ve_an_account": "Vous n'avez pas de compte ?",
+  "signin.sign_up": "Déconnexion",
+  "signin.form.rules.email_is_reqd": "Adresse Email requise",
+  "signin.form.rules.email_must_be_valid": "L'adresse Email doit être valide",
+  "signin.form.rules.passwd_required": "Mot de passe requis",
+  "signin.form.rules.passwd_must_be_8_chars": "Votre mot de passe doit contenir au moins 8 caractères",
   "signin.head.title": "Connexion | Noco",
   "signin.head.meta.hid": "Se connecter à Noco",
   "signin.head.meta.name": "Se connecter à Noco",
diff --git a/packages/nc-gui/static/lang/ja.json b/packages/nc-gui/static/lang/ja.json
index 68c0fd7837..c217517e4e 100644
--- a/packages/nc-gui/static/lang/ja.json
+++ b/packages/nc-gui/static/lang/ja.json
@@ -7,24 +7,24 @@
   "projects.create_new_project_button.subtext_2": "Create By Connecting <br>To An External Database",
   "projects.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite",
   "projects.search_project": "Search Project",
-  "projects.vertical_option_1": "Import Metadata",
-  "projects.vertical_option_2": "Export Metadata",
-  "projects.vertical_option_3": "Clear Metadata",
-  "projects.horizontal_option_1": "Stop Project",
-  "projects.horizontal_option_2": "Start Project",
-  "projects.horizontal_option_3": "Restart Project",
-  "projects.horizontal_option_4": "Delete Project",
+  "projects.import_metadata": "Import Metadata",
+  "projects.export_metadata": "Export Metadata",
+  "projects.clear_metadata": "Clear Metadata",
+  "projects.stop_project": "Stop Project",
+  "projects.start_project": "Start Project",
+  "projects.restart_project": "Restart Project",
+  "projects.delete_project": "Delete Project",
   "projects.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs",
   "projects.project_api_type_tooltip_rest": "Accessible via REST APIs",
   "projects.project_empty_message": "Get started by creating a new project",
   "projects.import_button.text": "Import NocoDB Project by uploading metadata zip file",
-  "projects.show_community_message_1_1": "Star",
-  "projects.show_community_message_1_2": "us on Github",
-  "projects.show_community_message_2": "Book a Free DEMO",
-  "projects.show_community_message_3": "Get your questions answered",
-  "projects.show_community_message_3_short": "Join Discord",
-  "projects.show_community_message_4": "Follow NocoDB",
-  "projects.search.no_result": "Your search for {search} found no results",
+  "projects.show_community_star": "Star",
+  "projects.show_community_us_on_Github": "us on Github",
+  "projects.show_community_book_a_free_demo": "Book a Free DEMO",
+  "projects.show_community_get_your_questions_answered": "Get your questions answered",
+  "projects.show_community_join_discord": "Join Discord",
+  "projects.show_community_follow_nocodb": "Follow NocoDB",
+  "projects.search.your_search_found_no_results": "Your search for {search} found no results",
   "projects.ext_db.title.edit": "Edit Project",
   "projects.ext_db.title.create": "Create Project",
   "projects.ext_db.project_name": "Enter Project Name",
@@ -44,38 +44,38 @@
   "projects.ext_db.credentials.button.test_db_conn": "Test Database Connection",
   "projects.ext_db.credentials.button.remove_db_from_env": "Remove Database from environment",
   "projects.ext_db.credentials.advanced": "SSL & Advanced parameters",
-  "projects.ext_db.credentials.advanced.ssl.option1": "Client Key",
-  "projects.ext_db.credentials.advanced.ssl.option2": "Client Cert",
-  "projects.ext_db.credentials.advanced.ssl.option3": "Server CA",
-  "projects.ext_db.credentials.advanced.ssl.option1.toolip": "Select .key file",
-  "projects.ext_db.credentials.advanced.ssl.option2.toolip": "Select .cert file",
-  "projects.ext_db.credentials.advanced.ssl.option3.toolip": "Select CA file",
+  "projects.ext_db.credentials.advanced.ssl.client_key": "Client Key",
+  "projects.ext_db.credentials.advanced.ssl.client_cert": "Client Cert",
+  "projects.ext_db.credentials.advanced.ssl.server_ca": "Server CA",
+  "projects.ext_db.credentials.advanced.ssl.client_key.toolip": "Select .key file",
+  "projects.ext_db.credentials.advanced.ssl.client_cert.toolip": "Select .cert file",
+  "projects.ext_db.credentials.advanced.ssl.server_ca.toolip": "Select CA file",
   "projects.ext_db.credentials.advanced.ssl.preferred": "Preferred",
-  "projects.ext_db.credentials.advanced.ssl.usage.option1": "No",
-  "projects.ext_db.credentials.advanced.ssl.usage.option2": "Preferred",
-  "projects.ext_db.credentials.advanced.ssl.usage.option3": "Required",
-  "projects.ext_db.credentials.advanced.ssl.usage.option4": "Required-CA",
-  "projects.ext_db.credentials.advanced.ssl.usage.option5": "Required-IDENTITY",
+  "projects.ext_db.credentials.advanced.ssl.usage.no": "No",
+  "projects.ext_db.credentials.advanced.ssl.usage.preferred": "Preferred",
+  "projects.ext_db.credentials.advanced.ssl.usage.required": "Required",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_ca": "Required-CA",
+  "projects.ext_db.credentials.advanced.ssl.usage.requried_identity": "Required-IDENTITY",
   "projects.ext_db.credentials.advanced.inflection.table_name": "Inflection - Table name",
   "projects.ext_db.credentials.advanced.inflection.column_name": "Inflection - Column name",
   "projects.ext_db.credentials.advanced.button.edit_conn_json": "Edit connection JSON",
-  "projects.ext_db.error.message_1": "Invalid character in folder path.",
-  "projects.ext_db.error.message_2": "Invalid database credentials.",
-  "projects.ext_db.error.message_3": "Unable to connect to database, please check your database is up.",
-  "projects.ext_db.error.message_4": "User does not exist or have sufficient permission to create schema.",
+  "projects.ext_db.error.invalid_char_in_folder_path": "Invalid character in folder path.",
+  "projects.ext_db.error.invalid_db_credentials": "Invalid database credentials.",
+  "projects.ext_db.error.unable_to_connect_to_db": "Unable to connect to database, please check your database is up.",
+  "projects.ext_db.error.user_doesnt_ve_sufficient_permission": "User does not exist or have sufficient permission to create schema.",
   "projects.ext_db.head.title": "Create Project | Noco",
   "projects.ext_db.dialog.success": "Connection was successful",
   "projects.ext_db.dialog.failure": "Connection Failure:",
   "signin.title": "SIGN IN",
-  "signin.input_1": "Enter your work email",
-  "signin.input_2": "Enter your password",
+  "signin.enter_your_work_email": "Enter your work email",
+  "signin.enter_your_password": "Enter your password",
   "signin.forget_password": "Forgot your password ?",
-  "signin.footer_text_1": "Don't have an account ?",
-  "signin.footer_text_2": "Sign Up",
-  "signin.form.rules.email_1": "E-mail is required",
-  "signin.form.rules.email_2": "E-mail must be valid",
-  "signin.form.rules.password_1": "Password is required",
-  "signin.form.rules.password_2": "You password must be atleast 8 characters",
+  "signin.dont_ve_an_account": "Don't have an account ?",
+  "signin.sign_up": "Sign Up",
+  "signin.form.rules.email_is_reqd": "E-mail is required",
+  "signin.form.rules.email_must_be_valid": "E-mail must be valid",
+  "signin.form.rules.passwd_required": "Password is required",
+  "signin.form.rules.passwd_must_be_8_chars": "You password must be atleast 8 characters",
   "signin.head.title": "Log In | Noco",
   "signin.head.meta.hid": "Log In To Noco",
   "signin.head.meta.name": "Log In To Noco",
diff --git a/packages/nc-gui/static/lang/zh.json b/packages/nc-gui/static/lang/zh.json
index 756569b975..10494cc261 100644
--- a/packages/nc-gui/static/lang/zh.json
+++ b/packages/nc-gui/static/lang/zh.json
@@ -7,24 +7,24 @@
     "projects.create_new_project_button.subtext_2": "Create By Connecting <br>To An External Database",
     "projects.create_new_project_button.subtext_2_tooltip": "Supports MySQL, PostgreSQL, SQL Server & SQLite",
     "projects.search_project": "Search Project",
-    "projects.vertical_option_1": "Import Metadata",
-    "projects.vertical_option_2": "Export Metadata",
-    "projects.vertical_option_3": "Clear Metadata",
-    "projects.horizontal_option_1": "Stop Project",
-    "projects.horizontal_option_2": "Start Project",
-    "projects.horizontal_option_3": "Restart Project",
-    "projects.horizontal_option_4": "Delete Project",
+    "projects.import_metadata": "Import Metadata",
+    "projects.export_metadata": "Export Metadata",
+    "projects.clear_metadata": "Clear Metadata",
+    "projects.stop_project": "Stop Project",
+    "projects.start_project": "Start Project",
+    "projects.restart_project": "Restart Project",
+    "projects.delete_project": "Delete Project",
     "projects.project_api_type_tooltip_graphql": "Accessible via GraphQL APIs",
     "projects.project_api_type_tooltip_rest": "Accessible via REST APIs",
     "projects.project_empty_message": "Get started by creating a new project",
     "projects.import_button.text": "Import NocoDB Project by uploading metadata zip file",
-    "projects.show_community_message_1_1": "Star",
-    "projects.show_community_message_1_2": "us on Github",
-    "projects.show_community_message_2": "Book a Free DEMO",
-    "projects.show_community_message_3": "Get your questions answered",
-    "projects.show_community_message_3_short": "Join Discord",
-    "projects.show_community_message_4": "Follow NocoDB",
-    "projects.search.no_result": "Your search for {search} found no results",
+    "projects.show_community_star": "Star",
+    "projects.show_community_us_on_Github": "us on Github",
+    "projects.show_community_book_a_free_demo": "Book a Free DEMO",
+    "projects.show_community_get_your_questions_answered": "Get your questions answered",
+    "projects.show_community_join_discord": "Join Discord",
+    "projects.show_community_follow_nocodb": "Follow NocoDB",
+    "projects.search.your_search_found_no_results": "Your search for {search} found no results",
     "projects.ext_db.title.edit": "Edit Project",
     "projects.ext_db.title.create": "Create Project",
     "projects.ext_db.project_name": "Enter Project Name",
@@ -44,38 +44,38 @@
     "projects.ext_db.credentials.button.test_db_conn": "Test Database Connection",
     "projects.ext_db.credentials.button.remove_db_from_env": "Remove Database from environment",
     "projects.ext_db.credentials.advanced": "SSL & Advanced parameters",
-    "projects.ext_db.credentials.advanced.ssl.option1": "Client Key",
-    "projects.ext_db.credentials.advanced.ssl.option2": "Client Cert",
-    "projects.ext_db.credentials.advanced.ssl.option3": "Server CA",
-    "projects.ext_db.credentials.advanced.ssl.option1.toolip": "Select .key file",
-    "projects.ext_db.credentials.advanced.ssl.option2.toolip": "Select .cert file",
-    "projects.ext_db.credentials.advanced.ssl.option3.toolip": "Select CA file",
+    "projects.ext_db.credentials.advanced.ssl.client_key": "Client Key",
+    "projects.ext_db.credentials.advanced.ssl.client_cert": "Client Cert",
+    "projects.ext_db.credentials.advanced.ssl.server_ca": "Server CA",
+    "projects.ext_db.credentials.advanced.ssl.client_key.toolip": "Select .key file",
+    "projects.ext_db.credentials.advanced.ssl.client_cert.toolip": "Select .cert file",
+    "projects.ext_db.credentials.advanced.ssl.server_ca.toolip": "Select CA file",
     "projects.ext_db.credentials.advanced.ssl.preferred": "Preferred",
-    "projects.ext_db.credentials.advanced.ssl.usage.option1": "No",
-    "projects.ext_db.credentials.advanced.ssl.usage.option2": "Preferred",
-    "projects.ext_db.credentials.advanced.ssl.usage.option3": "Required",
-    "projects.ext_db.credentials.advanced.ssl.usage.option4": "Required-CA",
-    "projects.ext_db.credentials.advanced.ssl.usage.option5": "Required-IDENTITY",
+    "projects.ext_db.credentials.advanced.ssl.usage.no": "No",
+    "projects.ext_db.credentials.advanced.ssl.usage.preferred": "Preferred",
+    "projects.ext_db.credentials.advanced.ssl.usage.required": "Required",
+    "projects.ext_db.credentials.advanced.ssl.usage.requried_ca": "Required-CA",
+    "projects.ext_db.credentials.advanced.ssl.usage.requried_identity": "Required-IDENTITY",
     "projects.ext_db.credentials.advanced.inflection.table_name": "Inflection - Table name",
     "projects.ext_db.credentials.advanced.inflection.column_name": "Inflection - Column name",
     "projects.ext_db.credentials.advanced.button.edit_conn_json": "Edit connection JSON",
-    "projects.ext_db.error.message_1": "Invalid character in folder path.",
-    "projects.ext_db.error.message_2": "Invalid database credentials.",
-    "projects.ext_db.error.message_3": "Unable to connect to database, please check your database is up.",
-    "projects.ext_db.error.message_4": "User does not exist or have sufficient permission to create schema.",
+    "projects.ext_db.error.invalid_char_in_folder_path": "Invalid character in folder path.",
+    "projects.ext_db.error.invalid_db_credentials": "Invalid database credentials.",
+    "projects.ext_db.error.unable_to_connect_to_db": "Unable to connect to database, please check your database is up.",
+    "projects.ext_db.error.user_doesnt_ve_sufficient_permission": "User does not exist or have sufficient permission to create schema.",
     "projects.ext_db.head.title": "Create Project | Noco",
     "projects.ext_db.dialog.success": "Connection was successful",
     "projects.ext_db.dialog.failure": "Connection Failure:",
     "signin.title": "SIGN IN",
-    "signin.input_1": "Enter your work email",
-    "signin.input_2": "Enter your password",
+    "signin.enter_your_work_email": "Enter your work email",
+    "signin.enter_your_password": "Enter your password",
     "signin.forget_password": "Forgot your password ?",
-    "signin.footer_text_1": "Don't have an account ?",
-    "signin.footer_text_2": "Sign Up",
-    "signin.form.rules.email_1": "E-mail is required",
-    "signin.form.rules.email_2": "E-mail must be valid",
-    "signin.form.rules.password_1": "Password is required",
-    "signin.form.rules.password_2": "You password must be atleast 8 characters",
+    "signin.dont_ve_an_account": "Don't have an account ?",
+    "signin.sign_up": "Sign Up",
+    "signin.form.rules.email_is_reqd": "E-mail is required",
+    "signin.form.rules.email_must_be_valid": "E-mail must be valid",
+    "signin.form.rules.passwd_required": "Password is required",
+    "signin.form.rules.passwd_must_be_8_chars": "You password must be atleast 8 characters",
     "signin.head.title": "Log In | Noco",
     "signin.head.meta.hid": "Log In To Noco",
     "signin.head.meta.name": "Log In To Noco",