From 463aeaefbc43f734906a7efd216cb6c2a2e697ae Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Thu, 28 Sep 2023 21:20:28 +0530
Subject: [PATCH 01/36] fix: i18n for Lookup

---
 .../nc-gui/components/smartsheet/column/LookupOptions.vue   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
index 670d6bb4b4..f1891a17d4 100644
--- a/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LookupOptions.vue
@@ -14,6 +14,8 @@ const vModel = useVModel(props, 'value', emit)
 
 const meta = inject(MetaInj, ref())
 
+const { t } = useI18n()
+
 const { setAdditionalValidations, validateInfos, onDataTypeChange, isEdit } = useColumnCreateStoreOrThrow()
 
 const projectStore = useProject()
@@ -22,8 +24,8 @@ const { tables } = storeToRefs(projectStore)
 const { metas } = useMetas()
 
 setAdditionalValidations({
-  fk_relation_column_id: [{ required: true, message: 'Required' }],
-  fk_lookup_column_id: [{ required: true, message: 'Required' }],
+  fk_relation_column_id: [{ required: true, message: t('general.required') }],
+  fk_lookup_column_id: [{ required: true, message: t('general.required') }],
 })
 
 if (!vModel.value.fk_relation_column_id) vModel.value.fk_relation_column_id = null

From 53cafa3c1789d86aaf4b7a14b2e215379b815577 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Thu, 28 Sep 2023 21:31:38 +0530
Subject: [PATCH 02/36] fix: i18n for Single text

---
 packages/nc-gui/components/cell/Text.vue | 4 ++--
 packages/nc-gui/lang/en.json             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index 9fc0b9209e..cd7b6efaf8 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -33,7 +33,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     :ref="focus"
     v-model="vModel"
     class="h-full w-full outline-none p-2 bg-transparent"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -46,7 +46,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     @mousedown.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <LazyCellClampedText v-else :value="vModel" :lines="rowHeight" />
 </template>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 06832cb117..0455eebeff 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -62,6 +62,7 @@
     "abort": "Abort",
     "saving": "Saving",
     "cancel": "Cancel",
+    "null": "Null",
     "clear": "Clear",
     "submit": "Submit",
     "create": "Create",

From a17d512e456b39fdd044bc58a84bbe0eee4d9822 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 10:05:08 +0530
Subject: [PATCH 03/36] fix: i18n for Barcode

---
 .../smartsheet/column/BarcodeOptions.vue          | 15 ++++++++-------
 .../components/smartsheet/column/DefaultValue.vue |  2 +-
 packages/nc-gui/lang/en.json                      |  4 ++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
index 743de8b473..6eff937686 100644
--- a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
@@ -22,6 +22,8 @@ const vModel = useVModel(props, 'modelValue', emit)
 
 const { setAdditionalValidations, validateInfos, column } = useColumnCreateStoreOrThrow()
 
+const { t } = useI18n()
+
 const columnsAllowedAsBarcodeValue = computed<SelectProps['options']>(() => {
   return fields.value
     ?.filter(
@@ -67,8 +69,8 @@ watch(columnsAllowedAsBarcodeValue, (newColumnsAllowedAsBarcodeValue) => {
 })
 
 setAdditionalValidations({
-  fk_barcode_value_column_id: [{ required: true, message: 'Required' }],
-  barcode_format: [{ required: true, message: 'Required' }],
+  fk_barcode_value_column_id: [{ required: true, message: t('general.required') }],
+  barcode_format: [{ required: true, message: t('general.required') }],
 })
 
 const showBarcodeValueColumnInfoIcon = computed(() => !columnsAllowedAsBarcodeValue.value?.length)
@@ -86,16 +88,15 @@ const showBarcodeValueColumnInfoIcon = computed(() => !columnsAllowedAsBarcodeVa
           <a-select
             v-model:value="vModel.fk_barcode_value_column_id"
             :options="columnsAllowedAsBarcodeValue"
-            placeholder="Select a column for the Barcode value"
-            not-found-content="No valid Column Type can be found."
+            :placeholder="$t('placeholder.barcodeColumn')"
+            :not-found-content="$t('placeholder.notFoundContent')"
             @click.stop
           />
           <div v-if="showBarcodeValueColumnInfoIcon" class="pl-2">
             <a-tooltip placement="bottom">
               <template #title>
                 <span>
-                  The valid Column Types for a Barcode Column are: Number, Single Line Text, Long Text, Phone Number, URL, Email,
-                  Decimal. Please create one first.
+                  {{ $t('msg.validColumnsForBarCode') }}
                 </span>
               </template>
               <component :is="iconMap.info" class="cursor-pointer" />
@@ -111,7 +112,7 @@ const showBarcodeValueColumnInfoIcon = computed(() => !columnsAllowedAsBarcodeVa
         <a-select
           v-model:value="vModel.meta.barcodeFormat"
           :options="supportedBarcodeFormats"
-          placeholder="Select a Barcode format"
+          :placeholder="$t('placeholder.selectBarcodeFormat')"
           @click.stop
         />
       </a-form-item>
diff --git a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
index 6c205f86f1..cc266a4063 100644
--- a/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
+++ b/packages/nc-gui/components/smartsheet/column/DefaultValue.vue
@@ -46,7 +46,7 @@ useProvideSmartsheetRowStore(vModel, rowRef)
 </script>
 
 <template>
-  <div class="!my-3 text-xs">Default Value</div>
+  <div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div>
   <div class="flex flex-row gap-2">
     <div class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md">
       <LazySmartsheetCell :column="vModel" :model-value="cdfValue" :edit-enabled="true" />
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0455eebeff..3a1b6d6ca1 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -737,6 +737,9 @@
     "clientCA": "Select CA file"
   },
   "placeholder": {
+    "barcodeColumn": "Select a column for the Barcode value",
+    "notFoundContent": "No valid Column Type can be found.",
+    "selectBarcodeFormat": "Select a Barcode format",
     "projName": "Enter Project Name",
     "selectGroupField": "Select a Grouping Field",
     "selectGroupFieldNotFound" : "No Single Select Field can be found. Please create one first.",
@@ -761,6 +764,7 @@
     "selectField": "Select field"
   },
   "msg": {
+    "validColumnsForBarCode": "The valid Column Types for a Barcode Column are: Number, Single Line Text, Long Text, Phone Number, URL, Email, Decimal. Please create one first.",
     "hm": {
       "title": "Has Many Relation",
       "icon": "HasManyIcon",

From e413a220dd6983012fbf276bf88a5bc7fe1afd6b Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 10:35:23 +0530
Subject: [PATCH 04/36] fix: i18n for Currnecy

---
 packages/nc-gui/components/cell/Currency.vue         |  4 ++--
 .../components/smartsheet/column/CurrencyOptions.vue | 12 +++++++-----
 packages/nc-gui/lang/en.json                         |  5 +++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index fc67d9274a..487a594178 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -79,7 +79,7 @@ onMounted(() => {
     v-model="vModel"
     type="number"
     class="w-full h-full text-sm border-none rounded-md outline-none"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="submitCurrency"
     @keydown.down.stop
     @keydown.left.stop
@@ -93,7 +93,7 @@ onMounted(() => {
     @contextmenu.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null">{{ $t('labels.null') }}</span>
 
   <!-- only show the numeric value as previously string value was accepted -->
   <span v-else-if="!isNaN(vModel)">{{ currency }}</span>
diff --git a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
index 63ce4816bd..f19d110c5e 100644
--- a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
@@ -12,6 +12,8 @@ const props = defineProps<{
 
 const emit = defineEmits(['update:value'])
 
+const { t } = useI18n()
+
 const vModel = useVModel(props, 'value', emit)
 
 const validators = {
@@ -20,7 +22,7 @@ const validators = {
       validator: (_: any, locale: any) => {
         return new Promise<void>((resolve, reject) => {
           if (!validateCurrencyLocale(locale)) {
-            return reject(new Error('Invalid locale'))
+            return reject(new Error(t('msg.invalidLocale')))
           }
           resolve()
         })
@@ -32,7 +34,7 @@ const validators = {
       validator: (_: any, currencyCode: any) => {
         return new Promise<void>((resolve, reject) => {
           if (!validateCurrencyCode(currencyCode)) {
-            return reject(new Error('Invalid Currency Code'))
+            return reject(new Error(t('msg.invalidCurrencyCode')))
           }
           resolve()
         })
@@ -54,7 +56,7 @@ const currencyLocaleList = ref<{ text: string; value: string }[]>([])
 const isMoney = computed(() => vModel.value.dt === 'money')
 
 const message = computed(() => {
-  if (isMoney.value && isPg.value) return "PostgreSQL 'money' type has own currency settings"
+  if (isMoney.value && isPg.value) return t('msg.postgresHasItsOwnCurrencySettings')
   return ''
 })
 
@@ -77,7 +79,7 @@ currencyLocales().then((locales) => {
 <template>
   <a-row gutter="8">
     <a-col :span="12">
-      <a-form-item v-bind="validateInfos['meta.currency_locale']" label="Currency Locale">
+      <a-form-item v-bind="validateInfos['meta.currency_locale']" :label="$t('title.currencyLocale')">
         <a-select
           v-model:value="vModel.meta.currency_locale"
           class="w-52"
@@ -94,7 +96,7 @@ currencyLocales().then((locales) => {
     </a-col>
 
     <a-col :span="12">
-      <a-form-item v-bind="validateInfos['meta.currency_code']" label="Currency Code">
+      <a-form-item v-bind="validateInfos['meta.currency_code']" :label="$t('title.currencyCode')">
         <a-select
           v-model:value="vModel.meta.currency_code"
           class="w-52"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3a1b6d6ca1..c5666e6898 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -258,6 +258,8 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "currencyLocale": "Currency Locale",
+    "currencyCode": "Currency Code",
     "searchMembers": "Search Members",
     "noMembersFound": "No members found",
     "dateJoined": "Date Joined",
@@ -764,6 +766,9 @@
     "selectField": "Select field"
   },
   "msg": {
+    "invalidLocale": "Invalid locale",
+    "invalidCurrencyCode": "Invalid Currency Code",
+    "postgresHasItsOwnCurrencySettings": "PostgreSQL 'money' type has own currency settings",
     "validColumnsForBarCode": "The valid Column Types for a Barcode Column are: Number, Single Line Text, Long Text, Phone Number, URL, Email, Decimal. Please create one first.",
     "hm": {
       "title": "Has Many Relation",

From 37312c566913960715293c3a11c106a2720d349a Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 10:41:06 +0530
Subject: [PATCH 05/36] fix: i18n for Date

---
 packages/nc-gui/components/cell/DatePicker.vue            | 8 +++++---
 .../nc-gui/components/smartsheet/column/DateOptions.vue   | 2 +-
 packages/nc-gui/lang/en.json                              | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
index 991fa52903..e1f2f79433 100644
--- a/packages/nc-gui/components/cell/DatePicker.vue
+++ b/packages/nc-gui/components/cell/DatePicker.vue
@@ -25,6 +25,8 @@ const { modelValue, isPk } = defineProps<Props>()
 
 const emit = defineEmits(['update:modelValue'])
 
+const { t } = useI18n()
+
 const { showNull } = useGlobal()
 
 const columnMeta = inject(ColumnInj, null)!
@@ -84,11 +86,11 @@ watch(
 
 const placeholder = computed(() => {
   if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
-    return '(Optional)'
+    return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
-    return 'NULL'
+    return t('general.null')
   } else if (isDateInvalid.value) {
-    return 'Invalid date'
+    return t('msg.invalidDate')
   } else {
     return ''
   }
diff --git a/packages/nc-gui/components/smartsheet/column/DateOptions.vue b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
index c2418e40f6..9d620a5a60 100644
--- a/packages/nc-gui/components/smartsheet/column/DateOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
@@ -16,7 +16,7 @@ if (!vModel.value.meta?.date_format) {
 </script>
 
 <template>
-  <a-form-item label="Date Format">
+  <a-form-item :label="$t('labels.dateFormat')">
     <a-select v-model:value="vModel.meta.date_format" dropdown-class-name="nc-dropdown-date-format">
       <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
         <div class="flex flex-row items-center">
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index c5666e6898..0a52c751e2 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -349,6 +349,7 @@
     "renameFile": "Rename File"
   },
   "labels": {
+    "dateFormat": "Date Format",
     "singularLabel": "Singular Label",
     "pluralLabel": "Plural Label",
     "optional": "Optional",
@@ -766,6 +767,7 @@
     "selectField": "Select field"
   },
   "msg": {
+    "invalidDate": "Invalid date",
     "invalidLocale": "Invalid locale",
     "invalidCurrencyCode": "Invalid Currency Code",
     "postgresHasItsOwnCurrencySettings": "PostgreSQL 'money' type has own currency settings",

From 9da06772801d84b83226a98031c009e96e5612c9 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 10:45:38 +0530
Subject: [PATCH 06/36] fix: i18n for DateTime

---
 packages/nc-gui/components/cell/DateTimePicker.vue        | 8 +++++---
 .../components/smartsheet/column/DateTimeOptions.vue      | 4 ++--
 packages/nc-gui/lang/en.json                              | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
index c0a3960d23..2b371829dd 100644
--- a/packages/nc-gui/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -40,6 +40,8 @@ const editable = inject(EditModeInj, ref(false))
 
 const isLockedMode = inject(IsLockedInj, ref(false))
 
+const { t } = useI18n()
+
 const isEditColumn = inject(EditColumnInj, ref(false))
 
 const column = inject(ColumnInj)!
@@ -137,11 +139,11 @@ watch(
 
 const placeholder = computed(() => {
   if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
-    return '(Optional)'
+    return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
-    return 'NULL'
+    return t('general.null')
   } else if (isDateInvalid.value) {
-    return 'Invalid date'
+    return t('msg.invalidDate')
   } else {
     return ''
   }
diff --git a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
index 152b504fd4..90386141d3 100644
--- a/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
@@ -21,14 +21,14 @@ if (!vModel.value.meta?.time_format) {
 </script>
 
 <template>
-  <a-form-item label="Date Format">
+  <a-form-item :label="$t('labels.dateFormat')">
     <a-select v-model:value="vModel.meta.date_format" class="nc-date-select" dropdown-class-name="nc-dropdown-date-format">
       <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
         {{ format }}
       </a-select-option>
     </a-select>
   </a-form-item>
-  <a-form-item label="Time Format">
+  <a-form-item :label="$t('labels.timeFormat')">
     <a-select v-model:value="vModel.meta.time_format" class="nc-time-select" dropdown-class-name="nc-dropdown-time-format">
       <a-select-option v-for="(format, i) of timeFormats" :key="i" :value="format">
         {{ format }}
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0a52c751e2..11d0d9c6c8 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -350,6 +350,7 @@
   },
   "labels": {
     "dateFormat": "Date Format",
+    "timeFormat": "Time Format",
     "singularLabel": "Singular Label",
     "pluralLabel": "Plural Label",
     "optional": "Optional",

From c52b281cb494eee54e3ee0071d2be71b72bfea17 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 10:52:01 +0530
Subject: [PATCH 07/36] fix: i18n for Decimal

---
 packages/nc-gui/components/cell/Decimal.vue   |  4 ++--
 .../smartsheet/column/DecimalOptions.vue      | 20 ++++++++++---------
 packages/nc-gui/lang/en.json                  | 11 +++++++++-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 547f14a227..80a7e9fc01 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -97,7 +97,7 @@ watch(isExpandedFormOpen, () => {
     class="outline-none !py-2 !px-1 border-none rounded-md w-full h-full !text-sm"
     type="number"
     :step="precision"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     style="letter-spacing: 0.06rem"
     @blur="editEnabled = false"
     @keydown.down.stop="onKeyDown"
@@ -110,7 +110,7 @@ watch(isExpandedFormOpen, () => {
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null capitalize">{{ $t('general.null') }}</span>
   <span v-else class="text-sm">{{ displayValue }}</span>
 </template>
 
diff --git a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
index 38b16f533e..3e7406fe42 100644
--- a/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DecimalOptions.vue
@@ -9,15 +9,17 @@ const emit = defineEmits(['update:value'])
 
 const precisionFormats = [1, 2, 3, 4, 5, 6, 7, 8]
 
+const { t } = useI18n()
+
 const precisionFormatsDisplay = {
-  1: '1.0',
-  2: '1.00',
-  3: '1.000',
-  4: '1.0000',
-  5: '1.00000',
-  6: '1.000000',
-  7: '1.0000000',
-  8: '1.00000000',
+  1: t('placeholder.decimal1'),
+  2: t('placeholder.decimal2'),
+  3: t('placeholder.decimal3'),
+  4: t('placeholder.decimal4'),
+  5: t('placeholder.decimal5'),
+  6: t('placeholder.decimal6'),
+  7: t('placeholder.decimal7'),
+  8: t('placeholder.decimal8'),
 }
 
 const vModel = useVModel(props, 'value', emit)
@@ -31,7 +33,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <a-form-item label="Precision">
+  <a-form-item :label="$t('placeholder.precision')">
     <a-select v-model:value="vModel.meta.precision" dropdown-class-name="nc-dropdown-decimal-format">
       <a-select-option v-for="(format, i) of precisionFormats" :key="i" :value="format">
         <div class="flex flex-row items-center">
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 11d0d9c6c8..7b531ef434 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -765,7 +765,16 @@
     "defaultValue": "Default value",
     "filterByEmail": "Filter by E-mail",
     "filterQuery": "Filter query",
-    "selectField": "Select field"
+    "selectField": "Select field",
+    "precision": "Precision",
+    "decimal1": "1.0",
+    "decimal2": "1.00",
+    "decimal3": "1.000",
+    "decimal4": "1.0000",
+    "decimal5": "1.00000",
+    "decimal6": "1.000000",
+    "decimal7": "1.0000000",
+    "decimal8": "1.00000000"
   },
   "msg": {
     "invalidDate": "Invalid date",

From 5abe1265c8daf12d690614b387dbd34cbdecbad3 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 11:02:34 +0530
Subject: [PATCH 08/36] fix: i18n for Duration

---
 packages/nc-gui/components/cell/Duration.vue          | 11 +++++++----
 .../components/smartsheet/column/DurationOptions.vue  |  4 ++--
 packages/nc-gui/lang/en.json                          |  3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/cell/Duration.vue b/packages/nc-gui/components/cell/Duration.vue
index 34cc923bf1..c3bc7bb3ea 100644
--- a/packages/nc-gui/components/cell/Duration.vue
+++ b/packages/nc-gui/components/cell/Duration.vue
@@ -23,6 +23,8 @@ const { modelValue, showValidationError = true } = defineProps<Props>()
 
 const emit = defineEmits(['update:modelValue'])
 
+const { t } = useI18n()
+
 const { showNull } = useGlobal()
 
 const column = inject(ColumnInj)
@@ -39,7 +41,9 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const durationType = computed(() => parseProp(column?.value?.meta)?.duration || 0)
 
-const durationPlaceholder = computed(() => (isEditColumn.value ? '(Optional)' : durationOptions[durationType.value].title))
+const durationPlaceholder = computed(() =>
+  isEditColumn.value ? `(${t('labels.optional')})` : durationOptions[durationType.value].title,
+)
 
 const localState = computed({
   get: () => convertMS2Duration(modelValue, durationType.value),
@@ -105,13 +109,12 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
       @mousedown.stop
     />
 
-    <span v-else-if="modelValue === null && showNull" class="nc-null">NULL</span>
+    <span v-else-if="modelValue === null && showNull" class="nc-null capitalize">{{ $t('general.null') }}</span>
 
     <span v-else> {{ localState }}</span>
 
     <div v-if="showWarningMessage && showValidationError" class="duration-warning">
-      <!-- TODO: i18n -->
-      Please enter a number
+      {{ $t('msg.plsEnterANumber') }}
     </div>
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/column/DurationOptions.vue b/packages/nc-gui/components/smartsheet/column/DurationOptions.vue
index 688c19c685..d6d844f0a2 100644
--- a/packages/nc-gui/components/smartsheet/column/DurationOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DurationOptions.vue
@@ -26,11 +26,11 @@ vModel.value.meta = {
 <template>
   <a-row>
     <a-col :span="24">
-      <span class="prose-sm mt-2">A duration of time in minutes or seconds (e.g. 1:23).</span>
+      <span class="prose-sm mt-2">{{ $t('labels.durationInfo') }}</span>
     </a-col>
 
     <a-col :span="24">
-      <a-form-item label="Duration Format">
+      <a-form-item :label="$t('labels.durationFormat')">
         <a-select v-model:value="vModel.meta.duration" class="w-52" dropdown-class-name="nc-dropdown-duration-option">
           <a-select-option v-for="(duration, i) of durationOptionList" :key="i" :value="duration.id">
             {{ duration.title }}
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 7b531ef434..4f06382922 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -349,6 +349,8 @@
     "renameFile": "Rename File"
   },
   "labels": {
+    "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
+    "durationFormat": "Duration Format",
     "dateFormat": "Date Format",
     "timeFormat": "Time Format",
     "singularLabel": "Singular Label",
@@ -777,6 +779,7 @@
     "decimal8": "1.00000000"
   },
   "msg": {
+    "plsEnterANumber": "Please enter a number",
     "invalidDate": "Invalid date",
     "invalidLocale": "Invalid locale",
     "invalidCurrencyCode": "Invalid Currency Code",

From 921f6aea2cad81825eebe02dff1871780c535f8d Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 12:26:40 +0530
Subject: [PATCH 09/36] fix: i18n for Formula

---
 .../smartsheet/column/FormulaOptions.vue      | 103 +++++++++++-------
 packages/nc-gui/lang/en.json                  |  29 +++++
 2 files changed, 95 insertions(+), 37 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index 92a7ea3e3d..3321041356 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -30,6 +30,8 @@ const emit = defineEmits(['update:value'])
 
 const uiTypesNotSupportedInFormulas = [UITypes.QrCode, UITypes.Barcode]
 
+const { t } = useI18n()
+
 const vModel = useVModel(props, 'value', emit)
 
 const { formState, setAdditionalValidations, validateInfos, sqlUi, column } = useColumnCreateStoreOrThrow()
@@ -155,17 +157,17 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
     const calleeName = parsedTree.callee.name.toUpperCase()
     // validate function name
     if (!availableFunctions.includes(calleeName)) {
-      errors.add(`'${calleeName}' function is not available`)
+      errors.add(t('msg.formula.functionNotAvailable', { function: calleeName }))
     }
     // validate arguments
     const validation = formulas[calleeName] && formulas[calleeName].validation
     if (validation && validation.args) {
       if (validation.args.rqd !== undefined && validation.args.rqd !== parsedTree.arguments.length) {
-        errors.add(`'${calleeName}' required ${validation.args.rqd} arguments`)
+        errors.add(t('msg.formula.requiredArgumentsFormula', { requiredArguments: validation.args.rqd, calleeName }))
       } else if (validation.args.min !== undefined && validation.args.min > parsedTree.arguments.length) {
-        errors.add(`'${calleeName}' required minimum ${validation.args.min} arguments`)
+        errors.add(t('msg.formula.minRequiredArgumentsFormula', { minRequiredArguments: validation.args.min, calleeName }))
       } else if (validation.args.max !== undefined && validation.args.max < parsedTree.arguments.length) {
-        errors.add(`'${calleeName}' required maximum ${validation.args.max} arguments`)
+        errors.add(t('msg.formula.maxRequiredArgumentsFormula', { maxRequiredArguments: validation.args.max, calleeName }))
       }
     }
     parsedTree.arguments.map((arg: Record<string, any>) => validateAgainstMeta(arg, errors))
@@ -181,7 +183,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.DATE,
             (v: any) => {
               if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add('The first parameter of WEEKDAY() should have date value')
+                typeErrors.add(t('msg.formula.firstParamWeekDayHaveDate'))
               }
             },
             typeErrors,
@@ -195,9 +197,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
                 typeof v !== 'string' ||
                 !['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'].includes(v.toLowerCase())
               ) {
-                typeErrors.add(
-                  'The second parameter of WEEKDAY() should have the value either "sunday", "monday", "tuesday", "wednesday", "thursday", "friday" or "saturday"',
-                )
+                typeErrors.add(t('msg.formula.secondParamWeekDayHaveDate'))
               }
             },
             typeErrors,
@@ -213,7 +213,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.DATE,
             (v: any) => {
               if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add('The first parameter of DATEADD() should have date value')
+                typeErrors.add(t('msg.formula.firstParamDateAddHaveDate'))
               }
             },
             typeErrors,
@@ -224,7 +224,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.NUMERIC,
             (v: any) => {
               if (typeof v !== 'number') {
-                typeErrors.add('The second parameter of DATEADD() should have numeric value')
+                typeErrors.add(t('msg.formula.secondParamDateAddHaveNumber'))
               }
             },
             typeErrors,
@@ -235,7 +235,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.STRING,
             (v: any) => {
               if (!['day', 'week', 'month', 'year'].includes(v)) {
-                typeErrors.add('The third parameter of DATEADD() should have the value either "day", "week", "month" or "year"')
+                typeErrors.add(typeErrors.add(t('msg.formula.thirdParamDateAddHaveDate')))
               }
             },
             typeErrors,
@@ -247,7 +247,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.DATE,
             (v: any) => {
               if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add('The first parameter of DATETIME_DIFF() should have date value')
+                typeErrors.add(t('msg.formula.firstParamDateDiffHaveDate'))
               }
             },
             typeErrors,
@@ -258,7 +258,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
             formulaTypes.DATE,
             (v: any) => {
               if (!validateDateWithUnknownFormat(v)) {
-                typeErrors.add('The second parameter of DATETIME_DIFF() should have date value')
+                typeErrors.add(t('msg.formula.secondParamDateDiffHaveDate'))
               }
             },
             typeErrors,
@@ -290,9 +290,7 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
                   'y',
                 ].includes(v)
               ) {
-                typeErrors.add(
-                  'The third parameter of DATETIME_DIFF() should have value either "milliseconds", "ms", "seconds", "s", "minutes", "m", "hours", "h", "days", "d", "weeks", "w", "months", "M", "quarters", "Q", "years", or "y"',
-                )
+                typeErrors.add(t('msg.formula.thirdParamDateDiffHaveDate'))
               }
             },
             typeErrors,
@@ -304,7 +302,11 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
     errors = new Set([...errors, ...typeErrors])
   } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
     if (supportedColumns.value.filter((c) => !column || column.value?.id !== c.id).every((c) => c.title !== parsedTree.name)) {
-      errors.add(`Column '${parsedTree.name}' is not available`)
+      errors.add(
+        t('msg.formula.columnNotAvailable', {
+          columnName: parsedTree.name,
+        }),
+      )
     }
 
     // check circular reference
@@ -388,12 +390,12 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
       }
       // vertices not same as visited = cycle found
       if (vertices !== visited) {
-        errors.add('Can’t save field because it causes a circular reference')
+        errors.add(t('msg.formula.cantSaveCircularReference'))
       }
     }
   } else if (parsedTree.type === JSEPNode.BINARY_EXP) {
     if (!availableBinOps.includes(parsedTree.operator)) {
-      errors.add(`'${parsedTree.operator}' operation is not available`)
+      errors.add(t('msg.formula.operationNotAvailable', { operation: parsedTree.operator }))
     }
     validateAgainstMeta(parsedTree.left, errors)
     validateAgainstMeta(parsedTree.right, errors)
@@ -401,10 +403,10 @@ function validateAgainstMeta(parsedTree: any, errors = new Set(), typeErrors = n
     // do nothing
   } else if (parsedTree.type === JSEPNode.COMPOUND) {
     if (parsedTree.body.length) {
-      errors.add('Can’t save field because the formula is invalid')
+      errors.add(t('msg.formula.cantSaveFieldFormulaInvalid'))
     }
   } else {
-    errors.add('Can’t save field because the formula is invalid')
+    errors.add(t('msg.formula.cantSaveFieldFormulaInvalid'))
   }
   return errors
 }
@@ -418,11 +420,11 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
       func(parsedTree.value)
     } else if (expectedType === formulaTypes.NUMERIC) {
       if (typeof parsedTree.value !== 'number') {
-        typeErrors.add('Numeric type is expected')
+        typeErrors.add(t('msg.formula.numericTypeIsExpected'))
       }
     } else if (expectedType === formulaTypes.STRING) {
       if (typeof parsedTree.value !== 'string') {
-        typeErrors.add('string type is expected')
+        typeErrors.add(t('msg.formula.stringTypeIsExpected'))
       }
     }
   } else if (parsedTree.type === JSEPNode.IDENTIFIER) {
@@ -435,9 +437,14 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
     if (col.uidt === UITypes.Formula) {
       const foundType = getRootDataType(jsep((col as any).formula_raw))
       if (foundType === 'N/A') {
-        typeErrors.add(`Not supported to reference column ${col.title}`)
+        typeErrors.add(t('msg.formula.notSupportedToReferenceColumn', { columnName: col.title }))
       } else if (expectedType !== foundType) {
-        typeErrors.add(`Type ${expectedType} is expected but found Type ${foundType}`)
+        typeErrors.add(
+          t('msg.formula.typeIsExpectedButFound', {
+            type: expectedType,
+            found: foundType,
+          }),
+        )
       }
     } else {
       switch (col.uidt) {
@@ -451,7 +458,11 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
         case UITypes.URL:
           if (expectedType !== formulaTypes.STRING) {
             typeErrors.add(
-              `Column '${parsedTree.name}' with ${formulaTypes.STRING} type is found but ${expectedType} type is expected`,
+              t('msg.formula.columnWithTypeFoundButExpected', {
+                columnName: parsedTree.name,
+                columnType: formulaTypes.STRING,
+                expectedType,
+              }),
             )
           }
           break
@@ -466,7 +477,11 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
         case UITypes.Currency:
           if (expectedType !== formulaTypes.NUMERIC) {
             typeErrors.add(
-              `Column '${parsedTree.name}' with ${formulaTypes.NUMERIC} type is found but ${expectedType} type is expected`,
+              t('msg.formula.columnWithTypeFoundButExpected', {
+                columnName: parsedTree.name,
+                columnType: formulaTypes.NUMERIC,
+                expectedType,
+              }),
             )
           }
           break
@@ -478,7 +493,11 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
         case UITypes.LastModifiedTime:
           if (expectedType !== formulaTypes.DATE) {
             typeErrors.add(
-              `Column '${parsedTree.name}' with ${formulaTypes.DATE} type is found but ${expectedType} type is expected`,
+              t('msg.formula.columnWithTypeFoundButExpected', {
+                columnName: parsedTree.name,
+                columnType: formulaTypes.DATE,
+                expectedType,
+              }),
             )
           }
           break
@@ -498,19 +517,29 @@ function validateAgainstType(parsedTree: any, expectedType: string, func: any, t
         case UITypes.Collaborator:
         case UITypes.QrCode:
         default:
-          typeErrors.add(`Not supported to reference column '${parsedTree.name}'`)
+          typeErrors.add(t('msg.formula.notSupportedToReferenceColumn', { columnName: parsedTree.name }))
           break
       }
     }
   } else if (parsedTree.type === JSEPNode.UNARY_EXP || parsedTree.type === JSEPNode.BINARY_EXP) {
     if (expectedType !== formulaTypes.NUMERIC) {
       // parsedTree.name won't be available here
-      typeErrors.add(`${formulaTypes.NUMERIC} type is found but ${expectedType} type is expected`)
+      typeErrors.add(
+        t('msg.formula.typeIsExpectedButFound', {
+          type: formulaTypes.NUMERIC,
+          found: expectedType,
+        }),
+      )
     }
   } else if (parsedTree.type === JSEPNode.CALL_EXP) {
     const calleeName = parsedTree.callee.name.toUpperCase()
     if (formulas[calleeName]?.type && expectedType !== formulas[calleeName].type) {
-      typeErrors.add(`${expectedType} not matched with ${formulas[calleeName].type}`)
+      typeErrors.add(
+        t('msg.formula.typeIsExpectedButFound', {
+          type: expectedType,
+          found: formulas[calleeName].type,
+        }),
+      )
     }
   }
   return typeErrors
@@ -692,7 +721,7 @@ const predictFunction = async () => {
 
 <template>
   <div class="formula-wrapper">
-    <a-form-item v-bind="validateInfos.formula_raw" label="Formula">
+    <a-form-item v-bind="validateInfos.formula_raw" :label="$t('datatype.Formula')">
       <GeneralIcon
         v-if="isEeUI"
         icon="magic"
@@ -712,14 +741,14 @@ const predictFunction = async () => {
     </a-form-item>
 
     <div class="text-gray-600 mt-2 mb-4 prose-sm">
-      Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out
+      {{ $t('msg.formula.hintStart') }}
       <a class="prose-sm" href="https://docs.nocodb.com/setup-and-usages/formulas#available-formula-features" target="_blank">
-        Formulas.
+        {{ $t('msg.formula.hintEnd') }}
       </a>
     </div>
 
     <div class="h-[250px] overflow-auto scrollbar-thin-primary">
-      <a-list ref="sugListRef" :data-source="suggestion" :locale="{ emptyText: 'No suggested formula was found' }">
+      <a-list ref="sugListRef" :data-source="suggestion" :locale="{ emptyText: $t('msg.formula.noSuggestedFormulaFound') }">
         <template #renderItem="{ item, index }">
           <a-list-item
             :ref="
@@ -740,9 +769,9 @@ const predictFunction = async () => {
                   <a-col :span="18">
                     <div v-if="item.type === 'function'" class="text-xs text-gray-500">
                       {{ item.description }} <br /><br />
-                      Syntax: <br />
+                      {{ $t('labels.syntax') }}: <br />
                       {{ item.syntax }} <br /><br />
-                      Examples: <br />
+                      {{ $t('labels.examples') }}: <br />
 
                       <div v-for="(example, idx) of item.examples" :key="idx">
                         <div>({{ idx + 1 }}): {{ example }}</div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 4f06382922..71e7dcd522 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -349,6 +349,8 @@
     "renameFile": "Rename File"
   },
   "labels": {
+    "syntax": "Syntax",
+    "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
     "durationFormat": "Duration Format",
     "dateFormat": "Date Format",
@@ -779,6 +781,33 @@
     "decimal8": "1.00000000"
   },
   "msg": {
+    "formula": {
+      "hintStart": "Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out",
+      "hintEnd": "Formulas.",
+      "noSuggestedFormulaFound": "No suggested formula found",
+      "numericTypeIsExpected": "Numeric type is expected",
+      "stringTypeIsExpected": "String type is expected",
+      "operationNotAvailable": "{operation} operation not available",
+      "cantSaveFieldFormulaInvalid": "Can’t save field because formula is invalid",
+      "notSupportedToReferenceColumn": "Not supported to reference column {columnName}",
+      "typeIsExpectedButFound": "Type {type} is expected but found Type {found}",
+      "requiredArgumentsFormula": "{calleeName} requires {requiredArguments} arguments",
+      "minRequiredArgumentsFormula": "{calleeName} required minimum {minRequiredArguments} arguments",
+      "maxRequiredArgumentsFormula": "{calleeName} required maximum {maxRequiredArguments} arguments",
+      "functionNotAvailable": "{function} function is not available",
+      "firstParamWeekDayHaveDate": "The first parameter of WEEKDAY() should have date value",
+      "secondParamWeekDayHaveDate": "The second parameter of WEEKDAY() should have the value either \"sunday\", \"monday\", \"tuesday\", \"wednesday\", \"thursday\", \"friday\" or \"saturday\"",
+      "firstParamDateAddHaveDate": "The first parameter of DATEADD() should have date value",
+      "secondParamDateAddHaveNumber": "The second parameter of DATEADD() should have numeric value",
+      "thirdParamDateAddHaveDate": "The third parameter of DATEADD() should have the value either \"day\", \"week\", \"month\" or \"year\"",
+      "firstParamDateDiffHaveDate": "The first parameter of DATEDIFF() should have date value",
+      "secondParamDateDiffHaveDate": "The second parameter of DATEDIFF() should have date value",
+      "thirdParamDateDiffHaveDate": "The third parameter of DATETIME_DIFF() should have value either \"milliseconds\", \"ms\", \"seconds\", \"s\", \"minutes\", \"m\", \"hours\", \"h\", \"days\", \"d\", \"weeks\", \"w\", \"months\", \"M\", \"quarters\", \"Q\", \"years\", or \"y\"",
+      "columnNotAvailable": "Column {columnName} is not available",
+      "cantSaveCircularReference": "Can’t save field because it causes a circular reference",
+      "columnWithTypeFoundButExpected": "Column {columnName} with {columnType} type is found but {expectedType} type is expected",
+      "columnNotMatchedWithType": "{columnName} is not matched with {columnType}"
+    },
     "plsEnterANumber": "Please enter a number",
     "invalidDate": "Invalid date",
     "invalidLocale": "Invalid locale",

From 97a4d9e18815f40c6976bb5b4b1faf3f5dac12bc Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 12:35:33 +0530
Subject: [PATCH 10/36] fix: i18n for LTAR

---
 .../column/LinkedToAnotherRecordOptions.vue   | 22 ++++++++++++++++---
 packages/nc-gui/lang/en.json                  |  9 +++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
index 52748e2018..c9aeaba955 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkedToAnotherRecordOptions.vue
@@ -19,8 +19,10 @@ const { setAdditionalValidations, validateInfos, onDataTypeChange, sqlUi, isXcdb
 const projectStore = useProject()
 const { tables } = storeToRefs(projectStore)
 
+const { t } = useI18n()
+
 setAdditionalValidations({
-  childId: [{ required: true, message: 'Required' }],
+  childId: [{ required: true, message: t('general.required') }],
 })
 
 const onUpdateDeleteOptions = sqlUi === MssqlUi ? ['NO ACTION'] : ['NO ACTION', 'CASCADE', 'RESTRICT', 'SET NULL', 'SET DEFAULT']
@@ -110,7 +112,14 @@ const isLinks = computed(() => vModel.value.uidt === UITypes.Links)
                 @change="onDataTypeChange"
               >
                 <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                  {{ option }}
+                  <template v-if="option === 'NO ACTION'">{{ $t('title.links.noAction') }}</template>
+                  <template v-else-if="option === 'CASCADE'">{{ $t('title.links.cascade') }}</template>
+                  <template v-else-if="option === 'RESTRICT'">{{ $t('title.links.restrict') }}</template>
+                  <template v-else-if="option === 'SET NULL'">{{ $t('title.links.setNull') }}</template>
+                  <template v-else-if="option === 'SET DEFAULT'">{{ $t('title.links.setDefault') }}</template>
+                  <template v-else>
+                    {{ option }}
+                  </template>
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -124,7 +133,14 @@ const isLinks = computed(() => vModel.value.uidt === UITypes.Links)
                 @change="onDataTypeChange"
               >
                 <a-select-option v-for="(option, i) of onUpdateDeleteOptions" :key="i" :value="option">
-                  {{ option }}
+                  <template v-if="option === 'NO ACTION'">{{ $t('title.links.noAction') }}</template>
+                  <template v-else-if="option === 'CASCADE'">{{ $t('title.links.cascade') }}</template>
+                  <template v-else-if="option === 'RESTRICT'">{{ $t('title.links.restrict') }}</template>
+                  <template v-else-if="option === 'SET NULL'">{{ $t('title.links.setNull') }}</template>
+                  <template v-else-if="option === 'SET DEFAULT'">{{ $t('title.links.setDefault') }}</template>
+                  <template v-else>
+                    {{ option }}
+                  </template>
                 </a-select-option>
               </a-select>
             </a-form-item>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 71e7dcd522..5c2b774e17 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -346,7 +346,14 @@
     "defaultView": "Default View",
     "relations": "Relations",
     "switchLanguage": "Switch Language",
-    "renameFile": "Rename File"
+    "renameFile": "Rename File",
+    "links": {
+      "noAction": "No Action",
+      "cascade": "Cascade",
+      "restrict": "Restrict",
+      "setNull": "Set NULL",
+      "setDefault": "Set Default"
+    }
   },
   "labels": {
     "syntax": "Syntax",

From 76b88b7c745d1009ebebb8ac9a05ef27ce8dcf00 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 12:48:16 +0530
Subject: [PATCH 11/36] fix: i18n for Percentage

---
 packages/nc-gui/components/cell/Percent.vue            |  4 ++--
 .../components/smartsheet/column/PercentOptions.vue    | 10 +++++-----
 packages/nc-gui/lang/en.json                           |  4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index 5fec5b0412..55b6188e56 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -42,7 +42,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     class="w-full !text-sm !border-none !outline-none focus:ring-0 text-base p-1"
     :class="{ '!px-2': editEnabled }"
     type="number"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -54,6 +54,6 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null capitalize">{{ $t('general.null') }}</span>
   <span v-else>{{ vModel }}</span>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
index f5bee9a456..f296ba5bba 100644
--- a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
@@ -20,7 +20,7 @@ if (!vModel.value.meta?.precision) vModel.value.meta.precision = precisions[0].i
 <template>
   <div class="flex flex-col mt-2 gap-2">
     <div class="flex flex-row space-x-2">
-      <a-form-item class="flex w-1/2" label="Precision">
+      <a-form-item class="flex w-1/2" :label="$t('placeholder.precision')">
         <a-select v-model:value="vModel.meta.precision" dropdown-class-name="nc-dropdown-precision">
           <a-select-option v-for="(precision, i) of precisions" :key="i" :value="precision.id">
             <div class="flex flex-row items-center">
@@ -31,15 +31,15 @@ if (!vModel.value.meta?.precision) vModel.value.meta.precision = precisions[0].i
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item label="Default Number (%)">
-        <a-input v-model:value="vModel.meta.default" name="default" type="number" />
+      <a-form-item :label="$t('labels.defaultNumberPercent')">
+        <a-input v-model:value="vModel.meta.default" :name="$t('labels.default')" type="number" />
       </a-form-item>
     </div>
     <div class="flex flex-row mt-2">
       <a-form-item>
         <div class="flex flex-row space-x-2 items-center">
-          <a-switch v-model:checked="vModel.meta.negative" name="negative" />
-          <div class="text-xs">Allow negative numbers</div>
+          <a-switch v-model:checked="vModel.meta.negative" :name="$t('labels.negative')" />
+          <div class="text-xs">{{ $t('placeholder.allowNegativeNumbers') }}</div>
         </div>
       </a-form-item>
     </div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 5c2b774e17..1016be829e 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -359,6 +359,9 @@
     "syntax": "Syntax",
     "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
+    "negative": "Negative",
+    "default": "Default",
+    "defaultNumberPercent": "Default Number (%)",
     "durationFormat": "Duration Format",
     "dateFormat": "Date Format",
     "timeFormat": "Time Format",
@@ -767,6 +770,7 @@
       "save": "Save password",
       "confirm": "Confirm new password"
     },
+    "allowNegativeNumbers": "Allow negative numbers",
     "searchProjectTree": "Search tables",
     "searchFields": "Search fields",
     "searchColumn": "Search {search} column",

From 57124940be23f23381d26a048d1deb5996f4fef4 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 12:52:30 +0530
Subject: [PATCH 12/36] fix: i18n for PgBinaryOption

---
 .../components/smartsheet/column/PgBinaryOptions.vue | 12 ++++++++----
 packages/nc-gui/lang/en.json                         |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
index 831105b3a5..925ac2a00a 100644
--- a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
@@ -23,10 +23,14 @@ vModel.value.meta = {
 <template>
   <a-row class="my-2" gutter="8">
     <a-col :span="24">
-      <a-form-item v-bind="validateInfos['meta.format']" label="Binary encoding format">
-        <a-select v-model:value="vModel.meta.format" placeholder="Binary encoding format" class="!w-full nc-link-singular">
-          <a-select-option value="escape">Escape</a-select-option>
-          <a-select-option value="hex">Hex</a-select-option>
+      <a-form-item v-bind="validateInfos['meta.format']" :label="$t('labels.binaryEncodingFormat')">
+        <a-select
+          v-model:value="vModel.meta.format"
+          :placeholder="$t('labels.binaryEncodingFormat')"
+          class="!w-full nc-link-singular"
+        >
+          <a-select-option value="escape">{{ $t('general.escape') }}</a-select-option>
+          <a-select-option value="hex">{{ $t('general.hex') }}</a-select-option>
         </a-select>
       </a-form-item>
     </a-col>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 1016be829e..3ccd51d7a6 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -63,6 +63,8 @@
     "saving": "Saving",
     "cancel": "Cancel",
     "null": "Null",
+    "escape": "Escape",
+    "hex": "Hex",
     "clear": "Clear",
     "submit": "Submit",
     "create": "Create",
@@ -356,6 +358,7 @@
     }
   },
   "labels": {
+    "binaryEncodingFormat": "Binary encoding format",
     "syntax": "Syntax",
     "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",

From 7679b5fe3bec826b2c5c11de29767a4e192afc18 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 12:59:40 +0530
Subject: [PATCH 13/36] fix: i18n for QrCode

---
 .../nc-gui/components/smartsheet/column/QrCodeOptions.vue   | 6 ++++--
 packages/nc-gui/components/virtual-cell/QrCode.vue          | 6 +++---
 packages/nc-gui/lang/en.json                                | 2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/QrCodeOptions.vue b/packages/nc-gui/components/smartsheet/column/QrCodeOptions.vue
index 172829fa26..cb240878fd 100644
--- a/packages/nc-gui/components/smartsheet/column/QrCodeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/QrCodeOptions.vue
@@ -14,6 +14,8 @@ const meta = inject(MetaInj, ref())
 
 const activeView = inject(ActiveViewInj, ref())
 
+const { t } = useI18n()
+
 const reloadDataHook = inject(ReloadViewDataHookInj)!
 
 const { fields, metaColumnById } = useViewColumns(activeView, meta, () => reloadDataHook.trigger())
@@ -42,7 +44,7 @@ onMounted(() => {
 })
 
 setAdditionalValidations({
-  fk_qr_value_column_id: [{ required: true, message: 'Required' }],
+  fk_qr_value_column_id: [{ required: true, message: t('general.required') }],
 })
 </script>
 
@@ -57,7 +59,7 @@ setAdditionalValidations({
         <a-select
           v-model:value="vModel.fk_qr_value_column_id"
           :options="columnsAllowedAsQrValue"
-          placeholder="Select a column for the QR code value"
+          :placeholder="$t('placeholder.selectAColumnForTheQRCodeValue')"
           @click.stop
         />
       </a-form-item>
diff --git a/packages/nc-gui/components/virtual-cell/QrCode.vue b/packages/nc-gui/components/virtual-cell/QrCode.vue
index 2cf8879dd7..f51a23be06 100644
--- a/packages/nc-gui/components/virtual-cell/QrCode.vue
+++ b/packages/nc-gui/components/virtual-cell/QrCode.vue
@@ -61,7 +61,7 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = us
         {{ qrValue }}
       </div>
     </template>
-    <img v-if="showQrCode" :src="qrCodeLarge" alt="QR Code" />
+    <img v-if="showQrCode" :src="qrCodeLarge" :alt="$t('title.qrCode')" />
   </a-modal>
   <div v-if="tooManyCharsForQrCode" class="text-left text-wrap mt-2 text-[#e65100] text-[10px]">
     {{ $t('labels.qrCodeValueTooLong') }}
@@ -71,10 +71,10 @@ const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = us
     :class="{ 'mx-auto': !isGallery }"
     :style="{ height: rowHeight ? `${rowHeight * 1.4}rem` : `1.4rem` }"
     :src="qrCode"
-    alt="QR Code"
+    :alt="$t('title.qrCode')"
     @click="showQrModal"
   />
-  <img v-else-if="showQrCode" class="mx-auto" :src="qrCode" alt="QR Code" @click="showQrModal" />
+  <img v-else-if="showQrCode" class="mx-auto" :src="qrCode" :alt="$t('title.qrCode')" @click="showQrModal" />
   <div v-if="showEditNonEditableFieldWarning" class="text-left text-wrap mt-2 text-[#e65100] text-xs">
     {{ $t('msg.warning.nonEditableFields.computedFieldUnableToClear') }}
   </div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3ccd51d7a6..acd447320f 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -267,6 +267,7 @@
     "dateJoined": "Date Joined",
     "tokenName": "Token name",
     "creator": "Creator",
+    "qrCode": "QR Code",
     "updateSelectedRows": "Update Selected Rows",
     "noFiltersAdded": "No filters added",
     "editCards": "Edit Cards",
@@ -773,6 +774,7 @@
       "save": "Save password",
       "confirm": "Confirm new password"
     },
+    "selectAColumnForTheQRCodeValue": "Select a column for the QR code value",
     "allowNegativeNumbers": "Allow negative numbers",
     "searchProjectTree": "Search tables",
     "searchFields": "Search fields",

From 136e081c5d02fd53ad9087811d4eb50d54b69eb9 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 13:05:30 +0530
Subject: [PATCH 14/36] fix: i18n for Rating

---
 .../nc-gui/components/smartsheet/column/RatingOptions.vue   | 4 ++--
 packages/nc-gui/lang/en.json                                | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/RatingOptions.vue b/packages/nc-gui/components/smartsheet/column/RatingOptions.vue
index 9479efb6ec..98b7ca533d 100644
--- a/packages/nc-gui/components/smartsheet/column/RatingOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RatingOptions.vue
@@ -71,7 +71,7 @@ watch(
 <template>
   <a-row :gutter="8">
     <a-col :span="12">
-      <a-form-item label="Icon">
+      <a-form-item :label="$t('labels.icon')">
         <a-select v-model:value="vModel.meta.iconIdx" class="w-52" dropdown-class-name="nc-dropdown-rating-icon">
           <a-select-option v-for="(icon, i) of iconList" :key="i" :value="i">
             <div class="flex items-center">
@@ -95,7 +95,7 @@ watch(
       </a-form-item>
     </a-col>
     <a-col :span="12">
-      <a-form-item label="Max">
+      <a-form-item :label="$t('labels.max')">
         <a-select v-model:value="vModel.meta.max" class="w-52" dropdown-class-name="nc-dropdown-rating-color">
           <a-select-option v-for="(v, i) in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]" :key="i" :value="v">
             {{ v }}
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index acd447320f..2932c7b825 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -359,6 +359,8 @@
     }
   },
   "labels": {
+    "icon": "Icon",
+    "max": "Max",
     "binaryEncodingFormat": "Binary encoding format",
     "syntax": "Syntax",
     "examples": "Examples",
@@ -832,25 +834,21 @@
     "validColumnsForBarCode": "The valid Column Types for a Barcode Column are: Number, Single Line Text, Long Text, Phone Number, URL, Email, Decimal. Please create one first.",
     "hm": {
       "title": "Has Many Relation",
-      "icon": "HasManyIcon",
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with multiple records from table "
     },
     "mm": {
       "title": "Many to Many Relation",
-      "icon": "ManytoManyIcon",
       "tooltip_desc": "Multiple records from table ",
       "tooltip_desc2": " can be linked with multiple records from table "
     },
     "bt": {
       "title": "Belongs to Relation",
-      "icon": "BelongsToIcon",
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a record from table "
     },
     "oo": {
       "title": "One to One Relation",
-      "icon": "OnetoOneIcon",
       "tooltip_desc": "A single record from table ",
       "tooltip_desc2": " can be linked with a single record from table "
     },

From f61f5144427331074274802f3549a3369c4be68d Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 13:12:55 +0530
Subject: [PATCH 15/36] fix: i18n for Rollup

---
 .../smartsheet/column/RollupOptions.vue       | 26 ++++++++++---------
 packages/nc-gui/lang/en.json                  | 11 +++++++-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
index 6b6eac6563..83a302279e 100644
--- a/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/RollupOptions.vue
@@ -21,21 +21,23 @@ const { tables } = storeToRefs(projectStore)
 
 const { metas } = useMetas()
 
+const { t } = useI18n()
+
 setAdditionalValidations({
-  fk_relation_column_id: [{ required: true, message: 'Required' }],
-  fk_rollup_column_id: [{ required: true, message: 'Required' }],
-  rollup_function: [{ required: true, message: 'Required' }],
+  fk_relation_column_id: [{ required: true, message: t('general.required') }],
+  fk_rollup_column_id: [{ required: true, message: t('general.required') }],
+  rollup_function: [{ required: true, message: t('general.required') }],
 })
 
 const aggrFunctionsList = [
-  { text: 'count', value: 'count' },
-  { text: 'min', value: 'min' },
-  { text: 'max', value: 'max' },
-  { text: 'avg', value: 'avg' },
-  { text: 'sum', value: 'sum' },
-  { text: 'countDistinct', value: 'countDistinct' },
-  { text: 'sumDistinct', value: 'sumDistinct' },
-  { text: 'avgDistinct', value: 'avgDistinct' },
+  { text: t('datatype.Count'), value: 'count' },
+  { text: t('general.min'), value: 'min' },
+  { text: t('general.max'), value: 'max' },
+  { text: t('general.avg'), value: 'avg' },
+  { text: t('general.sum'), value: 'sum' },
+  { text: t('general.countDistinct'), value: 'countDistinct' },
+  { text: t('general.sumDistinct'), value: 'sumDistinct' },
+  { text: t('general.avgDistinct'), value: 'avgDistinct' },
 ]
 
 if (!vModel.value.fk_relation_column_id) vModel.value.fk_relation_column_id = null
@@ -133,7 +135,7 @@ const cellIcon = (column: ColumnType) =>
       </a-form-item>
     </div>
 
-    <a-form-item label="Aggregate function" v-bind="validateInfos.rollup_function">
+    <a-form-item :label="$t('labels.aggregateFunction')" v-bind="validateInfos.rollup_function">
       <a-select
         v-model:value="vModel.rollup_function"
         dropdown-class-name="nc-dropdown-rollup-function"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 2932c7b825..1c82e4128c 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -153,7 +153,15 @@
     "active": "Active",
     "inactive": "Inactive",
     "linked": "linked",
-    "finish": "Finish"
+    "finish": "Finish",
+    "min": "Min",
+    "max": "Max",
+    "avg": "Avg",
+    "sum": "Sum",
+    "count": "Count",
+    "countDistinct": "Count Distinct",
+    "sumDistinct": "Sum Distinct",
+    "avgDistinct": "Avg Distinct"
   },
   "objects": {
     "workspace": "Workspace",
@@ -365,6 +373,7 @@
     "syntax": "Syntax",
     "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
+
     "negative": "Negative",
     "default": "Default",
     "defaultNumberPercent": "Default Number (%)",

From d4fc26f227f7292df3bf5e0062a97cf350e4a27d Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 13:28:54 +0530
Subject: [PATCH 16/36] fix: i18n for Multi and single select and its col
 option

---
 packages/nc-gui/components/cell/MultiSelect.vue           | 4 ++--
 packages/nc-gui/components/cell/SingleSelect.vue          | 4 ++--
 .../nc-gui/components/smartsheet/column/SelectOptions.vue | 8 +++++---
 packages/nc-gui/lang/en.json                              | 6 ++++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index ae68ab7aad..eafeca7270 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -378,7 +378,7 @@ const selectedOpts = computed(() => {
       v-model:value="vModel"
       mode="multiple"
       class="w-full overflow-hidden"
-      :placeholder="isEditColumn ? '(Optional)' : ''"
+      :placeholder="isEditColumn ? $t('labels.optional') : ''"
       :bordered="false"
       clear-icon
       show-search
@@ -421,7 +421,7 @@ const selectedOpts = computed(() => {
         <div class="flex gap-2 text-gray-500 items-center h-full">
           <component :is="iconMap.plusThick" class="min-w-4" />
           <div class="text-xs whitespace-normal">
-            Create new option named <strong>{{ searchVal }}</strong>
+            {{ $t('msg.selectOption.createNewOptionNamed') }} <strong>{{ searchVal }}</strong>
           </div>
         </div>
       </a-select-option>
diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 4e357d1cb2..5c0475addf 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -286,7 +286,7 @@ const selectedOpt = computed(() => {
       v-model:value="vModel"
       class="w-full overflow-hidden"
       :class="{ 'caret-transparent': !hasEditRoles }"
-      :placeholder="isEditColumn ? '(Optional)' : ''"
+      :placeholder="isEditColumn ? $t('labels.optional') : ''"
       :allow-clear="!column.rqd && editAllowed"
       :bordered="false"
       :open="isOpen && editAllowed"
@@ -324,7 +324,7 @@ const selectedOpt = computed(() => {
         <div class="flex gap-2 text-gray-500 items-center h-full">
           <component :is="iconMap.plusThick" class="min-w-4" />
           <div class="text-xs whitespace-normal">
-            Create new option named <strong>{{ searchVal }}</strong>
+            {{ $t('msg.selectOption.createNewOptionNamed') }} <strong>{{ searchVal }}</strong>
           </div>
         </div>
       </a-select-option>
diff --git a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
index c7d731c906..75d2bd5b9b 100644
--- a/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/SelectOptions.vue
@@ -49,6 +49,8 @@ const defaultOption = ref()
 
 const isKanban = inject(IsKanbanInj, ref(false))
 
+const { t } = useI18n()
+
 const validators = {
   colOptions: [
     {
@@ -61,13 +63,13 @@ const validators = {
                 if ((opt as any).status === 'remove') continue
 
                 if (!opt.title.length) {
-                  return reject(new Error("Select options can't be null"))
+                  return reject(new Error(t('msg.selectOption.cantBeNull')))
                 }
                 if (vModel.value.uidt === UITypes.MultiSelect && opt.title.includes(',')) {
-                  return reject(new Error("MultiSelect columns can't have commas(',')"))
+                  return reject(new Error(t('msg.selectOption.multiSelectCantHaveCommas')))
                 }
                 if (options.value.filter((el) => el.title === opt.title && (el as any).status !== 'remove').length > 1) {
-                  return reject(new Error("Select options can't have duplicates"))
+                  return reject(new Error(t('msg.selectOption.cantHaveDuplicates')))
                 }
               }
               resolve()
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 1c82e4128c..a2af2f49f4 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -835,6 +835,12 @@
       "columnWithTypeFoundButExpected": "Column {columnName} with {columnType} type is found but {expectedType} type is expected",
       "columnNotMatchedWithType": "{columnName} is not matched with {columnType}"
     },
+    "selectOption": {
+      "cantBeNull": "Select options can't be null",
+      "multiSelectCantHaveCommas": "MultiSelect columns can't have commas(',')",
+      "cantHaveDuplicates": "Select options can't have duplicates",
+      "createNewOptionNamed": "Create new option named"
+    },
     "plsEnterANumber": "Please enter a number",
     "invalidDate": "Invalid date",
     "invalidLocale": "Invalid locale",

From effac9d80071c26e57c6ced98e79ffd978445803 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 13:31:49 +0530
Subject: [PATCH 17/36] fix: i18n for Currency

---
 packages/nc-gui/components/cell/Currency.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index 487a594178..abdec73adf 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -93,7 +93,7 @@ onMounted(() => {
     @contextmenu.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">{{ $t('labels.null') }}</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null">{{ $t('general.null') }}</span>
 
   <!-- only show the numeric value as previously string value was accepted -->
   <span v-else-if="!isNaN(vModel)">{{ currency }}</span>

From 7c322608fe3f660199746002d50e273adc88ac96 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:08:42 +0530
Subject: [PATCH 18/36] fix: i18n for Currency, Email, Float, Integer, and URL

---
 packages/nc-gui/components/cell/Currency.vue | 2 +-
 packages/nc-gui/components/cell/Email.vue    | 4 ++--
 packages/nc-gui/components/cell/Float.vue    | 4 ++--
 packages/nc-gui/components/cell/Integer.vue  | 4 ++--
 packages/nc-gui/components/cell/Url.vue      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index abdec73adf..1b5d363969 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -93,7 +93,7 @@ onMounted(() => {
     @contextmenu.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">{{ $t('general.null') }}</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <!-- only show the numeric value as previously string value was accepted -->
   <span v-else-if="!isNaN(vModel)">{{ currency }}</span>
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 434dd0a1fc..385fecb852 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -71,7 +71,7 @@ watch(
     :ref="focus"
     v-model="vModel"
     class="w-full outline-none text-sm px-1 py-2"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -84,7 +84,7 @@ watch(
     @mousedown.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <nuxt-link
     v-else-if="validEmail"
diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue
index a9c8f41001..8a91b05ebb 100644
--- a/packages/nc-gui/components/cell/Float.vue
+++ b/packages/nc-gui/components/cell/Float.vue
@@ -51,7 +51,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     class="outline-none px-1 border-none w-full h-full text-sm"
     type="number"
     step="0.1"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -63,7 +63,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
   <span v-else class="text-sm">{{ vModel }}</span>
 </template>
 
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 477232670a..16a2597c32 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -88,7 +88,7 @@ function onKeyDown(e: any) {
     class="outline-none py-2 px-1 border-none w-full h-full text-sm"
     type="number"
     style="letter-spacing: 0.06rem"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown="onKeyDown"
     @keydown.down.stop
@@ -99,7 +99,7 @@ function onKeyDown(e: any) {
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
   <span v-else class="text-sm">{{ displayValue }}</span>
 </template>
 
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 6243e473bf..cd6d15077e 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -91,7 +91,7 @@ watch(
       v-if="editEnabled"
       :ref="focus"
       v-model="vModel"
-      :placeholder="isEditColumn ? 'Enter default URL (Optional)' : ''"
+      :placeholder="isEditColumn ? $t('labels.enterDefaultUrlOptional') : ''"
       class="outline-none text-sm w-full px-2 py-2 bg-transparent h-full"
       @blur="editEnabled = false"
       @keydown.down.stop
@@ -105,7 +105,7 @@ watch(
       @mousedown.stop
     />
 
-    <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+    <span v-else-if="vModel === null && showNull" class="nc-null uppercase"> $t('general.null')</span>
 
     <nuxt-link
       v-else-if="isValid && !cellUrlOptions?.overlay"

From 2509c8910798a166f68d8dc517ae0056c98ba01d Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:10:10 +0530
Subject: [PATCH 19/36] fix: i18n for JSON

---
 packages/nc-gui/components/cell/Json.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue
index 1206b4b5b2..aa4aedfd9f 100644
--- a/packages/nc-gui/components/cell/Json.vue
+++ b/packages/nc-gui/components/cell/Json.vue
@@ -149,10 +149,12 @@ useSelectedCellKeyupListener(active, (e) => {
         </a-button>
 
         <div v-if="!isForm || isExpanded" class="flex flex-row">
-          <a-button type="text" size="small" :onclick="clear"><div class="text-xs">Cancel</div></a-button>
+          <a-button type="text" size="small" :onclick="clear"
+            ><div class="text-xs">{{ $t('general.cancel') }}</div></a-button
+          >
 
           <a-button type="primary" size="small" :disabled="!!error || localValue === vModel" @click="onSave">
-            <div class="text-xs">Save</div>
+            <div class="text-xs">{{ $t('general.save') }}</div>
           </a-button>
         </div>
       </div>
@@ -171,7 +173,7 @@ useSelectedCellKeyupListener(active, (e) => {
       </span>
     </div>
 
-    <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+    <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
     <span v-else>{{ vModel }}</span>
   </component>

From 4e9adfeec860f7b9bfba254784f942318a82f6a3 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:13:32 +0530
Subject: [PATCH 20/36] fix: i18n for PhoneNumber

---
 packages/nc-gui/components/cell/PhoneNumber.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/PhoneNumber.vue b/packages/nc-gui/components/cell/PhoneNumber.vue
index 42f2f37f25..24c3c8ef36 100644
--- a/packages/nc-gui/components/cell/PhoneNumber.vue
+++ b/packages/nc-gui/components/cell/PhoneNumber.vue
@@ -15,6 +15,8 @@ const rowHeight = inject(RowHeightInj, ref(undefined))
 
 const { showNull } = useGlobal()
 
+const { t } = useI18n()
+
 const editEnabled = inject(EditModeInj)!
 
 const isEditColumn = inject(EditColumnInj, ref(false))
@@ -46,7 +48,7 @@ watch(
   () => editEnabled.value,
   () => {
     if (parseProp(column.value.meta)?.validate && !editEnabled.value && localState.value && !isMobilePhone(localState.value)) {
-      message.error('Invalid Phone Number')
+      message.error(t('msg.invalidPhoneNumber'))
       localState.value = undefined
       return
     }
@@ -61,7 +63,7 @@ watch(
     :ref="focus"
     v-model="vModel"
     class="w-full outline-none text-sm px-1 py-2"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -74,7 +76,7 @@ watch(
     @mousedown.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <a v-else-if="validEmail" class="text-sm underline hover:opacity-75" :href="`tel:${vModel}`" target="_blank">
     <LazyCellClampedText :value="vModel" :lines="rowHeight" />

From cb8c0f1c2a9db757afe165b071b3e78155bab3e1 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:17:09 +0530
Subject: [PATCH 21/36] fix: i18n for Text Area

---
 packages/nc-gui/components/cell/TextArea.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 0ebd53ae86..e387dbe90e 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -84,7 +84,7 @@ onClickOutside(inputWrapperRef, (e) => {
         :style="{
           minHeight: `${height}px`,
         }"
-        :placeholder="isEditColumn ? '(Optional)' : ''"
+        :placeholder="isEditColumn ? $t('labels.optional') : ''"
         @blur="editEnabled = false"
         @keydown.alt.enter.stop
         @keydown.shift.enter.stop
@@ -99,7 +99,7 @@ onClickOutside(inputWrapperRef, (e) => {
         @mousedown.stop
       />
 
-      <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+      <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
       <LazyCellClampedText v-else-if="rowHeight" :value="vModel" :lines="rowHeight" class="mr-7" />
 
@@ -113,7 +113,7 @@ onClickOutside(inputWrapperRef, (e) => {
         @click.stop="isVisible = !isVisible"
       >
         <NcTooltip placement="bottom">
-          <template #title>Expand</template>
+          <template #title>{{ $t('title.expand') }}</template>
           <component
             :is="iconMap.expand"
             class="transform dark:(!text-white) group-hover:(!text-grey-800 scale-120) text-gray-500 text-xs"
@@ -135,8 +135,8 @@ onClickOutside(inputWrapperRef, (e) => {
         <a-textarea
           ref="inputRef"
           v-model:value="vModel"
-          placeholder="Enter text"
           class="p-1 !pt-1 !pr-3 !border-0 !border-r-0 !focus:outline-transparent nc-scrollbar-md !text-black"
+          :placeholder="$t('activity.enterText')"
           :bordered="false"
           :auto-size="{ minRows: 20, maxRows: 20 }"
           :disabled="readOnly"

From 4fc726fd0819ae32f3430ab551af696df6105224 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:17:26 +0530
Subject: [PATCH 22/36] fix: i18n for Text Area

---
 packages/nc-gui/lang/en.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index a2af2f49f4..127c3dbc1e 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -281,6 +281,7 @@
     "editCards": "Edit Cards",
     "noFieldsFound": "No fields found",
     "displayValue": "Display Value",
+    "expand": "Expand",
     "hideAll":"Hide all",
     "hideSystemFields": "hideSystemFields",
     "removeFile": "Remove File",
@@ -373,7 +374,7 @@
     "syntax": "Syntax",
     "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
-
+    "enterDefaultUrlOptional": "Enter default URL (Optional)",
     "negative": "Negative",
     "default": "Default",
     "defaultNumberPercent": "Default Number (%)",
@@ -382,7 +383,7 @@
     "timeFormat": "Time Format",
     "singularLabel": "Singular Label",
     "pluralLabel": "Plural Label",
-    "optional": "Optional",
+    "optional": "(Optional)",
     "clickToMake": "Click to make",
     "visibleForRole": "visible for role:",
     "inUI": "in UI Dashboard",
@@ -561,6 +562,7 @@
     "hideInUI": "Hide in UI",
     "addBase": "Add Base",
     "editBase": "Edit Base",
+    "enterText": "Enter text",
     "okEditBase": "Ok & Edit Base",
     "showInUI": "Show in UI",
     "outOfSync": "Out of sync",
@@ -808,6 +810,7 @@
     "decimal8": "1.00000000"
   },
   "msg": {
+    "invalidPhoneNumber": "Invalid phone number",
     "formula": {
       "hintStart": "Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out",
       "hintEnd": "Formulas.",
@@ -1051,6 +1054,7 @@
       "invalidChar": "Invalid character in folder path.",
       "invalidDbCredentials": "Invalid database credentials.",
       "unableToConnectToDb": "Unable to connect to database, please check your database is up.",
+      "invalidYear": "Invalid year",
       "userDoesntHaveSufficientPermission": "User does not exist or have sufficient permission to create schema.",
       "dbConnectionStatus": "Invalid database parameters",
       "dbConnectionFailed": "Connection Failure:",

From 48806e3675c7b18327e7629827454d7c29be25a9 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:20:31 +0530
Subject: [PATCH 23/36] fix: i18n for Time Picker

---
 packages/nc-gui/components/cell/TimePicker.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
index 619ab45cba..7f66828006 100644
--- a/packages/nc-gui/components/cell/TimePicker.vue
+++ b/packages/nc-gui/components/cell/TimePicker.vue
@@ -38,6 +38,8 @@ const isTimeInvalid = ref(false)
 
 const dateFormat = isMysql(column.value.base_id) ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ'
 
+const { t } = useI18n()
+
 const localState = computed({
   get() {
     if (!modelValue) {
@@ -89,11 +91,11 @@ watch(
 
 const placeholder = computed(() => {
   if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
-    return '(Optional)'
+    return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
-    return 'NULL'
+    return t('general.null')
   } else if (isTimeInvalid.value) {
-    return 'Invalid time'
+    return t('msg.invalidTime')
   } else {
     return ''
   }

From 69da681cb9423307d9ff70cc5d2b21af834f88a9 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:21:42 +0530
Subject: [PATCH 24/36] fix: i18n for Year Picker

---
 packages/nc-gui/components/cell/YearPicker.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
index 117d615d9f..b2204fff9f 100644
--- a/packages/nc-gui/components/cell/YearPicker.vue
+++ b/packages/nc-gui/components/cell/YearPicker.vue
@@ -33,6 +33,8 @@ const isEditColumn = inject(EditColumnInj, ref(false))
 
 const isYearInvalid = ref(false)
 
+const { t } = useI18n()
+
 const localState = computed({
   get() {
     if (!modelValue) {
@@ -76,11 +78,11 @@ watch(
 
 const placeholder = computed(() => {
   if (isEditColumn.value && (modelValue === '' || modelValue === null)) {
-    return '(Optional)'
+    return t('labels.optional')
   } else if (modelValue === null && showNull.value) {
-    return 'NULL'
+    return t('general.null')
   } else if (isYearInvalid.value) {
-    return 'Invalid year'
+    return t('msg.invalidTime')
   } else {
     return ''
   }

From efd4fe425e8fdc621bb2faef1f6d03dcbe567ac6 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:25:29 +0530
Subject: [PATCH 25/36] fix: i18n for Grid

---
 packages/nc-gui/components/api-client/Headers.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/api-client/Headers.vue b/packages/nc-gui/components/api-client/Headers.vue
index ad4f826526..ba2c0acf0b 100644
--- a/packages/nc-gui/components/api-client/Headers.vue
+++ b/packages/nc-gui/components/api-client/Headers.vue
@@ -66,10 +66,10 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
         <tr>
           <th></th>
           <th>
-            <div class="text-left font-normal ml-2">Header Name</div>
+            <div class="text-left font-normal ml-2">{{ $t('labels.headerName') }}</div>
           </th>
           <th>
-            <div class="text-left font-normal ml-2">Value</div>
+            <div class="text-left font-normal ml-2">{{ $t('labels.value') }}</div>
           </th>
           <th class="w-8"></th>
         </tr>
@@ -87,9 +87,9 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
             <a-form-item class="form-item">
               <a-auto-complete
                 v-model:value="headerRow.name"
-                placeholder="Key"
                 class="nc-input-hook-header-key"
                 :options="headerList"
+                :placeholder="$t('labels.key')"
                 :filter-option="filterOption"
               />
             </a-form-item>
@@ -97,7 +97,11 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
 
           <td class="px-2">
             <a-form-item class="form-item">
-              <a-input v-model:value="headerRow.value" placeholder="Value" class="!rounded-md nc-input-hook-header-value" />
+              <a-input
+                v-model:value="headerRow.value"
+                :placeholder="$t('labels.value')"
+                class="!rounded-md nc-input-hook-header-value"
+              />
             </a-form-item>
           </td>
 
@@ -120,7 +124,7 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
           <td :colspan="12" class="">
             <NcButton size="small" type="secondary" @click="addHeaderRow">
               <div class="flex flex-row items-center gap-x-1">
-                <div>Add Header</div>
+                <div>{{ $t('labels.addHeader') }}</div>
                 <component :is="iconMap.plus" class="flex mx-auto" />
               </div>
             </NcButton>

From 12796f9a91eab78becb3032290f878ed1a00e614 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:31:09 +0530
Subject: [PATCH 26/36] fix: i18n for Grid

---
 packages/nc-gui/components/smartsheet/grid/Table.vue | 12 ++++++------
 packages/nc-gui/lang/en.json                         |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 43cf0ed365..40140af122 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -231,7 +231,7 @@ async function clearCell(ctx: { row: number; col: number } | null, skipUpdate =
   if (!ctx || !hasEditPermission.value || (!isLinksOrLTAR(fields.value[ctx.col]) && isVirtualCol(fields.value[ctx.col]))) return
 
   if (fields.value[ctx.col]?.uidt === UITypes.Links) {
-    return message.info('Links column clear is not supported yet')
+    return message.info(t('msg.linkColumnClearNotSupportedYet'))
   }
 
   const rowObj = dataRef.value[ctx.row]
@@ -266,10 +266,10 @@ async function clearCell(ctx: { row: number; col: number } | null, skipUpdate =
               activeCell.row = ctx.row
               scrollToCell?.()
             } else {
-              throw new Error('Record could not be found')
+              throw new Error(t('msg.recordCouldNotBeFound'))
             }
           } else {
-            throw new Error('Page size changed')
+            throw new Error(t('msg.pageSizeChanged'))
           }
         },
         args: [clone(ctx), clone(columnObj), clone(rowObj), clone(paginationDataRef.value)],
@@ -293,10 +293,10 @@ async function clearCell(ctx: { row: number; col: number } | null, skipUpdate =
               activeCell.row = ctx.row
               scrollToCell?.()
             } else {
-              throw new Error('Record could not be found')
+              throw new Error(t('msg.recordCouldNotBeFound'))
             }
           } else {
-            throw new Error('Page size changed')
+            throw new Error(t('msg.pageSizeChanged'))
           }
         },
         args: [clone(ctx), clone(columnObj), clone(rowObj), clone(paginationDataRef.value)],
@@ -1100,7 +1100,7 @@ watch(
           await loadData?.()
         } catch (e) {
           console.log(e)
-          message.error('Error loading data')
+          message.error(t('msg.errorLoadingData'))
         } finally {
           isViewDataLoading.value = false
         }
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 127c3dbc1e..61f47aaf92 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -810,7 +810,14 @@
     "decimal8": "1.00000000"
   },
   "msg": {
+    "optimizedQueryDisabled": "Optimized query is disabled",
+    "optimizedQueryEnabled": "Optimized query is enabled",
+    "invalidTime": "Invalid Time",
+    "linkColumnClearNotSupportedYet": "Link column clear is not supported yet",
+    "recordCouldNotBeFound": "Record could not be found",
     "invalidPhoneNumber": "Invalid phone number",
+    "pageSizeChanged": "Page size changed",
+    "errorLoadingData": "Error loading data",
     "formula": {
       "hintStart": "Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out",
       "hintEnd": "Formulas.",

From 2d76f79fabc4787cda8c893a024b7748417c342f Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:32:12 +0530
Subject: [PATCH 27/36] fix: i18n for Grid

---
 packages/nc-gui/components/smartsheet/grid/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/grid/index.vue b/packages/nc-gui/components/smartsheet/grid/index.vue
index 9bed913962..0ad2d07330 100644
--- a/packages/nc-gui/components/smartsheet/grid/index.vue
+++ b/packages/nc-gui/components/smartsheet/grid/index.vue
@@ -39,6 +39,8 @@ const route = router.currentRoute
 
 const { xWhere, eventBus } = useSmartsheetStoreOrThrow()
 
+const { t } = useI18n()
+
 const bulkUpdateDlg = ref(false)
 
 const routeQuery = computed(() => route.value.query as Record<string, string>)
@@ -151,10 +153,10 @@ const addRowExpandOnClose = (row: Row) => {
 const toggleOptimisedQuery = () => {
   if (optimisedQuery.value) {
     optimisedQuery.value = false
-    message.info('Optimised query disabled')
+    message.info(t('msg.optimizedQueryDisabled'))
   } else {
     optimisedQuery.value = true
-    message.info('Optimised query enabled')
+    message.info(t('msg.optimizedQueryEnabled'))
   }
 }
 

From df1a2deb0bcc2ac5d480e56e1db89d54499f96eb Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:47:16 +0530
Subject: [PATCH 28/36] fix: i18n for User profile

---
 packages/nc-gui/components/account/Profile.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index db959d808a..b31d238b51 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -15,9 +15,9 @@ const formValidator = ref()
 
 const formRules = {
   title: [
-    { required: true, message: t('error.nameRequired') },
-    { min: 2, message: t('error.nameMinLength') },
-    { max: 60, message: t('error.nameMaxLength') },
+    { required: true, message: t('msg.error.nameRequired') },
+    { min: 2, message: t('msg.error.nameMinLength') },
+    { max: 60, message: t('msg.error.nameMaxLength') },
   ],
 }
 

From 2551e359b93c74a80d9a4258c909bba4cec75e39 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:47:41 +0530
Subject: [PATCH 29/36] fix: i18n for Header and Params of webhook editor

---
 packages/nc-gui/components/api-client/Headers.vue |  6 +++---
 packages/nc-gui/components/api-client/Params.vue  | 10 +++++-----
 packages/nc-gui/lang/en.json                      |  8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/api-client/Headers.vue b/packages/nc-gui/components/api-client/Headers.vue
index ba2c0acf0b..9b58046552 100644
--- a/packages/nc-gui/components/api-client/Headers.vue
+++ b/packages/nc-gui/components/api-client/Headers.vue
@@ -69,7 +69,7 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
             <div class="text-left font-normal ml-2">{{ $t('labels.headerName') }}</div>
           </th>
           <th>
-            <div class="text-left font-normal ml-2">{{ $t('labels.value') }}</div>
+            <div class="text-left font-normal ml-2">{{ $t('placeholder.value') }}</div>
           </th>
           <th class="w-8"></th>
         </tr>
@@ -89,7 +89,7 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
                 v-model:value="headerRow.name"
                 class="nc-input-hook-header-key"
                 :options="headerList"
-                :placeholder="$t('labels.key')"
+                :placeholder="$t('placeholder.key')"
                 :filter-option="filterOption"
               />
             </a-form-item>
@@ -99,7 +99,7 @@ const filterOption = (input: string, option: Option) => option.value.toUpperCase
             <a-form-item class="form-item">
               <a-input
                 v-model:value="headerRow.value"
-                :placeholder="$t('labels.value')"
+                :placeholder="$t('placeholder.value')"
                 class="!rounded-md nc-input-hook-header-value"
               />
             </a-form-item>
diff --git a/packages/nc-gui/components/api-client/Params.vue b/packages/nc-gui/components/api-client/Params.vue
index 61aa3f1f2c..66a2e79336 100644
--- a/packages/nc-gui/components/api-client/Params.vue
+++ b/packages/nc-gui/components/api-client/Params.vue
@@ -24,11 +24,11 @@ const deleteParamRow = (i: number) => {
       <thead class="h-8">
         <tr>
           <th>
-            <div class="text-left font-normal ml-2">Parameter Name</div>
+            <div class="text-left font-normal ml-2">{{ $t('title.parameterName') }}</div>
           </th>
 
           <th>
-            <div class="text-left font-normal ml-2">Value</div>
+            <div class="text-left font-normal ml-2">{{ $t('placeholder.value') }}</div>
           </th>
 
           <th class="w-8">
@@ -41,13 +41,13 @@ const deleteParamRow = (i: number) => {
         <tr v-for="(paramRow, idx) in vModel" :key="idx" class="!h-2 overflow-hidden">
           <td class="px-2">
             <a-form-item class="form-item">
-              <a-input v-model:value="paramRow.name" placeholder="Key" class="!rounded-lg" />
+              <a-input v-model:value="paramRow.name" :placeholder="$t('placeholder.key')" class="!rounded-lg" />
             </a-form-item>
           </td>
 
           <td class="px-2">
             <a-form-item class="form-item">
-              <a-input v-model:value="paramRow.value" placeholder="Value" class="!rounded-lg" />
+              <a-input v-model:value="paramRow.value" :placeholder="$t('placeholder.value')" class="!rounded-lg" />
             </a-form-item>
           </td>
 
@@ -69,7 +69,7 @@ const deleteParamRow = (i: number) => {
           <td :colspan="12" class="">
             <NcButton size="small" type="secondary" @click="addParamRow">
               <div class="flex flex-row items-center gap-x-1">
-                <div>Add Parameter</div>
+                <div>{{ $t('activity.addParameter') }}</div>
                 <component :is="iconMap.plus" class="flex mx-auto" />
               </div>
             </NcButton>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 61f47aaf92..fd708e6bb1 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -268,6 +268,7 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "parameterName": "Parameter Name",
     "currencyLocale": "Currency Locale",
     "currencyCode": "Currency Code",
     "searchMembers": "Search Members",
@@ -368,12 +369,14 @@
     }
   },
   "labels": {
+    "headerName": "Header Name",
     "icon": "Icon",
     "max": "Max",
     "binaryEncodingFormat": "Binary encoding format",
     "syntax": "Syntax",
     "examples": "Examples",
     "durationInfo": "A duration of time in minutes or seconds (e.g. 1:23).",
+    "addHeader": "Add Header",
     "enterDefaultUrlOptional": "Enter default URL (Optional)",
     "negative": "Negative",
     "default": "Default",
@@ -561,6 +564,7 @@
     "addFiles": "Add File(s)",
     "hideInUI": "Hide in UI",
     "addBase": "Add Base",
+    "addParameter": "Add Parameter",
     "editBase": "Edit Base",
     "enterText": "Enter text",
     "okEditBase": "Ok & Edit Base",
@@ -807,7 +811,9 @@
     "decimal5": "1.00000",
     "decimal6": "1.000000",
     "decimal7": "1.0000000",
-    "decimal8": "1.00000000"
+    "decimal8": "1.00000000",
+    "value": "Value",
+    "key": "Key"
   },
   "msg": {
     "optimizedQueryDisabled": "Optimized query is disabled",

From 4682fc93608d42f4e25ad1d56f8f79f67da1d138 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 16:26:21 +0530
Subject: [PATCH 30/36] fix: i18n for webhook editor

---
 packages/nc-gui/components/webhook/Editor.vue | 107 +++++++++---------
 packages/nc-gui/lang/en.json                  |  25 ++++
 2 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 1de3554b32..7c4ff4b45d 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -94,22 +94,22 @@ const formInput = ref({
   'Email': [
     {
       key: 'to',
-      label: 'To Address',
-      placeholder: 'To Address',
+      label: t('labels.toAddress'),
+      placeholder: t('labels.toAddress'),
       type: 'SingleLineText',
       required: true,
     },
     {
       key: 'subject',
-      label: 'Subject',
-      placeholder: 'Subject',
+      label: t('labels.subject'),
+      placeholder: t('labels.subject'),
       type: 'SingleLineText',
       required: true,
     },
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
@@ -117,8 +117,8 @@ const formInput = ref({
   'Slack': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
@@ -126,8 +126,8 @@ const formInput = ref({
   'Microsoft Teams': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
@@ -135,8 +135,8 @@ const formInput = ref({
   'Discord': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
@@ -144,8 +144,8 @@ const formInput = ref({
   'Mattermost': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
@@ -153,15 +153,15 @@ const formInput = ref({
   'Twilio': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
     {
       key: 'to',
-      label: 'Comma separated Mobile #',
-      placeholder: 'Comma separated Mobile #',
+      label: t('labels.commaSeparatedMobileNumber'),
+      placeholder: t('labels.commaSeparatedMobileNumber'),
       type: 'LongText',
       required: true,
     },
@@ -169,15 +169,15 @@ const formInput = ref({
   'Whatsapp Twilio': [
     {
       key: 'body',
-      label: 'Body',
-      placeholder: 'Body',
+      label: t('labels.body'),
+      placeholder: t('labels.body'),
       type: 'LongText',
       required: true,
     },
     {
       key: 'to',
-      label: 'Comma separated Mobile #',
-      placeholder: 'Comma separated Mobile #',
+      label: t('labels.commaSeparatedMobileNumber'),
+      placeholder: t('labels.commaSeparatedMobileNumber'),
       type: 'LongText',
       required: true,
     },
@@ -196,26 +196,26 @@ const showLogs = computed(
 )
 
 const eventList = ref<Record<string, any>[]>([
-  { text: ['After', 'Insert'], value: ['after', 'insert'] },
-  { text: ['After', 'Update'], value: ['after', 'update'] },
-  { text: ['After', 'Delete'], value: ['after', 'delete'] },
-  { text: ['After', 'Bulk Insert'], value: ['after', 'bulkInsert'] },
-  { text: ['After', 'Bulk Update'], value: ['after', 'bulkUpdate'] },
-  { text: ['After', 'Bulk Delete'], value: ['after', 'bulkDelete'] },
+  { text: [t('general.after'), t('general.insert')], value: ['after', 'insert'] },
+  { text: [t('general.after'), t('general.update')], value: ['after', 'update'] },
+  { text: [t('general.after'), t('general.delete')], value: ['after', 'delete'] },
+  { text: [t('general.after'), t('general.bulkInsert')], value: ['after', 'bulkInsert'] },
+  { text: [t('general.after'), t('general.bulkUpdate')], value: ['after', 'bulkUpdate'] },
+  { text: [t('general.after'), t('general.bulkDelete')], value: ['after', 'bulkDelete'] },
 ])
 
 const notificationList = computed(() => {
   return isEeUI
-    ? [{ type: 'URL' }]
+    ? [{ type: 'URL', text: t('datatype.URL') }]
     : [
-        { type: 'URL' },
-        { type: 'Email' },
-        { type: 'Slack' },
-        { type: 'Microsoft Teams' },
-        { type: 'Discord' },
-        { type: 'Mattermost' },
-        { type: 'Twilio' },
-        { type: 'Whatsapp Twilio' },
+        { type: 'URL', text: t('datatype.URL') },
+        { type: 'Email', text: t('datatype.Email') },
+        { type: 'Slack', text: t('general.slack') },
+        { type: 'Microsoft Teams', text: t('general.microsoftTeams') },
+        { type: 'Discord', text: t('general.discord') },
+        { type: 'Mattermost', text: t('general.matterMost') },
+        { type: 'Twilio', text: t('general.twilio') },
+        { type: 'Whatsapp Twilio', text: t('general.whatsappTwilio') },
       ]
 })
 
@@ -524,7 +524,7 @@ onMounted(async () => {
             ref="titleDomRef"
             v-model="hookRef.title"
             class="flex flex-grow text-lg font-medium capitalize outline-none bg-inherit nc-text-field-hook-title"
-            placeholder="Webhook Title"
+            :placeholder="$t('placeholder.webhookTitle')"
             :contenteditable="true"
             @blur="isRenaming = false"
             @focus="isRenaming = true"
@@ -535,7 +535,7 @@ onMounted(async () => {
     </div>
     <div class="flex flex-row gap-2">
       <NcButton class="nc-btn-webhook-test" type="secondary" size="small" @click="testWebhook">
-        <div class="flex items-center px-1">Test Webhook</div>
+        <div class="flex items-center px-1">{{ $t('activity.testWebhook') }}</div>
       </NcButton>
 
       <NcButton
@@ -546,7 +546,7 @@ onMounted(async () => {
         :disabled="!isValid"
         @click.prevent="saveHooks"
       >
-        <template #loading> Saving </template>
+        <template #loading> {{ $t('general.saving') }} </template>
         <div class="flex items-center px-1">{{ $t('general.save') }}</div>
       </NcButton>
     </div>
@@ -562,7 +562,7 @@ onMounted(async () => {
     >
       <a-form :model="hookRef" name="create-or-edit-webhook">
         <a-form-item>
-          <div class="form-field-header">Event</div>
+          <div class="form-field-header">{{ $t('general.event') }}</div>
           <a-row type="flex" :gutter="[16, 16]">
             <a-col :span="12">
               <a-form-item v-bind="validateInfos.eventOperation">
@@ -608,7 +608,7 @@ onMounted(async () => {
 
                       <MdiCellphoneMessage v-if="notificationOption.type === 'Twilio'" class="mr-2" />
 
-                      {{ notificationOption.type }}
+                      {{ notificationOption.text }}
                     </div>
                   </a-select-option>
                 </NcSelect>
@@ -654,11 +654,11 @@ onMounted(async () => {
                   />
                 </a-tab-pane>
 
-                <a-tab-pane key="params" tab="Parameters" force-render>
+                <a-tab-pane key="params" :tab="$t('title.parameter')" force-render>
                   <LazyApiClientParams v-model="hookRef.notification.payload.parameters" class="p-4" />
                 </a-tab-pane>
 
-                <a-tab-pane key="headers" tab="Headers" class="nc-tab-headers">
+                <a-tab-pane key="headers" :tab="$t('title.headers')" class="nc-tab-headers">
                   <LazyApiClientHeaders v-model="hookRef.notification.payload.headers" class="!p-4" />
                 </a-tab-pane>
 
@@ -682,7 +682,7 @@ onMounted(async () => {
                   v-model="hookRef.notification.payload.channels"
                   :selected-channel-list="hookRef.notification.payload.channels"
                   :available-channel-list="slackChannels"
-                  placeholder="Select Slack channels"
+                  :placeholder="$t('placeholder.selectSlackChannels')"
                 />
               </a-form-item>
             </a-col>
@@ -695,7 +695,7 @@ onMounted(async () => {
                   v-model="hookRef.notification.payload.channels"
                   :selected-channel-list="hookRef.notification.payload.channels"
                   :available-channel-list="teamsChannels"
-                  placeholder="Select Microsoft Teams channels"
+                  :placeholder="$t('placeholder.selectTeamsChannels')"
                 />
               </a-form-item>
             </a-col>
@@ -708,7 +708,7 @@ onMounted(async () => {
                   v-model="hookRef.notification.payload.channels"
                   :selected-channel-list="hookRef.notification.payload.channels"
                   :available-channel-list="discordChannels"
-                  placeholder="Select Discord channels"
+                  :placeholder="$t('placeholder.selectDiscordChannels')"
                 />
               </a-form-item>
             </a-col>
@@ -721,7 +721,7 @@ onMounted(async () => {
                   v-model="hookRef.notification.payload.channels"
                   :selected-channel-list="hookRef.notification.payload.channels"
                   :available-channel-list="mattermostChannels"
-                  placeholder="Select Mattermost channels"
+                  :placeholder="$t('placeholder.selectMattermostChannels')"
                 />
               </a-form-item>
             </a-col>
@@ -747,7 +747,7 @@ onMounted(async () => {
                   class="nc-check-box-hook-condition"
                   @update:checked="hookRef.condition = $event"
                 >
-                  On Condition
+                  {{ $t('activity.onCondition') }}
                 </a-checkbox>
 
                 <LazySmartsheetToolbarColumnFilter
@@ -767,11 +767,16 @@ onMounted(async () => {
             <a-col :span="24">
               <div v-if="isBodyShown" class="text-gray-600">
                 <div class="flex items-center">
-                  <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
+                  <em
+                    >{{ $t('msg.webhookBodyMsg1') }} <strong>{{ $t('msg.webhookBodyMsg2') }}</strong>
+                    {{ $t('msg.webhookBodyMsg3') }}</em
+                  >
 
                   <a-tooltip bottom>
                     <template #title>
-                      <span> <strong>data</strong> : Row data <br /> </span>
+                      <span>
+                        <strong>{{ $t('general.data') }}</strong> : {{ $t('title.rowData') }} <br />
+                      </span>
                     </template>
                     <component :is="iconMap.info" class="ml-2" />
                   </a-tooltip>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index fd708e6bb1..3390297020 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -66,6 +66,12 @@
     "escape": "Escape",
     "hex": "Hex",
     "clear": "Clear",
+    "slack": "Slack",
+    "microsoftTeams": "Microsoft Teams",
+    "discord": "Discord",
+    "matterMost": "Mattermost",
+    "twilio": "Twilio",
+    "whatsappTwilio": "WhatsApp Twilio",
     "submit": "Submit",
     "create": "Create",
     "details": "Details",
@@ -76,6 +82,9 @@
     "action": "Action",
     "insert": "Insert",
     "delete": "Delete",
+    "bulkInsert": "Bulk Insert",
+    "bulkDelete": "Bulk Delete",
+    "bulkUpdate": "Bulk Update",
     "deleting": "Deleting",
     "update": "Update",
     "rename": "Rename",
@@ -268,6 +277,8 @@
     "isNotNull": "is not null"
   },
   "title": {
+    "parameter": "Parameter",
+    "headers": "Headers",
     "parameterName": "Parameter Name",
     "currencyLocale": "Currency Locale",
     "currencyCode": "Currency Code",
@@ -275,6 +286,7 @@
     "noMembersFound": "No members found",
     "dateJoined": "Date Joined",
     "tokenName": "Token name",
+    "rowData": "Row data",
     "creator": "Creator",
     "qrCode": "QR Code",
     "updateSelectedRows": "Update Selected Rows",
@@ -369,6 +381,10 @@
     }
   },
   "labels": {
+    "toAddress": "To Address",
+    "subject": "Subject",
+    "body": "Body",
+    "commaSeparatedMobileNumber": "Comma separated Mobile #",
     "headerName": "Header Name",
     "icon": "Icon",
     "max": "Max",
@@ -557,6 +573,7 @@
     "zoomInToViewColumns": "Zoom in to view columns"
   },
   "activity": {
+    "onCondition": "On Condition",
     "bulkDownload": "Bulk Download",
     "attachFile": "Attach File",
     "viewAttachment": "View Attachments",
@@ -776,6 +793,11 @@
     "clientCA": "Select CA file"
   },
   "placeholder": {
+    "selectSlackChannels": "Select Slack channels",
+    "selectTeamsChannels": "Select Microsoft Teams channels",
+    "selectDiscordChannels": "Select Discord channels",
+    "selectMattermostChannels": "Select Mattermost channels",
+    "webhookTitle": "Webhook Title",
     "barcodeColumn": "Select a column for the Barcode value",
     "notFoundContent": "No valid Column Type can be found.",
     "selectBarcodeFormat": "Select a Barcode format",
@@ -824,6 +846,9 @@
     "invalidPhoneNumber": "Invalid phone number",
     "pageSizeChanged": "Page size changed",
     "errorLoadingData": "Error loading data",
+    "webhookBodyMsg1": "Use context variable",
+    "webhookBodyMsg2": "body",
+    "webhookBodyMsg3": "to refer the record under consideration",
     "formula": {
       "hintStart": "Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out",
       "hintEnd": "Formulas.",

From 76b211007f3a5ac94c745492f296ae516d871bee Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 16:40:00 +0530
Subject: [PATCH 31/36] fix: i18n for Form View

---
 packages/nc-gui/components/smartsheet/Form.vue | 18 ++++++++++++------
 packages/nc-gui/lang/en.json                   |  7 +++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 6b33c990b7..84d5806d4d 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -389,8 +389,10 @@ watch(view, (nextView) => {
 <template>
   <template v-if="isMobileMode">
     <div class="pl-6 pr-[120px] py-6 bg-white flex-col justify-start items-start gap-2.5 inline-flex">
-      <div class="text-gray-500 text-5xl font-semibold leading-16">Available<br />in Desktop</div>
-      <div class="text-gray-500 text-base font-medium leading-normal">Form View is currently not supported on mobile.</div>
+      <div class="text-gray-500 text-5xl font-semibold leading-16">
+        {{ $t('general.available') }}<br />{{ $t('title.inDesktop') }}
+      </div>
+      <div class="text-gray-500 text-base font-medium leading-normal">{{ $t('msg.formViewNotSupportedOnMobile') }}</div>
     </div>
   </template>
   <template v-else>
@@ -399,16 +401,20 @@ watch(view, (nextView) => {
         <div v-if="formViewData" class="items-center justify-center text-center mt-2">
           <a-alert type="success">
             <template #message>
-              <div class="text-center">{{ formViewData.success_msg || 'Successfully submitted form data' }}</div>
+              <div class="text-center">{{ formViewData.success_msg || $t('msg.successfullySubmittedFormData') }}</div>
             </template>
           </a-alert>
 
           <div v-if="formViewData.show_blank_form" class="text-gray-400 mt-4">
-            New form will be loaded after {{ secondsRemain }} seconds
+            {{
+              $t('msg.newFormWillBeLoaded', {
+                seconds: secondsRemain,
+              })
+            }}
           </div>
 
           <div v-if="formViewData.submit_another_form || !isPublic" class="text-center mt-4">
-            <a-button type="primary" size="large" @click="submitted = false"> Submit Another Form</a-button>
+            <a-button type="primary" size="large" @click="submitted = false"> {{ $t('activity.submitAnotherForm') }}</a-button>
           </div>
         </div>
       </a-col>
@@ -773,7 +779,7 @@ watch(view, (nextView) => {
                     v-if="!localColumns.length"
                     class="mt-4 border-dashed border-2 border-gray-400 py-3 text-gray-400 text-center"
                   >
-                    Drag and drop fields here to add
+                    {{ $t('activity.dragAndDropFieldsHereToAdd') }}
                   </div>
                 </template>
               </Draggable>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3390297020..2b35639653 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -59,6 +59,7 @@
     "empty": "Empty",
     "changeIcon": "Change Icon",
     "save": "Save",
+    "available": "Available",
     "abort": "Abort",
     "saving": "Saving",
     "cancel": "Cancel",
@@ -286,6 +287,7 @@
     "noMembersFound": "No members found",
     "dateJoined": "Date Joined",
     "tokenName": "Token name",
+    "inDesktop": "in Desktop",
     "rowData": "Row data",
     "creator": "Creator",
     "qrCode": "QR Code",
@@ -582,6 +584,8 @@
     "hideInUI": "Hide in UI",
     "addBase": "Add Base",
     "addParameter": "Add Parameter",
+    "submitAnotherForm": "Submit Another Form",
+    "dragAndDropFieldsHereToAdd": "Drag and drop fields here to add",
     "editBase": "Edit Base",
     "enterText": "Enter text",
     "okEditBase": "Ok & Edit Base",
@@ -838,6 +842,9 @@
     "key": "Key"
   },
   "msg": {
+    "successfullySubmittedFormData": "Successfully submitted form data",
+    "formViewNotSupportedOnMobile": "Form view is not supported on mobile",
+    "newFormWillBeLoaded": "New form will be loaded after {seconds} seconds",
     "optimizedQueryDisabled": "Optimized query is disabled",
     "optimizedQueryEnabled": "Optimized query is enabled",
     "invalidTime": "Invalid Time",

From 7fc45b1bf122ab2aa587f11e1d950eca1f66bb2c Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 16:53:17 +0530
Subject: [PATCH 32/36] fix: i18n for Shared Form View

---
 packages/nc-gui/components/shared-view/AskPassword.vue | 10 +++++-----
 packages/nc-gui/lang/en.json                           |  3 +++
 .../nc-gui/pages/index/[typeOrId]/form/[viewId].vue    |  2 +-
 .../index/[typeOrId]/form/[viewId]/index/index.vue     |  8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components/shared-view/AskPassword.vue b/packages/nc-gui/components/shared-view/AskPassword.vue
index e695823186..12a0546ac2 100644
--- a/packages/nc-gui/components/shared-view/AskPassword.vue
+++ b/packages/nc-gui/components/shared-view/AskPassword.vue
@@ -35,27 +35,27 @@ const focus: VNodeRef = (el: typeof InputPassword) => el?.$el?.querySelector('in
     <template #header>
       <div class="flex flex-row items-center gap-x-2">
         <GeneralIcon icon="key" />
-        This shared view is protected
+        {{ $t('msg.thisSharedViewIsProtected') }}
       </div>
     </template>
 
     <div class="mt-2">
       <a-form ref="formRef" :model="formState" name="create-new-table-form" @finish="onFinish">
-        <a-form-item name="password" :rules="[{ required: true, message: 'Password is required' }]">
+        <a-form-item name="password" :rules="[{ required: true, message: $t('msg.error.signUpRules.passwdRequired') }]">
           <a-input-password
             ref="focus"
             v-model:value="formState.password"
             class="nc-input-md"
             hide-details
             size="large"
-            placeholder="Enter password"
+            :placeholder="$t('msg.info.signUp.enterPassword')"
           />
         </a-form-item>
       </a-form>
       <div class="flex flex-row justify-end gap-x-2 mt-6">
         <NcButton type="primary" html-type="submit" @click="onFinish"
-          >Unlock
-          <template #loading> Verifying Password </template>
+          >{{ $t('general.unlock') }}
+          <template #loading> {{ $t('msg.verifyingPassword') }}</template>
         </NcButton>
       </div>
     </div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 2b35639653..85c5eff418 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -99,6 +99,7 @@
     "deprecated": "Deprecated",
     "showAll": "Show all",
     "hideAll": "Hide all",
+    "notFound": "Not found",
     "showMore": "Show more",
     "showOptions": "Show options",
     "hideOptions": "Hide options",
@@ -842,6 +843,8 @@
     "key": "Key"
   },
   "msg": {
+    "verifyingPassword": "Verifying Password",
+    "thisSharedViewIsProtected": "This shared view is protected",
     "successfullySubmittedFormData": "Successfully submitted form data",
     "formViewNotSupportedOnMobile": "Form view is not supported on mobile",
     "newFormWillBeLoaded": "New form will be loaded after {seconds} seconds",
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 7645e223f6..e8f7266f36 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -75,7 +75,7 @@ watch(
     >
       <div class="w-full flex flex-col gap-4">
         <!-- todo: i18n -->
-        <h2 class="text-xl font-semibold">This shared view is protected</h2>
+        <h2 class="text-xl font-semibold">{{ $t('msg.thisSharedViewIsProtected') }}</h2>
 
         <a-form layout="vertical" no-style :model="form" @finish="loadSharedView">
           <a-form-item name="password" :rules="[{ required: true, message: $t('msg.error.signUpRules.passwdRequired') }]">
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
index d39f91d0e6..36a44c5e3e 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue
@@ -87,7 +87,7 @@ const onDecode = async (scannedCodeValue: string) => {
           {{ sharedFormView.subheading }}
         </h2>
 
-        <a-alert v-if="notFound" type="warning" class="my-4 text-center" message="Not found" />
+        <a-alert v-if="notFound" type="warning" class="my-4 text-center" :message="$t('general.notFound')" />
 
         <template v-else-if="submitted">
           <div class="flex justify-center">
@@ -96,15 +96,15 @@ const onDecode = async (scannedCodeValue: string) => {
                 type="success"
                 class="my-4 text-center"
                 outlined
-                :message="sharedFormView.success_msg || 'Successfully submitted form data'"
+                :message="sharedFormView.success_msg || $t('msg.successfullySubmittedFormData')"
               />
 
               <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('msg.newFormWillBeLoaded', { seconds: secondsRemain }) }}
               </p>
 
               <div v-if="sharedFormView.submit_another_form" class="text-center">
-                <a-button type="primary" @click="submitted = false"> Submit Another Form</a-button>
+                <a-button type="primary" @click="submitted = false"> {{ $t('activity.submitAnotherForm') }}</a-button>
               </div>
             </div>
           </div>

From 5a15c5d3053faa8f99c6e229219a345feaa708c0 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 16:59:05 +0530
Subject: [PATCH 33/36] fix: i18n for Signup page

---
 packages/nc-gui/lang/en.json               | 3 +++
 packages/nc-gui/pages/signup/[[token]].vue | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 85c5eff418..0ef1f4d8a1 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -292,6 +292,7 @@
     "rowData": "Row data",
     "creator": "Creator",
     "qrCode": "QR Code",
+    "termsOfService": "Terms of Service",
     "updateSelectedRows": "Update Selected Rows",
     "noFiltersAdded": "No filters added",
     "editCards": "Edit Cards",
@@ -843,6 +844,8 @@
     "key": "Key"
   },
   "msg": {
+    "bySigningUp": "By signing up, you agree to the",
+    "subscribeToOurWeeklyNewsletter": "Subscribe to our weekly newsletter",
     "verifyingPassword": "Verifying Password",
     "thisSharedViewIsProtected": "This shared view is protected",
     "successfullySubmittedFormData": "Successfully submitted form data",
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index 86e90f71ac..9895643bca 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -214,7 +214,7 @@ onMounted(async () => {
                 size="small"
                 class="my-1 hover:(ring ring-accent ring-opacity-100) focus:(!ring !ring-accent ring-opacity-100)"
               />
-              <div class="prose-xs text-gray-500">Subscribe to our weekly newsletter</div>
+              <div class="prose-xs text-gray-500">{{ $t('msg.subscribeToOurWeeklyNewsletter') }}</div>
             </div>
 
             <div class="text-end prose-sm">
@@ -227,8 +227,10 @@ onMounted(async () => {
       </div>
 
       <div class="prose-sm mt-4 text-gray-500">
-        By signing up, you agree to the
-        <a class="prose-sm !text-gray-500 underline" target="_blank" href="https://nocodb.com/policy-nocodb">Terms of Service</a>
+        {{ $t('msg.bySigningUp') }}
+        <a class="prose-sm !text-gray-500 underline" target="_blank" href="https://nocodb.com/policy-nocodb">
+          {{ $t('title.termsOfService') }}</a
+        >
       </div>
     </div>
   </NuxtLayout>

From 5fe0252af8a7e1d0e00b1823c9f91a392db4bacb Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 17:04:46 +0530
Subject: [PATCH 34/36] fix: i18n for Filter modal

---
 .../nc-gui/components/smartsheet/toolbar/ColumnFilter.vue   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 73bff974b0..ca50d2eddb 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -43,9 +43,11 @@ const { nestedLevel, parentId, autoSave, hookId, modelValue, showLoading, webHoo
 
 const nested = computed(() => nestedLevel.value > 0)
 
+const { t } = useI18n()
+
 const logicalOps = [
-  { value: 'and', text: 'AND' },
-  { value: 'or', text: 'OR' },
+  { value: 'and', text: t('general.and') },
+  { value: 'or', text: t('general.or') },
 ]
 
 const meta = inject(MetaInj, ref())

From 6ef8ff1906bc17d1d205037a62f3980c69540c4b Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 19:24:05 +0530
Subject: [PATCH 35/36] fix: i18n Fix for formula options

---
 .../components/smartsheet/column/FormulaOptions.vue  | 12 +++++++++---
 packages/nc-gui/lang/en.json                         |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
index 3321041356..cd13e92ce1 100644
--- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue
@@ -30,12 +30,12 @@ const emit = defineEmits(['update:value'])
 
 const uiTypesNotSupportedInFormulas = [UITypes.QrCode, UITypes.Barcode]
 
-const { t } = useI18n()
-
 const vModel = useVModel(props, 'value', emit)
 
 const { formState, setAdditionalValidations, validateInfos, sqlUi, column } = useColumnCreateStoreOrThrow()
 
+const { t } = useI18n()
+
 const { loadMagic, predictFunction: _predictFunction } = useNocoEe()
 
 enum JSEPNode {
@@ -741,7 +741,13 @@ const predictFunction = async () => {
     </a-form-item>
 
     <div class="text-gray-600 mt-2 mb-4 prose-sm">
-      {{ $t('msg.formula.hintStart') }}
+      {{
+        // As using {} in translation will be treated as placeholder, and this translation contain {} as part of th text
+        $t('msg.formula.hintStart', {
+          placeholder1: '{}',
+          placeholder2: '{column_name}',
+        })
+      }}
       <a class="prose-sm" href="https://docs.nocodb.com/setup-and-usages/formulas#available-formula-features" target="_blank">
         {{ $t('msg.formula.hintEnd') }}
       </a>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0ef1f4d8a1..0be3202f92 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -863,7 +863,7 @@
     "webhookBodyMsg2": "body",
     "webhookBodyMsg3": "to refer the record under consideration",
     "formula": {
-      "hintStart": "Hint: Use {} to reference columns, e.g: {column_name}. For more, please check out",
+      "hintStart": "Hint: Use {placeholder1} to reference columns, e.g: {placeholder2}. For more, please check out",
       "hintEnd": "Formulas.",
       "noSuggestedFormulaFound": "No suggested formula found",
       "numericTypeIsExpected": "Numeric type is expected",

From 1452afb7f4dfded6c97f83e252b2aa847b1ceeef Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 19:32:39 +0530
Subject: [PATCH 36/36] fix: Fixed shared view password localisation

---
 packages/nc-gui/components/shared-view/AskPassword.vue   | 2 +-
 packages/nc-gui/lang/en.json                             | 1 +
 packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/shared-view/AskPassword.vue b/packages/nc-gui/components/shared-view/AskPassword.vue
index 12a0546ac2..5c3abcfedf 100644
--- a/packages/nc-gui/components/shared-view/AskPassword.vue
+++ b/packages/nc-gui/components/shared-view/AskPassword.vue
@@ -48,7 +48,7 @@ const focus: VNodeRef = (el: typeof InputPassword) => el?.$el?.querySelector('in
             class="nc-input-md"
             hide-details
             size="large"
-            :placeholder="$t('msg.info.signUp.enterPassword')"
+            :placeholder="$t('msg.enterPassword')"
           />
         </a-form-item>
       </a-form>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 0be3202f92..da08db0f31 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -844,6 +844,7 @@
     "key": "Key"
   },
   "msg": {
+    "enterPassword":"Enter password",
     "bySigningUp": "By signing up, you agree to the",
     "subscribeToOurWeeklyNewsletter": "Subscribe to our weekly newsletter",
     "verifyingPassword": "Verifying Password",
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index e8f7266f36..671ef10b11 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -79,7 +79,7 @@ watch(
 
         <a-form layout="vertical" no-style :model="form" @finish="loadSharedView">
           <a-form-item name="password" :rules="[{ required: true, message: $t('msg.error.signUpRules.passwdRequired') }]">
-            <a-input-password v-model:value="form.password" size="large" :placeholder="$t('msg.info.signUp.enterPassword')" />
+            <a-input-password v-model:value="form.password" size="large" :placeholder="$t('msg.enterPassword')" />
           </a-form-item>
 
           <Transition name="layout">