From 5d2131069c853944abb845825b71ec61ffe94265 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Sun, 8 Oct 2023 23:09:18 +0530
Subject: [PATCH 1/9] fix: i18n

---
 .../nc-gui/components/account/UsersModal.vue  |  4 +-
 .../components/cell/attachment/RenameFile.vue |  6 ++-
 .../settings/data-sources/CreateBase.vue      |  2 +-
 .../nc-gui/components/dlg/AirtableImport.vue  |  2 +-
 .../dlg/share-and-collaborate/Collaborate.vue |  4 +-
 .../dlg/share-and-collaborate/SharePage.vue   |  5 ---
 .../dlg/share-and-collaborate/View.vue        |  4 +-
 .../nc-gui/components/general/FullScreen.vue  |  3 +-
 .../nc-gui/components/general/JoinCloud.vue   |  2 +-
 .../nc-gui/components/notification/Card.vue   |  7 ++--
 packages/nc-gui/components/roles/Badge.vue    |  5 +--
 .../smartsheet/expanded-form/index.vue        | 15 ++++---
 .../smartsheet/toolbar/ShareView.vue          | 19 +++------
 .../tabs/auth/user-management/UsersModal.vue  |  8 ++--
 .../nc-gui/components/template/Editor.vue     | 29 +++++---------
 .../components/workspace/CreateProjectDlg.vue | 16 ++++----
 .../components/workspace/InviteCollabDlg.vue  |  6 +--
 packages/nc-gui/lang/en.json                  | 39 +++++++++++++++++--
 packages/nocodb-sdk/src/lib/enums.ts          | 28 ++++++-------
 19 files changed, 106 insertions(+), 98 deletions(-)

diff --git a/packages/nc-gui/components/account/UsersModal.vue b/packages/nc-gui/components/account/UsersModal.vue
index 489508d9f8..7ebbe9001e 100644
--- a/packages/nc-gui/components/account/UsersModal.vue
+++ b/packages/nc-gui/components/account/UsersModal.vue
@@ -175,7 +175,7 @@ const emailInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
                     v-bind="validateInfos.emails"
                     validate-trigger="onBlur"
                     name="emails"
-                    :rules="[{ required: true, message: 'Please input email' }]"
+                    :rules="[{ required: true, message: $t('msg.plsInputEmail') }]"
                   >
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('datatype.Email') }}:</div>
 
@@ -190,7 +190,7 @@ const emailInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
                 </div>
 
                 <div class="flex flex-col w-2/4">
-                  <a-form-item name="role" :rules="[{ required: true, message: 'Role required' }]">
+                  <a-form-item name="role" :rules="[{ required: true, message: $t('msg.roleRequired') }]">
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('labels.selectUserRole') }}</div>
 
                     <a-select v-model:value="usersData.role" class="nc-user-roles" dropdown-class-name="nc-dropdown-user-role">
diff --git a/packages/nc-gui/components/cell/attachment/RenameFile.vue b/packages/nc-gui/components/cell/attachment/RenameFile.vue
index 0eb8289627..7218a15f56 100644
--- a/packages/nc-gui/components/cell/attachment/RenameFile.vue
+++ b/packages/nc-gui/components/cell/attachment/RenameFile.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-import { onKeyStroke, onMounted, reactive, ref } from '#imports'
+import { onKeyStroke, onMounted, reactive, ref, useI18n } from '#imports'
+
+const { t } = useI18n()
 
 const props = defineProps<{
   title: string
@@ -29,7 +31,7 @@ function renameFile(fileName: string) {
 // }
 
 const rules = {
-  title: [{ required: true, message: 'title is required.' }],
+  title: [{ required: true, message: t('labels.titleRequired') }],
 }
 
 function onCancel() {
diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
index f82975fce3..fd5b670583 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
@@ -124,7 +124,7 @@ const validators = computed(() => {
     'title': [
       {
         required: true,
-        message: 'Source name is required',
+        message: t('labels.sourceNameRequired'),
       },
       baseTitleValidator,
     ],
diff --git a/packages/nc-gui/components/dlg/AirtableImport.vue b/packages/nc-gui/components/dlg/AirtableImport.vue
index d32565d966..1280b8410f 100644
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@@ -336,7 +336,7 @@ onMounted(async () => {
             <a-input
               v-model:value="syncSource.details.syncSourceUrlOrId"
               class="nc-input-shared-base"
-              :placeholder="`${$t('labels.sharedBase')} URL`"
+              :placeholder="`${$t('labels.sharedBaseUrl')}`"
               size="large"
             />
           </a-form-item>
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
index aa149774f2..863c8fabe4 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/Collaborate.vue
@@ -58,7 +58,7 @@ watch(
               v-bind="validateInfos.emails"
               validate-trigger="onBlur"
               name="emails"
-              :rules="[{ required: true, message: 'Please input email' }]"
+              :rules="[{ required: true, message: t('msg.plsInputEmail') }]"
             >
               <a-input
                 v-model:value="invitationUsersData.emails"
@@ -72,7 +72,7 @@ watch(
           </div>
 
           <div class="flex flex-col w-1/5">
-            <a-form-item name="role" :rules="[{ required: true, message: 'Role required' }]">
+            <a-form-item name="role" :rules="[{ required: true, message: t('msg.roleRequired') }]">
               <a-select
                 v-model:value="invitationUsersData.role"
                 class="!rounded-md !bg-white"
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index d2f839e15a..a91c9fd8cf 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -330,29 +330,24 @@ const isPublicShareDisabled = computed(() => {
           </div>
 
           <div v-if="activeView?.type === ViewTypes.FORM" class="flex flex-row justify-between">
-            <!-- use RTL orientation in form - todo: i18n -->
             <div class="text-black">{{ $t('activity.surveyMode') }}</div>
             <a-switch
               v-model:checked="surveyMode"
               v-e="['c:share:view:surver-mode:toggle']"
               data-testid="nc-modal-share-view__surveyMode"
             >
-              <!-- todo i18n -->
             </a-switch>
           </div>
           <div v-if="activeView?.type === ViewTypes.FORM && isEeUI" class="flex flex-row justify-between">
-            <!-- use RTL orientation in form - todo: i18n -->
             <div class="text-black">{{ $t('activity.rtlOrientation') }}</div>
             <a-switch
               v-model:checked="withRTL"
               v-e="['c:share:view:rtl-orientation:toggle']"
               data-testid="nc-modal-share-view__RTL"
             >
-              <!-- todo i18n -->
             </a-switch>
           </div>
           <div v-if="activeView?.type === ViewTypes.FORM" class="flex flex-col justify-between gap-y-1 bg-gray-50 rounded-md">
-            <!-- todo: i18n -->
             <div class="flex flex-row justify-between">
               <div class="text-black">{{ $t('activity.useTheme') }}</div>
               <a-switch
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 760b0336eb..86d7eb8607 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -118,11 +118,11 @@ watch(showShareModal, (val) => {
           >
             <div v-if="isInvitationLinkCopied" class="flex flex-row items-center gap-x-1">
               <MdiTick class="h-3.5" />
-              Copied invite link
+              {{ $t('activity.copyInviteLink') }}
             </div>
             <div v-else class="flex flex-row items-center gap-x-1">
               <MdiContentCopy class="h-3.3" />
-              Copy invite link
+              {{ $t('activity.copiedInviteLink') }}
             </div>
           </a-button>
         </div>
diff --git a/packages/nc-gui/components/general/FullScreen.vue b/packages/nc-gui/components/general/FullScreen.vue
index c779635125..03e2a03987 100644
--- a/packages/nc-gui/components/general/FullScreen.vue
+++ b/packages/nc-gui/components/general/FullScreen.vue
@@ -34,9 +34,8 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
 
 <template>
   <a-tooltip placement="left">
-    <!-- todo: i18n -->
     <template #title>
-      <span class="text-xs">{{ isSidebarsOpen ? 'Full width' : 'Exit full width' }}</span>
+      <span class="text-xs">{{ isSidebarsOpen ? $t('activity.fullWidth') : $t('activity.exitFullWidth') }}</span>
     </template>
     <div
       v-e="['c:toolbar:fullscreen']"
diff --git a/packages/nc-gui/components/general/JoinCloud.vue b/packages/nc-gui/components/general/JoinCloud.vue
index 6ae3461b31..6bba339c15 100644
--- a/packages/nc-gui/components/general/JoinCloud.vue
+++ b/packages/nc-gui/components/general/JoinCloud.vue
@@ -13,7 +13,7 @@ import { iconMap } from '#imports'
       target="_blank"
     >
       <component :is="iconMap.cloud" class="mt-[1px] text-black font-bold" />
-      <div class="px-1 text-xs font-bold text-gray-800">Join</div>
+      <div class="px-1 text-xs font-bold text-gray-800">{{ $t('general.join') }}</div>
     </div>
     <div
       class="group flex justify-center items-center rounded-r-[3px] w-full cursor-pointer px-1 py-1 text-primary border-r-1 border-b-1 border-t-1 border-[#cdd1d6] m-0"
diff --git a/packages/nc-gui/components/notification/Card.vue b/packages/nc-gui/components/notification/Card.vue
index f1c4ea3ea7..125dcd6d6b 100644
--- a/packages/nc-gui/components/notification/Card.vue
+++ b/packages/nc-gui/components/notification/Card.vue
@@ -25,8 +25,7 @@ const groupType = computed({
     <div class="p-3" @click.stop>
       <div class="flex items-center">
         <span class="text-md font-medium text-[#212121]">
-          <!-- todo: i18n -->
-          Notification
+          {{ $t('activity.notification') }}
         </span>
         <div class="flex-grow"></div>
         <div
@@ -34,7 +33,7 @@ const groupType = computed({
           class="cursor-pointer text-xs text-gray-500 hover:text-primary"
           @click.stop="notificationStore.markAllAsRead"
         >
-          Mark all as read
+          {{ $t('activity.maskAllAsRead') }}
         </div>
       </div>
     </div>
@@ -48,7 +47,7 @@ const groupType = computed({
     >
       <template v-if="!notifications?.length">
         <div class="flex flex-col gap-2 items-center justify-center">
-          <div class="text-sm text-gray-400">You have no new notifications</div>
+          <div class="text-sm text-gray-400">{{ $t('msg.noNewNotifications') }}</div>
           <GeneralIcon icon="inbox" class="!text-40px text-gray-400" />
         </div>
       </template>
diff --git a/packages/nc-gui/components/roles/Badge.vue b/packages/nc-gui/components/roles/Badge.vue
index 1d01d03ae7..8056a95ee4 100644
--- a/packages/nc-gui/components/roles/Badge.vue
+++ b/packages/nc-gui/components/roles/Badge.vue
@@ -26,17 +26,16 @@ const sizeSelect = computed(() => props.size)
 
 const roleProperties = computed(() => {
   const role = roleRef.value
-
   const color = RoleColors[role]
   const icon = RoleIcons[role]
   const label = RoleLabels[role]
-
   return {
     color,
     icon,
     label,
   }
 })
+
 </script>
 
 <template>
@@ -63,7 +62,7 @@ const roleProperties = computed(() => {
       >
         <GeneralIcon :icon="roleProperties.icon" />
         <span class="flex whitespace-nowrap">
-          {{ roleProperties.label }}
+          {{ $t(`objects.roleType.${roleProperties.label}`) }}
         </span>
         <GeneralIcon v-if="clickableRef" icon="arrowDown" />
       </div>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 161df80464..7e097568f3 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -281,8 +281,7 @@ onMounted(async () => {
       await loadCommentsAndLogs()
     } catch (e: any) {
       if (e.response?.status === 404) {
-        // todo: i18n
-        message.error('Record not found')
+        message.error(t("msg.noRecordFound"))
         router.replace({ query: {} })
       } else throw e
     }
@@ -345,9 +344,9 @@ useActiveKeyupListener(
 
       if (changedColumns.value.size > 0) {
         await Modal.confirm({
-          title: 'Do you want to save the changes?',
-          okText: 'Save',
-          cancelText: 'Discard',
+          title: t('msg.saveChanges'),
+          okText: t('general.save'),
+          cancelText: t('label.discard'),
           onOk: async () => {
             await save()
             reloadHook?.trigger(null)
@@ -360,8 +359,8 @@ useActiveKeyupListener(
       } else if (isNew.value) {
         await Modal.confirm({
           title: 'Do you want to save the record?',
-          okText: 'Save',
-          cancelText: 'Discard',
+          okText: t('general.save'),
+          cancelText: t('label.discard'),
           onOk: async () => {
             const data = await _save(rowState.value)
             await syncLTARRefs(data)
@@ -389,7 +388,7 @@ const onDeleteRowClick = () => {
 const onConfirmDeleteRowClick = async () => {
   showDeleteRowModal.value = false
   await deleteRowById(primaryKey.value)
-  message.success('Row deleted')
+  message.success(t('msg.rowDeleted'))
   reloadTrigger.trigger()
   onClose()
   showDeleteRowModal.value = false
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue b/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue
index 21542c25dd..113b7243dc 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue
@@ -240,10 +240,6 @@ const copyIframeCode = async () => {
     }
   }
 }
-
-watch(shared, () => {
-  console.log('shared', shared.value)
-})
 </script>
 
 <template>
@@ -292,23 +288,21 @@ watch(shared, () => {
         @click="copyIframeCode"
       >
         <component :is="iconMap.embed" class="text-gray-500" />
-        Embed this view in your site
+        {{ $t('labels.embedInSite') }}
       </div>
 
       <div class="px-1 mt-2 flex flex-col gap-3">
-        <!-- todo: i18n -->
-        <div class="text-gray-500 border-b-1">Options</div>
+        <div class="text-gray-500 border-b-1">{{ $t('general.options') }}</div>
 
         <div class="px-1 flex flex-col gap-2">
           <div>
-            <!-- Survey Mode; todo: i18n -->
             <a-checkbox
               v-if="shared.type === ViewTypes.FORM"
               v-model:checked="surveyMode"
               data-testid="nc-modal-share-view__survey-mode"
               class="!text-sm"
             >
-              Use Survey Mode
+              {{ $t('general.useSurveyMode') }}
             </a-checkbox>
 
             <!--            <Transition name="layout" mode="out-in">
@@ -379,9 +373,8 @@ watch(shared, () => {
           </div>
 
           <div v-if="shared.type === ViewTypes.FORM">
-            <!-- todo: i18n -->
             <a-checkbox v-model:checked="viewTheme" data-testid="nc-modal-share-view__with-theme" class="!text-sm">
-              Use Theme
+              {{ $t('activity.useTheme') }}
             </a-checkbox>
 
             <Transition name="layout" mode="out-in">
@@ -400,10 +393,8 @@ watch(shared, () => {
           </div>
 
           <div v-if="shared.type === ViewTypes.FORM && isRtl">
-            <!-- use RTL orientation in form - todo: i18n -->
             <a-checkbox v-model:checked="withRTL" data-testid="nc-modal-share-view__locale" class="!text-sm">
-              <!-- todo i18n -->
-              RTL Orientation
+              {{ $t('activity.rtlOrientation') }}
             </a-checkbox>
           </div>
         </div>
diff --git a/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue b/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
index 9b6c0f2f19..df902eb4e5 100644
--- a/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
+++ b/packages/nc-gui/components/tabs/auth/user-management/UsersModal.vue
@@ -217,7 +217,7 @@ watch(
                     v-bind="validateInfos.emails"
                     validate-trigger="onBlur"
                     name="emails"
-                    :rules="[{ required: true, message: 'Please input email' }]"
+                    :rules="[{ required: true, message: t('msg.plsInputEmail') }]"
                   >
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('datatype.Email') }}:</div>
 
@@ -233,7 +233,7 @@ watch(
                 </div>
 
                 <div class="flex flex-col w-1/4">
-                  <a-form-item name="role" :rules="[{ required: true, message: 'Role required' }]">
+                  <a-form-item name="role" :rules="[{ required: true, message: t('msg.roleRequired') }]">
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('labels.selectUserRole') }}</div>
 
                     <a-select
@@ -274,9 +274,9 @@ watch(
       </div>
 
       <div class="flex flex-row justify-end gap-x-2 border-t-1 border-gray-100 pt-3">
-        <a-button key="back" class="!rounded-md" @click="cancel">Cancel</a-button>
+        <a-button key="back" class="!rounded-md" @click="cancel">{{$t('general.cancel')}}</a-button>
         <a-button class="!rounded-md">Manage base access</a-button>
-        <a-button key="submit" class="!rounded-md" type="primary" :loading="loading">Share</a-button>
+        <a-button key="submit" class="!rounded-md" type="primary" :loading="loading">{{$t('activity.share')}}</a-button>
       </div>
     </div>
   </GeneralModal>
diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index a3bd6af125..b069bd4502 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -706,8 +706,7 @@ function handleUIDTChange(column, table) {
           <template #extra>
             <a-tooltip bottom>
               <template #title>
-                <!-- TODO: i18n -->
-                <span>Delete Table</span>
+                <span>{{ $t('activity.deleteTable') }}</span>
               </template>
               <component
                 :is="iconMap.delete"
@@ -808,8 +807,7 @@ function handleUIDTChange(column, table) {
             <template #extra>
               <a-tooltip bottom>
                 <template #title>
-                  <!-- TODO: i18n -->
-                  <span>Delete Table</span>
+                  <span>{{ $t('activity.deleteTable') }}</span>
                 </template>
                 <component
                   :is="iconMap.delete"
@@ -846,8 +844,7 @@ function handleUIDTChange(column, table) {
 
                 <template v-else-if="column.key === 'dtxp' && hasSelectColumn[tableIdx]">
                   <span>
-                    <!-- TODO: i18n -->
-                    Options
+                    {{ $t('general.options')}}
                   </span>
                 </template>
               </template>
@@ -872,7 +869,7 @@ function handleUIDTChange(column, table) {
                       <a-select-option v-for="(option, i) of uiTypeOptions" :key="i" :value="option.value">
                         <a-tooltip placement="right">
                           <template v-if="isSelectDisabled(option.label, table.columns[record.key]?._disableSelect)" #title>
-                            The field is too large to be converted to {{ option.label }}
+                            {{ $t('msg.tooLargeField') }} {{ option.label }}
                           </template>
                           {{ option.label }}
                         </a-tooltip>
@@ -890,8 +887,7 @@ function handleUIDTChange(column, table) {
                 <template v-if="column.key === 'action'">
                   <a-tooltip v-if="record.key === 0">
                     <template #title>
-                      <!-- TODO: i18n -->
-                      <span>Primary Value</span>
+                      <span>{{ $t('general.primaryValue')}}</span>
                     </template>
 
                     <div class="flex items-center float-right mr-4">
@@ -901,8 +897,7 @@ function handleUIDTChange(column, table) {
 
                   <a-tooltip v-else>
                     <template #title>
-                      <!-- TODO: i18n -->
-                      <span>Delete Column</span>
+                      <span>{{  $t('activity.deleteColumn') }}</span>
                     </template>
 
                     <a-button type="text" @click="deleteTableColumn(tableIdx, record.key)">
@@ -918,8 +913,7 @@ function handleUIDTChange(column, table) {
             <div class="mt-5 flex gap-2 justify-center">
               <a-tooltip bottom>
                 <template #title>
-                  <!-- TODO: i18n -->
-                  <span>Add Number Column</span>
+                  <span>{{  $t('activity.column.addNumberColumn') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'Number')">
@@ -931,8 +925,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <!-- TODO: i18n -->
-                  <span>Add SingleLineText Column</span>
+                  <span>{{  $t('activity.column.addSingleLineText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">
@@ -944,8 +937,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <!-- TODO: i18n -->
-                  <span>Add LongText Column</span>
+                  <span>{{  $t('activity.column.addLongText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'LongText')">
@@ -957,8 +949,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <!-- TODO: i18n -->
-                  <span>Add Other Column</span>
+                  <span>{{  $t('activity.column.addOther') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 4cf684c58e..96b40bb863 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -3,7 +3,7 @@ import type { RuleObject } from 'ant-design-vue/es/form'
 import type { Form, Input } from 'ant-design-vue'
 import type { VNodeRef } from '@vue/runtime-core'
 import { computed } from '@vue/reactivity'
-import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useVModel } from '#imports'
+import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useVModel, useI18n } from '#imports'
 
 const props = defineProps<{
   modelValue: boolean
@@ -12,6 +12,8 @@ const props = defineProps<{
 
 const emit = defineEmits(['update:modelValue'])
 
+const { t } = useI18n()
+
 const dialogShow = useVModel(props, 'modelValue', emit)
 
 const baseType = computed(() => props.type ?? NcProjectType.DB)
@@ -24,7 +26,7 @@ const { navigateToProject } = useGlobal()
 const nameValidationRules = [
   {
     required: true,
-    message: 'Database name is required',
+    message: t('msg.dbNamerequired'),
   },
   baseTitleValidator,
 ] as RuleObject[]
@@ -95,7 +97,7 @@ const typeLabel = computed(() => {
       <!-- Create A New Table -->
       <div class="flex flex-row items-center">
         <GeneralProjectIcon :type="baseType" class="mr-2.5 !text-lg !h-4" />
-        Create {{ typeLabel }}
+        {{ $t('general.create')+` ${typeLabel}` }}
       </div>
     </template>
     <div class="mt-3">
@@ -121,19 +123,19 @@ const typeLabel = computed(() => {
       </a-form>
 
       <div class="flex flex-row justify-end mt-7 gap-x-2">
-        <NcButton type="secondary" @click="dialogShow = false">Cancel</NcButton>
+        <NcButton type="secondary" @click="dialogShow = false">{{ $t('general.cancel') }}</NcButton>
         <NcButton
           v-e="['a:base:create']"
           data-testid="docs-create-proj-dlg-create-btn"
           :loading="creating"
           type="primary"
-          :label="`Create ${typeLabel}`"
+          :label="$t('general.create')+` ${typeLabel}`"
           :loading-label="`Creating ${typeLabel}`"
           @click="createProject"
         >
-          {{ `Create ${typeLabel}` }}
+          {{ $t('general.create')+` ${typeLabel}` }}
           <template #loading>
-            {{ `Creating ${typeLabel}` }}
+            {{ $t('general.creating')+` ${typeLabel}` }}
           </template>
         </NcButton>
       </div>
diff --git a/packages/nc-gui/components/workspace/InviteCollabDlg.vue b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
index 5f3e3c966d..be0b23e1bb 100644
--- a/packages/nc-gui/components/workspace/InviteCollabDlg.vue
+++ b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
@@ -137,7 +137,7 @@ const emailInput = ref((el) => {
           <div class="flex flex-col mt-1 border-b-1 pb-5">
             <div class="flex flex-row items-center pl-1.5 pb-1 h-[1.1rem]">
               <MdiAccountOutline />
-              <div class="text-xs ml-0.5 mt-0.5">Copy Invite Token</div>
+              <div class="text-xs ml-0.5 mt-0.5">{{ $t('title.copyInviteToken') }}</div>
             </div>
 
             <a-alert class="mt-1" type="success" show-icon>
@@ -193,7 +193,7 @@ const emailInput = ref((el) => {
                     v-bind="validateInfos.emails"
                     validate-trigger="onBlur"
                     name="emails"
-                    :rules="[{ required: true, message: 'Please input email' }]"
+                    :rules="[{ required: true, message: $t('msg.plsInputEmail') }]"
                   >
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('datatype.Email') }}:</div>
 
@@ -207,7 +207,7 @@ const emailInput = ref((el) => {
                 </div>
 
                 <div class="flex flex-col w-2/4">
-                  <a-form-item name="role" :rules="[{ required: true, message: 'Role required' }]">
+                  <a-form-item name="role" :rules="[{ required: true, message: $t('msg.roleRequired') }]">
                     <div class="ml-1 mb-1 text-xs text-gray-500">{{ $t('labels.selectUserRole') }}</div>
 
                     <a-select v-model:value="usersData.role" class="nc-user-roles" dropdown-class-name="nc-dropdown-user-role">
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 1e20360be1..0609c491f5 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -76,6 +76,7 @@
     "whatsappTwilio": "WhatsApp Twilio",
     "submit": "Submit",
     "create": "Create",
+    "creating": "Creating",
     "details": "Details",
     "skip": "Skip",
     "duplicate": "Duplicate",
@@ -174,7 +175,11 @@
     "count": "Count",
     "countDistinct": "Count Distinct",
     "sumDistinct": "Sum Distinct",
-    "avgDistinct": "Avg Distinct"
+    "avgDistinct": "Avg Distinct",
+    "join": "Join",
+    "options": "Options",
+    "primaryValue": "Primary Value",
+    "useSurveyMode": "Use Survey Mode"
   },
   "objects": {
     "workspace": "Workspace",
@@ -215,6 +220,8 @@
       "editor": "Editor",
       "commenter": "Commenter",
       "viewer": "Viewer",
+      "noaccess":"No Access",
+      "super": "Super",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -314,6 +321,7 @@
     "renamingTable": "Renaming Table",
     "copyAuthToken": "Copy Auth Token",
     "copiedAuthToken": "Copied Auth Token",
+    "copyInviteToken": "Copy Invite Token",
     "showSidebar": "Show Sidebar",
     "hideSidebar": "Hide Sidebar",
     "creatingTable": "Creating Table",
@@ -548,7 +556,7 @@
     "requestDataSource": "Request a data source you need?",
     "apiKey": "API Key",
     "personalAccessToken": "Personal Access Token",
-    "sharedBase": "Shared Base",
+    "sharedBaseUrl": "Shared Base",
     "importData": "Import Data",
     "importSecondaryViews": "Import Secondary Views",
     "importRollupColumns": "Import Rollup Columns",
@@ -587,7 +595,10 @@
     "includeData": "Include Data",
     "includeView": "Include View",
     "includeWebhook": "Include Webhook",
-    "zoomInToViewColumns": "Zoom in to view columns"
+    "zoomInToViewColumns": "Zoom in to view columns",
+    "embedInSite": "Embed this view in your site",
+    "titleRequired": "title is required.",
+    "sourceNameRequired":"Source name is required"
   },
   "activity": {
     "onCondition": "On Condition",
@@ -620,6 +631,8 @@
     "useTheme": "Use Theme",
     "copyLink": "Copy Link",
     "copiedLink": "Link Copied",
+    "copyInviteLink":"Copy invite link",
+    "copiedInviteLink":"Copied invite link",
     "copyUrl": "Copy URL",
     "moreColors": "More Colors",
     "moveProject": "Move Base",
@@ -761,6 +774,16 @@
     "toggleCommentsDraw": "Toggle comments draw",
     "expandRecord": "Expand Record",
     "deleteRecord": "Delete Record",
+    "fullWidth": "Full width",
+    "exitFullWidth": "Full width",
+    "maskAllAsRead": "Mark all as read",
+    "column":{
+      "delete": "Delete Column",
+      "addNumber": "Add Number Column",
+      "addSingleLineText": "Add SingleLineText Column",
+      "addLongText": "Add LongText Column",
+      "addOther":"Add Other Column"
+    },
     "erd": {
       "showColumns": "Show Columns",
       "showPkAndFk": "Show Primary and Foreign Keys",
@@ -913,6 +936,7 @@
       "createNewOptionNamed": "Create new option named"
     },
     "plsEnterANumber": "Please enter a number",
+    "plsInputEmail": "Please input email",
     "invalidDate": "Invalid date",
     "invalidLocale": "Invalid locale",
     "invalidCurrencyCode": "Invalid Currency Code",
@@ -951,6 +975,12 @@
     "areYouSureUWantTo": "Are you sure you want to delete the following",
     "idColumnRequired": "ID column is required, you can rename this later if required.",
     "length59Required": "The length exceeds the max 59 characters",
+    "noNewNotifications": "You have no new notifications",
+    "noRecordFound": "Record not found",
+    "rowDeleted": "Row deleted",
+    "saveChanges": "Do you want to save the changes?",
+    "tooLargeField": "The field is too large to be converted to",
+    "roleRequired": "Role required",
     "warning": {
       "dbValid": "Please make sure database you are trying to connect is valid! This operation can cause schema loss!!",
       "barcode": {
@@ -1110,7 +1140,8 @@
       "computedFieldDeleteWarning": "contents are read-only",
       "noMoreRecords": "No more records",
       "tokenNameNotEmpty": "Token name should not be empty",
-      "tokenNameMaxLength": "Token name should not be more than 255 characters"
+      "tokenNameMaxLength": "Token name should not be more than 255 characters",
+      "dbNamerequired": "Database name is required"
     },
     "error": {
       "nameRequired": "Name Required",
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index 3c7ff29b43..bc2e3703ab 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -161,20 +161,20 @@ export enum WorkspacePlan {
 }
 
 export const RoleLabels = {
-  [WorkspaceUserRoles.OWNER]: 'Owner',
-  [WorkspaceUserRoles.CREATOR]: 'Creator',
-  [WorkspaceUserRoles.EDITOR]: 'Editor',
-  [WorkspaceUserRoles.COMMENTER]: 'Commenter',
-  [WorkspaceUserRoles.VIEWER]: 'Viewer',
-  [ProjectRoles.OWNER]: 'Owner',
-  [ProjectRoles.CREATOR]: 'Creator',
-  [ProjectRoles.EDITOR]: 'Editor',
-  [ProjectRoles.COMMENTER]: 'Commenter',
-  [ProjectRoles.VIEWER]: 'Viewer',
-  [ProjectRoles.NO_ACCESS]: 'No Access',
-  [OrgUserRoles.SUPER_ADMIN]: 'Super',
-  [OrgUserRoles.CREATOR]: 'Creator',
-  [OrgUserRoles.VIEWER]: 'Viewer',
+  [WorkspaceUserRoles.OWNER]: 'owner',
+  [WorkspaceUserRoles.CREATOR]: 'creator',
+  [WorkspaceUserRoles.EDITOR]: 'editor',
+  [WorkspaceUserRoles.COMMENTER]: 'commenter',
+  [WorkspaceUserRoles.VIEWER]: 'viewer',
+  [ProjectRoles.OWNER]: 'owner',
+  [ProjectRoles.CREATOR]: 'creator',
+  [ProjectRoles.EDITOR]: 'editor',
+  [ProjectRoles.COMMENTER]: 'commenter',
+  [ProjectRoles.VIEWER]: 'viewer',
+  [ProjectRoles.NO_ACCESS]: 'noaccess',
+  [OrgUserRoles.SUPER_ADMIN]: 'super',
+  [OrgUserRoles.CREATOR]: 'creator',
+  [OrgUserRoles.VIEWER]: 'viewer',
 };
 
 export const RoleColors = {

From 9bd231bf40c79a339c15f0753deedc5c268d9ffb Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Mon, 9 Oct 2023 00:28:15 +0530
Subject: [PATCH 2/9] fix(nc-gui): i18n for aettings and page

---
 .../smartsheet/expanded-form/index.vue        |  4 +--
 .../nc-gui/components/workspace/Settings.vue  | 31 ++++++++++---------
 packages/nc-gui/lang/en.json                  | 15 +++++++--
 .../pages/index/[typeOrId]/form/[viewId].vue  |  5 ++-
 packages/nc-gui/pages/reset/[id].vue          |  7 +++--
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 7e097568f3..2cc3b92e43 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -346,7 +346,7 @@ useActiveKeyupListener(
         await Modal.confirm({
           title: t('msg.saveChanges'),
           okText: t('general.save'),
-          cancelText: t('label.discard'),
+          cancelText: t('labels.discard'),
           onOk: async () => {
             await save()
             reloadHook?.trigger(null)
@@ -360,7 +360,7 @@ useActiveKeyupListener(
         await Modal.confirm({
           title: 'Do you want to save the record?',
           okText: t('general.save'),
-          cancelText: t('label.discard'),
+          cancelText: t('labels.discard'),
           onOk: async () => {
             const data = await _save(rowState.value)
             await syncLTARRefs(data)
diff --git a/packages/nc-gui/components/workspace/Settings.vue b/packages/nc-gui/components/workspace/Settings.vue
index b86adbc5c0..e987fb088f 100644
--- a/packages/nc-gui/components/workspace/Settings.vue
+++ b/packages/nc-gui/components/workspace/Settings.vue
@@ -1,5 +1,8 @@
 <script lang="ts" setup>
+import { useI18n } from '#imports'
 const { signOut } = useGlobal()
+const { t } = useI18n()
+
 
 const { deleteWorkspace, navigateToWorkspace, updateWorkspace } = useWorkspace()
 const { workspacesList, activeWorkspaceId, activeWorkspace, workspaces } = storeToRefs(useWorkspace())
@@ -17,9 +20,9 @@ const form = ref({
 
 const formRules = {
   title: [
-    { required: true, message: 'Workspace name required' },
-    { min: 3, message: 'Workspace name must be at least 3 characters long' },
-    { max: 50, message: 'Workspace name must be at most 50 characters long' },
+    { required: true, message: t('msg.wsNameRequired') },
+    { min: 3, message: t('msg.wsNameMinLength') },
+    { max: 50, message: t('msg.wsNameMaxLength') },
   ],
 }
 
@@ -104,9 +107,9 @@ const onCancel = () => {
 <template>
   <div class="flex flex-col items-center nc-workspace-settings-settings">
     <div class="item flex flex-col w-full">
-      <div class="font-medium text-base">Change Workspace Name</div>
+      <div class="font-medium text-base">{{ $t('labels.changeWsName') }}</div>
       <a-form ref="formValidator" layout="vertical" no-style :model="form" class="w-full" @finish="titleChange">
-        <div class="text-gray-500 mt-6 mb-1.5">Workspace name</div>
+        <div class="text-gray-500 mt-6 mb-1.5">{{ $t('objects.workspace') $t('general.name')}}</div>
         <a-form-item name="title" :rules="formRules.title">
           <a-input
             v-model:value="form.title"
@@ -123,8 +126,8 @@ const onCancel = () => {
             data-testid="nc-workspace-settings-settings-rename-cancel"
             @click="onCancel"
           >
-            <template #loading> Renaming Workspace </template>
-            Cancel
+            <template #loading> {{ $t('title.renamingWs') }} </template>
+            {{ $t('general.cancel') }}
           </NcButton>
           <NcButton
             v-e="['c:workspace:settings:rename']"
@@ -134,18 +137,18 @@ const onCancel = () => {
             :loading="isDeleting"
             data-testid="nc-workspace-settings-settings-rename-submit"
           >
-            <template #loading> Renaming Workspace </template>
-            Rename Workspace
+            <template #loading> {{ $t('title.renamingWs') }} </template>
+            {{ $t('title.renameWs') }}
           </NcButton>
         </div>
       </a-form>
     </div>
     <div class="item flex flex-col">
-      <div class="font-medium text-base">Delete Workspace</div>
-      <div class="text-gray-500 mt-2">Delete this workspace and all it’s contents.</div>
+      <div class="font-medium text-base">{{ $t('title.deleteWs') }}</div>
+      <div class="text-gray-500 mt-2">{{ $t('msg.wsDeleteDlg') }}</div>
       <div class="flex flex-row mt-8 gap-x-2">
         <a-checkbox v-model:checked="isConfirmed" />
-        <div class="flex">I understand that this action is irreversible</div>
+        <div class="flex">{{ $t('msg.userConfirmation') }}</div>
       </div>
 
       <div class="flex flex-row w-full justify-end mt-8">
@@ -156,8 +159,8 @@ const onCancel = () => {
           :loading="isDeleting"
           @click="onDelete"
         >
-          <template #loading> Deleting Workspace </template>
-          Delete Workspace
+          <template #loading> {{ $t('title.deletingWs') }} </template>
+          {{ $t('title.deleteWs') }}
         </NcButton>
       </div>
     </div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0609c491f5..3a5e2ac50d 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -319,6 +319,10 @@
     "downloadFile": "Download File",
     "renameTable": "Rename Table",
     "renamingTable": "Renaming Table",
+    "renamingWs": "Renaming Workspace",
+    "renameWs": "Rename Workspace",
+    "deleteWs": "Delete Workspace",
+    "deletingWs": "Deleting Workspace",
     "copyAuthToken": "Copy Auth Token",
     "copiedAuthToken": "Copied Auth Token",
     "copyInviteToken": "Copy Invite Token",
@@ -598,7 +602,8 @@
     "zoomInToViewColumns": "Zoom in to view columns",
     "embedInSite": "Embed this view in your site",
     "titleRequired": "title is required.",
-    "sourceNameRequired":"Source name is required"
+    "sourceNameRequired":"Source name is required",
+    "changeWsName":"Change Workspace Name",
   },
   "activity": {
     "onCondition": "On Condition",
@@ -1141,7 +1146,13 @@
       "noMoreRecords": "No more records",
       "tokenNameNotEmpty": "Token name should not be empty",
       "tokenNameMaxLength": "Token name should not be more than 255 characters",
-      "dbNamerequired": "Database name is required"
+      "dbNamerequired": "Database name is required",
+      "wsNameRequired":"Workspace name required",
+      "wsNameMinLength":"Workspace name must be at least 3 characters long",
+      "wsNameMaxLength":"Workspace name must be at most 50 characters long",
+      "wsDeleteDlg": "Delete this workspace and all it’s contents.",
+      "userConfirmation": "I understand that this action is irreversible",
+      "pageNotFound":"Page Not Found"
     },
     "error": {
       "nameRequired": "Name Required",
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 671ef10b11..876d7f4621 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -17,6 +17,7 @@ import {
   useRoute,
   useSidebar,
   watch,
+  useI18n
 } from '#imports'
 
 definePageMeta({
@@ -27,6 +28,8 @@ useSidebar('nc-left-sidebar', { hasSidebar: false })
 
 const route = useRoute()
 
+const { t } = useI18n()
+
 const { loadSharedView, sharedView, sharedViewMeta, meta, notFound, password, passwordDlg, passwordError } =
   useProvideSharedFormStore(route.params.viewId as string)
 
@@ -43,7 +46,7 @@ if (!notFound.value) {
   applyLanguageDirection(sharedViewMeta.value.rtl ? 'rtl' : 'ltr')
 } else {
   navigateTo('/error/404')
-  throw createError({ statusCode: 404, statusMessage: 'Page Not Found' })
+  throw createError({ statusCode: 404, statusMessage: t('msg.pageNotFound') })
 }
 
 const form = reactive({
diff --git a/packages/nc-gui/pages/reset/[id].vue b/packages/nc-gui/pages/reset/[id].vue
index 40fa92c1d5..c67b2cf732 100644
--- a/packages/nc-gui/pages/reset/[id].vue
+++ b/packages/nc-gui/pages/reset/[id].vue
@@ -10,6 +10,7 @@ import {
   useApi,
   useRoute,
   useRouter,
+  useI18n
 } from '#imports'
 
 definePageMeta({
@@ -18,6 +19,8 @@ definePageMeta({
 
 const { api, isLoading, error } = useApi()
 
+const { t } = useI18n()
+
 const route = useRoute()
 const navigator = useRouter()
 
@@ -88,7 +91,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.new')"
             name="password"
-            :rules="[{ required: true, message: 'password is required' }]"
+            :rules="[{ required: true, message: t('error.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.password"
@@ -101,7 +104,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.confirm')"
             name="newPassword"
-            :rules="[{ required: true, message: 'password is required' }]"
+            :rules="[{ required: true, message: t('error.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.newPassword"

From 37f7071c1125bd8ab59043cc7cef117a861872e9 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Mon, 9 Oct 2023 00:29:12 +0530
Subject: [PATCH 3/9] fix(nc-gui): json error

---
 packages/nc-gui/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3a5e2ac50d..2c9ce8fb74 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -603,7 +603,7 @@
     "embedInSite": "Embed this view in your site",
     "titleRequired": "title is required.",
     "sourceNameRequired":"Source name is required",
-    "changeWsName":"Change Workspace Name",
+    "changeWsName":"Change Workspace Name"
   },
   "activity": {
     "onCondition": "On Condition",

From 4a5d1c29ec4843ca42d4758cff40e05d203fde3b Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Mon, 9 Oct 2023 13:50:47 +0530
Subject: [PATCH 4/9] fix(nc-gui): fix i18n for surveys and dlgs

---
 .../components/workspace/InviteCollabDlg.vue  | 12 ++++++----
 .../components/workspace/MoveProjectDlg.vue   |  3 +--
 packages/nc-gui/lang/en.json                  | 17 ++++++++++----
 packages/nc-gui/layouts/base.vue              |  6 ++---
 packages/nc-gui/layouts/new.vue               |  6 ++---
 .../pages/index/[typeOrId]/form/[viewId].vue  |  3 +--
 .../[typeOrId]/form/[viewId]/index/survey.vue | 23 ++++++++++---------
 7 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/packages/nc-gui/components/workspace/InviteCollabDlg.vue b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
index be0b23e1bb..ba90013749 100644
--- a/packages/nc-gui/components/workspace/InviteCollabDlg.vue
+++ b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
@@ -42,12 +42,18 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
           if (!value || value.length === 0) {
-            callback('Email is required')
+            callback(t('error.signUpRules.emailReqd'))
             return
           }
           const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
           if (invalidEmails.length > 0) {
-            callback(`${invalidEmails.length > 1 ? ' Invalid emails:' : 'Invalid email:'} ${invalidEmails.join(', ')} `)
+            callback(
+              `${
+                invalidEmails.length > 1
+                  ? `${t('error.signUpRules.invalidEmails')}: `
+                  : `${t('error.signUpRules.invalidEmails')}: `
+              } ${invalidEmails.join(', ')} `,
+            )
           } else {
             callback()
           }
@@ -119,8 +125,6 @@ const emailInput = ref((el) => {
     wrap-class-name="nc-modal-invite-user"
     @cancel="emit('closed')"
   >
-    <!-- TODO: i18n -->
-
     <div class="flex flex-col">
       <div class="flex flex-row justify-between items-center pb-1.5 mb-2 border-b-1 w-full">
         <a-typography-title class="select-none" :level="4"> {{ $t('activity.inviteUser') }}</a-typography-title>
diff --git a/packages/nc-gui/components/workspace/MoveProjectDlg.vue b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
index c4d2eea619..050aec3ef5 100644
--- a/packages/nc-gui/components/workspace/MoveProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/MoveProjectDlg.vue
@@ -55,8 +55,7 @@ const ownedWorkspaces = computed(() => {
       <!-- Create A New Table -->
       <div class="prose-xl font-bold self-center my-4">{{ $t('activity.moveProject') }}</div>
 
-      <!-- todo: i18n -->
-      <div class="mb-2">Workspace</div>
+      <div class="mb-2">{{ $t('objects.workspace') }}</div>
       <a-select v-model:value="workspaceId" class="w-full" show-search>
         <a-select-option v-for="workspace of ownedWorkspaces" :key="workspace.id" :value="workspace.id">
           {{ workspace.title }}
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 2c9ce8fb74..41efc8dedc 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -179,7 +179,10 @@
     "join": "Join",
     "options": "Options",
     "primaryValue": "Primary Value",
-    "useSurveyMode": "Use Survey Mode"
+    "useSurveyMode": "Use Survey Mode",
+    "shift": "Shift",
+    "enter": "Enter",
+    "seconds": "Seconds"
   },
   "objects": {
     "workspace": "Workspace",
@@ -602,8 +605,10 @@
     "zoomInToViewColumns": "Zoom in to view columns",
     "embedInSite": "Embed this view in your site",
     "titleRequired": "title is required.",
-    "sourceNameRequired":"Source name is required",
-    "changeWsName":"Change Workspace Name"
+    "sourceNameRequired": "Source name is required",
+    "changeWsName": "Change Workspace Name",
+    "pressEnter": "Press Enter",
+    "newFormLoaded": "New form will be loaded after"
   },
   "activity": {
     "onCondition": "On Condition",
@@ -1152,7 +1157,11 @@
       "wsNameMaxLength":"Workspace name must be at most 50 characters long",
       "wsDeleteDlg": "Delete this workspace and all it’s contents.",
       "userConfirmation": "I understand that this action is irreversible",
-      "pageNotFound":"Page Not Found"
+      "pageNotFound":"Page Not Found",
+      "makeLineBreak":"to make a line break",
+      "goToNext": "Go to next",
+      "thankyou":"Thank you!",
+      "submittedFormData": "You have successfully submitted the form data."
     },
     "error": {
       "nameRequired": "Name Required",
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index 5e7503807b..01a59b354c 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -69,7 +69,7 @@ hooks.hook('page:finish', () => {
         <LazyGeneralReleaseInfo />
 
         <a-tooltip v-if="!appInfo.ee" placement="bottom" :mouse-enter-delay="1">
-          <template #title> Switch language</template>
+          <template #title>{{ $t('title.switchLanguage') }}</template>
 
           <div class="flex pr-4 items-center">
             <LazyGeneralLanguage class="cursor-pointer text-2xl hover:text-accent" />
@@ -106,7 +106,7 @@ hooks.hook('page:finish', () => {
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
 
-                    &lt;!&ndash; todo: i18n &ndash;&gt;
+                    &lt;!&ndash; &ndash;&gt;
                     <span class="prose group-hover:text-primary">Account management</span>
                   </nuxt-link>
                 </a-menu-item>
@@ -129,7 +129,7 @@ hooks.hook('page:finish', () => {
       </a-layout-header>
 
       <a-tooltip v-if="!appInfo.ee" placement="bottom">
-        <template #title> Switch language</template>
+        <template #title>{{ $t('title.switchLanguage') }}</template>
 
         <LazyGeneralLanguage v-if="!signedIn && !route.params.baseId && !route.params.erdUuid" class="nc-lang-btn" />
       </a-tooltip>
diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index ad4b97efc4..acc8e557db 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -58,7 +58,7 @@ export default {
 
         <div v-if="$route.name === 'index-index'" class="flex gap-1">
           <!-- <a-button class="!text-inherit" data-testid="nc-dash-nav-workspaces"> Projects</a-button -->
-          <!-- <a-button ghost class="!text-inherit" data-testid="nc-dash-nav-explore"> Template</a-button>
+          <!-- <a-button ghost !text-inherit" data-testid="nc-dash-nav-explore"> Template</a-button>
           <a-button ghost class="!text-inherit" data-testid="nc-dash-nav-help"> Help</a-button> -->
         </div>
         <div class="flex-1 min-w-0 flex justify-end gap-2">
@@ -92,7 +92,7 @@ export default {
                   <nuxt-link v-e="['c:navbar:user:email']" class="nc-base-menu-item group !no-underline" to="/account/users">
                     <MdiAccountCircleOutline class="mt-1 group-hover:text-accent" />&nbsp;
                     <div class="prose group-hover:text-primary">
-                      <div>Account</div>
+                      <div>{{ $t('labels.account') }}</div>
                       <div class="text-xs text-gray-500">{{ email }}</div>
                     </div>
                   </nuxt-link>
@@ -107,7 +107,7 @@ export default {
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
 
-                    &lt;!&ndash; todo: i18n &ndash;&gt;
+                    &lt;!&ndash; &ndash;&gt;
                     <span class="prose group-hover:text-primary">Account management</span>
                   </nuxt-link>
                 </a-menu-item>
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 876d7f4621..e3c6737584 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -12,12 +12,12 @@ import {
   provide,
   reactive,
   ref,
+  useI18n,
   useProvideSharedFormStore,
   useProvideSmartsheetStore,
   useRoute,
   useSidebar,
   watch,
-  useI18n
 } from '#imports'
 
 definePageMeta({
@@ -77,7 +77,6 @@ watch(
       @close="passwordDlg = false"
     >
       <div class="w-full flex flex-col gap-4">
-        <!-- todo: i18n -->
         <h2 class="text-xl font-semibold">{{ $t('msg.thisSharedViewIsProtected') }}</h2>
 
         <a-form layout="vertical" no-style :model="form" @finish="loadSharedView">
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 44a5fac20d..92a81f60ed 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -318,8 +318,8 @@ onMounted(() => {
                 </div>
 
                 <div v-if="field.uidt === UITypes.LongText" class="text-sm text-gray-500 flex flex-wrap items-center">
-                  Shift <MdiAppleKeyboardShift class="mx-1 text-primary" /> + Enter
-                  <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> to make a line break
+                  {{ $t('general.shift') }} <MdiAppleKeyboardShift class="mx-1 text-primary" /> + {{ $t('general.enter') }}
+                  <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> {{ $t('msg.makeLineBreak') }}
                 </div>
               </div>
             </LazySmartsheetDivDataCell>
@@ -345,7 +345,9 @@ onMounted(() => {
 
               <div v-else-if="!submitted" class="flex items-center gap-3 flex-col">
                 <a-tooltip
-                  :title="v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : 'Go to next'"
+                  :title="
+                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.goToNext')
+                  "
                   :mouse-enter-delay="0.25"
                   :mouse-leave-delay="0"
                 >
@@ -361,7 +363,7 @@ onMounted(() => {
                     @click="goNext()"
                   >
                     <Transition name="fade">
-                      <span v-if="!v$.localState[field.title]?.$error" class="uppercase text-white">Ok</span>
+                      <span v-if="!v$.localState[field.title]?.$error" class="uppercase text-white">{{ $t('general.ok') }}</span>
                     </Transition>
 
                     <Transition name="slide-right" mode="out-in">
@@ -375,9 +377,8 @@ onMounted(() => {
                   </NcButton>
                 </a-tooltip>
 
-                <!-- todo: i18n -->
                 <div class="hidden md:flex text-sm text-gray-500 items-center gap-1">
-                  Press Enter <MaterialSymbolsKeyboardReturn class="text-primary" />
+                  {{ $t('labels.pressEnter') }} <MaterialSymbolsKeyboardReturn class="text-primary" />
                 </div>
               </div>
             </div>
@@ -392,21 +393,21 @@ onMounted(() => {
 
                 <template v-else>
                   <div class="flex flex-col gap-1">
-                    <div>Thank you!</div>
+                    <div>{{ $t('msg.thankyou') }}</div>
 
-                    <div>You have successfully submitted the form data.</div>
+                    <div>{{ $t('msg.submittedFormData') }}</div>
                   </div>
                 </template>
               </div>
 
               <div v-if="sharedFormView" class="mt-3">
                 <p v-if="sharedFormView?.show_blank_form" class="text-xs text-slate-500 dark:text-slate-300 text-center my-4">
-                  New form will be loaded after {{ secondsRemain }} seconds
+                  {{ $t('labels.newFormLoaded') }} {{ secondsRemain }} {{ $t('general.seconds') }}
                 </p>
 
                 <div v-if="sharedFormView?.submit_another_form" class="text-center">
                   <NcButton type="primary" data-testid="nc-survey-form__btn-submit-another-form" @click="resetForm">
-                    Submit Another Form
+                    {{ $t('activity.submitAnotherForm') }}
                   </NcButton>
                 </div>
               </div>
@@ -448,7 +449,7 @@ onMounted(() => {
           </a-tooltip>
 
           <a-tooltip
-            :title="v$.localState[field.title]?.$error ? '' : 'Go to next'"
+            :title="v$.localState[field.title]?.$error ? '' : $t('msg.goToNext')"
             :mouse-enter-delay="0.25"
             :mouse-leave-delay="0"
           >

From 5fb540d3461cc0c1208f64f549c616fc2eebfacb Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Tue, 10 Oct 2023 08:05:45 +0530
Subject: [PATCH 5/9] fix(nc-gui): i18n issues

---
 .../components/dlg/share-and-collaborate/View.vue  |  4 ++--
 packages/nc-gui/components/notification/Card.vue   |  2 +-
 .../components/workspace/CreateProjectDlg.vue      | 14 +++++++-------
 .../components/workspace/InviteCollabDlg.vue       |  4 ++--
 packages/nc-gui/lang/en.json                       | 12 +++++++-----
 packages/nc-gui/layouts/base.vue                   |  8 ++++----
 packages/nc-gui/layouts/new.vue                    | 10 +++++-----
 packages/nocodb-sdk/src/lib/enums.ts               |  2 +-
 8 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
index 86d7eb8607..6a643517fc 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/View.vue
@@ -118,11 +118,11 @@ watch(showShareModal, (val) => {
           >
             <div v-if="isInvitationLinkCopied" class="flex flex-row items-center gap-x-1">
               <MdiTick class="h-3.5" />
-              {{ $t('activity.copyInviteLink') }}
+              {{ $t('activity.copiedInviteLink') }}
             </div>
             <div v-else class="flex flex-row items-center gap-x-1">
               <MdiContentCopy class="h-3.3" />
-              {{ $t('activity.copiedInviteLink') }}
+              {{ $t('activity.copyInviteLink') }}
             </div>
           </a-button>
         </div>
diff --git a/packages/nc-gui/components/notification/Card.vue b/packages/nc-gui/components/notification/Card.vue
index 125dcd6d6b..9bf9b3f621 100644
--- a/packages/nc-gui/components/notification/Card.vue
+++ b/packages/nc-gui/components/notification/Card.vue
@@ -33,7 +33,7 @@ const groupType = computed({
           class="cursor-pointer text-xs text-gray-500 hover:text-primary"
           @click.stop="notificationStore.markAllAsRead"
         >
-          {{ $t('activity.maskAllAsRead') }}
+          {{ $t('activity.markAllAsRead') }}
         </div>
       </div>
     </div>
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 96b40bb863..d5236df858 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -3,7 +3,7 @@ import type { RuleObject } from 'ant-design-vue/es/form'
 import type { Form, Input } from 'ant-design-vue'
 import type { VNodeRef } from '@vue/runtime-core'
 import { computed } from '@vue/reactivity'
-import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useVModel, useI18n } from '#imports'
+import { NcProjectType, baseTitleValidator, extractSdkResponseErrorMsg, ref, useGlobal, useI18n, useVModel } from '#imports'
 
 const props = defineProps<{
   modelValue: boolean
@@ -26,7 +26,7 @@ const { navigateToProject } = useGlobal()
 const nameValidationRules = [
   {
     required: true,
-    message: t('msg.dbNamerequired'),
+    message: t('msg.dbNameRequired'),
   },
   baseTitleValidator,
 ] as RuleObject[]
@@ -97,7 +97,7 @@ const typeLabel = computed(() => {
       <!-- Create A New Table -->
       <div class="flex flex-row items-center">
         <GeneralProjectIcon :type="baseType" class="mr-2.5 !text-lg !h-4" />
-        {{ $t('general.create')+` ${typeLabel}` }}
+        {{ `${$t('general.create')} ${typeLabel}` }}
       </div>
     </template>
     <div class="mt-3">
@@ -129,13 +129,13 @@ const typeLabel = computed(() => {
           data-testid="docs-create-proj-dlg-create-btn"
           :loading="creating"
           type="primary"
-          :label="$t('general.create')+` ${typeLabel}`"
-          :loading-label="`Creating ${typeLabel}`"
+          :label="`${$t('general.create')} ${typeLabel}`"
+          :loading-label="`${$t('general.creating')} ${typeLabel}`"
           @click="createProject"
         >
-          {{ $t('general.create')+` ${typeLabel}` }}
+          {{ `${$t('general.create')} ${typeLabel}` }}
           <template #loading>
-            {{ $t('general.creating')+` ${typeLabel}` }}
+            {{ `${$t('general.creating')} ${typeLabel}` }}
           </template>
         </NcButton>
       </div>
diff --git a/packages/nc-gui/components/workspace/InviteCollabDlg.vue b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
index ba90013749..b39b30612c 100644
--- a/packages/nc-gui/components/workspace/InviteCollabDlg.vue
+++ b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
@@ -42,7 +42,7 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
           if (!value || value.length === 0) {
-            callback(t('error.signUpRules.emailReqd'))
+            callback(t('error.signUpRules.emailRequired'))
             return
           }
           const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
@@ -51,7 +51,7 @@ const validators = computed(() => {
               `${
                 invalidEmails.length > 1
                   ? `${t('error.signUpRules.invalidEmails')}: `
-                  : `${t('error.signUpRules.invalidEmails')}: `
+                  : `${t('error.signUpRules.invalidEmail')}: `
               } ${invalidEmails.join(', ')} `,
             )
           } else {
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0ce480dd62..db33003210 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -182,7 +182,8 @@
     "useSurveyMode": "Use Survey Mode",
     "shift": "Shift",
     "enter": "Enter",
-    "seconds": "Seconds"
+    "seconds": "Seconds",
+    "todo": "todo"
   },
   "objects": {
     "workspace": "Workspace",
@@ -224,7 +225,7 @@
       "commenter": "Commenter",
       "viewer": "Viewer",
       "noaccess":"No Access",
-      "super": "Super",
+      "superAdmin": "Super Admin",
       "orgLevelCreator": "Organization Level Creator",
       "orgLevelViewer": "Organization Level Viewer"
     },
@@ -388,6 +389,7 @@
     "resetPasswordMenu": "Reset Password",
     "tokens": "Tokens",
     "userManagement": "User Management",
+    "accountManagement": "Account management",
     "licence": "Licence",
     "allowAllMimeTypes": "Allow All Mime Types",
     "defaultView": "Default View",
@@ -787,7 +789,7 @@
     "deleteRecord": "Delete Record",
     "fullWidth": "Full width",
     "exitFullWidth": "Full width",
-    "maskAllAsRead": "Mark all as read",
+    "markAllAsRead": "Mark all as read",
     "column":{
       "delete": "Delete Column",
       "addNumber": "Add Number Column",
@@ -1153,7 +1155,7 @@
       "noMoreRecords": "No more records",
       "tokenNameNotEmpty": "Token name should not be empty",
       "tokenNameMaxLength": "Token name should not be more than 255 characters",
-      "dbNamerequired": "Database name is required",
+      "dbNameRequired": "Database name is required",
       "wsNameRequired":"Workspace name required",
       "wsNameMinLength":"Workspace name must be at least 3 characters long",
       "wsNameMaxLength":"Workspace name must be at most 50 characters long",
@@ -1181,7 +1183,7 @@
       "dbConnectionFailed": "Connection Failure:",
       "nullFilterExists": "Null filter exists. Please remove them",
       "signUpRules": {
-        "emailReqd": "Email is required",
+        "emailRequired": "Email is required",
         "emailInvalid": "Email must be valid",
         "passwdRequired": "Password is required",
         "passwdLength": "You password must be atleast 8 characters",
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index 01a59b354c..3da25f91f8 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -97,8 +97,8 @@ hooks.hook('page:finish', () => {
                   </nuxt-link>
                 </a-menu-item>
 
-                <a-menu-divider class="!m-0" />
-                <!--                <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
+                <!-- <a-menu-divider class="!m-0" />
+                <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
                   <nuxt-link
                     v-e="['c:settings:appstore', { page: true }]"
                     class="nc-base-menu-item group !no-underline"
@@ -106,8 +106,8 @@ hooks.hook('page:finish', () => {
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
 
-                    &lt;!&ndash; &ndash;&gt;
-                    <span class="prose group-hover:text-primary">Account management</span>
+                    &lt;!&ndash; {{`${$t('general.todo')}: i18n`}} &ndash;&gt;
+                    <span class="prose group-hover:text-primary">{{ $t('title.accountManagement') }}</span>
                   </nuxt-link>
                 </a-menu-item>
 
diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index acc8e557db..e361358108 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -58,7 +58,7 @@ export default {
 
         <div v-if="$route.name === 'index-index'" class="flex gap-1">
           <!-- <a-button class="!text-inherit" data-testid="nc-dash-nav-workspaces"> Projects</a-button -->
-          <!-- <a-button ghost !text-inherit" data-testid="nc-dash-nav-explore"> Template</a-button>
+          <!-- <a-button ghost class="!text-inherit" data-testid="nc-dash-nav-explore"> Template</a-button>
           <a-button ghost class="!text-inherit" data-testid="nc-dash-nav-help"> Help</a-button> -->
         </div>
         <div class="flex-1 min-w-0 flex justify-end gap-2">
@@ -99,7 +99,7 @@ export default {
                 </a-menu-item>
 
                 <a-menu-divider class="!m-0" />
-                <!--                <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
+                  <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
                   <nuxt-link
                     v-e="['c:settings:appstore', { page: true }]"
                     class="nc-base-menu-item group !no-underline"
@@ -107,12 +107,12 @@ export default {
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
 
-                    &lt;!&ndash; &ndash;&gt;
-                    <span class="prose group-hover:text-primary">Account management</span>
+                    &lt;!&ndash; {{`${$t('general.todo')}: i18n`}} &ndash;&gt;
+                    <span class="prose group-hover:text-primary">{{ $t('title.accountManagement') }}</span>
                   </nuxt-link>
                 </a-menu-item>
 
-                <a-menu-divider class="!m-0" /> -->
+                <a-menu-divider class="!m-0" />
 
                 <a-menu-item key="1" class="!rounded-b group" data-testid="nc-menu-accounts__sign-out">
                   <div
diff --git a/packages/nocodb-sdk/src/lib/enums.ts b/packages/nocodb-sdk/src/lib/enums.ts
index bc2e3703ab..b58e05b5de 100644
--- a/packages/nocodb-sdk/src/lib/enums.ts
+++ b/packages/nocodb-sdk/src/lib/enums.ts
@@ -172,7 +172,7 @@ export const RoleLabels = {
   [ProjectRoles.COMMENTER]: 'commenter',
   [ProjectRoles.VIEWER]: 'viewer',
   [ProjectRoles.NO_ACCESS]: 'noaccess',
-  [OrgUserRoles.SUPER_ADMIN]: 'super',
+  [OrgUserRoles.SUPER_ADMIN]: 'superAdmin',
   [OrgUserRoles.CREATOR]: 'creator',
   [OrgUserRoles.VIEWER]: 'viewer',
 };

From 86f71fae2e289a69df59fdf73a13a92dc04a7732 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Tue, 10 Oct 2023 09:07:53 +0530
Subject: [PATCH 6/9] fix(nc-gui): commented unwanted lines

---
 packages/nc-gui/layouts/new.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index e361358108..12ea29cd9a 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -99,7 +99,7 @@ export default {
                 </a-menu-item>
 
                 <a-menu-divider class="!m-0" />
-                  <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
+                  <!-- <a-menu-item v-if="isUIAllowed('superAdminAppStore')" key="0" class="!rounded-t">
                   <nuxt-link
                     v-e="['c:settings:appstore', { page: true }]"
                     class="nc-base-menu-item group !no-underline"
@@ -110,7 +110,7 @@ export default {
                     &lt;!&ndash; {{`${$t('general.todo')}: i18n`}} &ndash;&gt;
                     <span class="prose group-hover:text-primary">{{ $t('title.accountManagement') }}</span>
                   </nuxt-link>
-                </a-menu-item>
+                </a-menu-item> -->
 
                 <a-menu-divider class="!m-0" />
 

From 26a091083729ba5b43c18757b378c0aa553badb6 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Tue, 10 Oct 2023 09:50:52 +0530
Subject: [PATCH 7/9] fix(nc-gui): removed unwanted keys

---
 packages/nc-gui/lang/en.json     | 3 +--
 packages/nc-gui/layouts/base.vue | 2 --
 packages/nc-gui/layouts/new.vue  | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index d61d384fab..4de736b4fc 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -182,8 +182,7 @@
     "useSurveyMode": "Use Survey Mode",
     "shift": "Shift",
     "enter": "Enter",
-    "seconds": "Seconds",
-    "todo": "todo"
+    "seconds": "Seconds"
   },
   "objects": {
     "workspace": "Workspace",
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index 3da25f91f8..11ea749114 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -105,8 +105,6 @@ hooks.hook('page:finish', () => {
                     to="/admin/users"
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
-
-                    &lt;!&ndash; {{`${$t('general.todo')}: i18n`}} &ndash;&gt;
                     <span class="prose group-hover:text-primary">{{ $t('title.accountManagement') }}</span>
                   </nuxt-link>
                 </a-menu-item>
diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index 12ea29cd9a..4cc45ce2a7 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -106,8 +106,6 @@ export default {
                     to="/admin/users"
                   >
                     <MdiShieldAccountOutline class="mt-1 group-hover:text-accent" />&nbsp;
-
-                    &lt;!&ndash; {{`${$t('general.todo')}: i18n`}} &ndash;&gt;
                     <span class="prose group-hover:text-primary">{{ $t('title.accountManagement') }}</span>
                   </nuxt-link>
                 </a-menu-item> -->

From 4135d92894709456e884a046ecade71e853d6d5b Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:44:07 +0530
Subject: [PATCH 8/9] fix: review corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .../nc-gui/components/notification/Card.vue   |  2 +-
 .../nc-gui/components/template/Editor.vue     | 14 +++++-----
 .../components/workspace/CreateProjectDlg.vue |  2 +-
 .../components/workspace/InviteCollabDlg.vue  |  6 ++---
 .../nc-gui/components/workspace/Settings.vue  | 11 ++++----
 packages/nc-gui/lang/en.json                  | 27 ++++++++++---------
 .../[typeOrId]/form/[viewId]/index/survey.vue | 10 +++----
 packages/nc-gui/pages/reset/[id].vue          |  6 ++---
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/nc-gui/components/notification/Card.vue b/packages/nc-gui/components/notification/Card.vue
index 9bf9b3f621..40d16d2734 100644
--- a/packages/nc-gui/components/notification/Card.vue
+++ b/packages/nc-gui/components/notification/Card.vue
@@ -25,7 +25,7 @@ const groupType = computed({
     <div class="p-3" @click.stop>
       <div class="flex items-center">
         <span class="text-md font-medium text-[#212121]">
-          {{ $t('activity.notification') }}
+          {{ $t('general.notification') }}
         </span>
         <div class="flex-grow"></div>
         <div
diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index b069bd4502..8d1e064d04 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -844,7 +844,7 @@ function handleUIDTChange(column, table) {
 
                 <template v-else-if="column.key === 'dtxp' && hasSelectColumn[tableIdx]">
                   <span>
-                    {{ $t('general.options')}}
+                    {{ $t('general.options') }}
                   </span>
                 </template>
               </template>
@@ -887,7 +887,7 @@ function handleUIDTChange(column, table) {
                 <template v-if="column.key === 'action'">
                   <a-tooltip v-if="record.key === 0">
                     <template #title>
-                      <span>{{ $t('general.primaryValue')}}</span>
+                      <span>{{ $t('general.primaryValue') }}</span>
                     </template>
 
                     <div class="flex items-center float-right mr-4">
@@ -897,7 +897,7 @@ function handleUIDTChange(column, table) {
 
                   <a-tooltip v-else>
                     <template #title>
-                      <span>{{  $t('activity.deleteColumn') }}</span>
+                      <span>{{ $t('activity.column.delete') }}</span>
                     </template>
 
                     <a-button type="text" @click="deleteTableColumn(tableIdx, record.key)">
@@ -913,7 +913,7 @@ function handleUIDTChange(column, table) {
             <div class="mt-5 flex gap-2 justify-center">
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addNumberColumn') }}</span>
+                  <span>{{ $t('activity.column.addNumber') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'Number')">
@@ -925,7 +925,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addSingleLineText') }}</span>
+                  <span>{{ $t('activity.column.addSingleLineText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">
@@ -937,7 +937,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addLongText') }}</span>
+                  <span>{{ $t('activity.column.addLongText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'LongText')">
@@ -949,7 +949,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addOther') }}</span>
+                  <span>{{ $t('activity.column.addOther') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index d5236df858..9adbc89faa 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -26,7 +26,7 @@ const { navigateToProject } = useGlobal()
 const nameValidationRules = [
   {
     required: true,
-    message: t('msg.dbNameRequired'),
+    message: t('msg.info.dbNameRequired'),
   },
   baseTitleValidator,
 ] as RuleObject[]
diff --git a/packages/nc-gui/components/workspace/InviteCollabDlg.vue b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
index b39b30612c..f186bd1fdc 100644
--- a/packages/nc-gui/components/workspace/InviteCollabDlg.vue
+++ b/packages/nc-gui/components/workspace/InviteCollabDlg.vue
@@ -42,7 +42,7 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
           if (!value || value.length === 0) {
-            callback(t('error.signUpRules.emailRequired'))
+            callback(t('msg.error.signUpRules.emailRequired'))
             return
           }
           const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
@@ -50,8 +50,8 @@ const validators = computed(() => {
             callback(
               `${
                 invalidEmails.length > 1
-                  ? `${t('error.signUpRules.invalidEmails')}: `
-                  : `${t('error.signUpRules.invalidEmail')}: `
+                  ? `${t('msg.error.signUpRules.invalidEmails')}: `
+                  : `${t('msg.error.signUpRules.invalidEmail')}: `
               } ${invalidEmails.join(', ')} `,
             )
           } else {
diff --git a/packages/nc-gui/components/workspace/Settings.vue b/packages/nc-gui/components/workspace/Settings.vue
index e987fb088f..a343df3cab 100644
--- a/packages/nc-gui/components/workspace/Settings.vue
+++ b/packages/nc-gui/components/workspace/Settings.vue
@@ -3,7 +3,6 @@ import { useI18n } from '#imports'
 const { signOut } = useGlobal()
 const { t } = useI18n()
 
-
 const { deleteWorkspace, navigateToWorkspace, updateWorkspace } = useWorkspace()
 const { workspacesList, activeWorkspaceId, activeWorkspace, workspaces } = storeToRefs(useWorkspace())
 
@@ -20,9 +19,9 @@ const form = ref({
 
 const formRules = {
   title: [
-    { required: true, message: t('msg.wsNameRequired') },
-    { min: 3, message: t('msg.wsNameMinLength') },
-    { max: 50, message: t('msg.wsNameMaxLength') },
+    { required: true, message: t('msg.info.wsNameRequired') },
+    { min: 3, message: t('msg.info.wsNameMinLength') },
+    { max: 50, message: t('msg.info.wsNameMaxLength') },
   ],
 }
 
@@ -145,10 +144,10 @@ const onCancel = () => {
     </div>
     <div class="item flex flex-col">
       <div class="font-medium text-base">{{ $t('title.deleteWs') }}</div>
-      <div class="text-gray-500 mt-2">{{ $t('msg.wsDeleteDlg') }}</div>
+      <div class="text-gray-500 mt-2">{{ $t('msg.info.wsDeleteDlg') }}</div>
       <div class="flex flex-row mt-8 gap-x-2">
         <a-checkbox v-model:checked="isConfirmed" />
-        <div class="flex">{{ $t('msg.userConfirmation') }}</div>
+        <div class="flex">{{ $t('msg.info.userConfirmation') }}</div>
       </div>
 
       <div class="flex flex-row w-full justify-end mt-8">
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 4de736b4fc..38be976c42 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -566,7 +566,7 @@
     "requestDataSource": "Request a data source you need?",
     "apiKey": "API Key",
     "personalAccessToken": "Personal Access Token",
-    "sharedBaseUrl": "Shared Base",
+    "sharedBaseUrl": "Shared Base URL",
     "importData": "Import Data",
     "importSecondaryViews": "Import Secondary Views",
     "importRollupColumns": "Import Rollup Fields",
@@ -644,8 +644,8 @@
     "useTheme": "Use Theme",
     "copyLink": "Copy Link",
     "copiedLink": "Link Copied",
-    "copyInviteLink":"Copy invite link",
-    "copiedInviteLink":"Copied invite link",
+    "copyInviteLink": "Copy invite link",
+    "copiedInviteLink": "Copied invite link",
     "copyUrl": "Copy URL",
     "moreColors": "More Colors",
     "moveProject": "Move Base",
@@ -788,14 +788,14 @@
     "expandRecord": "Expand Record",
     "deleteRecord": "Delete Record",
     "fullWidth": "Full width",
-    "exitFullWidth": "Full width",
+    "exitFullWidth": "Exit full width",
     "markAllAsRead": "Mark all as read",
     "column":{
-      "delete": "Delete Column",
-      "addNumber": "Add Number Column",
-      "addSingleLineText": "Add SingleLineText Column",
-      "addLongText": "Add LongText Column",
-      "addOther":"Add Other Column"
+      "delete": "Delete Field",
+      "addNumber": "Add Number Field",
+      "addSingleLineText": "Add SingleLineText Field",
+      "addLongText": "Add LongText Field",
+      "addOther":"Add Other Field"
     },
     "erd": {
       "showColumns": "Show Fields",
@@ -991,7 +991,7 @@
     "length59Required": "The length exceeds the max 59 characters",
     "noNewNotifications": "You have no new notifications",
     "noRecordFound": "Record not found",
-    "rowDeleted": "Row deleted",
+    "rowDeleted": "Record deleted",
     "saveChanges": "Do you want to save the changes?",
     "tooLargeField": "The field is too large to be converted to",
     "roleRequired": "Role required",
@@ -1161,10 +1161,11 @@
       "wsNameMaxLength":"Workspace name must be at most 50 characters long",
       "wsDeleteDlg": "Delete this workspace and all it’s contents.",
       "userConfirmation": "I understand that this action is irreversible",
-      "pageNotFound":"Page Not Found",
-      "makeLineBreak":"to make a line break",
+      "pageNotFound": "Page Not Found",
+      "makeLineBreak": "to make a line break",
+      "goToPrevious": "Go to previous",
       "goToNext": "Go to next",
-      "thankyou":"Thank you!",
+      "thankYou": "Thank you!",
       "submittedFormData": "You have successfully submitted the form data."
     },
     "error": {
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
index 92a81f60ed..0c49a4c2c9 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue
@@ -346,7 +346,7 @@ onMounted(() => {
               <div v-else-if="!submitted" class="flex items-center gap-3 flex-col">
                 <a-tooltip
                   :title="
-                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.goToNext')
+                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.info.goToNext')
                   "
                   :mouse-enter-delay="0.25"
                   :mouse-leave-delay="0"
@@ -393,9 +393,9 @@ onMounted(() => {
 
                 <template v-else>
                   <div class="flex flex-col gap-1">
-                    <div>{{ $t('msg.thankyou') }}</div>
+                    <div>{{ $t('msg.info.thankYou') }}</div>
 
-                    <div>{{ $t('msg.submittedFormData') }}</div>
+                    <div>{{ $t('msg.info.submittedFormData') }}</div>
                   </div>
                 </template>
               </div>
@@ -429,7 +429,7 @@ onMounted(() => {
           v-if="!submitted"
           class="color-transition shadow-sm absolute bottom-18 right-1/2 transform translate-x-[50%] md:bottom-4 md:(right-12 transform-none) flex items-center bg-white border dark:bg-slate-500 rounded divide-x-1"
         >
-          <a-tooltip :title="isFirst ? '' : 'Go to previous'" :mouse-enter-delay="0.25" :mouse-leave-delay="0">
+          <a-tooltip :title="isFirst ? '' : $t('msg.info.goToPrevious')" :mouse-enter-delay="0.25" :mouse-leave-delay="0">
             <button
               :class="
                 animationTarget === AnimationTarget.ArrowLeft && isAnimating
@@ -449,7 +449,7 @@ onMounted(() => {
           </a-tooltip>
 
           <a-tooltip
-            :title="v$.localState[field.title]?.$error ? '' : $t('msg.goToNext')"
+            :title="v$.localState[field.title]?.$error ? '' : $t('msg.info.goToNext')"
             :mouse-enter-delay="0.25"
             :mouse-leave-delay="0"
           >
diff --git a/packages/nc-gui/pages/reset/[id].vue b/packages/nc-gui/pages/reset/[id].vue
index c67b2cf732..0b385933e7 100644
--- a/packages/nc-gui/pages/reset/[id].vue
+++ b/packages/nc-gui/pages/reset/[id].vue
@@ -10,7 +10,7 @@ import {
   useApi,
   useRoute,
   useRouter,
-  useI18n
+  useI18n,
 } from '#imports'
 
 definePageMeta({
@@ -91,7 +91,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.new')"
             name="password"
-            :rules="[{ required: true, message: t('error.passwdRequired') }]"
+            :rules="[{ required: true, message: t('msg.error.signUpRules.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.password"
@@ -104,7 +104,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.confirm')"
             name="newPassword"
-            :rules="[{ required: true, message: t('error.passwdRequired') }]"
+            :rules="[{ required: true, message: t('msg.error.signUpRules.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.newPassword"

From 6cbeeab8dccdefd19a2241d4f43344380b6612f7 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 20 Oct 2023 17:44:03 +0530
Subject: [PATCH 9/9] fix: i18n cleanup

---
 packages/nc-gui/components/template/Editor.vue |  6 +++++-
 .../components/workspace/CreateProjectDlg.vue  | 18 +++++++++++++++---
 packages/nc-gui/lang/en.json                   |  4 +++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/template/Editor.vue b/packages/nc-gui/components/template/Editor.vue
index 8d1e064d04..c4b0335659 100644
--- a/packages/nc-gui/components/template/Editor.vue
+++ b/packages/nc-gui/components/template/Editor.vue
@@ -869,7 +869,11 @@ function handleUIDTChange(column, table) {
                       <a-select-option v-for="(option, i) of uiTypeOptions" :key="i" :value="option.value">
                         <a-tooltip placement="right">
                           <template v-if="isSelectDisabled(option.label, table.columns[record.key]?._disableSelect)" #title>
-                            {{ $t('msg.tooLargeField') }} {{ option.label }}
+                            {{
+                              $t('msg.tooLargeFieldEntity', {
+                                entity: option.label,
+                              })
+                            }}
                           </template>
                           {{ option.label }}
                         </a-tooltip>
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 9adbc89faa..bde875b7ba 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -97,7 +97,11 @@ const typeLabel = computed(() => {
       <!-- Create A New Table -->
       <div class="flex flex-row items-center">
         <GeneralProjectIcon :type="baseType" class="mr-2.5 !text-lg !h-4" />
-        {{ `${$t('general.create')} ${typeLabel}` }}
+        {{
+          $t('general.createEntity', {
+            entity: typeLabel,
+          })
+        }}
       </div>
     </template>
     <div class="mt-3">
@@ -133,9 +137,17 @@ const typeLabel = computed(() => {
           :loading-label="`${$t('general.creating')} ${typeLabel}`"
           @click="createProject"
         >
-          {{ `${$t('general.create')} ${typeLabel}` }}
+          {{
+            $t('general.createEntity', {
+              entity: typeLabel,
+            })
+          }}
           <template #loading>
-            {{ `${$t('general.creating')} ${typeLabel}` }}
+            {{
+              $t('general.creatingEntity', {
+                entity: typeLabel,
+              })
+            }}
           </template>
         </NcButton>
       </div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 38be976c42..9fbccf84c1 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -76,7 +76,9 @@
     "whatsappTwilio": "WhatsApp Twilio",
     "submit": "Submit",
     "create": "Create",
+    "createEntity": "Create {entity}",
     "creating": "Creating",
+    "creatingEntity": "Creating {entity}",
     "details": "Details",
     "skip": "Skip",
     "duplicate": "Duplicate",
@@ -993,7 +995,7 @@
     "noRecordFound": "Record not found",
     "rowDeleted": "Record deleted",
     "saveChanges": "Do you want to save the changes?",
-    "tooLargeField": "The field is too large to be converted to",
+    "tooLargeFieldEntity": "The field is too large to be converted to {entity}",
     "roleRequired": "Role required",
     "warning": {
       "dbValid": "Please make sure database you are trying to connect is valid! This operation can cause schema loss!!",