From 0ccbe5882cb1f15e84874a9f668be1edec717ff7 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:51:55 +0530
Subject: [PATCH 01/27] chore: Improvement is keyboard shortcuts (#10925)

---
 .../widgets/WootWriter/ReplyBottomPanel.vue   |   2 +-
 .../widgets/modal/WootKeyShortcutModal.vue    | 111 ++++++------------
 .../components/widgets/modal/constants.js     | 101 ++++++++--------
 .../dashboard/i18n/locale/en/settings.json    |   5 -
 4 files changed, 91 insertions(+), 128 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 5d516e111..9c04232e2 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -127,7 +127,7 @@ export default {
     const uploadRef = ref(false);
 
     const keyboardEvents = {
-      'Alt+KeyA': {
+      '$mod+Alt+KeyA': {
         action: () => {
           // TODO: This is really hacky, we need to replace the file picker component with
           // a custom one, where the logic and the component markup is isolated.
diff --git a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
index b982d96d0..04cd100ef 100644
--- a/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/WootKeyShortcutModal.vue
@@ -1,41 +1,34 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useDetectKeyboardLayout } from 'dashboard/composables/useDetectKeyboardLayout';
-import { SHORTCUT_KEYS } from './constants';
+import { SHORTCUT_KEYS, KEYS } from './constants';
 import {
   LAYOUT_QWERTZ,
   keysToModifyInQWERTZ,
 } from 'shared/helpers/KeyboardHelpers';
 import Hotkey from 'dashboard/components/base/Hotkey.vue';
 
-defineProps({
-  show: {
-    type: Boolean,
-    default: false,
-  },
-});
-
+defineProps({ show: Boolean });
 defineEmits(['close']);
 
 const { t } = useI18n();
-
-const shortcutKeys = SHORTCUT_KEYS;
 const currentLayout = ref(null);
 
-const title = item => t(`KEYBOARD_SHORTCUTS.TITLE.${item.label}`);
+const title = computed(
+  () => item => t(`KEYBOARD_SHORTCUTS.TITLE.${item.label}`)
+);
 
 // Added this function to check if the keySet needs a shift key
 // This is used to display the shift key in the modal
 // If the current layout is QWERTZ and the keySet contains a key that needs a shift key
 // If layout is QWERTZ then we add the Shift+keysToModify to fix an known issue
 // https://github.com/chatwoot/chatwoot/issues/9492
-const needsShiftKey = keySet => {
-  return (
+const needsShiftKey = computed(
+  () => keySet =>
     currentLayout.value === LAYOUT_QWERTZ &&
     keySet.some(key => keysToModifyInQWERTZ.has(key))
-  );
-};
+);
 
 onMounted(async () => {
   currentLayout.value = await useDetectKeyboardLayout();
@@ -55,80 +48,46 @@ onMounted(async () => {
           </h5>
           <div class="flex items-center gap-2 mb-1 ml-2">
             <Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
-              {{ $t('KEYBOARD_SHORTCUTS.KEYS.WINDOWS_KEY_AND_COMMAND_KEY') }}
+              {{ KEYS.WIN }}
             </Hotkey>
             <Hotkey custom-class="min-h-[28px] min-w-[36px] key">
-              {{ $t('KEYBOARD_SHORTCUTS.KEYS.FORWARD_SLASH_KEY') }}
+              {{ KEYS.SLASH }}
             </Hotkey>
           </div>
         </div>
       </div>
 
       <div class="grid grid-cols-2 px-8 pt-0 pb-8 gap-x-5 gap-y-3">
-        <div class="flex justify-between items-center min-w-[25rem]">
-          <h5 class="text-sm text-slate-800 dark:text-slate-100">
-            {{ $t('KEYBOARD_SHORTCUTS.TITLE.OPEN_CONVERSATION') }}
-          </h5>
-          <div class="flex items-center gap-2 mb-1 ml-2">
-            <div class="flex gap-2">
-              <Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
-                {{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
-              </Hotkey>
-              <Hotkey custom-class="min-h-[28px] w-9 key"> {{ 'J' }} </Hotkey>
-              <span
-                class="flex items-center text-sm font-semibold text-slate-800 dark:text-slate-100"
-              >
-                {{ $t('KEYBOARD_SHORTCUTS.KEYS.FORWARD_SLASH_KEY') }}
-              </span>
-            </div>
-            <Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
-              {{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
-            </Hotkey>
-            <Hotkey custom-class="w-9 key"> {{ 'K' }} </Hotkey>
-          </div>
-        </div>
-
-        <div class="flex justify-between items-center min-w-[25rem]">
-          <h5 class="text-sm text-slate-800 dark:text-slate-100">
-            {{ $t('KEYBOARD_SHORTCUTS.TITLE.RESOLVE_AND_NEXT') }}
-          </h5>
-          <div class="flex items-center gap-2 mb-1 ml-2">
-            <Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
-              {{ $t('KEYBOARD_SHORTCUTS.KEYS.WINDOWS_KEY_AND_COMMAND_KEY') }}
-            </Hotkey>
-            <Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
-              {{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
-            </Hotkey>
-            <Hotkey custom-class="w-9 key"> {{ 'E' }} </Hotkey>
-          </div>
-        </div>
         <div
-          v-for="shortcutKey in shortcutKeys"
-          :key="shortcutKey.id"
+          v-for="shortcut in SHORTCUT_KEYS"
+          :key="shortcut.id"
           class="flex justify-between items-center min-w-[25rem]"
         >
           <h5 class="text-sm text-slate-800 min-w-[36px] dark:text-slate-100">
-            {{ title(shortcutKey) }}
+            {{ title(shortcut) }}
           </h5>
           <div class="flex items-center gap-2 mb-1 ml-2">
-            <Hotkey
-              v-if="needsShiftKey(shortcutKey.keySet)"
-              custom-class="min-h-[28px] min-w-[36px] key"
-            >
-              {{ 'Shift' }}
-            </Hotkey>
-            <Hotkey
-              :class="{ 'min-w-[60px]': shortcutKey.firstKey !== 'Up' }"
-              custom-class="min-h-[28px] normal-case key"
-            >
-              {{ shortcutKey.firstKey }}
-            </Hotkey>
-            <Hotkey
-              :class="{ 'normal-case': shortcutKey.secondKey === 'Down' }"
-              custom-class="min-h-[28px] min-w-[36px] key"
-            >
-              {{ shortcutKey.secondKey }}
-            </Hotkey>
+            <template v-if="needsShiftKey(shortcut.keySet)">
+              <Hotkey custom-class="min-h-[28px] min-w-[36px] key">
+                {{ KEYS.SHIFT }}
+              </Hotkey>
+            </template>
+
+            <template v-for="(key, index) in shortcut.displayKeys" :key="index">
+              <template v-if="key !== KEYS.SLASH">
+                <Hotkey
+                  custom-class="min-h-[28px] min-w-[36px] key normal-case"
+                >
+                  {{ key }}
+                </Hotkey>
+              </template>
+              <span
+                v-else
+                class="flex items-center text-sm font-semibold text-slate-800 dark:text-slate-100"
+              >
+                {{ key }}
+              </span>
+            </template>
           </div>
         </div>
       </div>
diff --git a/app/javascript/dashboard/components/widgets/modal/constants.js b/app/javascript/dashboard/components/widgets/modal/constants.js
index 7ad2085d0..bfecafb87 100644
--- a/app/javascript/dashboard/components/widgets/modal/constants.js
+++ b/app/javascript/dashboard/components/widgets/modal/constants.js
@@ -1,86 +1,95 @@
+export const KEYS = {
+  ALT: 'Alt / ⌥',
+  WIN: 'Win / ⌘',
+  SHIFT: 'Shift',
+  SLASH: '/',
+  UP: 'Up',
+  DOWN: 'Down',
+};
+
 export const SHORTCUT_KEYS = [
   {
     id: 1,
-    label: 'NAVIGATE_DROPDOWN',
-    firstKey: 'Up',
-    secondKey: 'Down',
-    keySet: ['ArrowUp', 'ArrowDown'],
+    label: 'OPEN_CONVERSATION',
+    displayKeys: [KEYS.ALT, 'J', KEYS.SLASH, KEYS.ALT, 'K'],
+    keySet: ['Alt+KeyJ', 'Alt+KeyK'],
   },
   {
     id: 2,
-    label: 'RESOLVE_CONVERSATION',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'E',
-    keySet: ['Alt+KeyE'],
+    label: 'RESOLVE_AND_NEXT',
+    displayKeys: [KEYS.WIN, KEYS.ALT, 'E'],
+    keySet: ['$mod+Alt+KeyE'],
   },
   {
     id: 3,
-    label: 'GO_TO_CONVERSATION_DASHBOARD',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'C',
-    keySet: ['Alt+KeyC'],
+    label: 'NAVIGATE_DROPDOWN',
+    displayKeys: [KEYS.UP, KEYS.DOWN],
+    keySet: ['ArrowUp', 'ArrowDown'],
   },
   {
     id: 4,
-    label: 'ADD_ATTACHMENT',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'A',
-    keySet: ['Alt+KeyA'],
+    label: 'RESOLVE_CONVERSATION',
+    displayKeys: [KEYS.ALT, 'E'],
+    keySet: ['Alt+KeyE'],
   },
   {
     id: 5,
-    label: 'GO_TO_CONTACTS_DASHBOARD',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'V',
-    keySet: ['Alt+KeyV'],
+    label: 'GO_TO_CONVERSATION_DASHBOARD',
+    displayKeys: [KEYS.ALT, 'C'],
+    keySet: ['Alt+KeyC'],
   },
   {
     id: 6,
-    label: 'TOGGLE_SIDEBAR',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'O',
-    keySet: ['Alt+KeyO'],
+    label: 'ADD_ATTACHMENT',
+    displayKeys: [KEYS.WIN, KEYS.ALT, 'A'],
+    keySet: ['$mod+Alt+KeyA'],
   },
   {
     id: 7,
-    label: 'GO_TO_REPORTS_SIDEBAR',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'R',
-    keySet: ['Alt+KeyR'],
+    label: 'GO_TO_CONTACTS_DASHBOARD',
+    displayKeys: [KEYS.ALT, 'V'],
+    keySet: ['Alt+KeyV'],
   },
   {
     id: 8,
-    label: 'MOVE_TO_NEXT_TAB',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'N',
-    keySet: ['Alt+KeyN'],
+    label: 'TOGGLE_SIDEBAR',
+    displayKeys: [KEYS.ALT, 'O'],
+    keySet: ['Alt+KeyO'],
   },
   {
     id: 9,
-    label: 'GO_TO_SETTINGS',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'S',
-    keySet: ['Alt+KeyS'],
+    label: 'GO_TO_REPORTS_SIDEBAR',
+    displayKeys: [KEYS.ALT, 'R'],
+    keySet: ['Alt+KeyR'],
+  },
+  {
+    id: 10,
+    label: 'MOVE_TO_NEXT_TAB',
+    displayKeys: [KEYS.ALT, 'N'],
+    keySet: ['Alt+KeyN'],
   },
   {
     id: 11,
-    label: 'SWITCH_TO_PRIVATE_NOTE',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'P',
-    keySet: ['Alt+KeyP'],
+    label: 'GO_TO_SETTINGS',
+    displayKeys: [KEYS.ALT, 'S'],
+    keySet: ['Alt+KeyS'],
   },
   {
     id: 12,
-    label: 'SWITCH_TO_REPLY',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'L',
-    keySet: ['Alt+KeyL'],
+    label: 'SWITCH_TO_PRIVATE_NOTE',
+    displayKeys: [KEYS.ALT, 'P'],
+    keySet: ['Alt+KeyP'],
   },
   {
     id: 13,
+    label: 'SWITCH_TO_REPLY',
+    displayKeys: [KEYS.ALT, 'L'],
+    keySet: ['Alt+KeyL'],
+  },
+  {
+    id: 14,
     label: 'TOGGLE_SNOOZE_DROPDOWN',
-    firstKey: 'Alt / ⌥',
-    secondKey: 'M',
+    displayKeys: [KEYS.ALT, 'M'],
     keySet: ['Alt+KeyM'],
   },
 ];
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }

From a9de672932cd81555e2e8ff9f21fd530530b1cf1 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 26 Feb 2025 16:35:47 -0800
Subject: [PATCH 02/27] chore: Fix issue with new conversation editor (#10985)

https://github.com/chatwoot/chatwoot/pull/10888 introduced a bug in the
conversation editor since we were using the templates , email and phone
number payloads in contactable inboxes . temporary fix for this, we need
to rework this fix.
---
 app/views/api/v1/models/_inbox_slim.json.jbuilder | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/views/api/v1/models/_inbox_slim.json.jbuilder b/app/views/api/v1/models/_inbox_slim.json.jbuilder
index 0b2670c0b..67bc7e843 100644
--- a/app/views/api/v1/models/_inbox_slim.json.jbuilder
+++ b/app/views/api/v1/models/_inbox_slim.json.jbuilder
@@ -4,4 +4,10 @@ json.channel_id resource.channel_id
 json.name resource.name
 json.channel_type resource.channel_type
 json.provider resource.channel.try(:provider)
+
+# Fix me: this is for the new conversation modal to work,
+# Potentially refactor this later.
 json.email resource.channel.try(:email) if resource.email?
+json.phone_number resource.channel.try(:phone_number)
+json.medium resource.channel.try(:medium) if resource.twilio?
+json.message_templates resource.channel.try(:message_templates) if resource.whatsapp?

From 2556de1f38035dfcf4e3182058cd7111a5c12d72 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 27 Feb 2025 12:10:33 +0530
Subject: [PATCH 03/27] feat: Support bigger font size in dashboard (#10974)

# Pull Request Template

## Description

Fixes
https://linear.app/chatwoot/issue/CW-4091/accessibility-improvement-support-bigger-font-size-for-the-dashboard

## Type of change

- [x] New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

### **Loom video**

https://www.loom.com/share/1ab781859fa748a5ad54aacbacd127b4?sid=a7dd9164-a6de-462f-bff7-1b25e9c55b4f

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 app/javascript/dashboard/App.vue              |  10 +-
 .../dashboard/assets/scss/widgets/_base.scss  |   9 +-
 .../Campaigns/CampaignLayout.vue              |   4 +-
 .../LiveChatCampaignDialog.vue                |   2 +-
 .../SMSCampaign/SMSCampaignDialog.vue         |   2 +-
 .../Contacts/ContactsDetailsLayout.vue        |  10 +-
 .../Contacts/ContactsHeader/ContactHeader.vue |   2 +-
 .../ContactsActiveFiltersPreview.vue          |   2 +-
 .../Contacts/ContactsListLayout.vue           |   2 +-
 .../components-next/EmptyStateLayout.vue      |   2 +-
 .../HelpCenter/HelpCenterLayout.vue           |   4 +-
 .../ArticleEditorProperties.vue               |  14 +-
 .../Pages/CategoryPage/CategoryDialog.vue     |   2 +-
 .../Pages/CategoryPage/CategoryForm.vue       |   2 +-
 .../PortalSettingsPage/PortalSettings.vue     |   2 +-
 .../PortalSwitcher/PortalSwitcher.vue         |   2 +-
 .../components/ActionButtons.vue              |   2 +-
 .../components/AttachmentPreviews.vue         |   6 +-
 .../components/ComposeNewConversationForm.vue |   2 +-
 .../components-next/captain/PageLayout.vue    |   4 +-
 .../captain/pageComponents/Paywall.vue        |   2 +-
 .../pagination/PaginationFooter.vue           |   2 +-
 .../phonenumberinput/PhoneNumberInput.vue     |   2 +-
 .../components-next/sidebar/Sidebar.vue       |   2 +-
 .../sidebar/SidebarGroupLeaf.vue              |   2 +-
 .../components-next/switch/Switch.vue         |   2 +-
 .../dashboard/components/SettingsSection.vue  |  49 ++---
 .../dashboard/components/ui/PreviewCard.vue   |   9 +-
 .../dashboard/components/ui/Switch.vue        |   8 +-
 .../dashboard/components/ui/Tabs/Tabs.vue     |  39 ++--
 .../dashboard/components/ui/Wizard.vue        |  10 +-
 .../widgets/AutomationActionInput.vue         |   4 +-
 .../components/widgets/FilterInput/Index.vue  |   2 +-
 .../components/widgets/SettingIntroBanner.vue |   2 +-
 .../widgets/WootWriter/ReplyTopPanel.vue      |   2 +-
 .../widgets/conversation/ConversationCard.vue |   2 +-
 .../conversation/ConversationSidebar.vue      |   2 +-
 .../conversation/linear/CreateIssue.vue       |   6 +-
 .../composables/spec/useFontSize.spec.js      | 175 ++++++++++++++++++
 .../dashboard/composables/useFontSize.js      | 140 ++++++++++++++
 .../dashboard/helper/themeHelper.js           |   4 +-
 .../dashboard/i18n/locale/en/settings.json    |  18 ++
 .../widget-preview/components/Widget.vue      |   2 +-
 .../settings/automation/AddAutomationRule.vue |   4 +-
 .../automation/EditAutomationRule.vue         |   4 +-
 .../billing/components/BillingHeader.vue      |   2 +-
 .../components/BaseSettingsListItem.vue       |   2 +-
 .../settings/inbox/InboxChannels.vue          |   2 +-
 .../routes/dashboard/settings/inbox/Index.vue |   4 +-
 .../dashboard/settings/inbox/Settings.vue     |   2 +-
 .../settings/inbox/WidgetBuilder.vue          |   5 +-
 .../components/SenderNameExamplePreview.vue   |   2 +-
 .../dashboard/settings/macros/MacroNode.vue   |   3 +-
 .../settings/macros/MacroProperties.vue       |   4 +-
 .../settings/profile/AudioAlertTone.vue       |   2 +-
 .../settings/profile/ChangePassword.vue       |   8 +-
 .../dashboard/settings/profile/FontSize.vue   |  62 +++++++
 .../dashboard/settings/profile/HotKeyCard.vue |  10 +-
 .../dashboard/settings/profile/Index.vue      |  29 ++-
 .../settings/profile/UserBasicDetails.vue     |   8 +-
 .../reports/components/ReportsWrapper.vue     |   2 +-
 .../routes/dashboard/settings/sla/SlaForm.vue |  12 +-
 .../dashboard/settings/sla/SlaTimeInput.vue   |   6 +-
 .../shared/components/emoji/EmojiInput.vue    |  10 +-
 app/javascript/v3/components/Form/Select.vue  |   2 +-
 app/javascript/v3/components/Form/Switch.vue  |   4 +-
 66 files changed, 598 insertions(+), 162 deletions(-)
 create mode 100644 app/javascript/dashboard/composables/spec/useFontSize.spec.js
 create mode 100644 app/javascript/dashboard/composables/useFontSize.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/profile/FontSize.vue

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index c32cb98d2..ae50055fb 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -14,6 +14,7 @@ import WootSnackbarBox from './components/SnackbarContainer.vue';
 import { setColorTheme } from './helper/themeHelper';
 import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import { useAccount } from 'dashboard/composables/useAccount';
+import { useFontSize } from 'dashboard/composables/useFontSize';
 import {
   registerSubscription,
   verifyServiceWorkerExistence,
@@ -37,8 +38,15 @@ export default {
     const router = useRouter();
     const store = useStore();
     const { accountId } = useAccount();
+    // Use the font size composable (it automatically sets up the watcher)
+    const { currentFontSize } = useFontSize();
 
-    return { router, store, currentAccountId: accountId };
+    return {
+      router,
+      store,
+      currentAccountId: accountId,
+      currentFontSize,
+    };
   },
   data() {
     return {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_base.scss b/app/javascript/dashboard/assets/scss/widgets/_base.scss
index d35c1cfc9..9367e8b2d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_base.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_base.scss
@@ -82,7 +82,7 @@ input[type='url']:not(.reset-base) {
 }
 
 input[type='file'] {
-  @apply bg-white dark:bg-slate-800 leading-[1.15] mb-4;
+  @apply bg-white dark:bg-n-solid-1 leading-[1.15] mb-4;
 }
 
 // Select
@@ -141,11 +141,16 @@ code {
   @apply text-xs border-0;
 
   &.hljs {
-    @apply bg-slate-50 dark:bg-slate-700 text-slate-800 dark:text-slate-50 rounded-lg p-5;
+    @apply bg-n-slate-3 dark:bg-n-solid-3 text-slate-800 dark:text-slate-50 rounded-lg p-5;
 
     .hljs-number,
     .hljs-string {
       @apply text-red-800 dark:text-red-400;
     }
+
+    .hljs-name,
+    .hljs-tag {
+      @apply text-n-slate-11;
+    }
   }
 }
diff --git a/app/javascript/dashboard/components-next/Campaigns/CampaignLayout.vue b/app/javascript/dashboard/components-next/Campaigns/CampaignLayout.vue
index 3169dbc3e..184e8bd10 100644
--- a/app/javascript/dashboard/components-next/Campaigns/CampaignLayout.vue
+++ b/app/javascript/dashboard/components-next/Campaigns/CampaignLayout.vue
@@ -22,7 +22,7 @@ const handleButtonClick = () => {
 <template>
   <section class="flex flex-col w-full h-full overflow-hidden bg-n-background">
     <header class="sticky top-0 z-10 px-6 lg:px-0">
-      <div class="w-full max-w-[960px] mx-auto">
+      <div class="w-full max-w-[60rem] mx-auto">
         <div class="flex items-center justify-between w-full h-20 gap-2">
           <span class="text-xl font-medium text-n-slate-12">
             {{ headerTitle }}
@@ -44,7 +44,7 @@ const handleButtonClick = () => {
       </div>
     </header>
     <main class="flex-1 px-6 overflow-y-auto lg:px-0">
-      <div class="w-full max-w-[960px] mx-auto py-4">
+      <div class="w-full max-w-[60rem] mx-auto py-4">
         <slot name="default" />
       </div>
     </main>
diff --git a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
index ea76c6130..574b06125 100644
--- a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
+++ b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/LiveChatCampaign/LiveChatCampaignDialog.vue
@@ -40,7 +40,7 @@ const handleSubmit = campaignDetails => {
 
 <template>
   <div
-    class="w-[400px] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6 max-h-[85vh] overflow-y-auto"
+    class="w-[25rem] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6 max-h-[85vh] overflow-y-auto"
   >
     <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
       {{ t(`CAMPAIGN.LIVE_CHAT.CREATE.TITLE`) }}
diff --git a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/SMSCampaign/SMSCampaignDialog.vue b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/SMSCampaign/SMSCampaignDialog.vue
index b190b031b..d959499ee 100644
--- a/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/SMSCampaign/SMSCampaignDialog.vue
+++ b/app/javascript/dashboard/components-next/Campaigns/Pages/CampaignPage/SMSCampaign/SMSCampaignDialog.vue
@@ -39,7 +39,7 @@ const handleClose = () => emit('close');
 
 <template>
   <div
-    class="w-[400px] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
+    class="w-[25rem] z-50 min-w-0 absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
   >
     <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
       {{ t(`CAMPAIGN.SMS.CREATE.TITLE`) }}
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
index 57c4ba7c8..bb4327816 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsDetailsLayout.vue
@@ -65,8 +65,8 @@ const toggleBlock = () => {
     <div
       class="flex flex-col w-full h-full transition-all duration-300 ltr:2xl:ml-56 rtl:2xl:mr-56"
     >
-      <header class="sticky top-0 z-10 px-6 xl:px-0">
-        <div class="w-full mx-auto max-w-[650px]">
+      <header class="sticky top-0 z-10 px-6 3xl:px-0">
+        <div class="w-full mx-auto max-w-[40.625rem]">
           <div class="flex items-center justify-between w-full h-20 gap-2">
             <Breadcrumb
               :items="breadcrumbItems"
@@ -98,8 +98,8 @@ const toggleBlock = () => {
           </div>
         </div>
       </header>
-      <main class="flex-1 px-6 overflow-y-auto xl:px-px">
-        <div class="w-full py-4 mx-auto max-w-[650px]">
+      <main class="flex-1 px-6 overflow-y-auto 3xl:px-px">
+        <div class="w-full py-4 mx-auto max-w-[40.625rem]">
           <slot name="default" />
         </div>
       </main>
@@ -107,7 +107,7 @@ const toggleBlock = () => {
 
     <div
       v-if="slots.sidebar"
-      class="overflow-y-auto justify-end min-w-[200px] w-full py-6 max-w-[440px] border-l border-n-weak bg-n-solid-2"
+      class="overflow-y-auto justify-end min-w-52 w-full py-6 max-w-md border-l border-n-weak bg-n-solid-2"
     >
       <slot name="sidebar" />
     </div>
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactHeader.vue b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactHeader.vue
index 44350bba1..42f526f95 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactHeader.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactHeader.vue
@@ -60,7 +60,7 @@ const emit = defineEmits([
 <template>
   <header class="sticky top-0 z-10">
     <div
-      class="flex items-center justify-between w-full h-20 px-6 gap-2 mx-auto max-w-[960px]"
+      class="flex items-center justify-between w-full h-20 px-6 gap-2 mx-auto max-w-[60rem]"
     >
       <span class="text-xl font-medium truncate text-n-slate-12">
         {{ headerTitle }}
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/components/ContactsActiveFiltersPreview.vue b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/components/ContactsActiveFiltersPreview.vue
index 36162520d..88ee94604 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/components/ContactsActiveFiltersPreview.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/components/ContactsActiveFiltersPreview.vue
@@ -62,7 +62,7 @@ const activeFilterQueryData = computed(() => {
       t('CONTACTS_LAYOUT.FILTER.ACTIVE_FILTERS.CLEAR_FILTERS')
     "
     :show-clear-button="!hasActiveSegments"
-    class="max-w-[960px] px-6"
+    class="max-w-[60rem] px-6"
     @open-filter="emit('openFilter')"
     @clear-filters="emit('clearFilters')"
   />
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsListLayout.vue b/app/javascript/dashboard/components-next/Contacts/ContactsListLayout.vue
index 22b32d7b8..25aac5df8 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsListLayout.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsListLayout.vue
@@ -72,7 +72,7 @@ const openFilter = () => {
         @clear-filters="emit('clearFilters')"
       />
       <main class="flex-1 overflow-y-auto">
-        <div class="w-full mx-auto max-w-[960px]">
+        <div class="w-full mx-auto max-w-[60rem]">
           <ContactsActiveFiltersPreview
             v-if="
               (hasAppliedFilters || !isNotSegmentView) &&
diff --git a/app/javascript/dashboard/components-next/EmptyStateLayout.vue b/app/javascript/dashboard/components-next/EmptyStateLayout.vue
index 686d4b8a4..09b8afee5 100644
--- a/app/javascript/dashboard/components-next/EmptyStateLayout.vue
+++ b/app/javascript/dashboard/components-next/EmptyStateLayout.vue
@@ -22,7 +22,7 @@ defineProps({
     class="relative flex flex-col items-center justify-center w-full h-full overflow-hidden"
   >
     <div
-      class="relative w-full max-w-[960px] mx-auto overflow-hidden h-full max-h-[448px]"
+      class="relative w-full max-w-[60rem] mx-auto overflow-hidden h-full max-h-[28rem]"
     >
       <div
         class="w-full h-full space-y-4 overflow-y-hidden opacity-50 pointer-events-none"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue b/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
index d7a8fd91d..c430a3d15 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/HelpCenterLayout.vue
@@ -60,7 +60,7 @@ const togglePortalSwitcher = () => {
 <template>
   <section class="flex flex-col w-full h-full overflow-hidden bg-n-background">
     <header class="sticky top-0 z-10 px-6 pb-3 lg:px-0">
-      <div class="w-full max-w-[960px] mx-auto lg:px-6">
+      <div class="w-full max-w-[60rem] mx-auto lg:px-6">
         <div
           v-if="showHeaderTitle"
           class="flex items-center justify-start h-20 gap-2"
@@ -96,7 +96,7 @@ const togglePortalSwitcher = () => {
       </div>
     </header>
     <main class="flex-1 px-6 overflow-y-auto lg:px-0">
-      <div class="w-full max-w-[960px] mx-auto py-3 lg:px-6">
+      <div class="w-full max-w-[60rem] mx-auto py-3 lg:px-6">
         <slot name="content" />
       </div>
     </main>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorProperties.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorProperties.vue
index 4de31a6ba..b5862f33f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorProperties.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditorProperties.vue
@@ -52,7 +52,7 @@ onMounted(() => {
 
 <template>
   <div
-    class="flex flex-col absolute w-[400px] bg-n-alpha-3 outline outline-1 outline-n-container backdrop-blur-[100px] shadow-lg gap-6 rounded-xl p-6"
+    class="flex flex-col absolute w-[25rem] bg-n-alpha-3 outline outline-1 outline-n-container backdrop-blur-[100px] shadow-lg gap-6 rounded-xl p-6"
   >
     <div class="flex items-center justify-between">
       <h3>
@@ -75,7 +75,7 @@ onMounted(() => {
       <div>
         <div class="flex justify-between w-full gap-4 py-2">
           <label
-            class="text-sm font-medium whitespace-nowrap min-w-[100px] text-slate-900 dark:text-slate-50"
+            class="text-sm font-medium whitespace-nowrap min-w-[6.25rem] text-slate-900 dark:text-slate-50"
           >
             {{
               t(
@@ -90,9 +90,9 @@ onMounted(() => {
                 'HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_DESCRIPTION_PLACEHOLDER'
               )
             "
-            class="w-[220px]"
+            class="w-[13.75rem]"
             custom-text-area-wrapper-class="!p-0 !border-0 !rounded-none !bg-transparent transition-none"
-            custom-text-area-class="max-h-[150px]"
+            custom-text-area-class="max-h-[9.375rem]"
             auto-height
             min-height="3rem"
           />
@@ -108,12 +108,12 @@ onMounted(() => {
             :label="
               t('HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TITLE')
             "
-            custom-label-class="min-w-[120px]"
+            custom-label-class="min-w-[7.5rem]"
           />
         </div>
         <div class="flex justify-between w-full gap-3 py-2">
           <label
-            class="text-sm font-medium whitespace-nowrap min-w-[120px] text-slate-900 dark:text-slate-50"
+            class="text-sm font-medium whitespace-nowrap min-w-[7.5rem] text-slate-900 dark:text-slate-50"
           >
             {{
               t('HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TAGS')
@@ -126,7 +126,7 @@ onMounted(() => {
                 'HELP_CENTER.EDIT_ARTICLE_PAGE.ARTICLE_PROPERTIES.META_TAGS_PLACEHOLDER'
               )
             "
-            class="w-[224px]"
+            class="w-[14rem]"
           />
         </div>
       </div>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
index 78e0594e7..62c893971 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
@@ -90,7 +90,7 @@ const handleCategory = async formData => {
 
 <template>
   <div
-    class="w-[400px] absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
+    class="w-[25rem] absolute top-10 ltr:right-0 rtl:left-0 bg-n-alpha-3 backdrop-blur-[100px] p-6 rounded-xl border border-slate-50 dark:border-slate-900 shadow-md flex flex-col gap-6"
   >
     <h3 class="text-base font-medium text-slate-900 dark:text-slate-50">
       {{
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
index b0adfa6e9..b9953dabb 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
@@ -201,7 +201,7 @@ defineExpose({ state, isSubmitDisabled });
                 color="slate"
                 size="sm"
                 :icon="!state.icon ? 'i-lucide-smile-plus' : ''"
-                class="!h-[38px] !w-[38px] absolute top-[31px] !outline-none !rounded-[7px] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
+                class="!h-[2.4rem] !w-[2.375rem] absolute top-[1.94rem] !outline-none !rounded-[0.438rem] border-0 ltr:left-px rtl:right-px ltr:!rounded-r-none rtl:!rounded-l-none"
                 @click="isEmojiPickerOpen = !isEmojiPickerOpen"
               />
               <EmojiInput
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/PortalSettings.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/PortalSettings.vue
index ccf1ad997..a49493818 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/PortalSettings.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/PortalSettingsPage/PortalSettings.vue
@@ -74,7 +74,7 @@ const handleDeletePortal = () => {
       </div>
       <div
         v-else-if="activePortal"
-        class="flex flex-col w-full gap-4 max-w-[640px] pb-8"
+        class="flex flex-col w-full gap-4 max-w-[40rem] pb-8"
       >
         <PortalBaseSettings
           :active-portal="activePortal"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/PortalSwitcher/PortalSwitcher.vue b/app/javascript/dashboard/components-next/HelpCenter/PortalSwitcher/PortalSwitcher.vue
index 1b4668b91..5a835f8cb 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/PortalSwitcher/PortalSwitcher.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/PortalSwitcher/PortalSwitcher.vue
@@ -92,7 +92,7 @@ const redirectToPortalHomePage = () => {
 
 <template>
   <div
-    class="pt-5 pb-3 bg-n-alpha-3 backdrop-blur-[100px] outline outline-n-container outline-1 z-50 absolute w-[440px] rounded-xl shadow-md flex flex-col gap-4"
+    class="pt-5 pb-3 bg-n-alpha-3 backdrop-blur-[100px] outline outline-n-container outline-1 z-50 absolute w-[27.5rem] rounded-xl shadow-md flex flex-col gap-4"
   >
     <div
       class="flex items-center justify-between gap-4 px-6 pb-3 border-b border-n-alpha-2"
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 244ce0653..8d421a5aa 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -148,7 +148,7 @@ useKeyboardEvents(keyboardEvents);
 
 <template>
   <div
-    class="flex items-center justify-between w-full h-[52px] gap-2 px-4 py-3"
+    class="flex items-center justify-between w-full h-[3.25rem] gap-2 px-4 py-3"
   >
     <div class="flex items-center gap-2">
       <WhatsAppOptions
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/AttachmentPreviews.vue b/app/javascript/dashboard/components-next/NewConversation/components/AttachmentPreviews.vue
index 2e03f64c0..fe57d19c4 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/AttachmentPreviews.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/AttachmentPreviews.vue
@@ -47,10 +47,10 @@ const removeAttachment = id => {
       <div
         v-for="attachment in filteredImageAttachments"
         :key="attachment.id"
-        class="relative group/image w-[72px] h-[72px]"
+        class="relative group/image w-[4.5rem] h-[4.5rem]"
       >
         <img
-          class="object-cover w-[72px] h-[72px] rounded-lg"
+          class="object-cover w-[4.5rem] h-[4.5rem] rounded-lg"
           :src="attachment.thumb"
         />
         <Button
@@ -69,7 +69,7 @@ const removeAttachment = id => {
       <div
         v-for="attachment in filteredNonImageAttachments"
         :key="attachment.id"
-        class="max-w-[300px] inline-flex items-center h-8 min-w-0 bg-n-alpha-2 dark:bg-n-solid-3 rounded-lg gap-3 ltr:pl-3 rtl:pr-3 ltr:pr-2 rtl:pl-2"
+        class="max-w-[18.75rem] inline-flex items-center h-8 min-w-0 bg-n-alpha-2 dark:bg-n-solid-3 rounded-lg gap-3 ltr:pl-3 rtl:pr-3 ltr:pr-2 rtl:pl-2"
       >
         <span class="text-sm font-medium text-n-slate-11">
           {{ fileNameWithEllipsis(attachment.resource) }}
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
index 0e6a79f51..41ff88976 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
@@ -265,7 +265,7 @@ const handleSendWhatsappMessage = async ({ message, templateParams }) => {
 
 <template>
   <div
-    class="w-[670px] mt-2 divide-y divide-n-strong overflow-visible transition-all duration-300 ease-in-out top-full justify-between flex flex-col bg-n-alpha-3 border border-n-strong shadow-sm backdrop-blur-[100px] rounded-xl"
+    class="w-[42rem] mt-2 divide-y divide-n-strong overflow-visible transition-all duration-300 ease-in-out top-full justify-between flex flex-col bg-n-alpha-3 border border-n-strong shadow-sm backdrop-blur-[100px] rounded-xl"
   >
     <ContactSelector
       :contacts="contacts"
diff --git a/app/javascript/dashboard/components-next/captain/PageLayout.vue b/app/javascript/dashboard/components-next/captain/PageLayout.vue
index dd76f1b62..aaceda050 100644
--- a/app/javascript/dashboard/components-next/captain/PageLayout.vue
+++ b/app/javascript/dashboard/components-next/captain/PageLayout.vue
@@ -68,7 +68,7 @@ const handlePageChange = event => {
 <template>
   <section class="flex flex-col w-full h-full overflow-hidden bg-n-background">
     <header class="sticky top-0 z-10 px-6 xl:px-0">
-      <div class="w-full max-w-[960px] mx-auto">
+      <div class="w-full max-w-[60rem] mx-auto">
         <div
           class="flex items-start lg:items-center justify-between w-full py-6 lg:py-0 lg:h-20 gap-4 lg:gap-2 flex-col lg:flex-row"
         >
@@ -96,7 +96,7 @@ const handlePageChange = event => {
       </div>
     </header>
     <main class="flex-1 px-6 overflow-y-auto xl:px-0">
-      <div class="w-full max-w-[960px] mx-auto py-4">
+      <div class="w-full max-w-[60rem] mx-auto py-4">
         <slot v-if="!showPaywall" name="controls" />
         <div
           v-if="isFetching"
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/Paywall.vue b/app/javascript/dashboard/components-next/captain/pageComponents/Paywall.vue
index 8439ca467..b9deb0ff0 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/Paywall.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/Paywall.vue
@@ -27,7 +27,7 @@ const openBilling = () => {
 
 <template>
   <div
-    class="w-full max-w-[960px] mx-auto h-full max-h-[448px] grid place-content-center"
+    class="w-full max-w-[60rem] mx-auto h-full max-h-[448px] grid place-content-center"
   >
     <BasePaywallModal
       class="mx-auto"
diff --git a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
index fb72befd7..e58b2db86 100644
--- a/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
+++ b/app/javascript/dashboard/components-next/pagination/PaginationFooter.vue
@@ -63,7 +63,7 @@ const pageInfo = computed(() => {
 
 <template>
   <div
-    class="flex justify-between h-12 w-full max-w-[957px] outline outline-n-container outline-1 -outline-offset-1 mx-auto bg-n-solid-2 rounded-xl py-2 ltr:pl-4 rtl:pr-4 ltr:pr-3 rtl:pl-3 items-center before:absolute before:inset-x-0 before:-top-4 before:bg-gradient-to-t before:from-n-background before:from-10% before:dark:from-0% before:to-transparent before:h-4 before:pointer-events-none"
+    class="flex justify-between h-12 w-full max-w-[calc(60rem-3px)] outline outline-n-container outline-1 -outline-offset-1 mx-auto bg-n-solid-2 rounded-xl py-2 ltr:pl-4 rtl:pr-4 ltr:pr-3 rtl:pl-3 items-center before:absolute before:inset-x-0 before:-top-4 before:bg-gradient-to-t before:from-n-background before:from-10% before:dark:from-0% before:to-transparent before:h-4 before:pointer-events-none"
   >
     <div class="flex items-center gap-3">
       <span class="min-w-0 text-sm font-normal line-clamp-1 text-n-slate-11">
diff --git a/app/javascript/dashboard/components-next/phonenumberinput/PhoneNumberInput.vue b/app/javascript/dashboard/components-next/phonenumberinput/PhoneNumberInput.vue
index e523c306b..bb39c1502 100644
--- a/app/javascript/dashboard/components-next/phonenumberinput/PhoneNumberInput.vue
+++ b/app/javascript/dashboard/components-next/phonenumberinput/PhoneNumberInput.vue
@@ -185,7 +185,7 @@ watch(
               "
               trailing-icon
               :disabled="disabled"
-              class="!h-[30px] top-1 !px-2 outline-0 !outline-none !rounded-lg border-0 ltr:!rounded-r-none rtl:!rounded-l-none"
+              class="!h-[1.875rem] top-1 !px-2 outline-0 !outline-none !rounded-lg border-0 ltr:!rounded-r-none rtl:!rounded-l-none"
               @click="toggleCountryDropdown"
             >
               <span
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index 9dd73e7e4..3b68bfd8c 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -515,7 +515,7 @@ const menuItems = computed(() => {
 
 <template>
   <aside
-    class="w-[200px] bg-n-solid-2 rtl:border-l ltr:border-r border-n-weak h-screen flex flex-col text-sm pb-1"
+    class="w-[12.5rem] bg-n-solid-2 rtl:border-l ltr:border-r border-n-weak h-screen flex flex-col text-sm pb-1"
   >
     <section class="grid gap-2 mt-2 mb-4">
       <div class="flex items-center min-w-0 gap-2 px-2">
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue b/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
index 33e105563..f97beadee 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarGroupLeaf.vue
@@ -31,7 +31,7 @@ const shouldRenderComponent = computed(() => {
       :is="to ? 'router-link' : 'div'"
       :to="to"
       :title="label"
-      class="flex h-8 items-center gap-2 px-2 py-1 rounded-lg max-w-[151px] hover:bg-gradient-to-r from-transparent via-n-slate-3/70 to-n-slate-3/70 group"
+      class="flex h-8 items-center gap-2 px-2 py-1 rounded-lg max-w-[9.438rem] hover:bg-gradient-to-r from-transparent via-n-slate-3/70 to-n-slate-3/70 group"
       :class="{
         'n-blue-text bg-n-alpha-2 active': active,
       }"
diff --git a/app/javascript/dashboard/components-next/switch/Switch.vue b/app/javascript/dashboard/components-next/switch/Switch.vue
index e8f409c0e..4428154a0 100644
--- a/app/javascript/dashboard/components-next/switch/Switch.vue
+++ b/app/javascript/dashboard/components-next/switch/Switch.vue
@@ -27,7 +27,7 @@ const updateValue = () => {
   >
     <span class="sr-only">{{ t('SWITCH.TOGGLE') }}</span>
     <span
-      class="absolute top-px left-0.5 h-3 w-3 transform rounded-full shadow-sm transition-transform duration-200 ease-in-out"
+      class="absolute top-[0.07rem] left-0.5 h-3 w-3 transform rounded-full shadow-sm transition-transform duration-200 ease-in-out"
       :class="
         modelValue
           ? 'translate-x-2.5 bg-white'
diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index ee3509d64..c8c1fd007 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -23,33 +23,34 @@ export default {
 
 <template>
   <div
-    class="ml-0 mr-0 flex py-8 w-full xl:w-3/4 flex-col xl:flex-row"
+    class="ml-0 mr-0 py-8 w-full"
     :class="{
-      'border-b border-solid border-slate-50 dark:border-slate-700/30':
-        showBorder,
+      'border-b border-solid border-n-weak/60 dark:border-n-weak': showBorder,
     }"
   >
-    <div class="w-full xl:w-1/4 min-w-0 xl:max-w-[30%] pr-12">
-      <p
-        v-if="title"
-        class="text-base text-woot-500 dark:text-woot-500 mb-0 font-medium"
-      >
-        {{ title }}
-      </p>
-      <p
-        class="text-sm mb-2 text-slate-700 dark:text-slate-300 leading-5 tracking-normal mt-2"
-      >
-        <slot v-if="subTitle" name="subTitle">
-          {{ subTitle }}
-        </slot>
-      </p>
-      <p v-if="note">
-        <span class="font-semibold">{{ $t('INBOX_MGMT.NOTE') }}</span>
-        {{ note }}
-      </p>
-    </div>
-    <div class="w-full xl:w-1/2 min-w-0 xl:max-w-[50%]">
-      <slot />
+    <div class="grid grid-cols-1 lg:grid-cols-6 gap-6">
+      <div class="col-span-2 xl:col-span-1">
+        <p
+          v-if="title"
+          class="text-base text-woot-500 dark:text-woot-500 mb-0 font-medium"
+        >
+          {{ title }}
+        </p>
+        <p
+          class="text-sm mb-2 text-slate-700 dark:text-slate-300 leading-5 tracking-normal mt-2"
+        >
+          <slot v-if="subTitle" name="subTitle">
+            {{ subTitle }}
+          </slot>
+        </p>
+        <p v-if="note">
+          <span class="font-semibold">{{ $t('INBOX_MGMT.NOTE') }}</span>
+          {{ note }}
+        </p>
+      </div>
+      <div class="col-span-4 lg:col-span-4 2xl:col-span-3">
+        <slot />
+      </div>
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/ui/PreviewCard.vue b/app/javascript/dashboard/components/ui/PreviewCard.vue
index 069ea37a9..1c90ce956 100644
--- a/app/javascript/dashboard/components/ui/PreviewCard.vue
+++ b/app/javascript/dashboard/components/ui/PreviewCard.vue
@@ -23,17 +23,16 @@ export default {
 
 <template>
   <div
-    class="flex flex-col min-w-[15rem] max-h-[21.25rem] max-w-[23.75rem] rounded-md border border-solid border-slate-75 dark:border-slate-600"
+    class="flex flex-col min-w-[15rem] max-h-[21.25rem] max-w-[23.75rem] rounded-md border border-solid border-n-strong"
     :class="{
-      'bg-woot-25 dark:bg-slate-700 border border-solid border-woot-300 dark:border-woot-400':
+      'bg-woot-25 dark:bg-n-solid-2 border border-solid border-n-blue-border':
         active,
     }"
   >
     <div
-      class="flex justify-between items-center px-2 w-full h-10 bg-slate-50 dark:bg-slate-900 rounded-t-[5px] border-b border-solid border-slate-50 dark:border-slate-600"
+      class="flex justify-between items-center rounded-t-md px-2 w-full h-10 bg-slate-50 dark:bg-slate-900 border-b border-solid border-n-strong"
       :class="{
-        'bg-woot-50 border-b border-solid border-woot-75 dark:border-woot-700':
-          active,
+        'bg-woot-50 border-b border-solid border-n-blue-border': active,
       }"
     >
       <div class="flex items-center p-1 text-sm font-medium">{{ heading }}</div>
diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index f3bc9ee91..b4398baf8 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -38,20 +38,20 @@ export default {
   cursor: pointer;
   display: flex;
   flex-shrink: 0;
-  height: 19px;
+  height: 1.188rem;
   position: relative;
   transition-duration: 200ms;
   transition-property: background-color;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  width: 34px;
+  width: 2.125rem;
 
   &.active {
     background-color: var(--w-500);
   }
 
   &.small {
-    width: 22px;
-    height: 14px;
+    width: 1.375rem;
+    height: 0.875rem;
 
     span {
       height: var(--space-one);
diff --git a/app/javascript/dashboard/components/ui/Tabs/Tabs.vue b/app/javascript/dashboard/components/ui/Tabs/Tabs.vue
index 83653d8a6..7a2b5054d 100644
--- a/app/javascript/dashboard/components/ui/Tabs/Tabs.vue
+++ b/app/javascript/dashboard/components/ui/Tabs/Tabs.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { ref, provide, onMounted, computed } from 'vue';
-import { useEventListener } from '@vueuse/core';
+import { ref, useTemplateRef, provide, computed, watch } from 'vue';
+import { useElementSize } from '@vueuse/core';
 
 const props = defineProps({
   index: {
@@ -19,6 +19,12 @@ const props = defineProps({
 
 const emit = defineEmits(['change']);
 
+const tabsContainer = useTemplateRef('tabsContainer');
+const tabsList = useTemplateRef('tabsList');
+
+const { width: containerWidth } = useElementSize(tabsContainer);
+const { width: listWidth } = useElementSize(tabsList);
+
 const hasScroll = ref(false);
 
 const activeIndex = computed({
@@ -34,20 +40,16 @@ provide('updateActiveIndex', index => {
 });
 
 const computeScrollWidth = () => {
-  // TODO: use useElementSize from vueuse
-  const tabElement = document.querySelector('.tabs');
-  if (tabElement) {
-    hasScroll.value = tabElement.scrollWidth > tabElement.clientWidth;
+  if (tabsContainer.value && tabsList.value) {
+    hasScroll.value = tabsList.value.scrollWidth > tabsList.value.clientWidth;
   }
 };
 
 const onScrollClick = direction => {
-  // TODO: use useElementSize from vueuse
-  const tabElement = document.querySelector('.tabs');
-  if (tabElement) {
-    let scrollPosition = tabElement.scrollLeft;
+  if (tabsContainer.value && tabsList.value) {
+    let scrollPosition = tabsList.value.scrollLeft;
     scrollPosition += direction === 'left' ? -100 : 100;
-    tabElement.scrollTo({
+    tabsList.value.scrollTo({
       top: 0,
       left: scrollPosition,
       behavior: 'smooth',
@@ -55,14 +57,19 @@ const onScrollClick = direction => {
   }
 };
 
-useEventListener(window, 'resize', computeScrollWidth);
-onMounted(() => {
-  computeScrollWidth();
-});
+// Watch for changes in element sizes with immediate execution
+watch(
+  [containerWidth, listWidth],
+  () => {
+    computeScrollWidth();
+  },
+  { immediate: true }
+);
 </script>
 
 <template>
   <div
+    ref="tabsContainer"
     :class="{
       'tabs--container--with-border': border,
       'tabs--container--compact': isCompact,
@@ -76,7 +83,7 @@ onMounted(() => {
     >
       <fluent-icon icon="chevron-left" :size="16" />
     </button>
-    <ul :class="{ 'tabs--with-scroll': hasScroll }" class="tabs">
+    <ul ref="tabsList" :class="{ 'tabs--with-scroll': hasScroll }" class="tabs">
       <slot />
     </ul>
     <button
diff --git a/app/javascript/dashboard/components/ui/Wizard.vue b/app/javascript/dashboard/components/ui/Wizard.vue
index 4b45b6ef5..19bf08bcd 100644
--- a/app/javascript/dashboard/components/ui/Wizard.vue
+++ b/app/javascript/dashboard/components/ui/Wizard.vue
@@ -72,26 +72,26 @@ export default {
 
     &.active {
       h3 {
-        @apply text-woot-500 dark:text-woot-500;
+        @apply text-n-blue-text dark:text-n-blue-text;
       }
 
       .step {
-        @apply bg-woot-500 dark:bg-woot-500;
+        @apply bg-n-brand dark:bg-n-brand;
       }
     }
 
     &.over {
       &::after {
-        @apply bg-woot-500 dark:bg-woot-500;
+        @apply bg-n-brand dark:bg-n-brand;
       }
 
       .step {
-        @apply bg-woot-500 dark:bg-woot-500;
+        @apply bg-n-brand dark:bg-n-brand;
       }
 
       & + .item {
         &::before {
-          @apply bg-woot-500 dark:bg-woot-500;
+          @apply bg-n-brand dark:bg-n-brand;
         }
       }
     }
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index e062a0bb3..8d7a2289d 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -201,10 +201,10 @@ export default {
 
 <style lang="scss" scoped>
 .filter {
-  @apply bg-slate-50 dark:bg-slate-800 p-2 border border-solid border-slate-75 dark:border-slate-600 rounded-md mb-2;
+  @apply bg-n-slate-3 dark:bg-n-solid-3 p-2 border border-solid border-n-strong dark:border-n-strong rounded-md mb-2;
 
   &.is-a-macro {
-    @apply mb-0 bg-white dark:bg-slate-700 p-0 border-0 rounded-none;
+    @apply mb-0 bg-n-slate-2 dark:bg-n-solid-3 p-0 border-0 rounded-none;
   }
 }
 
diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index ebc8f13ba..75177b509 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -128,7 +128,7 @@ export default {
     getInputErrorClass(errorMessage) {
       return errorMessage
         ? 'bg-red-50 dark:bg-red-800/50 border-red-100 dark:border-red-700/50'
-        : 'bg-slate-50 dark:bg-slate-800 border-slate-75 dark:border-slate-700/50';
+        : 'bg-n-slate-3 dark:bg-n-solid-3 border-n-strong dark:border-n-strong';
     },
   },
 };
diff --git a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
index db165da7e..33725bae8 100644
--- a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
+++ b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
@@ -14,7 +14,7 @@ export default {
 </script>
 
 <template>
-  <div class="pt-4 pb-0 px-8 border-b border-solid border-n-weak">
+  <div class="pt-4 pb-0 px-8 border-b border-solid border-n-weak/60">
     <h2 class="text-2xl text-slate-800 dark:text-slate-100 mb-1 font-medium">
       {{ headerTitle }}
     </h2>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
index d9e031385..0b75be50b 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
@@ -85,7 +85,7 @@ export default {
 </script>
 
 <template>
-  <div class="flex justify-between h-[52px] gap-2 ltr:pl-3 rtl:pr-3">
+  <div class="flex justify-between h-[3.25rem] gap-2 ltr:pl-3 rtl:pr-3">
     <EditorModeToggle
       :mode="mode"
       class="mt-3"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 690259a5e..7d771ad88 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -411,7 +411,7 @@ export default {
   }
 
   .checkbox-wrapper {
-    @apply h-10 w-10 flex items-center justify-center rounded-full cursor-pointer mt-4;
+    @apply flex items-center justify-center rounded-full cursor-pointer mt-4;
 
     input[type='checkbox'] {
       @apply m-0 cursor-pointer;
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationSidebar.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationSidebar.vue
index 8313ab5fe..c91232cc5 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationSidebar.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationSidebar.vue
@@ -53,7 +53,7 @@ const showCopilotTab = computed(() =>
 
 <template>
   <div
-    class="ltr:border-l rtl:border-r border-n-weak h-full overflow-hidden z-10 min-w-[320px] w-[320px] 2xl:min-w-96 2xl:w-96 flex flex-col bg-n-background"
+    class="ltr:border-l rtl:border-r border-n-weak h-full overflow-hidden z-10 w-80 min-w-80 2xl:min-w-96 2xl:w-96 flex flex-col bg-n-background"
   >
     <div v-if="showCopilotTab" class="p-2">
       <TabBar
diff --git a/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue b/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
index c5c7c9713..51ce2ae9a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
@@ -45,7 +45,7 @@ const statusDesiredOrder = [
 ];
 
 const isCreating = ref(false);
-const inputStyles = { borderRadius: '12px', fontSize: '14px' };
+const inputStyles = { borderRadius: '0.75rem', fontSize: '0.875rem' };
 
 const formState = reactive({
   title: '',
@@ -209,7 +209,7 @@ onMounted(getTeams);
       v-model="formState.title"
       :class="{ error: v$.title.$error }"
       class="w-full"
-      :styles="{ ...inputStyles, padding: '6px 12px' }"
+      :styles="{ ...inputStyles, padding: '0.375rem 0.75rem' }"
       :label="$t('INTEGRATION_SETTINGS.LINEAR.ADD_OR_LINK.FORM.TITLE.LABEL')"
       :placeholder="
         $t('INTEGRATION_SETTINGS.LINEAR.ADD_OR_LINK.FORM.TITLE.PLACEHOLDER')
@@ -221,7 +221,7 @@ onMounted(getTeams);
       {{ $t('INTEGRATION_SETTINGS.LINEAR.ADD_OR_LINK.FORM.DESCRIPTION.LABEL') }}
       <textarea
         v-model="formState.description"
-        :style="{ ...inputStyles, padding: '8px 12px' }"
+        :style="{ ...inputStyles, padding: '0.5rem 0.75rem' }"
         rows="3"
         class="text-sm"
         :placeholder="
diff --git a/app/javascript/dashboard/composables/spec/useFontSize.spec.js b/app/javascript/dashboard/composables/spec/useFontSize.spec.js
new file mode 100644
index 000000000..9253a3988
--- /dev/null
+++ b/app/javascript/dashboard/composables/spec/useFontSize.spec.js
@@ -0,0 +1,175 @@
+import { ref } from 'vue';
+import { useFontSize } from '../useFontSize';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+
+// Mock dependencies
+vi.mock('dashboard/composables/useUISettings');
+vi.mock('dashboard/composables', () => ({
+  useAlert: vi.fn(message => message),
+}));
+vi.mock('vue-i18n');
+
+// Mock requestAnimationFrame
+global.requestAnimationFrame = vi.fn(cb => cb());
+
+describe('useFontSize', () => {
+  const mockUISettings = ref({
+    font_size: '16px',
+  });
+  const mockUpdateUISettings = vi.fn().mockResolvedValue(undefined);
+  const mockTranslate = vi.fn(key => key);
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+
+    // Setup mocks
+    useUISettings.mockReturnValue({
+      uiSettings: mockUISettings,
+      updateUISettings: mockUpdateUISettings,
+    });
+
+    useI18n.mockReturnValue({
+      t: mockTranslate,
+    });
+
+    // Reset DOM state
+    document.documentElement.style.removeProperty('font-size');
+
+    // Reset mockUISettings to default
+    mockUISettings.value = { font_size: '16px' };
+  });
+
+  it('returns fontSizeOptions with correct structure', () => {
+    const { fontSizeOptions } = useFontSize();
+    expect(fontSizeOptions).toHaveLength(6);
+    expect(fontSizeOptions[0]).toHaveProperty('value');
+    expect(fontSizeOptions[0]).toHaveProperty('label');
+
+    // Check specific options
+    expect(fontSizeOptions.find(option => option.value === '16px')).toEqual({
+      value: '16px',
+      label:
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.DEFAULT',
+    });
+
+    expect(fontSizeOptions.find(option => option.value === '14px')).toEqual({
+      value: '14px',
+      label:
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.SMALLER',
+    });
+
+    expect(fontSizeOptions.find(option => option.value === '22px')).toEqual({
+      value: '22px',
+      label:
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.EXTRA_LARGE',
+    });
+  });
+
+  it('returns currentFontSize from UI settings', () => {
+    const { currentFontSize } = useFontSize();
+    expect(currentFontSize.value).toBe('16px');
+
+    mockUISettings.value.font_size = '18px';
+    expect(currentFontSize.value).toBe('18px');
+  });
+
+  it('applies font size to document root correctly based on pixel values', () => {
+    const { applyFontSize } = useFontSize();
+
+    applyFontSize('18px');
+    expect(document.documentElement.style.fontSize).toBe('18px');
+
+    applyFontSize('14px');
+    expect(document.documentElement.style.fontSize).toBe('14px');
+
+    applyFontSize('22px');
+    expect(document.documentElement.style.fontSize).toBe('22px');
+
+    applyFontSize('16px');
+    expect(document.documentElement.style.fontSize).toBe('16px');
+  });
+
+  it('updates UI settings and applies font size', async () => {
+    const { updateFontSize } = useFontSize();
+
+    await updateFontSize('20px');
+
+    expect(mockUpdateUISettings).toHaveBeenCalledWith({ font_size: '20px' });
+    expect(document.documentElement.style.fontSize).toBe('20px');
+    expect(useAlert).toHaveBeenCalledWith(
+      'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.UPDATE_SUCCESS'
+    );
+  });
+
+  it('shows error alert when update fails', async () => {
+    mockUpdateUISettings.mockRejectedValueOnce(new Error('Update failed'));
+
+    const { updateFontSize } = useFontSize();
+    await updateFontSize('20px');
+
+    expect(useAlert).toHaveBeenCalledWith(
+      'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.UPDATE_ERROR'
+    );
+  });
+
+  it('handles unknown font size values gracefully', () => {
+    const { applyFontSize } = useFontSize();
+
+    // Should not throw an error and should apply the default font size
+    applyFontSize('unknown-size');
+    expect(document.documentElement.style.fontSize).toBe('16px');
+  });
+
+  it('watches for UI settings changes and applies font size', async () => {
+    useFontSize();
+
+    // Initial font size should now be 16px instead of empty
+    expect(document.documentElement.style.fontSize).toBe('16px');
+
+    // Update UI settings
+    mockUISettings.value = { font_size: '18px' };
+
+    // Wait for next tick to let watchers fire
+    await Promise.resolve();
+
+    expect(document.documentElement.style.fontSize).toBe('18px');
+  });
+
+  it('translates font size option labels correctly', () => {
+    // Set up specific translation mapping
+    mockTranslate.mockImplementation(key => {
+      const translations = {
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.SMALLER':
+          'Smaller',
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.DEFAULT':
+          'Default',
+        'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.EXTRA_LARGE':
+          'Extra Large',
+      };
+      return translations[key] || key;
+    });
+
+    const { fontSizeOptions } = useFontSize();
+
+    // Check that translation is applied
+    expect(fontSizeOptions.find(option => option.value === '14px').label).toBe(
+      'Smaller'
+    );
+    expect(fontSizeOptions.find(option => option.value === '16px').label).toBe(
+      'Default'
+    );
+    expect(fontSizeOptions.find(option => option.value === '22px').label).toBe(
+      'Extra Large'
+    );
+
+    // Verify translation function was called with correct keys
+    expect(mockTranslate).toHaveBeenCalledWith(
+      'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.SMALLER'
+    );
+    expect(mockTranslate).toHaveBeenCalledWith(
+      'PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.DEFAULT'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/composables/useFontSize.js b/app/javascript/dashboard/composables/useFontSize.js
new file mode 100644
index 000000000..9bb8d4841
--- /dev/null
+++ b/app/javascript/dashboard/composables/useFontSize.js
@@ -0,0 +1,140 @@
+/**
+ * @file useFontSize.js
+ * @description A composable for managing font size settings throughout the application.
+ * This handles font size selection, application to the DOM, and persistence in user settings.
+ */
+
+import { computed, watch } from 'vue';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+
+/**
+ * Font size options with their pixel values
+ * @type {Object}
+ */
+const FONT_SIZE_OPTIONS = {
+  SMALLER: '14px',
+  SMALL: '15px',
+  DEFAULT: '16px',
+  LARGE: '18px',
+  LARGER: '20px',
+  EXTRA_LARGE: '22px',
+};
+
+/**
+ * Array of font size option keys
+ * @type {Array<string>}
+ */
+const FONT_SIZE_NAMES = Object.keys(FONT_SIZE_OPTIONS);
+
+/**
+ * Get font size label translation key
+ *
+ * @param {string} name - Font size name
+ * @returns {string} Translation key
+ */
+const getFontSizeLabelKey = name =>
+  `PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.OPTIONS.${name}`;
+
+/**
+ * Create font size option object
+ *
+ * @param {Function} t - Translation function
+ * @param {string} name - Font size name
+ * @returns {Object} Font size option with value and label
+ */
+const createFontSizeOption = (t, name) => ({
+  value: FONT_SIZE_OPTIONS[name],
+  label: t(getFontSizeLabelKey(name)),
+});
+
+/**
+ * Apply font size value to document root
+ *
+ * @param {string} pixelValue - Font size value in pixels
+ */
+const applyFontSizeToDOM = pixelValue => {
+  document.documentElement.style.setProperty(
+    'font-size',
+    pixelValue ?? FONT_SIZE_OPTIONS.DEFAULT
+  );
+};
+
+/**
+ * Font size management composable
+ *
+ * @returns {Object} Font size utilities and state
+ * @property {Array} fontSizeOptions - Array of font size options for select components
+ * @property {import('vue').ComputedRef<string>} currentFontSize - Current font size from UI settings
+ * @property {Function} applyFontSize - Function to apply font size to document
+ * @property {Function} updateFontSize - Function to update font size in settings with alert feedback
+ */
+export const useFontSize = () => {
+  const { uiSettings, updateUISettings } = useUISettings();
+  const { t } = useI18n();
+
+  /**
+   * Font size options for select dropdown
+   * @type {Array<{value: string, label: string}>}
+   */
+  const fontSizeOptions = FONT_SIZE_NAMES.map(name =>
+    createFontSizeOption(t, name)
+  );
+
+  /**
+   * Current font size from UI settings
+   * @type {import('vue').ComputedRef<string>}
+   */
+  const currentFontSize = computed(
+    () => uiSettings.value.font_size || FONT_SIZE_OPTIONS.DEFAULT
+  );
+
+  /**
+   * Apply font size to document root
+   * @param {string} pixelValue - Font size in pixels (e.g., '16px')
+   * @returns {void}
+   */
+  const applyFontSize = pixelValue => {
+    // Use requestAnimationFrame for better performance
+    requestAnimationFrame(() => applyFontSizeToDOM(pixelValue));
+  };
+
+  /**
+   * Update font size in settings and apply to document
+   * Shows success/error alerts
+   * @param {string} pixelValue - Font size in pixels (e.g., '16px')
+   * @returns {Promise<void>}
+   */
+  const updateFontSize = async pixelValue => {
+    try {
+      await updateUISettings({ font_size: pixelValue });
+      applyFontSize(pixelValue);
+      useAlert(
+        t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.UPDATE_SUCCESS')
+      );
+    } catch (error) {
+      useAlert(
+        t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.UPDATE_ERROR')
+      );
+    }
+  };
+
+  // Watch for changes to the font size in UI settings
+  watch(
+    () => uiSettings.value.font_size,
+    newSize => {
+      applyFontSize(newSize);
+    },
+    { immediate: true }
+  );
+
+  return {
+    fontSizeOptions,
+    currentFontSize,
+    applyFontSize,
+    updateFontSize,
+  };
+};
+
+export default useFontSize;
diff --git a/app/javascript/dashboard/helper/themeHelper.js b/app/javascript/dashboard/helper/themeHelper.js
index b19b0541a..159d94373 100644
--- a/app/javascript/dashboard/helper/themeHelper.js
+++ b/app/javascript/dashboard/helper/themeHelper.js
@@ -9,9 +9,9 @@ export const setColorTheme = isOSOnDarkMode => {
     selectedColorScheme === 'dark'
   ) {
     document.body.classList.add('dark');
-    document.documentElement.setAttribute('style', 'color-scheme: dark;');
+    document.documentElement.style.setProperty('color-scheme', 'dark');
   } else {
     document.body.classList.remove('dark');
-    document.documentElement.setAttribute('style', 'color-scheme: light;');
+    document.documentElement.style.setProperty('color-scheme', 'light');
   }
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
index 6abf25355..028a330ac 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/Widget.vue
@@ -140,7 +140,7 @@ export default {
     </div>
     <div
       v-if="isWidgetVisible"
-      class="widget-wrapper flex flex-col justify-between rounded-lg shadow-md bg-slate-25 dark:bg-slate-800 h-[500px] w-[320px]"
+      class="widget-wrapper flex flex-col justify-between rounded-lg shadow-md bg-slate-25 dark:bg-slate-800 h-[31.25rem] w-80"
     >
       <WidgetHead :config="getWidgetConfig" />
       <div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index ba5252f12..21a35bb72 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -195,7 +195,7 @@ export default {
             {{ $t('AUTOMATION.ADD.FORM.CONDITIONS.LABEL') }}
           </label>
           <div
-            class="w-full p-4 mb-4 border border-solid rounded-lg bg-slate-25 dark:bg-slate-700 border-slate-50 dark:border-slate-700"
+            class="w-full p-4 mb-4 border border-solid rounded-lg bg-n-slate-2 dark:bg-n-solid-2 border-n-strong"
           >
             <FilterInputBox
               v-for="(condition, i) in automation.conditions"
@@ -262,7 +262,7 @@ export default {
             {{ $t('AUTOMATION.ADD.FORM.ACTIONS.LABEL') }}
           </label>
           <div
-            class="w-full p-4 mb-4 border border-solid rounded-lg bg-slate-25 dark:bg-slate-700 border-slate-50 dark:border-slate-700"
+            class="w-full p-4 mb-4 border border-solid rounded-lg bg-n-slate-2 dark:bg-n-solid-2 border-n-strong"
           >
             <AutomationActionInput
               v-for="(action, i) in automation.actions"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 5cf90ca0c..220ca57ff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -178,7 +178,7 @@ export default {
             {{ $t('AUTOMATION.ADD.FORM.CONDITIONS.LABEL') }}
           </label>
           <div
-            class="w-full p-4 mb-4 border border-solid rounded-lg bg-slate-25 dark:bg-slate-700 border-slate-50 dark:border-slate-700"
+            class="w-full p-4 mb-4 border border-solid rounded-lg bg-n-slate-2 dark:bg-n-solid-2 border-n-strong"
           >
             <FilterInputBox
               v-for="(condition, i) in automation.conditions"
@@ -245,7 +245,7 @@ export default {
             {{ $t('AUTOMATION.ADD.FORM.ACTIONS.LABEL') }}
           </label>
           <div
-            class="w-full p-4 mb-4 border border-solid rounded-lg bg-slate-25 dark:bg-slate-700 border-slate-50 dark:border-slate-700"
+            class="w-full p-4 mb-4 border border-solid rounded-lg bg-n-slate-2 dark:bg-n-solid-2 border-n-strong"
           >
             <AutomationActionInput
               v-for="(action, i) in automation.actions"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingHeader.vue
index ef0b8d9cd..ee70d9fe8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/billing/components/BillingHeader.vue
@@ -12,7 +12,7 @@ defineProps({
 </script>
 
 <template>
-  <div class="grid grid-cols-[1fr_200px] gap-5">
+  <div class="grid grid-cols-[1fr_auto] gap-5">
     <div>
       <span class="text-base font-medium text-n-slate-12">
         {{ title }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
index d98a8e243..3ff111f05 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BaseSettingsListItem.vue
@@ -30,7 +30,7 @@ defineProps({
           <slot name="label" />
         </div>
         <p
-          class="text-base text-slate-600 dark:text-slate-300 max-w-[400px] w-full line-clamp-2"
+          class="text-base text-slate-600 dark:text-slate-300 max-w-[25rem] w-full line-clamp-2"
         >
           <slot name="description">
             {{ description }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
index 3921307d2..82136dc34 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
@@ -41,7 +41,7 @@ export default {
 
 <template>
   <div
-    class="flex flex-row overflow-auto p-4 h-full bg-slate-25 dark:bg-slate-800"
+    class="flex flex-row overflow-auto p-4 h-full bg-n-alpha-2 dark:bg-n-solid-1"
   >
     <woot-wizard
       class="hidden md:block w-1/4"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 461ec9f3a..99a64081b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -105,14 +105,14 @@ const openDelete = inbox => {
                 />
                 <div
                   v-else
-                  class="w-12 h-12 bg-black-50 dark:bg-black-800 rounded-full p-2 ring ring-opacity-20 dark:ring-opacity-80 ring-black-100 dark:ring-black-900 border border-slate-100 dark:border-slate-700/50 shadow-sm block"
+                  class="w-[48px] h-[48px] flex justify-center items-center bg-black-50 dark:bg-black-800 rounded-full p-2 ring ring-opacity-20 dark:ring-opacity-80 ring-black-100 dark:ring-black-900 border border-slate-100 dark:border-slate-700/50 shadow-sm"
                 >
                   <svg
                     xmlns="http://www.w3.org/2000/svg"
                     width="32"
                     height="32"
                     viewBox="0 0 24 24"
-                    class="opacity-80 p-1"
+                    class="opacity-80 p-1 flex-shrink-0"
                   >
                     <path
                       fill="currentColor"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index b91fc2414..785c12d3a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -362,7 +362,7 @@ export default {
 
 <template>
   <div
-    class="flex-grow flex-shrink w-full min-w-0 pl-0 pr-0 overflow-auto bg-white settings dark:bg-slate-800"
+    class="flex-grow flex-shrink w-full min-w-0 pl-0 pr-0 overflow-auto settings bg-n-solid-1"
   >
     <SettingIntroBanner
       :header-image="inbox.avatarUrl"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
index 9f1f532ed..04423ba14 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/WidgetBuilder.vue
@@ -413,7 +413,10 @@ export default {
             :widget-bubble-type="widgetBubbleType"
           />
         </div>
-        <div v-else class="mx-5 p-2.5 bg-slate-50 rounded-lg dark:bg-slate-700">
+        <div
+          v-else
+          class="mx-5 p-2.5 bg-n-slate-3 rounded-lg dark:bg-n-solid-3"
+        >
           <woot-code :script="widgetScript" />
         </div>
       </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
index 3fbc26043..2b5b23907 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/SenderNameExamplePreview.vue
@@ -69,7 +69,7 @@ export default {
 </script>
 
 <template>
-  <div class="flex flex-row items-center gap-4">
+  <div class="flex flex-col lg:flex-row items-start lg:items-center gap-4">
     <button
       v-for="keyOption in senderNameKeyOptions"
       :key="keyOption.key"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
index 599a91ecd..3682c14a7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroNode.vue
@@ -67,7 +67,7 @@ const dropdownValues = () => {
       :class="
         errorKey
           ? 'bg-red-50 animate-shake dark:bg-red-800'
-          : 'bg-white dark:bg-slate-700'
+          : 'bg-n-slate-2 dark:bg-n-solid-3'
       "
     >
       <ActionInput
@@ -89,6 +89,7 @@ const dropdownValues = () => {
       size="small"
       variant="smooth"
       color-scheme="alert"
+      class="flex-shrink-0"
       @click="$emit('deleteNode')"
     />
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
index bc8353b49..d1e250147 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
@@ -91,9 +91,9 @@ export default {
         </button>
       </div>
       <div
-        class="mt-2 flex items-start p-2 bg-slate-50 dark:bg-slate-700 rounded-md"
+        class="mt-2 flex items-start p-2 bg-n-slate-3 dark:bg-n-solid-3 rounded-md"
       >
-        <fluent-icon icon="info" size="20" class="flex-shrink" />
+        <fluent-icon icon="info" size="16" class="flex-shrink-0 mt-0.5" />
         <p
           class="ml-2 rtl:ml-0 rtl:mr-2 mb-0 text-slate-600 dark:text-slate-200"
         >
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue
index 06d6932d4..4ec8183d7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/AudioAlertTone.vue
@@ -86,7 +86,7 @@ const playAudio = async () => {
       v-tooltip.top="
         $t('PROFILE_SETTINGS.FORM.AUDIO_NOTIFICATIONS_SECTION.PLAY')
       "
-      class="border-0 shadow-sm outline-none flex justify-center items-center size-10 appearance-none rounded-xl ring-ash-200 ring-1 ring-inset focus:ring-2 focus:ring-inset focus:ring-primary-500 flex-shrink-0 mt-[28px]"
+      class="border-0 shadow-sm outline-none flex justify-center items-center size-10 appearance-none rounded-xl ring-ash-200 ring-1 ring-inset focus:ring-2 focus:ring-inset focus:ring-primary-500 flex-shrink-0 mt-[1.75rem]"
       @click="playAudio"
     >
       <Icon icon="i-lucide-volume-2" />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
index 6ac4bcbf8..e224ee5c5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/ChangePassword.vue
@@ -20,10 +20,10 @@ export default {
       isPasswordChanging: false,
       errorMessage: '',
       inputStyles: {
-        borderRadius: '12px',
-        padding: '6px 12px',
-        fontSize: '14px',
-        marginBottom: '2px',
+        borderRadius: '0.75rem',
+        padding: '0.375rem 0.75rem',
+        fontSize: '0.875rem',
+        marginBottom: '0.125rem',
       },
     };
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/FontSize.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/FontSize.vue
new file mode 100644
index 000000000..2dc0e89b3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/FontSize.vue
@@ -0,0 +1,62 @@
+<script setup>
+import { computed } from 'vue';
+import FormSelect from 'v3/components/Form/Select.vue';
+import { useFontSize } from 'dashboard/composables/useFontSize';
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: 'default',
+  },
+  label: {
+    type: String,
+    default: '',
+  },
+  description: {
+    type: String,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['change']);
+
+const { fontSizeOptions } = useFontSize();
+
+const selectedValue = computed({
+  get: () => props.value,
+  set: value => {
+    emit('change', value);
+  },
+});
+</script>
+
+<template>
+  <div class="flex gap-2 justify-between w-full items-start">
+    <div>
+      <label class="text-n-gray-12 font-medium leading-6 text-sm">
+        {{ label }}
+      </label>
+      <p class="text-n-gray-11">
+        {{ description }}
+      </p>
+    </div>
+    <FormSelect
+      v-model="selectedValue"
+      name="fontSize"
+      spacing="compact"
+      class="min-w-28 mt-px"
+      :value="selectedValue"
+      :options="fontSizeOptions"
+      label=""
+    >
+      <option
+        v-for="option in fontSizeOptions"
+        :key="option.value"
+        :value="option.value"
+        :selected="option.value === selectedValue"
+      >
+        {{ option.label }}
+      </option>
+    </FormSelect>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue
index 4bd77166d..f652adeb0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/HotKeyCard.vue
@@ -25,15 +25,17 @@ defineProps({
 
 <template>
   <button
-    class="flex flex-col gap-4 w-full h-fit sm:max-h-[220px] p-4 sm:max-w-[350px] rounded-md border border-solid border-ash-200"
+    class="flex flex-col gap-4 w-full h-fit p-4 rounded-md border border-n-weak dark:border-n-weak"
     :class="{
       'border-primary-300 ': active,
     }"
   >
     <div class="flex flex-col gap-2 items-center w-full rounded-t-[5px]">
-      <div class="flex items-center justify-between w-full gap-1">
-        <div class="flex items-center text-base font-medium text-ash-900">
-          {{ title }}
+      <div class="grid grid-cols-[1fr_auto] items-center w-full gap-1">
+        <div
+          class="overflow-hidden text-base font-medium text-ash-900 text-left"
+        >
+          <span class="block truncate">{{ title }}</span>
         </div>
         <input
           :checked="active"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index a38046580..85204627a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -2,6 +2,7 @@
 import { mapGetters } from 'vuex';
 import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
+import { useFontSize } from 'dashboard/composables/useFontSize';
 import { clearCookiesOnLogout } from 'dashboard/store/utils/api.js';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
 import { parseAPIErrorResponse } from 'dashboard/store/utils/api';
@@ -9,6 +10,7 @@ import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 import UserProfilePicture from './UserProfilePicture.vue';
 import UserBasicDetails from './UserBasicDetails.vue';
 import MessageSignature from './MessageSignature.vue';
+import FontSize from './FontSize.vue';
 import HotKeyCard from './HotKeyCard.vue';
 import ChangePassword from './ChangePassword.vue';
 import NotificationPreferences from './NotificationPreferences.vue';
@@ -25,6 +27,7 @@ export default {
   components: {
     MessageSignature,
     FormSection,
+    FontSize,
     UserProfilePicture,
     Policy,
     UserBasicDetails,
@@ -36,12 +39,12 @@ export default {
   },
   mixins: [globalConfigMixin],
   setup() {
-    const { uiSettings, updateUISettings, isEditorHotKeyEnabled } =
-      useUISettings();
+    const { isEditorHotKeyEnabled } = useUISettings();
+    const { currentFontSize, updateFontSize } = useFontSize();
 
     return {
-      uiSettings,
-      updateUISettings,
+      currentFontSize,
+      updateFontSize,
       isEditorHotKeyEnabled,
     };
   },
@@ -182,7 +185,7 @@ export default {
 </script>
 
 <template>
-  <div class="grid py-16 px-5 font-inter mx-auto gap-16 sm:max-w-[720px]">
+  <div class="grid py-16 px-5 font-inter mx-auto gap-16 sm:max-w-screen-md">
     <div class="flex flex-col gap-6">
       <h2 class="text-2xl font-medium text-ash-900">
         {{ $t('PROFILE_SETTINGS.TITLE') }}
@@ -201,7 +204,19 @@ export default {
         @update-user="updateProfile"
       />
     </div>
-
+    <FormSection
+      :title="$t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.TITLE')"
+      :description="$t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.NOTE')"
+    >
+      <FontSize
+        :value="currentFontSize"
+        :label="$t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.TITLE')"
+        :description="
+          $t('PROFILE_SETTINGS.FORM.INTERFACE_SECTION.FONT_SIZE.NOTE')
+        "
+        @change="updateFontSize"
+      />
+    </FormSection>
     <FormSection
       :title="$t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.TITLE')"
       :description="$t('PROFILE_SETTINGS.FORM.MESSAGE_SIGNATURE_SECTION.NOTE')"
@@ -221,7 +236,7 @@ export default {
         <button
           v-for="hotKey in hotKeys"
           :key="hotKey.key"
-          class="px-0 reset-base"
+          class="px-0 reset-base w-full sm:flex-1"
         >
           <HotKeyCard
             :key="hotKey.title"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
index f4ca75033..10720e472 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/UserBasicDetails.vue
@@ -35,10 +35,10 @@ export default {
       userDisplayName: this.displayName,
       userEmail: this.email,
       inputStyles: {
-        borderRadius: '12px',
-        padding: '6px 12px',
-        fontSize: '14px',
-        marginBottom: '2px',
+        borderRadius: '0.75rem',
+        padding: '0.375rem 0.75rem',
+        fontSize: '0.875rem',
+        marginBottom: '0.125rem',
       },
     };
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportsWrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportsWrapper.vue
index 7d522f53a..eda443c0e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportsWrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportsWrapper.vue
@@ -2,7 +2,7 @@
   <div
     class="reports--wrapper overflow-auto bg-n-background w-full px-8 xl:px-0"
   >
-    <div class="max-w-[960px] mx-auto pb-12">
+    <div class="max-w-[60rem] mx-auto pb-12">
       <router-view />
     </div>
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
index de5098ac4..9df7582b6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaForm.vue
@@ -161,9 +161,9 @@ export default {
         :class="{ error: v$.name.$error }"
         class="w-full"
         :styles="{
-          borderRadius: '12px',
-          padding: '6px 12px',
-          fontSize: '14px',
+          borderRadius: '0.75rem',
+          padding: '0.375rem 0.75rem',
+          fontSize: '0.875rem',
         }"
         :label="$t('SLA.FORM.NAME.LABEL')"
         :placeholder="$t('SLA.FORM.NAME.PLACEHOLDER')"
@@ -175,9 +175,9 @@ export default {
         v-model="description"
         class="w-full"
         :styles="{
-          borderRadius: '12px',
-          padding: '6px 12px',
-          fontSize: '14px',
+          borderRadius: '0.75rem',
+          padding: '0.375rem 0.75rem',
+          fontSize: '0.875rem',
         }"
         :label="$t('SLA.FORM.DESCRIPTION.LABEL')"
         :placeholder="$t('SLA.FORM.DESCRIPTION.PLACEHOLDER')"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
index 981dd6c0e..d7532d9bf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/sla/SlaTimeInput.vue
@@ -91,9 +91,9 @@ export default {
       :class="{ error: v$.thresholdTime.$error }"
       class="flex-grow"
       :styles="{
-        borderRadius: '12px',
-        padding: '6px 12px',
-        fontSize: '14px',
+        borderRadius: '0.75rem',
+        padding: '0.375rem 0.75rem',
+        fontSize: '0.875rem',
       }"
       :label="label"
       :placeholder="placeholder"
diff --git a/app/javascript/shared/components/emoji/EmojiInput.vue b/app/javascript/shared/components/emoji/EmojiInput.vue
index e27c4ec2a..0672a4bb3 100644
--- a/app/javascript/shared/components/emoji/EmojiInput.vue
+++ b/app/javascript/shared/components/emoji/EmojiInput.vue
@@ -87,7 +87,7 @@ export default {
 <template>
   <div
     role="dialog"
-    class="emoji-dialog bg-white shadow-lg dark:bg-slate-900 rounded-md border border-solid border-slate-75 dark:border-slate-800/50 box-content h-[300px] absolute right-0 -top-[95px] w-80 z-20"
+    class="emoji-dialog bg-white shadow-lg dark:bg-slate-900 rounded-md border border-solid border-slate-75 dark:border-slate-800/50 box-content h-[18.75rem] absolute right-0 -top-[95px] w-80 z-20"
   >
     <div class="flex flex-col">
       <div class="flex gap-2 emoji-search--wrap">
@@ -230,7 +230,7 @@ export default {
   @apply box-border p-1;
 
   .emoji--item {
-    @apply h-[26px] w-[26px] leading-normal m-1;
+    @apply h-[1.625rem] w-[1.625rem] leading-normal m-1;
   }
 }
 
@@ -243,7 +243,7 @@ export default {
 }
 
 .empty-message {
-  @apply items-center flex flex-col h-[212px] justify-center;
+  @apply items-center flex flex-col h-[13.25rem] justify-center;
 
   .emoji-icon {
     @apply text-slate-200 dark:text-slate-200 mb-2;
@@ -255,7 +255,7 @@ export default {
 }
 
 .emoji-item {
-  @apply h-[212px] overflow-y-auto;
+  @apply h-[13.25rem] overflow-y-auto;
 }
 
 .emoji-category--title {
@@ -263,7 +263,7 @@ export default {
 }
 
 .emoji-dialog--footer {
-  @apply relative w-[322px] -left-px rtl:left-[unset] rtl:-right-px bottom-0 py-0 rounded-b-md border-b border-solid border-slate-75 dark:border-slate-800/50 px-1 bg-slate-75 dark:bg-slate-800;
+  @apply relative w-full py-0 rounded-b-[0.34rem] px-1 bg-slate-75 dark:bg-slate-800;
 
   ul {
     @apply flex relative left-[2px] rtl:left-[unset] rtl:right-[2px] list-none m-0 overflow-auto py-1 px-0;
diff --git a/app/javascript/v3/components/Form/Select.vue b/app/javascript/v3/components/Form/Select.vue
index 3cfef8da7..0fd9ad002 100644
--- a/app/javascript/v3/components/Form/Select.vue
+++ b/app/javascript/v3/components/Form/Select.vue
@@ -68,7 +68,7 @@ export default {
         'text-ash-900': modelValue,
         'pl-9': icon,
       }"
-      class="block w-full px-3 py-2 pr-6 mb-0 border-0 shadow-sm outline-none appearance-none rounded-xl select-caret ring-ash-200 ring-1 ring-inset placeholder:text-ash-900 focus:ring-2 focus:ring-inset focus:ring-primary-500 sm:text-sm sm:leading-6"
+      class="block w-full px-3 py-2 pr-6 mb-0 border-0 shadow-sm outline-none appearance-none rounded-xl select-caret ring-ash-200 ring-1 ring-inset placeholder:text-ash-900 focus:ring-2 focus:ring-inset focus:ring-primary-500 text-sm leading-6"
       @input="onInput"
     >
       <option value="" disabled selected class="hidden">
diff --git a/app/javascript/v3/components/Form/Switch.vue b/app/javascript/v3/components/Form/Switch.vue
index cc2fc6133..597284ef8 100644
--- a/app/javascript/v3/components/Form/Switch.vue
+++ b/app/javascript/v3/components/Form/Switch.vue
@@ -30,8 +30,8 @@ export default {
       class="rounded-full bg-white top-0.5 absolute dark:bg-white w-3 h-3 translate-y-0 duration-200 transition-transform ease-in-out"
       :class="
         modelValue
-          ? 'ltr:translate-x-0 rtl:translate-x-[12px]'
-          : 'ltr:-translate-x-[12px] rtl:translate-x-0'
+          ? 'ltr:translate-x-0 rtl:translate-x-[0.75rem]'
+          : 'ltr:-translate-x-[0.75rem] rtl:translate-x-0'
       "
     />
   </button>

From 77a0f18685b76e30f5ffaf7aa7358faea150147a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 27 Feb 2025 16:53:57 +0530
Subject: [PATCH 04/27] feat: setup eslint for vue-i18n (#10889)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .eslintrc.js                                  |  14 ++
 .../dashboard/settings/agentBots/Index.vue    |   2 +-
 .../settings/components/BasePaywallModal.vue  |   2 +-
 package.json                                  |   1 +
 pnpm-lock.yaml                                | 139 +++++++++++++++++-
 5 files changed, 154 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index a2932b2a9..6c867f557 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,6 +4,8 @@ module.exports = {
     'prettier',
     'plugin:vue/vue3-recommended',
     'plugin:vitest-globals/recommended',
+    // use recommended-legacy when upgrading the plugin to v4
+    'plugin:@intlify/vue-i18n/recommended',
   ],
   overrides: [
     {
@@ -229,6 +231,18 @@ module.exports = {
     'vue/singleline-html-element-content-newline': 'off',
     'import/extensions': ['off'],
     'no-console': 'error',
+    '@intlify/vue-i18n/no-dynamic-keys': 'warn',
+    '@intlify/vue-i18n/no-unused-keys': [
+      'warn',
+      {
+        extensions: ['.js', '.vue'],
+      },
+    ],
+  },
+  settings: {
+    'vue-i18n': {
+      localeDir: './app/javascript/*/i18n/**.json',
+    },
   },
   env: {
     browser: true,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
index 886de661e..028d06177 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue
@@ -70,7 +70,7 @@ export default {
       </div>
 
       <div class="hidden w-1/3 lg:block">
-        <p v-html="$t('AGENT_BOTS.SIDEBAR_TXT')" />
+        <p v-dompurify-html="$t('AGENT_BOTS.SIDEBAR_TXT')" />
       </div>
     </div>
     <woot-button
diff --git a/app/javascript/dashboard/routes/dashboard/settings/components/BasePaywallModal.vue b/app/javascript/dashboard/routes/dashboard/settings/components/BasePaywallModal.vue
index e2b552d52..6701d111a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/components/BasePaywallModal.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/components/BasePaywallModal.vue
@@ -42,8 +42,8 @@ const emit = defineEmits(['upgrade']);
       </span>
     </div>
     <p
+      v-dompurify-html="$t(`${featurePrefix}.${i18nKey}.AVAILABLE_ON`)"
       class="text-sm font-normal text-n-slate-11"
-      v-html="$t(`${featurePrefix}.${i18nKey}.AVAILABLE_ON`)"
     />
     <p class="text-sm font-normal text-n-slate-11">
       {{ $t(`${featurePrefix}.${i18nKey}.UPGRADE_PROMPT`) }}
diff --git a/package.json b/package.json
index ca61726e1..624b77686 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,7 @@
     "@iconify-json/ph": "^1.2.1",
     "@iconify-json/ri": "^1.2.3",
     "@iconify-json/teenyicons": "^1.2.1",
+    "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
     "@size-limit/file": "^8.2.4",
     "@vitest/coverage-v8": "3.0.5",
     "@vue/test-utils": "^2.4.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 69532a380..1696ded6d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -251,6 +251,9 @@ importers:
       '@iconify-json/teenyicons':
         specifier: ^1.2.1
         version: 1.2.1
+      '@intlify/eslint-plugin-vue-i18n':
+        specifier: ^3.2.0
+        version: 3.2.0(eslint@8.57.0)
       '@size-limit/file':
         specifier: ^8.2.4
         version: 8.2.6(size-limit@8.2.6)
@@ -768,6 +771,10 @@ packages:
     resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  '@eslint/eslintrc@3.2.0':
+    resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   '@eslint/js@8.57.0':
     resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -896,6 +903,12 @@ packages:
     resolution: {integrity: sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==}
     engines: {node: '>= 16'}
 
+  '@intlify/eslint-plugin-vue-i18n@3.2.0':
+    resolution: {integrity: sha512-TOIrD4tJE48WMyVIB8bNeQJJPYo1Prpqnm9Xpn1UZmcqlELhm8hmP8QyJnkgesfbG7hyiX/kvo63W7ClEQmhpg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      eslint: ^8.0.0 || ^9.0.0-0
+
   '@intlify/message-compiler@9.14.2':
     resolution: {integrity: sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==}
     engines: {node: '>= 16'}
@@ -2623,6 +2636,12 @@ packages:
     engines: {node: '>=6.0'}
     hasBin: true
 
+  eslint-compat-utils@0.6.4:
+    resolution: {integrity: sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      eslint: '>=6.0.0'
+
   eslint-config-airbnb-base@15.0.0:
     resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -2711,12 +2730,20 @@ packages:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   eslint@8.57.0:
     resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
+  espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2931,6 +2958,14 @@ packages:
     resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
     engines: {node: '>=8'}
 
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@15.14.0:
+    resolution: {integrity: sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==}
+    engines: {node: '>=18'}
+
   globalthis@1.0.3:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
@@ -3063,6 +3098,10 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
+  ignore@6.0.2:
+    resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
+    engines: {node: '>= 4'}
+
   immutable@4.3.7:
     resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==}
 
@@ -3167,6 +3206,9 @@ packages:
     resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
     engines: {node: '>=12'}
 
+  is-language-code@3.1.0:
+    resolution: {integrity: sha512-zJdQ3QTeLye+iphMeK3wks+vXSRFKh68/Pnlw7aOfApFSEIOhYa8P9vwwa6QrImNNBMJTiL1PpYF0f4BxDuEgA==}
+
   is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
@@ -3320,6 +3362,15 @@ packages:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
 
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonc-eslint-parser@2.4.0:
+    resolution: {integrity: sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
   jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
 
@@ -5038,6 +5089,10 @@ packages:
   yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
+  yaml-eslint-parser@1.2.3:
+    resolution: {integrity: sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+
   yaml@2.3.1:
     resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
     engines: {node: '>= 14'}
@@ -5456,6 +5511,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@eslint/eslintrc@3.2.0':
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.4.0
+      espree: 10.3.0
+      globals: 14.0.0
+      ignore: 5.2.4
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
   '@eslint/js@8.57.0': {}
 
   '@floating-ui/core@1.6.7':
@@ -5645,6 +5714,31 @@ snapshots:
       '@intlify/message-compiler': 9.14.2
       '@intlify/shared': 9.14.2
 
+  '@intlify/eslint-plugin-vue-i18n@3.2.0(eslint@8.57.0)':
+    dependencies:
+      '@eslint/eslintrc': 3.2.0
+      '@intlify/core-base': 9.14.2
+      '@intlify/message-compiler': 9.14.2
+      debug: 4.4.0
+      eslint: 8.57.0
+      eslint-compat-utils: 0.6.4(eslint@8.57.0)
+      glob: 10.4.5
+      globals: 15.14.0
+      ignore: 6.0.2
+      import-fresh: 3.3.0
+      is-language-code: 3.1.0
+      js-yaml: 4.1.0
+      json5: 2.2.3
+      jsonc-eslint-parser: 2.4.0
+      lodash: 4.17.21
+      parse5: 7.1.2
+      semver: 7.6.3
+      synckit: 0.9.1
+      vue-eslint-parser: 9.4.3(eslint@8.57.0)
+      yaml-eslint-parser: 1.2.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@intlify/message-compiler@9.14.2':
     dependencies:
       '@intlify/shared': 9.14.2
@@ -6891,6 +6985,10 @@ snapshots:
     dependencies:
       acorn: 8.10.0
 
+  acorn-jsx@5.3.2(acorn@8.14.0):
+    dependencies:
+      acorn: 8.14.0
+
   acorn-walk@8.3.4:
     dependencies:
       acorn: 8.12.1
@@ -6899,8 +6997,7 @@ snapshots:
 
   acorn@8.12.1: {}
 
-  acorn@8.14.0:
-    optional: true
+  acorn@8.14.0: {}
 
   activestorage@5.2.8:
     dependencies:
@@ -7700,6 +7797,11 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
+  eslint-compat-utils@0.6.4(eslint@8.57.0):
+    dependencies:
+      eslint: 8.57.0
+      semver: 7.6.3
+
   eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.30.0(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       confusing-browser-globals: 1.0.10
@@ -7807,6 +7909,8 @@ snapshots:
 
   eslint-visitor-keys@3.4.3: {}
 
+  eslint-visitor-keys@4.2.0: {}
+
   eslint@8.57.0:
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
@@ -7850,6 +7954,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  espree@10.3.0:
+    dependencies:
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      eslint-visitor-keys: 4.2.0
+
   espree@9.6.1:
     dependencies:
       acorn: 8.10.0
@@ -8078,6 +8188,10 @@ snapshots:
     dependencies:
       type-fest: 0.20.2
 
+  globals@14.0.0: {}
+
+  globals@15.14.0: {}
+
   globalthis@1.0.3:
     dependencies:
       define-properties: 1.2.0
@@ -8264,6 +8378,8 @@ snapshots:
 
   ignore@5.2.4: {}
 
+  ignore@6.0.2: {}
+
   immutable@4.3.7:
     optional: true
 
@@ -8360,6 +8476,10 @@ snapshots:
 
   is-interactive@2.0.0: {}
 
+  is-language-code@3.1.0:
+    dependencies:
+      '@babel/runtime': 7.26.7
+
   is-negative-zero@2.0.2: {}
 
   is-negative-zero@2.0.3: {}
@@ -8542,6 +8662,15 @@ snapshots:
     dependencies:
       minimist: 1.2.8
 
+  json5@2.2.3: {}
+
+  jsonc-eslint-parser@2.4.0:
+    dependencies:
+      acorn: 8.14.0
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      semver: 7.6.3
+
   jsonfile@6.1.0:
     dependencies:
       universalify: 2.0.1
@@ -10410,6 +10539,12 @@ snapshots:
 
   yallist@4.0.0: {}
 
+  yaml-eslint-parser@1.2.3:
+    dependencies:
+      eslint-visitor-keys: 3.4.3
+      lodash: 4.17.21
+      yaml: 2.5.1
+
   yaml@2.3.1: {}
 
   yaml@2.5.1: {}

From 30996140a3a44a12f32ae532d1296b0f6c386636 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 27 Feb 2025 17:54:40 +0530
Subject: [PATCH 05/27] fix: Show "not-allowed" cursor for disabled buttons
 (#10986)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Pull Request Template

## Description

Fixed an issue where hover styles were still applied to disabled
buttons. Previously, `disabled:pointer-events-none` was used to prevent
interactions, ensuring hover styles wouldn’t apply. However, this also
removed showing the "not-allowed" cursor. This has been replaced with
`hover:enabled` to ensure hover effects only apply when the button is
enabled while preserving proper cursor behavior.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

### **Screen recording**

**Before**


https://github.com/user-attachments/assets/a5d33869-4d9d-499b-94c8-6371cbb44ecc


**After**


https://github.com/user-attachments/assets/a03d93dc-2374-4c76-8bed-8f1fe79593d2


**Case where `disabled:pointer-events-none` and `hover:enabled` are not
added (for context only).**



https://github.com/user-attachments/assets/407320d8-f889-49d2-a78c-a5d24ed745a0




## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 .../components-next/button/Button.vue         | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/javascript/dashboard/components-next/button/Button.vue b/app/javascript/dashboard/components-next/button/Button.vue
index fadff67b2..81a74eec4 100644
--- a/app/javascript/dashboard/components-next/button/Button.vue
+++ b/app/javascript/dashboard/components-next/button/Button.vue
@@ -99,45 +99,50 @@ const computedJustify = computed(() => {
 const STYLE_CONFIG = {
   colors: {
     blue: {
-      solid: 'bg-n-brand text-white hover:brightness-110 outline-transparent',
+      solid:
+        'bg-n-brand text-white hover:enabled:brightness-110 outline-transparent',
       faded:
-        'bg-n-brand/10 text-n-blue-text hover:bg-n-brand/20 outline-transparent',
+        'bg-n-brand/10 text-n-blue-text hover:enabled:bg-n-brand/20 outline-transparent',
       outline: 'text-n-blue-text outline-n-blue-border',
-      ghost: 'text-n-blue-text hover:bg-n-alpha-2 outline-transparent',
-      link: 'text-n-blue-text hover:underline outline-transparent',
+      ghost: 'text-n-blue-text hover:enabled:bg-n-alpha-2 outline-transparent',
+      link: 'text-n-blue-text hover:enabled:underline outline-transparent',
     },
     ruby: {
-      solid: 'bg-n-ruby-9 text-white hover:bg-n-ruby-10 outline-transparent',
+      solid:
+        'bg-n-ruby-9 text-white hover:enabled:bg-n-ruby-10 outline-transparent',
       faded:
-        'bg-n-ruby-9/10 text-n-ruby-11 hover:bg-n-ruby-9/20 outline-transparent',
-      outline: 'text-n-ruby-11 hover:bg-n-ruby-9/10 outline-n-ruby-8',
-      ghost: 'text-n-ruby-11 hover:bg-n-alpha-2 outline-transparent',
-      link: 'text-n-ruby-9 hover:underline outline-transparent',
+        'bg-n-ruby-9/10 text-n-ruby-11 hover:enabled:bg-n-ruby-9/20 outline-transparent',
+      outline: 'text-n-ruby-11 hover:enabled:bg-n-ruby-9/10 outline-n-ruby-8',
+      ghost: 'text-n-ruby-11 hover:enabled:bg-n-alpha-2 outline-transparent',
+      link: 'text-n-ruby-9 hover:enabled:underline outline-transparent',
     },
     amber: {
-      solid: 'bg-n-amber-9 text-white hover:bg-n-amber-10 outline-transparent',
+      solid:
+        'bg-n-amber-9 text-white hover:enabled:bg-n-amber-10 outline-transparent',
       faded:
-        'bg-n-amber-9/10 text-n-slate-12 hover:bg-n-amber-9/20 outline-transparent',
-      outline: 'text-n-amber-11 hover:bg-n-amber-9/10 outline-n-amber-9',
-      link: 'text-n-amber-9 hover:underline outline-transparent',
-      ghost: 'text-n-amber-9 hover:bg-n-alpha-2 outline-transparent',
+        'bg-n-amber-9/10 text-n-slate-12 hover:enabled:bg-n-amber-9/20 outline-transparent',
+      outline:
+        'text-n-amber-11 hover:enabled:bg-n-amber-9/10 outline-n-amber-9',
+      link: 'text-n-amber-9 hover:enabled:underline outline-transparent',
+      ghost: 'text-n-amber-9 hover:enabled:bg-n-alpha-2 outline-transparent',
     },
     slate: {
       solid:
-        'bg-n-solid-3 dark:hover:bg-n-solid-2 hover:bg-n-alpha-2 text-n-slate-12 outline-n-container',
+        'bg-n-solid-3 dark:hover:enabled:bg-n-solid-2 hover:enabled:bg-n-alpha-2 text-n-slate-12 outline-n-container',
       faded:
-        'bg-n-slate-9/10 text-n-slate-12 hover:bg-n-slate-9/20 outline-transparent',
-      outline: 'text-n-slate-11 outline-n-strong hover:bg-n-slate-9/10',
-      link: 'text-n-slate-11 hover:text-n-slate-12 hover:underline outline-transparent',
-      ghost: 'text-n-slate-12 hover:bg-n-alpha-2 outline-transparent',
+        'bg-n-slate-9/10 text-n-slate-12 hover:enabled:bg-n-slate-9/20 outline-transparent',
+      outline: 'text-n-slate-11 outline-n-strong hover:enabled:bg-n-slate-9/10',
+      link: 'text-n-slate-11 hover:enabled:text-n-slate-12 hover:enabled:underline outline-transparent',
+      ghost: 'text-n-slate-12 hover:enabled:bg-n-alpha-2 outline-transparent',
     },
     teal: {
-      solid: 'bg-n-teal-9 text-white hover:bg-n-teal-10 outline-transparent',
+      solid:
+        'bg-n-teal-9 text-white hover:enabled:bg-n-teal-10 outline-transparent',
       faded:
-        'bg-n-teal-9/10 text-n-slate-12 hover:bg-n-teal-9/20 outline-transparent',
-      outline: 'text-n-teal-11 hover:bg-n-teal-9/10 outline-n-teal-9',
-      link: 'text-n-teal-9 hover:underline outline-transparent',
-      ghost: 'text-n-teal-9 hover:bg-n-alpha-2 outline-transparent',
+        'bg-n-teal-9/10 text-n-slate-12 hover:enabled:bg-n-teal-9/20 outline-transparent',
+      outline: 'text-n-teal-11 hover:enabled:bg-n-teal-9/10 outline-n-teal-9',
+      link: 'text-n-teal-9 hover:enabled:underline outline-transparent',
+      ghost: 'text-n-teal-9 hover:enabled:bg-n-alpha-2 outline-transparent',
     },
   },
   sizes: {
@@ -171,7 +176,7 @@ const STYLE_CONFIG = {
     center: 'justify-center',
     end: 'justify-end',
   },
-  base: 'inline-flex items-center min-w-0 gap-2 transition-all duration-200 ease-in-out border-0 rounded-lg outline-1 outline disabled:cursor-not-allowed disabled:pointer-events-none disabled:opacity-50',
+  base: 'inline-flex items-center min-w-0 gap-2 transition-all duration-200 ease-in-out border-0 rounded-lg outline-1 outline disabled:opacity-50',
 };
 
 const variantClasses = computed(() => {

From 12134f9391d62c9ed2887f84daf0feefa376c93e Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 27 Feb 2025 18:15:53 +0530
Subject: [PATCH 06/27] feat: Linear OAuth 2.0  (#10851)

Fixes https://linear.app/chatwoot/issue/CW-3417/oauth-20-authentication
We are planning to publish the Chatwoot app in the Linear [integration
list](https://linear.app/docs/integration-directory). While we currently
use token-based authentication, Linear recommends OAuth2 authentication.
This PR implements OAuth2 support.

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .env.example                                  |  4 +
 .../integrations/linear_controller.rb         | 10 +++
 .../linear/callbacks_controller.rb            | 70 +++++++++++++++
 app/helpers/linear/integration_helper.rb      | 47 ++++++++++
 .../i18n/locale/en/integrations.json          |  6 ++
 .../settings/integrations/Linear.vue          | 66 ++++++++++++++
 .../integrations/integrations.routes.js       | 11 ++-
 app/models/integrations/app.rb                | 24 +++++
 .../integrations/linear/create.json.jbuilder  |  1 +
 config/integration/apps.yml                   | 19 +---
 config/routes.rb                              |  5 ++
 lib/integrations/linear/processor_service.rb  |  3 +-
 lib/linear.rb                                 |  8 +-
 .../integrations/linear_controller_spec.rb    | 10 +++
 .../linear/callbacks_controller_spec.rb       | 88 +++++++++++++++++++
 spec/factories/integrations/hooks.rb          |  2 +-
 .../helpers/linear/integration_helper_spec.rb | 81 +++++++++++++++++
 spec/lib/linear_spec.rb                       |  6 +-
 18 files changed, 432 insertions(+), 29 deletions(-)
 create mode 100644 app/controllers/linear/callbacks_controller.rb
 create mode 100644 app/helpers/linear/integration_helper.rb
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Linear.vue
 create mode 100644 app/views/api/v1/accounts/integrations/linear/create.json.jbuilder
 create mode 100644 spec/controllers/linear/callbacks_controller_spec.rb
 create mode 100644 spec/helpers/linear/integration_helper_spec.rb

diff --git a/.env.example b/.env.example
index b7ba0920d..6e2b7fe56 100644
--- a/.env.example
+++ b/.env.example
@@ -155,6 +155,10 @@ TWITTER_ENVIRONMENT=
 SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
 
+#Linear Integration
+LINEAR_CLIENT_ID=
+LINEAR_CLIENT_SECRET=
+
 # Google OAuth
 GOOGLE_OAUTH_CLIENT_ID=
 GOOGLE_OAUTH_CLIENT_SECRET=
diff --git a/app/controllers/api/v1/accounts/integrations/linear_controller.rb b/app/controllers/api/v1/accounts/integrations/linear_controller.rb
index 814373c7e..4e5348e88 100644
--- a/app/controllers/api/v1/accounts/integrations/linear_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/linear_controller.rb
@@ -1,5 +1,11 @@
 class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
   before_action :fetch_conversation, only: [:link_issue, :linked_issues]
+  before_action :fetch_hook, only: [:destroy]
+
+  def destroy
+    @hook.destroy!
+    head :ok
+  end
 
   def teams
     teams = linear_processor_service.teams
@@ -90,4 +96,8 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
   def permitted_params
     params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
   end
+
+  def fetch_hook
+    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'linear')
+  end
 end
diff --git a/app/controllers/linear/callbacks_controller.rb b/app/controllers/linear/callbacks_controller.rb
new file mode 100644
index 000000000..c0688cefc
--- /dev/null
+++ b/app/controllers/linear/callbacks_controller.rb
@@ -0,0 +1,70 @@
+class Linear::CallbacksController < ApplicationController
+  include Linear::IntegrationHelper
+
+  def show
+    @response = oauth_client.auth_code.get_token(
+      params[:code],
+      redirect_uri: "#{base_url}/linear/callback"
+    )
+
+    handle_response
+  rescue StandardError => e
+    Rails.logger.error("Linear callback error: #{e.message}")
+    redirect_to linear_redirect_uri
+  end
+
+  private
+
+  def oauth_client
+    OAuth2::Client.new(
+      ENV.fetch('LINEAR_CLIENT_ID', nil),
+      ENV.fetch('LINEAR_CLIENT_SECRET', nil),
+      {
+        site: 'https://api.linear.app',
+        token_url: '/oauth/token',
+        authorize_url: '/oauth/authorize'
+      }
+    )
+  end
+
+  def handle_response
+    hook = account.hooks.new(
+      access_token: parsed_body['access_token'],
+      status: 'enabled',
+      app_id: 'linear',
+      settings: {
+        token_type: parsed_body['token_type'],
+        expires_in: parsed_body['expires_in'],
+        scope: parsed_body['scope']
+      }
+    )
+    # You may wonder why we're not handling the refresh token update, since the token will expire only after 10 years, https://github.com/linear/linear/issues/251
+    hook.save!
+    redirect_to linear_redirect_uri
+  rescue StandardError => e
+    Rails.logger.error("Linear callback error: #{e.message}")
+    redirect_to linear_redirect_uri
+  end
+
+  def account
+    @account ||= Account.find(account_id)
+  end
+
+  def account_id
+    return unless params[:state]
+
+    verify_linear_token(params[:state])
+  end
+
+  def linear_redirect_uri
+    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/linear"
+  end
+
+  def parsed_body
+    @parsed_body ||= @response.response.parsed
+  end
+
+  def base_url
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+  end
+end
diff --git a/app/helpers/linear/integration_helper.rb b/app/helpers/linear/integration_helper.rb
new file mode 100644
index 000000000..19f16832d
--- /dev/null
+++ b/app/helpers/linear/integration_helper.rb
@@ -0,0 +1,47 @@
+module Linear::IntegrationHelper
+  # Generates a signed JWT token for Linear integration
+  #
+  # @param account_id [Integer] The account ID to encode in the token
+  # @return [String, nil] The encoded JWT token or nil if client secret is missing
+  def generate_linear_token(account_id)
+    return if client_secret.blank?
+
+    JWT.encode(token_payload(account_id), client_secret, 'HS256')
+  rescue StandardError => e
+    Rails.logger.error("Failed to generate Linear token: #{e.message}")
+    nil
+  end
+
+  def token_payload(account_id)
+    {
+      sub: account_id,
+      iat: Time.current.to_i
+    }
+  end
+
+  # Verifies and decodes a Linear JWT token
+  #
+  # @param token [String] The JWT token to verify
+  # @return [Integer, nil] The account ID from the token or nil if invalid
+  def verify_linear_token(token)
+    return if token.blank? || client_secret.blank?
+
+    decode_token(token, client_secret)
+  end
+
+  private
+
+  def client_secret
+    @client_secret ||= ENV.fetch('LINEAR_CLIENT_SECRET', nil)
+  end
+
+  def decode_token(token, secret)
+    JWT.decode(token, secret, true, {
+                 algorithm: 'HS256',
+                 verify_expiration: true
+               }).first['sub']
+  rescue StandardError => e
+    Rails.logger.error("Unexpected error verifying Linear token: #{e.message}")
+    nil
+  end
+end
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 56f6e9776..58e70db8b 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -297,6 +297,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Linear.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Linear.vue
new file mode 100644
index 000000000..5cb4d2b07
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Linear.vue
@@ -0,0 +1,66 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import {
+  useFunctionGetter,
+  useMapGetter,
+  useStore,
+} from 'dashboard/composables/store';
+
+import Integration from './Integration.vue';
+import Spinner from 'shared/components/Spinner.vue';
+
+const store = useStore();
+
+const integrationLoaded = ref(false);
+
+const integration = useFunctionGetter('integrations/getIntegration', 'linear');
+
+const uiFlags = useMapGetter('integrations/getUIFlags');
+
+const integrationAction = computed(() => {
+  if (integration.value.enabled) {
+    return 'disconnect';
+  }
+  return integration.value.action;
+});
+
+const initializeLinearIntegration = async () => {
+  await store.dispatch('integrations/get', 'linear');
+  integrationLoaded.value = true;
+};
+
+onMounted(() => {
+  initializeLinearIntegration();
+});
+</script>
+
+<template>
+  <div class="flex-grow flex-shrink p-4 overflow-auto">
+    <div class="flex flex-col">
+      <div class="flex flex-col">
+        <div>
+          <div
+            v-if="integrationLoaded && !uiFlags.isCreatingLinear"
+            class="p-4 mb-4 bg-white border border-solid rounded-sm dark:bg-slate-800 border-slate-75 dark:border-slate-700/50"
+          >
+            <Integration
+              :integration-id="integration.id"
+              :integration-logo="integration.logo"
+              :integration-name="integration.name"
+              :integration-description="integration.description"
+              :integration-enabled="integration.enabled"
+              :integration-action="integrationAction"
+              :delete-confirmation-text="{
+                title: $t('INTEGRATION_SETTINGS.LINEAR.DELETE.TITLE'),
+                message: $t('INTEGRATION_SETTINGS.LINEAR.DELETE.MESSAGE'),
+              }"
+            />
+          </div>
+          <div v-else class="flex items-center justify-center flex-1">
+            <Spinner size="" color-scheme="primary" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js b/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
index a2ec06ae0..dca2a19ed 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
@@ -7,7 +7,7 @@ import Webhook from './Webhooks/Index.vue';
 import DashboardApps from './DashboardApps/Index.vue';
 import Slack from './Slack.vue';
 import SettingsContent from '../Wrapper.vue';
-
+import Linear from './Linear.vue';
 export default {
   routes: [
     {
@@ -71,6 +71,15 @@ export default {
           },
           props: route => ({ code: route.query.code }),
         },
+        {
+          path: 'linear',
+          name: 'settings_integrations_linear',
+          component: Linear,
+          meta: {
+            permissions: ['administrator'],
+          },
+          props: route => ({ code: route.query.code }),
+        },
         {
           path: ':integration_id',
           name: 'settings_applications_integration',
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
index 0afb083dc..b57a109db 100644
--- a/app/models/integrations/app.rb
+++ b/app/models/integrations/app.rb
@@ -1,4 +1,5 @@
 class Integrations::App
+  include Linear::IntegrationHelper
   attr_accessor :params
 
   def initialize(params)
@@ -25,10 +26,18 @@ class Integrations::App
     params[:fields]
   end
 
+  # There is no way to get the account_id from the linear callback
+  # so we are using the generate_linear_token method to generate a token and encode it in the state parameter
+  def encode_state
+    generate_linear_token(Current.account.id)
+  end
+
   def action
     case params[:id]
     when 'slack'
       "#{params[:action]}&client_id=#{ENV.fetch('SLACK_CLIENT_ID', nil)}&redirect_uri=#{self.class.slack_integration_url}"
+    when 'linear'
+      build_linear_action
     else
       params[:action]
     end
@@ -45,6 +54,17 @@ class Integrations::App
     end
   end
 
+  def build_linear_action
+    [
+      "#{params[:action]}?response_type=code",
+      "client_id=#{ENV.fetch('LINEAR_CLIENT_ID', nil)}",
+      "redirect_uri=#{self.class.linear_integration_url}",
+      "state=#{encode_state}",
+      'scope=read,write',
+      'prompt=consent'
+    ].join('&')
+  end
+
   def enabled?(account)
     case params[:id]
     when 'webhook'
@@ -64,6 +84,10 @@ class Integrations::App
     "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{Current.account.id}/settings/integrations/slack"
   end
 
+  def self.linear_integration_url
+    "#{ENV.fetch('FRONTEND_URL', nil)}/linear/callback"
+  end
+
   class << self
     def apps
       Hashie::Mash.new(APPS_CONFIG)
diff --git a/app/views/api/v1/accounts/integrations/linear/create.json.jbuilder b/app/views/api/v1/accounts/integrations/linear/create.json.jbuilder
new file mode 100644
index 000000000..c208c81db
--- /dev/null
+++ b/app/views/api/v1/accounts/integrations/linear/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/app', formats: [:json], resource: @hook.app
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index 4fc65af11..b625e83b5 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -59,26 +59,9 @@ linear:
   id: linear
   logo: linear.png
   i18n_key: linear
-  action: /linear
+  action: https://linear.app/oauth/authorize
   hook_type: account
   allow_multiple_hooks: false
-  settings_json_schema:
-    {
-      'type': 'object',
-      'properties': { 'api_key': { 'type': 'string' } },
-      'required': ['api_key'],
-      'additionalProperties': false,
-    }
-  settings_form_schema:
-    [
-      {
-        'label': 'API Key',
-        'type': 'text',
-        'name': 'api_key',
-        'validation': 'required',
-      },
-    ]
-  visible_properties: []
 slack:
   id: slack
   logo: slack.png
diff --git a/config/routes.rb b/config/routes.rb
index 712aa150d..5340ec9cd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -233,6 +233,7 @@ Rails.application.routes.draw do
             end
             resource :linear, controller: 'linear', only: [] do
               collection do
+                delete :destroy
                 get :teams
                 get :team_entities
                 post :create_issue
@@ -444,6 +445,10 @@ Rails.application.routes.draw do
     resource :callback, only: [:show]
   end
 
+  namespace :linear do
+    resource :callback, only: [:show]
+  end
+
   namespace :twilio do
     resources :callback, only: [:create]
     resources :delivery_status, only: [:create]
diff --git a/lib/integrations/linear/processor_service.rb b/lib/integrations/linear/processor_service.rb
index 20b04a301..2dfae28dc 100644
--- a/lib/integrations/linear/processor_service.rb
+++ b/lib/integrations/linear/processor_service.rb
@@ -76,7 +76,6 @@ class Integrations::Linear::ProcessorService
   end
 
   def linear_client
-    credentials = linear_hook.settings
-    @linear_client ||= Linear.new(credentials['api_key'])
+    @linear_client ||= Linear.new(linear_hook.access_token)
   end
 end
diff --git a/lib/linear.rb b/lib/linear.rb
index 2e801c673..9a998c34a 100644
--- a/lib/linear.rb
+++ b/lib/linear.rb
@@ -2,9 +2,9 @@ class Linear
   BASE_URL = 'https://api.linear.app/graphql'.freeze
   PRIORITY_LEVELS = (0..4).to_a
 
-  def initialize(api_key)
-    @api_key = api_key
-    raise ArgumentError, 'Missing Credentials' if api_key.blank?
+  def initialize(access_token)
+    @access_token = access_token
+    raise ArgumentError, 'Missing Credentials' if access_token.blank?
   end
 
   def teams
@@ -108,7 +108,7 @@ class Linear
   def post(payload)
     HTTParty.post(
       BASE_URL,
-      headers: { 'Authorization' => @api_key, 'Content-Type' => 'application/json' },
+      headers: { 'Authorization' => "Bearer #{@access_token}", 'Content-Type' => 'application/json' },
       body: payload.to_json
     )
   end
diff --git a/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
index 8b5de48dd..b1341e65e 100644
--- a/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb
@@ -12,6 +12,16 @@ RSpec.describe 'Linear Integration API', type: :request do
     allow(Integrations::Linear::ProcessorService).to receive(:new).with(account: account).and_return(processor_service)
   end
 
+  describe 'DELETE /api/v1/accounts/:account_id/integrations/linear' do
+    it 'deletes the linear integration' do
+      delete "/api/v1/accounts/#{account.id}/integrations/linear",
+             headers: agent.create_new_auth_token,
+             as: :json
+      expect(response).to have_http_status(:ok)
+      expect(account.hooks.count).to eq(0)
+    end
+  end
+
   describe 'GET /api/v1/accounts/:account_id/integrations/linear/teams' do
     context 'when it is an authenticated user' do
       context 'when data is retrieved successfully' do
diff --git a/spec/controllers/linear/callbacks_controller_spec.rb b/spec/controllers/linear/callbacks_controller_spec.rb
new file mode 100644
index 000000000..b3245fbc5
--- /dev/null
+++ b/spec/controllers/linear/callbacks_controller_spec.rb
@@ -0,0 +1,88 @@
+require 'rails_helper'
+
+RSpec.describe Linear::CallbacksController, type: :request do
+  let(:account) { create(:account) }
+  let(:code) { SecureRandom.hex(10) }
+  let(:state) { SecureRandom.hex(10) }
+  let(:linear_redirect_uri) { "#{ENV.fetch('FRONTEND_URL', '')}/app/accounts/#{account.id}/settings/integrations/linear" }
+
+  describe 'GET /linear/callback' do
+    let(:access_token) { SecureRandom.hex(10) }
+    let(:response_body) do
+      {
+        'access_token' => access_token,
+        'token_type' => 'Bearer',
+        'expires_in' => 7200,
+        'scope' => 'read,write'
+      }
+    end
+
+    before do
+      stub_const('ENV', ENV.to_hash.merge('FRONTEND_URL' => 'http://www.example.com'))
+
+      controller = described_class.new
+      allow(controller).to receive(:verify_linear_token).with(state).and_return(account.id)
+      allow(described_class).to receive(:new).and_return(controller)
+    end
+
+    context 'when successful' do
+      before do
+        stub_request(:post, 'https://api.linear.app/oauth/token')
+          .to_return(
+            status: 200,
+            body: response_body.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'creates a new integration hook' do
+        expect do
+          get linear_callback_path, params: { code: code, state: state }
+        end.to change(Integrations::Hook, :count).by(1)
+
+        hook = Integrations::Hook.last
+        expect(hook.access_token).to eq(access_token)
+        expect(hook.app_id).to eq('linear')
+        expect(hook.status).to eq('enabled')
+        expect(hook.settings).to eq(
+          'token_type' => 'Bearer',
+          'expires_in' => 7200,
+          'scope' => 'read,write'
+        )
+        expect(response).to redirect_to(linear_redirect_uri)
+      end
+    end
+
+    context 'when the code is missing' do
+      before do
+        stub_request(:post, 'https://api.linear.app/oauth/token')
+          .to_return(
+            status: 200,
+            body: response_body.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'redirects to the linear_redirect_uri' do
+        get linear_callback_path, params: { state: state }
+        expect(response).to redirect_to(linear_redirect_uri)
+      end
+    end
+
+    context 'when the token is invalid' do
+      before do
+        stub_request(:post, 'https://api.linear.app/oauth/token')
+          .to_return(
+            status: 400,
+            body: { error: 'invalid_grant' }.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'redirects to the linear_redirect_uri' do
+        get linear_callback_path, params: { code: code, state: state }
+        expect(response).to redirect_to(linear_redirect_uri)
+      end
+    end
+  end
+end
diff --git a/spec/factories/integrations/hooks.rb b/spec/factories/integrations/hooks.rb
index 12958c1ac..498fb9f9a 100644
--- a/spec/factories/integrations/hooks.rb
+++ b/spec/factories/integrations/hooks.rb
@@ -29,7 +29,7 @@ FactoryBot.define do
 
     trait :linear do
       app_id { 'linear' }
-      settings { { api_key: 'api_key' } }
+      access_token { SecureRandom.hex }
     end
   end
 end
diff --git a/spec/helpers/linear/integration_helper_spec.rb b/spec/helpers/linear/integration_helper_spec.rb
new file mode 100644
index 000000000..4f0f65c31
--- /dev/null
+++ b/spec/helpers/linear/integration_helper_spec.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+RSpec.describe Linear::IntegrationHelper do
+  include described_class
+
+  describe '#generate_linear_token' do
+    let(:account_id) { 1 }
+    let(:client_secret) { 'test_secret' }
+    let(:current_time) { Time.current }
+
+    before do
+      allow(ENV).to receive(:fetch).with('LINEAR_CLIENT_SECRET', nil).and_return(client_secret)
+      allow(Time).to receive(:current).and_return(current_time)
+    end
+
+    it 'generates a valid JWT token with correct payload' do
+      token = generate_linear_token(account_id)
+      decoded_token = JWT.decode(token, client_secret, true, algorithm: 'HS256').first
+
+      expect(decoded_token['sub']).to eq(account_id)
+      expect(decoded_token['iat']).to eq(current_time.to_i)
+    end
+
+    context 'when client secret is not configured' do
+      let(:client_secret) { nil }
+
+      it 'returns nil' do
+        expect(generate_linear_token(account_id)).to be_nil
+      end
+    end
+
+    context 'when an error occurs' do
+      before do
+        allow(JWT).to receive(:encode).and_raise(StandardError.new('Test error'))
+      end
+
+      it 'logs the error and returns nil' do
+        expect(Rails.logger).to receive(:error).with('Failed to generate Linear token: Test error')
+        expect(generate_linear_token(account_id)).to be_nil
+      end
+    end
+  end
+
+  describe '#verify_linear_token' do
+    let(:account_id) { 1 }
+    let(:client_secret) { 'test_secret' }
+    let(:valid_token) do
+      JWT.encode({ sub: account_id, iat: Time.current.to_i }, client_secret, 'HS256')
+    end
+
+    before do
+      allow(ENV).to receive(:fetch).with('LINEAR_CLIENT_SECRET', nil).and_return(client_secret)
+    end
+
+    it 'successfully verifies and returns account_id from valid token' do
+      expect(verify_linear_token(valid_token)).to eq(account_id)
+    end
+
+    context 'when token is blank' do
+      it 'returns nil' do
+        expect(verify_linear_token('')).to be_nil
+        expect(verify_linear_token(nil)).to be_nil
+      end
+    end
+
+    context 'when client secret is not configured' do
+      let(:client_secret) { nil }
+
+      it 'returns nil' do
+        expect(verify_linear_token(valid_token)).to be_nil
+      end
+    end
+
+    context 'when token is invalid' do
+      it 'logs the error and returns nil' do
+        expect(Rails.logger).to receive(:error).with(/Unexpected error verifying Linear token:/)
+        expect(verify_linear_token('invalid_token')).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/lib/linear_spec.rb b/spec/lib/linear_spec.rb
index e8a866cc5..2ebaec1a8 100644
--- a/spec/lib/linear_spec.rb
+++ b/spec/lib/linear_spec.rb
@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 describe Linear do
-  let(:api_key) { 'valid_api_key' }
+  let(:access_token) { 'valid_access_token' }
   let(:url) { 'https://api.linear.app/graphql' }
-  let(:linear_client) { described_class.new(api_key) }
-  let(:headers) { { 'Content-Type' => 'application/json', 'Authorization' => api_key } }
+  let(:linear_client) { described_class.new(access_token) }
+  let(:headers) { { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{access_token}" } }
 
   it 'raises an exception if the API key is absent' do
     expect { described_class.new(nil) }.to raise_error(ArgumentError, 'Missing Credentials')

From b52b2b9a4712b6a3fb3084d46d079197599135eb Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 27 Feb 2025 21:45:20 +0530
Subject: [PATCH 07/27] chore: Fix issue with compose conversation form
 (#10991)

---
 .../NewConversation/ComposeConversation.vue   |  14 +-
 .../helpers/composeConversationHelper.js      |  15 ++
 .../specs/composeConversationHelper.spec.js   | 147 ++++++++++++++++++
 .../conversation/contact/ConversationForm.vue |  47 ++++--
 .../api/v1/models/_inbox_slim.json.jbuilder   |   7 -
 5 files changed, 211 insertions(+), 19 deletions(-)

diff --git a/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue b/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
index 9a49fc39a..93b0baa3d 100644
--- a/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
@@ -13,6 +13,7 @@ import {
   createNewContact,
   fetchContactableInboxes,
   processContactableInboxes,
+  mergeInboxDetails,
 } from 'dashboard/components-next/NewConversation/helpers/composeConversationHelper';
 
 import ComposeNewConversationForm from 'dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue';
@@ -47,6 +48,7 @@ const currentUser = useMapGetter('getCurrentUser');
 const globalConfig = useMapGetter('globalConfig/get');
 const uiFlags = useMapGetter('contactConversations/getUIFlags');
 const messageSignature = useMapGetter('getMessageSignature');
+const inboxesList = useMapGetter('inboxes/getInboxes');
 
 const sendWithSignature = computed(() =>
   fetchSignatureFlagFromUISettings(targetInbox.value?.channelType)
@@ -104,7 +106,12 @@ const handleSelectedContact = async ({ value, action, ...rest }) => {
     isFetchingInboxes.value = true;
     try {
       const contactableInboxes = await fetchContactableInboxes(contact.id);
-      selectedContact.value.contactInboxes = contactableInboxes;
+      // Merge the processed contactableInboxes with the inboxesList
+      selectedContact.value.contactInboxes = mergeInboxDetails(
+        contactableInboxes,
+        inboxesList.value
+      );
+
       isFetchingInboxes.value = false;
     } catch (error) {
       isFetchingInboxes.value = false;
@@ -162,9 +169,12 @@ watch(
   () => {
     if (activeContact.value && props.contactId) {
       const contactInboxes = activeContact.value?.contactInboxes || [];
+      // First process the contactable inboxes to get the right structure
+      const processedInboxes = processContactableInboxes(contactInboxes);
+      // Then Merge processedInboxes with the inboxes list
       selectedContact.value = {
         ...activeContact.value,
-        contactInboxes: processContactableInboxes(contactInboxes),
+        contactInboxes: mergeInboxDetails(processedInboxes, inboxesList.value),
       };
     }
   },
diff --git a/app/javascript/dashboard/components-next/NewConversation/helpers/composeConversationHelper.js b/app/javascript/dashboard/components-next/NewConversation/helpers/composeConversationHelper.js
index c5d3c6264..57e819245 100644
--- a/app/javascript/dashboard/components-next/NewConversation/helpers/composeConversationHelper.js
+++ b/app/javascript/dashboard/components-next/NewConversation/helpers/composeConversationHelper.js
@@ -87,6 +87,21 @@ export const processContactableInboxes = inboxes => {
   }));
 };
 
+export const mergeInboxDetails = (inboxesData, inboxesList = []) => {
+  if (!inboxesData || !inboxesData.length) {
+    return [];
+  }
+
+  return inboxesData.map(inboxData => {
+    const matchingInbox =
+      inboxesList.find(inbox => inbox.id === inboxData.id) || {};
+    return {
+      ...camelcaseKeys(matchingInbox, { deep: true }),
+      ...inboxData,
+    };
+  });
+};
+
 export const prepareAttachmentPayload = (
   attachedFiles,
   directUploadsEnabled
diff --git a/app/javascript/dashboard/components-next/NewConversation/helpers/specs/composeConversationHelper.spec.js b/app/javascript/dashboard/components-next/NewConversation/helpers/specs/composeConversationHelper.spec.js
index 9307e657c..3de1fad0d 100644
--- a/app/javascript/dashboard/components-next/NewConversation/helpers/specs/composeConversationHelper.spec.js
+++ b/app/javascript/dashboard/components-next/NewConversation/helpers/specs/composeConversationHelper.spec.js
@@ -110,6 +110,153 @@ describe('composeConversationHelper', () => {
     });
   });
 
+  describe('mergeInboxDetails', () => {
+    it('returns empty array if inboxesData is empty or null', () => {
+      expect(helpers.mergeInboxDetails(null)).toEqual([]);
+      expect(helpers.mergeInboxDetails([])).toEqual([]);
+      expect(helpers.mergeInboxDetails(undefined)).toEqual([]);
+    });
+
+    it('merges inbox data with matching inboxes from the list', () => {
+      const inboxesData = [
+        { id: 1, sourceId: 'source1' },
+        { id: 2, sourceId: 'source2' },
+      ];
+
+      const inboxesList = [
+        {
+          id: 1,
+          name: 'Inbox 1',
+          channel_type: 'Channel::Email',
+          channel_id: 10,
+          phone_number: null,
+        },
+        {
+          id: 2,
+          name: 'Inbox 2',
+          channel_type: 'Channel::Whatsapp',
+          channel_id: 20,
+          phone_number: '+1234567890',
+        },
+        {
+          id: 3,
+          name: 'Inbox 3',
+          channel_type: 'Channel::Api',
+          channel_id: 30,
+          phone_number: null,
+        },
+      ];
+
+      const result = helpers.mergeInboxDetails(inboxesData, inboxesList);
+
+      expect(result.length).toBe(2);
+      expect(result[0]).toMatchObject({
+        id: 1,
+        sourceId: 'source1',
+        name: 'Inbox 1',
+        channelType: 'Channel::Email',
+        channelId: 10,
+        phoneNumber: null,
+      });
+
+      expect(result[1]).toMatchObject({
+        id: 2,
+        sourceId: 'source2',
+        name: 'Inbox 2',
+        channelType: 'Channel::Whatsapp',
+        channelId: 20,
+        phoneNumber: '+1234567890',
+      });
+    });
+
+    it('handles inboxes not found in the list', () => {
+      const inboxesData = [
+        { id: 1, sourceId: 'source1' },
+        { id: 99, sourceId: 'source99' }, // This doesn't exist in inboxesList
+      ];
+
+      const inboxesList = [
+        {
+          id: 1,
+          name: 'Inbox 1',
+          channel_type: 'Channel::Email',
+        },
+      ];
+
+      const result = helpers.mergeInboxDetails(inboxesData, inboxesList);
+
+      expect(result.length).toBe(2);
+
+      expect(result[0]).toMatchObject({
+        id: 1,
+        sourceId: 'source1',
+        name: 'Inbox 1',
+        channelType: 'Channel::Email',
+      });
+
+      expect(result[1]).toMatchObject({
+        id: 99,
+        sourceId: 'source99',
+      });
+
+      expect(result[1].name).toBeUndefined();
+      expect(result[1].channelType).toBeUndefined();
+    });
+
+    it('camelcases properties from inboxesList', () => {
+      const inboxesData = [{ id: 1, sourceId: 'source1' }];
+
+      const inboxesList = [
+        {
+          id: 1,
+          name: 'Inbox 1',
+          channel_type: 'Channel::Email',
+          avatar_url: 'https://example.com/avatar.png',
+          working_hours: [
+            {
+              day_of_week: 1,
+              closed_all_day: false,
+            },
+          ],
+        },
+      ];
+
+      const result = helpers.mergeInboxDetails(inboxesData, inboxesList);
+
+      expect(result[0]).toMatchObject({
+        id: 1,
+        sourceId: 'source1',
+        name: 'Inbox 1',
+        channelType: 'Channel::Email',
+        avatarUrl: 'https://example.com/avatar.png',
+      });
+
+      expect(result[0].workingHours[0]).toMatchObject({
+        dayOfWeek: 1,
+        closedAllDay: false,
+      });
+    });
+
+    it('preserves original properties when they conflict with inboxesList', () => {
+      const inboxesData = [
+        { id: 1, sourceId: 'source1', name: 'Original Name' },
+      ];
+
+      const inboxesList = [
+        {
+          id: 1,
+          name: 'List Name',
+          channel_type: 'Channel::Email',
+        },
+      ];
+
+      const result = helpers.mergeInboxDetails(inboxesData, inboxesList);
+
+      expect(result[0].name).toBe('Original Name');
+      expect(result[0].channelType).toBe('Channel::Email');
+    });
+  });
+
   describe('prepareAttachmentPayload', () => {
     it('prepares direct upload files', () => {
       const files = [{ blobSignedId: 'signed1' }];
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 47517798b..9b5614e8a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -105,6 +105,7 @@ export default {
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
       messageSignature: 'getMessageSignature',
+      inboxesList: 'inboxes/getInboxes',
     }),
     sendWithSignature() {
       return this.fetchSignatureFlagFromUISettings(this.channelType);
@@ -139,13 +140,29 @@ export default {
     selectedInbox: {
       get() {
         const inboxList = this.contact.contact_inboxes || [];
-        return (
-          inboxList.find(inbox => {
-            return inbox.inbox?.id && inbox.inbox?.id === this.targetInbox?.id;
-          }) || {
-            inbox: {},
-          }
+        const selectedContactInbox = inboxList.find(
+          inbox => inbox.inbox?.id && inbox.inbox?.id === this.targetInbox?.id
         );
+
+        if (!selectedContactInbox) {
+          return { inbox: {} };
+        }
+
+        // Find the matching inbox from the inboxesList
+        const matchingInbox =
+          this.inboxesList.find(
+            item => item.id === selectedContactInbox.inbox?.id
+          ) || {};
+
+        // The entire inbox payload is not available in this object, so we need to patch it from the store
+        return {
+          ...selectedContactInbox,
+          inbox: {
+            ...matchingInbox,
+            ...selectedContactInbox.inbox,
+            sourceId: selectedContactInbox.source_id || matchingInbox.sourceId,
+          },
+        };
       },
       set(value) {
         this.targetInbox = value.inbox;
@@ -165,12 +182,22 @@ export default {
         ? this.$t('CONVERSATION.FOOTER.DISABLE_SIGN_TOOLTIP')
         : this.$t('CONVERSATION.FOOTER.ENABLE_SIGN_TOOLTIP');
     },
+
     inboxes() {
       const inboxList = this.contact.contact_inboxes || [];
-      return inboxList.map(inbox => ({
-        ...inbox.inbox,
-        sourceId: inbox.source_id,
-      }));
+      if (!inboxList.length) return [];
+
+      return inboxList.map(inbox => {
+        const matchingInbox =
+          this.inboxesList.find(item => item.id === inbox.inbox?.id) || {};
+
+        // Create merged object with a clear property order
+        return {
+          ...matchingInbox,
+          ...inbox.inbox,
+          sourceId: inbox.source_id,
+        };
+      });
     },
     isAnEmailInbox() {
       return (
diff --git a/app/views/api/v1/models/_inbox_slim.json.jbuilder b/app/views/api/v1/models/_inbox_slim.json.jbuilder
index 67bc7e843..c47aabf30 100644
--- a/app/views/api/v1/models/_inbox_slim.json.jbuilder
+++ b/app/views/api/v1/models/_inbox_slim.json.jbuilder
@@ -4,10 +4,3 @@ json.channel_id resource.channel_id
 json.name resource.name
 json.channel_type resource.channel_type
 json.provider resource.channel.try(:provider)
-
-# Fix me: this is for the new conversation modal to work,
-# Potentially refactor this later.
-json.email resource.channel.try(:email) if resource.email?
-json.phone_number resource.channel.try(:phone_number)
-json.medium resource.channel.try(:medium) if resource.twilio?
-json.message_templates resource.channel.try(:message_templates) if resource.whatsapp?

From 0fbb9b91b2c6b0be3df479f52b427433755e70d7 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:46:02 -0800
Subject: [PATCH 08/27] chore: Update translations (#10990)

---
 .../dashboard/i18n/locale/am/contact.json     |   8 +-
 .../i18n/locale/am/conversation.json          |   1 +
 .../dashboard/i18n/locale/am/settings.json    |   5 -
 .../dashboard/i18n/locale/ar/contact.json     |   8 +-
 .../i18n/locale/ar/conversation.json          |   1 +
 .../dashboard/i18n/locale/ar/settings.json    |   5 -
 .../dashboard/i18n/locale/az/contact.json     |   8 +-
 .../i18n/locale/az/conversation.json          |   1 +
 .../dashboard/i18n/locale/az/settings.json    |   5 -
 .../dashboard/i18n/locale/bg/contact.json     |   8 +-
 .../i18n/locale/bg/conversation.json          |   1 +
 .../dashboard/i18n/locale/bg/settings.json    |   5 -
 .../dashboard/i18n/locale/ca/contact.json     |   8 +-
 .../i18n/locale/ca/conversation.json          |   1 +
 .../dashboard/i18n/locale/ca/settings.json    |   5 -
 .../dashboard/i18n/locale/cs/contact.json     |   8 +-
 .../i18n/locale/cs/conversation.json          |   1 +
 .../dashboard/i18n/locale/cs/settings.json    |   5 -
 .../dashboard/i18n/locale/da/cannedMgmt.json  |   2 +-
 .../dashboard/i18n/locale/da/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/da/contact.json     |   8 +-
 .../i18n/locale/da/conversation.json          |   1 +
 .../dashboard/i18n/locale/da/settings.json    |   5 -
 .../dashboard/i18n/locale/de/contact.json     |   8 +-
 .../i18n/locale/de/conversation.json          |   1 +
 .../dashboard/i18n/locale/de/settings.json    |   5 -
 .../dashboard/i18n/locale/el/contact.json     |   8 +-
 .../i18n/locale/el/conversation.json          |   1 +
 .../dashboard/i18n/locale/el/settings.json    |   5 -
 .../dashboard/i18n/locale/es/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/es/contact.json     |  42 +++---
 .../i18n/locale/es/conversation.json          |   5 +-
 .../i18n/locale/es/integrationApps.json       |   2 +-
 .../i18n/locale/es/integrations.json          |  30 ++--
 .../dashboard/i18n/locale/es/search.json      |   4 +-
 .../dashboard/i18n/locale/es/settings.json    |   7 +-
 .../dashboard/i18n/locale/fa/contact.json     |   8 +-
 .../i18n/locale/fa/conversation.json          |   1 +
 .../dashboard/i18n/locale/fa/settings.json    |   5 -
 .../dashboard/i18n/locale/fi/contact.json     |   8 +-
 .../i18n/locale/fi/conversation.json          |   1 +
 .../dashboard/i18n/locale/fi/settings.json    |   5 -
 .../dashboard/i18n/locale/fr/contact.json     |   8 +-
 .../i18n/locale/fr/conversation.json          |   1 +
 .../dashboard/i18n/locale/fr/settings.json    |   5 -
 .../dashboard/i18n/locale/he/contact.json     |   8 +-
 .../i18n/locale/he/conversation.json          |   1 +
 .../dashboard/i18n/locale/he/settings.json    |   5 -
 .../dashboard/i18n/locale/hi/contact.json     |   8 +-
 .../i18n/locale/hi/conversation.json          |   1 +
 .../dashboard/i18n/locale/hi/settings.json    |   5 -
 .../dashboard/i18n/locale/hr/contact.json     |   8 +-
 .../i18n/locale/hr/conversation.json          |   1 +
 .../dashboard/i18n/locale/hr/settings.json    |   5 -
 .../dashboard/i18n/locale/hu/contact.json     |   8 +-
 .../i18n/locale/hu/conversation.json          |   1 +
 .../dashboard/i18n/locale/hu/settings.json    |   5 -
 .../dashboard/i18n/locale/hy/contact.json     |   8 +-
 .../i18n/locale/hy/conversation.json          |   1 +
 .../dashboard/i18n/locale/hy/settings.json    |   5 -
 .../dashboard/i18n/locale/id/contact.json     |   8 +-
 .../i18n/locale/id/conversation.json          |   1 +
 .../dashboard/i18n/locale/id/settings.json    |   5 -
 .../dashboard/i18n/locale/is/contact.json     |   8 +-
 .../i18n/locale/is/conversation.json          |   1 +
 .../dashboard/i18n/locale/is/settings.json    |   5 -
 .../dashboard/i18n/locale/it/contact.json     |   8 +-
 .../i18n/locale/it/conversation.json          |   1 +
 .../dashboard/i18n/locale/it/settings.json    |   5 -
 .../dashboard/i18n/locale/ja/contact.json     |   8 +-
 .../i18n/locale/ja/conversation.json          |   1 +
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   2 +-
 .../dashboard/i18n/locale/ja/settings.json    |   5 -
 .../dashboard/i18n/locale/ka/contact.json     |   8 +-
 .../i18n/locale/ka/conversation.json          |   1 +
 .../dashboard/i18n/locale/ka/settings.json    |   5 -
 .../dashboard/i18n/locale/ko/contact.json     |   8 +-
 .../i18n/locale/ko/conversation.json          |   1 +
 .../dashboard/i18n/locale/ko/settings.json    |   5 -
 .../dashboard/i18n/locale/lt/contact.json     |   8 +-
 .../i18n/locale/lt/conversation.json          |   1 +
 .../dashboard/i18n/locale/lt/settings.json    |   5 -
 .../dashboard/i18n/locale/lv/contact.json     |   8 +-
 .../i18n/locale/lv/conversation.json          |   1 +
 .../dashboard/i18n/locale/lv/settings.json    |   5 -
 .../dashboard/i18n/locale/ml/contact.json     |   8 +-
 .../i18n/locale/ml/conversation.json          |   1 +
 .../dashboard/i18n/locale/ml/settings.json    |   5 -
 .../dashboard/i18n/locale/ms/contact.json     |   8 +-
 .../i18n/locale/ms/conversation.json          |   1 +
 .../dashboard/i18n/locale/ms/settings.json    |   5 -
 .../dashboard/i18n/locale/ne/contact.json     |   8 +-
 .../i18n/locale/ne/conversation.json          |   1 +
 .../dashboard/i18n/locale/ne/settings.json    |   5 -
 .../dashboard/i18n/locale/nl/contact.json     |   8 +-
 .../i18n/locale/nl/conversation.json          |   1 +
 .../dashboard/i18n/locale/nl/settings.json    |   5 -
 .../dashboard/i18n/locale/no/contact.json     |   8 +-
 .../i18n/locale/no/conversation.json          |   1 +
 .../dashboard/i18n/locale/no/settings.json    |   5 -
 .../dashboard/i18n/locale/pl/contact.json     |   8 +-
 .../i18n/locale/pl/conversation.json          |   1 +
 .../dashboard/i18n/locale/pl/settings.json    |   5 -
 .../dashboard/i18n/locale/pt/contact.json     |   8 +-
 .../i18n/locale/pt/conversation.json          |   1 +
 .../dashboard/i18n/locale/pt/settings.json    |   5 -
 .../i18n/locale/pt_BR/advancedFilters.json    |   8 +-
 .../i18n/locale/pt_BR/agentBots.json          |   8 +-
 .../i18n/locale/pt_BR/agentMgmt.json          |   2 +-
 .../i18n/locale/pt_BR/attributesMgmt.json     |   2 +-
 .../i18n/locale/pt_BR/auditLogs.json          |   6 +-
 .../i18n/locale/pt_BR/bulkActions.json        |   2 +-
 .../dashboard/i18n/locale/pt_BR/campaign.json |   4 +-
 .../i18n/locale/pt_BR/cannedMgmt.json         |  12 +-
 .../dashboard/i18n/locale/pt_BR/chatlist.json |  12 +-
 .../dashboard/i18n/locale/pt_BR/contact.json  |  46 ++++---
 .../i18n/locale/pt_BR/contactFilters.json     |   4 +-
 .../i18n/locale/pt_BR/conversation.json       |  49 +++----
 .../i18n/locale/pt_BR/generalSettings.json    |  36 ++---
 .../i18n/locale/pt_BR/helpCenter.json         |  30 ++--
 .../dashboard/i18n/locale/pt_BR/inbox.json    |  12 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  30 ++--
 .../i18n/locale/pt_BR/integrations.json       |  46 +++----
 .../i18n/locale/pt_BR/labelsMgmt.json         |  16 +--
 .../dashboard/i18n/locale/pt_BR/macros.json   |   4 +-
 .../dashboard/i18n/locale/pt_BR/report.json   |  64 ++++-----
 .../dashboard/i18n/locale/pt_BR/search.json   |   8 +-
 .../dashboard/i18n/locale/pt_BR/settings.json |  29 ++--
 .../dashboard/i18n/locale/pt_BR/sla.json      |   8 +-
 .../i18n/locale/pt_BR/teamsSettings.json      |  26 ++--
 .../dashboard/i18n/locale/ro/contact.json     |   8 +-
 .../i18n/locale/ro/conversation.json          |   1 +
 .../dashboard/i18n/locale/ro/settings.json    |   5 -
 .../dashboard/i18n/locale/ru/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/ru/contact.json     |   8 +-
 .../i18n/locale/ru/conversation.json          |   7 +-
 .../i18n/locale/ru/integrations.json          | 128 +++++++++---------
 .../dashboard/i18n/locale/ru/settings.json    |  11 +-
 .../dashboard/i18n/locale/sh/contact.json     |   8 +-
 .../i18n/locale/sh/conversation.json          |   1 +
 .../dashboard/i18n/locale/sh/settings.json    |   5 -
 .../dashboard/i18n/locale/sk/contact.json     |   8 +-
 .../i18n/locale/sk/conversation.json          |   1 +
 .../dashboard/i18n/locale/sk/settings.json    |   5 -
 .../dashboard/i18n/locale/sl/contact.json     |   8 +-
 .../i18n/locale/sl/conversation.json          |   1 +
 .../dashboard/i18n/locale/sl/settings.json    |   5 -
 .../dashboard/i18n/locale/sq/contact.json     |   8 +-
 .../i18n/locale/sq/conversation.json          |   1 +
 .../dashboard/i18n/locale/sq/settings.json    |   5 -
 .../dashboard/i18n/locale/sr/contact.json     |   8 +-
 .../i18n/locale/sr/conversation.json          |   1 +
 .../dashboard/i18n/locale/sr/settings.json    |   5 -
 .../dashboard/i18n/locale/sv/contact.json     |   8 +-
 .../i18n/locale/sv/conversation.json          |   1 +
 .../dashboard/i18n/locale/sv/settings.json    |   5 -
 .../dashboard/i18n/locale/ta/contact.json     |   8 +-
 .../i18n/locale/ta/conversation.json          |   1 +
 .../dashboard/i18n/locale/ta/settings.json    |   5 -
 .../dashboard/i18n/locale/th/contact.json     |   8 +-
 .../i18n/locale/th/conversation.json          |   1 +
 .../dashboard/i18n/locale/th/settings.json    |   5 -
 .../dashboard/i18n/locale/tl/contact.json     |   8 +-
 .../i18n/locale/tl/conversation.json          |   1 +
 .../dashboard/i18n/locale/tl/settings.json    |   5 -
 .../dashboard/i18n/locale/tr/contact.json     |   8 +-
 .../i18n/locale/tr/conversation.json          |   1 +
 .../dashboard/i18n/locale/tr/settings.json    |   5 -
 .../dashboard/i18n/locale/uk/contact.json     |   8 +-
 .../i18n/locale/uk/conversation.json          |   1 +
 .../dashboard/i18n/locale/uk/settings.json    |   5 -
 .../dashboard/i18n/locale/ur/contact.json     |   8 +-
 .../i18n/locale/ur/conversation.json          |   1 +
 .../dashboard/i18n/locale/ur/settings.json    |   5 -
 .../dashboard/i18n/locale/ur_IN/contact.json  |   8 +-
 .../i18n/locale/ur_IN/conversation.json       |   1 +
 .../dashboard/i18n/locale/ur_IN/settings.json |   5 -
 .../dashboard/i18n/locale/vi/contact.json     |   8 +-
 .../i18n/locale/vi/conversation.json          |   1 +
 .../dashboard/i18n/locale/vi/settings.json    |   5 -
 .../dashboard/i18n/locale/zh_CN/contact.json  |   8 +-
 .../i18n/locale/zh_CN/conversation.json       |   3 +-
 .../dashboard/i18n/locale/zh_CN/settings.json |   5 -
 .../dashboard/i18n/locale/zh_CN/sla.json      |  14 +-
 .../i18n/locale/zh_CN/whatsappTemplates.json  |  18 +--
 .../dashboard/i18n/locale/zh_TW/contact.json  |   8 +-
 .../i18n/locale/zh_TW/conversation.json       |   1 +
 .../dashboard/i18n/locale/zh_TW/settings.json |   5 -
 app/javascript/survey/i18n/locale/am.json     |   2 +-
 app/javascript/survey/i18n/locale/ar.json     |   2 +-
 app/javascript/survey/i18n/locale/az.json     |   2 +-
 app/javascript/survey/i18n/locale/bg.json     |   2 +-
 app/javascript/survey/i18n/locale/ca.json     |   2 +-
 app/javascript/survey/i18n/locale/cs.json     |   2 +-
 app/javascript/survey/i18n/locale/da.json     |   2 +-
 app/javascript/survey/i18n/locale/de.json     |   2 +-
 app/javascript/survey/i18n/locale/el.json     |   2 +-
 app/javascript/survey/i18n/locale/es.json     |   2 +-
 app/javascript/survey/i18n/locale/fa.json     |   2 +-
 app/javascript/survey/i18n/locale/fi.json     |   2 +-
 app/javascript/survey/i18n/locale/fr.json     |   2 +-
 app/javascript/survey/i18n/locale/he.json     |   2 +-
 app/javascript/survey/i18n/locale/hi.json     |   2 +-
 app/javascript/survey/i18n/locale/hr.json     |   2 +-
 app/javascript/survey/i18n/locale/hu.json     |   2 +-
 app/javascript/survey/i18n/locale/hy.json     |   2 +-
 app/javascript/survey/i18n/locale/id.json     |   2 +-
 app/javascript/survey/i18n/locale/is.json     |   2 +-
 app/javascript/survey/i18n/locale/it.json     |   2 +-
 app/javascript/survey/i18n/locale/ja.json     |   2 +-
 app/javascript/survey/i18n/locale/ka.json     |   2 +-
 app/javascript/survey/i18n/locale/ko.json     |   2 +-
 app/javascript/survey/i18n/locale/lt.json     |   2 +-
 app/javascript/survey/i18n/locale/lv.json     |   2 +-
 app/javascript/survey/i18n/locale/ml.json     |   2 +-
 app/javascript/survey/i18n/locale/ms.json     |   2 +-
 app/javascript/survey/i18n/locale/ne.json     |   2 +-
 app/javascript/survey/i18n/locale/nl.json     |   2 +-
 app/javascript/survey/i18n/locale/no.json     |   2 +-
 app/javascript/survey/i18n/locale/pl.json     |   2 +-
 app/javascript/survey/i18n/locale/pt.json     |   2 +-
 app/javascript/survey/i18n/locale/pt_BR.json  |   2 +-
 app/javascript/survey/i18n/locale/ro.json     |   2 +-
 app/javascript/survey/i18n/locale/ru.json     |   2 +-
 app/javascript/survey/i18n/locale/sh.json     |   2 +-
 app/javascript/survey/i18n/locale/sk.json     |   2 +-
 app/javascript/survey/i18n/locale/sl.json     |   2 +-
 app/javascript/survey/i18n/locale/sq.json     |   2 +-
 app/javascript/survey/i18n/locale/sr.json     |   2 +-
 app/javascript/survey/i18n/locale/sv.json     |   2 +-
 app/javascript/survey/i18n/locale/ta.json     |   2 +-
 app/javascript/survey/i18n/locale/th.json     |   2 +-
 app/javascript/survey/i18n/locale/tl.json     |   2 +-
 app/javascript/survey/i18n/locale/tr.json     |   2 +-
 app/javascript/survey/i18n/locale/uk.json     |   2 +-
 app/javascript/survey/i18n/locale/ur.json     |   2 +-
 app/javascript/survey/i18n/locale/ur_IN.json  |   2 +-
 app/javascript/survey/i18n/locale/vi.json     |   2 +-
 app/javascript/survey/i18n/locale/zh_CN.json  |   2 +-
 app/javascript/survey/i18n/locale/zh_TW.json  |   2 +-
 app/javascript/widget/i18n/locale/am.json     |  18 +--
 app/javascript/widget/i18n/locale/ar.json     |  18 +--
 app/javascript/widget/i18n/locale/az.json     |  18 +--
 app/javascript/widget/i18n/locale/bg.json     |  18 +--
 app/javascript/widget/i18n/locale/ca.json     |  18 +--
 app/javascript/widget/i18n/locale/cs.json     |  18 +--
 app/javascript/widget/i18n/locale/da.json     |  18 +--
 app/javascript/widget/i18n/locale/de.json     |  18 +--
 app/javascript/widget/i18n/locale/el.json     |  18 +--
 app/javascript/widget/i18n/locale/es.json     |  18 +--
 app/javascript/widget/i18n/locale/fa.json     |  18 +--
 app/javascript/widget/i18n/locale/fi.json     |  18 +--
 app/javascript/widget/i18n/locale/fr.json     |  18 +--
 app/javascript/widget/i18n/locale/he.json     |  18 +--
 app/javascript/widget/i18n/locale/hi.json     |  18 +--
 app/javascript/widget/i18n/locale/hr.json     |  18 +--
 app/javascript/widget/i18n/locale/hu.json     |  18 +--
 app/javascript/widget/i18n/locale/hy.json     |  18 +--
 app/javascript/widget/i18n/locale/id.json     |  18 +--
 app/javascript/widget/i18n/locale/is.json     |  18 +--
 app/javascript/widget/i18n/locale/it.json     |  18 +--
 app/javascript/widget/i18n/locale/ja.json     |  18 +--
 app/javascript/widget/i18n/locale/ka.json     |  18 +--
 app/javascript/widget/i18n/locale/ko.json     |  18 +--
 app/javascript/widget/i18n/locale/lt.json     |  18 +--
 app/javascript/widget/i18n/locale/lv.json     |  18 +--
 app/javascript/widget/i18n/locale/ml.json     |  18 +--
 app/javascript/widget/i18n/locale/ms.json     |  18 +--
 app/javascript/widget/i18n/locale/ne.json     |  18 +--
 app/javascript/widget/i18n/locale/nl.json     |  18 +--
 app/javascript/widget/i18n/locale/no.json     |  18 +--
 app/javascript/widget/i18n/locale/pl.json     |  18 +--
 app/javascript/widget/i18n/locale/pt.json     |  18 +--
 app/javascript/widget/i18n/locale/pt_BR.json  |  24 ++--
 app/javascript/widget/i18n/locale/ro.json     |  18 +--
 app/javascript/widget/i18n/locale/ru.json     |  18 +--
 app/javascript/widget/i18n/locale/sh.json     |  18 +--
 app/javascript/widget/i18n/locale/sk.json     |  18 +--
 app/javascript/widget/i18n/locale/sl.json     |  18 +--
 app/javascript/widget/i18n/locale/sq.json     |  18 +--
 app/javascript/widget/i18n/locale/sr.json     |  18 +--
 app/javascript/widget/i18n/locale/sv.json     |  18 +--
 app/javascript/widget/i18n/locale/ta.json     |  18 +--
 app/javascript/widget/i18n/locale/th.json     |  18 +--
 app/javascript/widget/i18n/locale/tl.json     |  18 +--
 app/javascript/widget/i18n/locale/tr.json     |  18 +--
 app/javascript/widget/i18n/locale/uk.json     |  18 +--
 app/javascript/widget/i18n/locale/ur.json     |  18 +--
 app/javascript/widget/i18n/locale/ur_IN.json  |  18 +--
 app/javascript/widget/i18n/locale/vi.json     |  18 +--
 app/javascript/widget/i18n/locale/zh_CN.json  |  18 +--
 app/javascript/widget/i18n/locale/zh_TW.json  |  18 +--
 config/locales/es.yml                         |   4 +-
 config/locales/ja.yml                         |   2 +-
 config/locales/lv.yml                         |   2 +-
 config/locales/pt_BR.yml                      |  26 ++--
 296 files changed, 1311 insertions(+), 1207 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/am/contact.json b/app/javascript/dashboard/i18n/locale/am/contact.json
index 6bfb9ed23..f5925eda3 100644
--- a/app/javascript/dashboard/i18n/locale/am/contact.json
+++ b/app/javascript/dashboard/i18n/locale/am/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/am/conversation.json b/app/javascript/dashboard/i18n/locale/am/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/am/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/am/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/am/settings.json b/app/javascript/dashboard/i18n/locale/am/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/am/settings.json
+++ b/app/javascript/dashboard/i18n/locale/am/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 2c8172342..10b7d40a5 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "سيتم نسخ تفاصيل الاتصال من <strong>{primaryContactName}</strong> إلى <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "رسالة_خطأ"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " دمج جهات الاتصال",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "رسالة",
       "SEND_MESSAGE": "إرسال الرسالة",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "جهات الاتصال"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "تم حفظ جهة الاتصال بنجاح",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "تم إلغاء حجب جهة الاتصال بنجاح",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "استيراد جهات الاتصال من خلال ملف CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index 413a2a78d..f31b0a0a5 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "تحديد كمعلق",
       "RESOLVED": "تحديد كمحلولة",
       "MARK_AS_UNREAD": "وضع علامة كغير مقروء",
+      "MARK_AS_READ": "تحديد كمقروء",
       "REOPEN": "إعادة فتح المحادثة",
       "SNOOZE": {
         "TITLE": "تأجيل",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index c7843d601..fbcd1bdf2 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "التبديل إلى الملاحظة الخاصة",
       "SWITCH_TO_REPLY": "التبديل إلى الرد",
       "TOGGLE_SNOOZE_DROPDOWN": "تبديل القائمة المنسدلة"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘\n",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/az/contact.json b/app/javascript/dashboard/i18n/locale/az/contact.json
index 6bfb9ed23..f5925eda3 100644
--- a/app/javascript/dashboard/i18n/locale/az/contact.json
+++ b/app/javascript/dashboard/i18n/locale/az/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/az/conversation.json b/app/javascript/dashboard/i18n/locale/az/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/az/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/az/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/az/settings.json b/app/javascript/dashboard/i18n/locale/az/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/az/settings.json
+++ b/app/javascript/dashboard/i18n/locale/az/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index aacb1e77c..12d30f114 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Детайлите на контакт <strong>{primaryContactName}</strong> ще бъдат копирани в <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ГРЕШКА"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Обединяване на контакти",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Съобщение",
       "SEND_MESSAGE": "Изпрати съобщение",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Контакти"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Успешно запазване на контакта",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Внасяне на контакти чрез CSV файл.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index c3bfd3cc6..a0cc7db03 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 9b17fbb60..38502c9ae 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 60827cf61..49a711692 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Les dades de contacte de <strong>{primaryContactName}</strong> es copiaran a <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Fusiona contactes",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Missatge",
       "SEND_MESSAGE": "Envia missatge",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contactes"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contacte guardat correctament",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Aquest contacte s'ha desbloquejat correctament",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importa contactes a través d'un fitxer CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 359cb0aaf..16a9335a6 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Marca com a pendent",
       "RESOLVED": "Marca com a resolt",
       "MARK_AS_UNREAD": "Marca com a no llegit",
+      "MARK_AS_READ": "Marca com a llegit",
       "REOPEN": "Torna a obrir la conversa",
       "SNOOZE": {
         "TITLE": "Posposat",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index ca9db807d..383ccbd3e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Canvia a la nota privada",
       "SWITCH_TO_REPLY": "Canvia a Respon",
       "TOGGLE_SNOOZE_DROPDOWN": "Commuta el menú desplegable de posposar"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index b8408b867..24c4fe7e1 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Zpráva",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakty"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt byl úspěšně uložen",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index c8bdb85e8..019340ce3 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Označit jako nevyřízené",
       "RESOLVED": "Označit jako vyřešené",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Znovu otevřít konverzaci",
       "SNOOZE": {
         "TITLE": "Odložit",
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index b775423a3..5d7a82e92 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
index 9f2be6e31..ec44285ec 100644
--- a/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
@@ -35,7 +35,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Canned response added successfully.",
-        "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere."
+        "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot server, Prøv igen senere."
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
index 8ff20ee23..3f746bb63 100644
--- a/app/javascript/dashboard/i18n/locale/da/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -9,7 +9,7 @@
     "FAILED_TO_SEND": "Failed to send",
     "TAB_HEADING": "Samtaler",
     "MENTION_HEADING": "Omtaler",
-    "UNATTENDED_HEADING": "Unattet",
+    "UNATTENDED_HEADING": "Ubehandlet",
     "SEARCH": {
       "INPUT": "Søg efter Mennesker, Chats, Gemte svar .."
     },
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index c7bc271bb..9d442467c 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Kontaktoplysninger på <strong>{primaryContactName}</strong> vil blive kopieret til <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "FEJL_MEDDELELSE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Sammenflet kontakter",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Besked",
       "SEND_MESSAGE": "Send besked",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakter"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt gemt med succes",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importér kontakter via en CSV-fil.",
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 19c01a42a..174f30214 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Markér som afventende",
       "RESOLVED": "Marker som løst",
       "MARK_AS_UNREAD": "Marker som ulæst",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Genåbn samtale",
       "SNOOZE": {
         "TITLE": "Udsæt",
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 6bc9a173d..27ca0e865 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Skift til privat note",
       "SWITCH_TO_REPLY": "Skift til svar",
       "TOGGLE_SNOOZE_DROPDOWN": "Skift snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Vind / ¤",
-      "ALT_OR_OPTION_KEY": "Alt. / ¤",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 374f290e9..924799aa4 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Details von Kontakt <strong>{primaryContactName}</strong> wird zu <strong>{parentContactName}</strong> kopiert."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Kontakte zusammenführen",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Nachricht",
       "SEND_MESSAGE": "Nachricht senden",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakte"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt erfolgreich gespeichert",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Dieser Kontakt wurde erfolgreich entsperrt",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Kontakte über CSV-Datei importieren.",
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index ef0e1804a..c45a03c71 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Als ausstehend markieren",
       "RESOLVED": "Als gelöst markieren",
       "MARK_AS_UNREAD": "Als ungelesen markieren",
+      "MARK_AS_READ": "Als gelesen markieren",
       "REOPEN": "Konversation wieder öffnen",
       "SNOOZE": {
         "TITLE": "Erinnern",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index eaef94f96..531083087 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Zu privaten Notizen wechseln",
       "SWITCH_TO_REPLY": "Zur Antwort wechseln",
       "TOGGLE_SNOOZE_DROPDOWN": "Schlummer-Dropdown ein-/ausblenden"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 5d4eebcd5..5487a61b6 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Τα στοιχεία επικοινωνίας του <strong>{primaryContactName}</strong> θα αντιγραφούν στο <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Συγχώνευση επαφών",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Μήνυμα",
       "SEND_MESSAGE": "Αποστολή μηνύματος",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Επαφές"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Η επαφή αποθηκεύτηκε με επιτυχία",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Εισαγωγή επαφών μέσω αρχείου CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index 29904744b..470b922b0 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Σήμανση ως εκκρεμής",
       "RESOLVED": "Σήμανση ως επιλυμένου",
       "MARK_AS_UNREAD": "Σήμανση ως μη αναγνωσμένο",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Άνοιγμα συνομιλίας",
       "SNOOZE": {
         "TITLE": "Αναβολή",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 24d4890cf..fc2d8e609 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Αλλαγή σε Ιδιωτική Σημείωση",
       "SWITCH_TO_REPLY": "Εναλλαγή σε απάντηση",
       "TOGGLE_SNOOZE_DROPDOWN": "Εναλλαγή αναβολής dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / °C.",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 8588dfdb0..bbb6efc5c 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -101,7 +101,7 @@
         "CONTENT": "ha compartido una url"
       },
       "contact": {
-        "CONTENT": "Shared contact"
+        "CONTENT": "Contacto compartido"
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index e3c76ded6..b3165cce0 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Los datos de contacto de <strong>{primaryContactName}</strong> se copiarán en <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Combinar contactos",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Buscar...",
       "MESSAGE_BUTTON": "Mensaje",
       "SEND_MESSAGE": "Enviar mensaje",
+      "BLOCK_CONTACT": "Bloquear contacto",
+      "UNBLOCK_CONTACT": "Desbloquear contacto",
       "BREADCRUMB": {
         "CONTACTS": "Contactos"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contacto guardado correctamente",
           "ERROR_MESSAGE": "No se pudo guardar el contacto. Inténtalo de nuevo más tarde."
         },
+        "BLOCK_SUCCESS_MESSAGE": "Este contacto se ha bloqueado correctamente",
+        "BLOCK_ERROR_MESSAGE": "No se pudo bloquear el contacto. Inténtalo de nuevo más tarde.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Este contacto está desbloqueado correctamente",
+        "UNBLOCK_ERROR_MESSAGE": "No se pudo desbloquear el contacto. Inténtalo de nuevo más tarde.",
         "IMPORT_CONTACT": {
           "TITLE": "Importar contactos",
           "DESCRIPTION": "Importar contactos a través de un archivo CSV.",
@@ -346,10 +352,10 @@
             "TITLE": "¿Desea guardar este filtro?",
             "CONFIRM": "Guardar filtro",
             "LABEL": "Nombre",
-            "PLACEHOLDER": "Introduzca el nombre del filtro",
-            "ERROR": "Introduzca un nombre válido",
+            "PLACEHOLDER": "Ingrese el nombre del filtro",
+            "ERROR": "Ingrese un nombre válido",
             "SUCCESS_MESSAGE": "Filtro guardado correctamente",
-            "ERROR_MESSAGE": "No se puede guardar el filtro. Inténtalo de nuevo más tarde."
+            "ERROR_MESSAGE": "No se pudo guardar el filtro. Inténtalo de nuevo más tarde."
           },
           "DELETE_SEGMENT": {
             "TITLE": "Confirmar eliminación",
@@ -357,13 +363,13 @@
             "CONFIRM": "Sí, eliminar",
             "CANCEL": "No, cancelar",
             "SUCCESS_MESSAGE": "Filtro eliminado correctamente",
-            "ERROR_MESSAGE": "No se puede eliminar el filtro. Inténtalo de nuevo más tarde."
+            "ERROR_MESSAGE": "No se pudo eliminar el filtro. Inténtalo de nuevo más tarde."
           }
         }
       }
     },
     "PAGINATION_FOOTER": {
-      "SHOWING": "Mostrando {startItem} - {endItem} de contactos {totalItems}"
+      "SHOWING": "Mostrando {startItem} - {endItem} de {totalItems} contactos"
     },
     "FILTER": {
       "NAME": "Nombre",
@@ -402,27 +408,27 @@
         "TITLE": "Editar detalles del contacto",
         "FORM": {
           "FIRST_NAME": {
-            "PLACEHOLDER": "Introduzca el primer nombre"
+            "PLACEHOLDER": "Ingrese el nombre"
           },
           "LAST_NAME": {
-            "PLACEHOLDER": "Introduzca el apellido"
+            "PLACEHOLDER": "Ingrese el apellido"
           },
           "EMAIL_ADDRESS": {
-            "PLACEHOLDER": "Introduzca la dirección de correo electrónico",
+            "PLACEHOLDER": "Ingrese el correo electrónico",
             "DUPLICATE": "Ésta dirección de correo está siendo utilizada por otro contacto."
           },
           "PHONE_NUMBER": {
-            "PLACEHOLDER": "Introduzca el número de teléfono",
+            "PLACEHOLDER": "Ingrese el número de teléfono",
             "DUPLICATE": "Este número de teléfono está en uso para otro contacto."
           },
           "CITY": {
             "PLACEHOLDER": "Introduzca el nombre de la ciudad"
           },
           "COUNTRY": {
-            "PLACEHOLDER": "Seleccionar país"
+            "PLACEHOLDER": "Seleccione el país"
           },
           "BIO": {
-            "PLACEHOLDER": "Introduzca la biografía"
+            "PLACEHOLDER": "Ingrese la biografía"
           },
           "COMPANY_NAME": {
             "PLACEHOLDER": "Escriba el nombre de la empresa"
@@ -430,25 +436,25 @@
         },
         "UPDATE_BUTTON": "Actualizar contacto",
         "SUCCESS_MESSAGE": "Contacto actualizado correctamente",
-        "ERROR_MESSAGE": "No se puede actualizar el contacto. Inténtalo de nuevo más tarde."
+        "ERROR_MESSAGE": "No se pudo actualizar el contacto. Inténtalo de nuevo más tarde."
       },
       "SOCIAL_MEDIA": {
         "TITLE": "Editar enlaces de redes sociales",
         "FORM": {
           "FACEBOOK": {
-            "PLACEHOLDER": "Añadir Facebook"
+            "PLACEHOLDER": "Agregar Facebook"
           },
           "GITHUB": {
-            "PLACEHOLDER": "Añadir Github"
+            "PLACEHOLDER": "Agregar Github"
           },
           "INSTAGRAM": {
-            "PLACEHOLDER": "Añadir Instagram"
+            "PLACEHOLDER": "Agregar Instagram"
           },
           "LINKEDIN": {
-            "PLACEHOLDER": "Añadir LinkedIn"
+            "PLACEHOLDER": "Agregar LinkedIn"
           },
           "TWITTER": {
-            "PLACEHOLDER": "Añadir Twitter/X"
+            "PLACEHOLDER": "Agregar Twitter/X"
           }
         }
       }
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index ae0a7dd1f..5071d0638 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Marcar como pendiente",
       "RESOLVED": "Marcar como resuelto",
       "MARK_AS_UNREAD": "Marcar como no leído",
+      "MARK_AS_READ": "Marcar como leído",
       "REOPEN": "Resolver conversación",
       "SNOOZE": {
         "TITLE": "Posponer",
@@ -134,7 +135,7 @@
           "FAILED": "No se pudo asignar el agente. Por favor, inténtelo de nuevo."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Etiqueta asignada #{labelName} a la conversación con id {conversationId}",
+          "SUCCESFUL": "Etiqueta #{labelName} asignada a la conversación con id {conversationId}",
           "FAILED": "No se pudo asignar el agente. Por favor, inténtelo de nuevo."
         },
         "TEAM_ASSIGNMENT": {
@@ -358,6 +359,6 @@
     "TRY_THESE_PROMPTS": "Prueba estas sugerencias"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": "No se puede descargar el archivo adjunto. Por favor, inténtelo de nuevo"
+    "ERROR_DOWNLOADING": "No se pudo descargar el archivo adjunto. Por favor, inténtelo de nuevo"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrationApps.json b/app/javascript/dashboard/i18n/locale/es/integrationApps.json
index 6ef3a3af9..370087e78 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrationApps.json
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Desconectar"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with {installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow es una plataforma de comprensión del lenguaje natural que facilita el diseño e integración de una interfaz de usuario conversacional en su aplicación móvil, aplicación web, dispositivo, bot, sistema interactivo de respuesta de voz, etc. <br /> <br /> La integración de Dialogflow con {installationName} le permite configurar un bot de Dialogflow con sus bandejas de entrada que permite al bot manejar las consultas inicialmente y entregarlas a un agente cuando sea necesario. Dialogflow se puede utilizar para calificar a los clientes potenciales, reducir la carga de trabajo de los agentes proporcionando preguntas frecuentes, etc. <br /> <br /> Para añadir Dialogflow, necesita crear una cuenta de servicio en la consola del proyecto de Google y compartir las credenciales. Consulte la documentación de Dialogflow para obtener más información."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 0980f1d59..4eb4ee4e7 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -1,7 +1,7 @@
 {
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integraciones",
-    "DESCRIPTION": "Chatwoot integrates with multiple tools and services to improve your team's efficiency. Explore the list below to configure your favorite apps.",
+    "DESCRIPTION": "Chatwoot se integra con múltiples herramientas y servicios para mejorar la eficiencia de tu equipo. Explora la lista de abajo para configurar tus aplicaciones favoritas.",
     "LEARN_MORE": "Más información acerca de integraciones",
     "LOADING": "Obteniendo integraciones",
     "CAPTAIN": {
@@ -12,7 +12,7 @@
     },
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "Eventos suscritos",
-      "LEARN_MORE": "Learn more about webhooks",
+      "LEARN_MORE": "Aprenda más sobre webhooks",
       "FORM": {
         "CANCEL": "Cancelar",
         "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un callback.",
@@ -31,7 +31,7 @@
         },
         "END_POINT": {
           "LABEL": "URL de Webhook",
-          "PLACEHOLDER": "Example: {webhookExampleURL}",
+          "PLACEHOLDER": "Ejemplo: {webhookExampleURL}",
           "ERROR": "Por favor, introduzca una URL válida"
         },
         "EDIT_SUBMIT": "Actualizar webhook",
@@ -90,7 +90,7 @@
       },
       "HELP_TEXT": {
         "TITLE": "¿Cómo utilizar la Integración Slack?",
-        "BODY": "With this integration, all of your incoming conversations will be synced to the ***{selectedChannelName}*** channel in your Slack workspace. You can manage all your customer conversations right within the channel and never miss a message.\n\nHere are the main features of the integration:\n\n**Respond to conversations from within Slack:** To respond to a conversation in the ***{selectedChannelName}*** Slack channel, simply type out your message and send it as a thread. This will create a response back to the customer through Chatwoot. It's that simple!\n\n **Create private notes:** If you want to create private notes instead of replies, start your message with ***`note:`***. This ensures that your message is kept private and won't be visible to the customer.\n\n**Associate an agent profile:** If the person who replied on Slack has an agent profile in Chatwoot under the same email, the replies will be associated with that agent profile automatically. This means you can easily track who said what and when. On the other hand, when the replier doesn't have an associated agent profile, the replies will appear from the bot profile to the customer.",
+        "BODY": "Con esta integración, todas tus conversaciones entrantes serán sincronizadas con el canal ***{selectedChannelName}*** en tu espacio de trabajo en Slack. Puedes administrar todas tus conversaciones con los clientes directamente en tu canal y nunca perder un mensaje.\n\nEstas son las principales características de la integración:\n\n**Responda a conversaciones desde Slack:** Para responder a una conversación en el canal Slack ***{selectedChannelName}***, simplemente escriba el mensaje y envíalo como un hilo. Esto creará una respuesta que se enviará al cliente mediante Chatwoot. ¡Es así de simple!\n\n**Crea notas privadas:** Si quieres crear una nota privada en lugar de una respuesta, comience su mensaje con ***`note:`***. Esto asegurará que tu mensaje se mantenga privado y no será visible al cliente.\n\n**Asociar un perfil de agente:** Si la persona que responde en Slack tiene un agente de perfil en Chatwoot bajo el mismo correo electrónico, las respuestas serán asociadas con ese perfil de agente automáticamente. Esto quiere decir que puedes fácilmente estar al tanto de quién dijo qué y cuándo. Por el otro lado, cuando la persona que responde no tiene un perfil de agente, las respuestas aparecerán desde el perfil de bot al cliente.",
         "SELECTED": "seleccionado"
       },
       "SELECT_CHANNEL": {
@@ -114,7 +114,7 @@
     },
     "OPEN_AI": {
       "AI_ASSIST": "Asistencia AI",
-      "WITH_AI": " {option} with AI ",
+      "WITH_AI": " {option} con IA ",
       "OPTIONS": {
         "REPLY_SUGGESTION": "Responder sugerencia",
         "SUMMARIZE": "Resumir",
@@ -233,13 +233,13 @@
         "EMPTY_LIST": "No se encontraron problemas lineales",
         "LOADING": "Cargando",
         "ERROR": "Hubo un error al recuperar los problemas lineales, por favor inténtalo de nuevo",
-        "LINK_SUCCESS": "Issue linked successfully",
-        "LINK_ERROR": "There was an error linking the issue, please try again",
-        "LINK_TITLE": "Conversation (#{conversationId}) with {name}"
+        "LINK_SUCCESS": "Incidencia enlazada correctamente",
+        "LINK_ERROR": "Ocurrió un error al enlazar la incidencia. Inténtelo de nuevo",
+        "LINK_TITLE": "Conversación (#{conversationId}) con {name}"
       },
       "ADD_OR_LINK": {
-        "TITLE": "Create/link linear issue",
-        "DESCRIPTION": "Create Linear issues from conversations, or link existing ones for seamless tracking.",
+        "TITLE": "Crear/enlazar incidencia con Linear",
+        "DESCRIPTION": "Crear incidencias en Linear desde conversaciones, o enlazar existentes para un seguimiento fluido.",
         "FORM": {
           "TITLE": {
             "LABEL": "Título",
@@ -284,17 +284,17 @@
         },
         "CREATE": "Crear",
         "CANCEL": "Cancelar",
-        "CREATE_SUCCESS": "Issue created successfully",
-        "CREATE_ERROR": "There was an error creating the issue, please try again",
-        "LOADING_TEAM_ERROR": "There was an error fetching the teams, please try again",
-        "LOADING_TEAM_ENTITIES_ERROR": "There was an error fetching the team entities, please try again"
+        "CREATE_SUCCESS": "Incidencia creada correctamente",
+        "CREATE_ERROR": "Hubo un error creando la incidencia. Inténtalo de nuevo",
+        "LOADING_TEAM_ERROR": "Hubo un error al coger los equipos. Inténtalo de nuevo",
+        "LOADING_TEAM_ENTITIES_ERROR": "Hubo un error al coger las entidades del equipo. Inténtalo de nuevo"
       },
       "ISSUE": {
         "STATUS": "Estado",
         "PRIORITY": "Prioridad",
         "ASSIGNEE": "Cesionario",
         "LABELS": "Etiquetas",
-        "CREATED_AT": "Created at {createdAt}"
+        "CREATED_AT": "Creado en {createdAt}"
       },
       "UNLINK": {
         "TITLE": "Desenlazar",
diff --git a/app/javascript/dashboard/i18n/locale/es/search.json b/app/javascript/dashboard/i18n/locale/es/search.json
index 1734afb32..835bccc2a 100644
--- a/app/javascript/dashboard/i18n/locale/es/search.json
+++ b/app/javascript/dashboard/i18n/locale/es/search.json
@@ -11,8 +11,8 @@
       "CONVERSATIONS": "Conversaciones",
       "MESSAGES": "Mensajes"
     },
-    "VIEW_MORE": "View more",
-    "LOAD_MORE": "Load more",
+    "VIEW_MORE": "Ver más",
+    "LOAD_MORE": "Cargar más",
     "SEARCHING_DATA": "Buscando",
     "LOADING_DATA": "Cargando",
     "EMPTY_STATE": "Ningún {item} encontrado para la consulta '{query}'",
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 8971ae3a9..25ccfc1fb 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -195,7 +195,7 @@
     "CHANGE_AVAILABILITY_STATUS": "Cambiar",
     "CHANGE_ACCOUNTS": "Cambiar de cuenta",
     "SWITCH_ACCOUNT": "Cambiar de cuenta",
-    "CONTACT_SUPPORT": "Contactar al soporte",
+    "CONTACT_SUPPORT": "Contactar a soporte",
     "SELECTOR_SUBTITLE": "Seleccione una cuenta de la siguiente lista",
     "PROFILE_SETTINGS": "Ajustes del perfil",
     "KEYBOARD_SHORTCUTS": "Atajos de teclado",
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Cambiar a nota privada",
       "SWITCH_TO_REPLY": "Cambiar a respuesta",
       "TOGGLE_SNOOZE_DROPDOWN": "Cambiar el menú desplegable"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Windows / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt \\ ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 9ec559e51..302b9892a 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "اطلاعات مخاطب <strong>{primaryContactName}</strong> کپی شود به <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " ادغام مخاطبین",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "پیام",
       "SEND_MESSAGE": "ارسال پیام",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "مخاطبین"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "مخاطب با موفقیت ذخیره شد",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "مخاطب با موفقیت رفع نسداد شد",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "مخاطبین را از طریق یک فایل CSV وارد کنید.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 2dfec80c9..c7f4026d7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "علامت گذاری به عنوان در انتظار",
       "RESOLVED": "علامت زدن به عنوان حل شده",
       "MARK_AS_UNREAD": "علامت گذاری به عنوان خوانده نشده",
+      "MARK_AS_READ": "ثبت به عنوان خوانده شده",
       "REOPEN": "مکالمه را دوباره باز کنید",
       "SNOOZE": {
         "TITLE": "به تعویق انداختن",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 80623c7ea..d448e55d2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "رفتن به یادداشت خصوصی",
       "SWITCH_TO_REPLY": "رفتن به پاسخ",
       "TOGGLE_SNOOZE_DROPDOWN": "تغییر حالت بازکردن تعویق"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 8d6cd41d5..2daab6519 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Yhdistä yhteystiedot",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Viesti",
       "SEND_MESSAGE": "Lähetä viesti",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Yhteystiedot"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakti tallennettu onnistuneesti",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index 9e5bdecbc..a221e178b 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Avaa keskustelu uudelleen",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index bed0e9a58..afe261db7 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index bac79479b..31bf17529 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Les coordonnées de <strong>{primaryContactName}</strong> seront copiées vers <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Fusionner les contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Envoyer un message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact enregistré avec succès",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importer des contacts via un fichier CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 6caa39cef..8a2d23576 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Marquer comme en attente",
       "RESOLVED": "Marquer comme résolu",
       "MARK_AS_UNREAD": "Marquer comme non lu",
+      "MARK_AS_READ": "Marquer comme lu",
       "REOPEN": "Reprendre la conversation",
       "SNOOZE": {
         "TITLE": "Reporter",
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index d0ebec3aa..adbb0ff6e 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Basculer vers une note privée",
       "SWITCH_TO_REPLY": "Basculer vers la réponse",
       "TOGGLE_SNOOZE_DROPDOWN": "Activer/désactiver la liste déroulante de répétition"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index da3572952..dbec8858a 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "פרטי הקשר של <strong>{primaryContactName}</strong> יועתקו אל <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "הודעת שגיאה"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " מזג אנשי קשר",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "הודעה",
       "SEND_MESSAGE": "שלח הודעה",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "איש קשר"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "איש הקשר נשמר בהצלחה",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "ייבא אנשי קשר באמצעות קובץ CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 8303feb9d..359ba6c12 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "סמן כממתין",
       "RESOLVED": "סמן כפתור",
       "MARK_AS_UNREAD": "סמן כלא נקרא",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "פתח מחדש את השיחה",
       "SNOOZE": {
         "TITLE": "נודניק",
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 13fe2cb31..9fc083fb0 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "עבור להערה פרטית",
       "SWITCH_TO_REPLY": "עבור לתשובה",
       "TOGGLE_SNOOZE_DROPDOWN": "החלפת תפריט נודניק"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "נצח / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index e49625e9c..5ff7fb0fd 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 1b3bbb37f..3a70ae1e9 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hr/contact.json b/app/javascript/dashboard/i18n/locale/hr/contact.json
index a6e8b5d65..d772deab2 100644
--- a/app/javascript/dashboard/i18n/locale/hr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hr/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Poruka",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakti"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/hr/conversation.json b/app/javascript/dashboard/i18n/locale/hr/conversation.json
index 001162d8d..c0c26e3ad 100644
--- a/app/javascript/dashboard/i18n/locale/hr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hr/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 230b01fc4..24a62aaea 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index b91e5e287..98b4d811f 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "<strong>{primaryContactName}</strong> kontakt adatai át lesznek másolva hozzá: <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "HIBA_ÜZENET"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Kontaktok egyesítése",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Üzenet",
       "SEND_MESSAGE": "Üzenet elküldése",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontaktok"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt mentés sikeres",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Kontaktok importálása CSV fájlból.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 10da985f3..f2f37086f 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Függőben levőként megjelölés",
       "RESOLVED": "Megjelölés megoldottként",
       "MARK_AS_UNREAD": "Megjelölés olvasatlanként",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Beszélgetés újranyitása",
       "SNOOZE": {
         "TITLE": "Halasztás",
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index f934b44ea..1b22986a3 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Válts privát jegyzetre",
       "SWITCH_TO_REPLY": "Válts a válasz fülre",
       "TOGGLE_SNOOZE_DROPDOWN": "Alvómód bekapcsolása a legördülő menüben"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/\n"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hy/contact.json b/app/javascript/dashboard/i18n/locale/hy/contact.json
index 69e077fbf..fd62731d6 100644
--- a/app/javascript/dashboard/i18n/locale/hy/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hy/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/hy/conversation.json b/app/javascript/dashboard/i18n/locale/hy/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/hy/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hy/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 6ff919fa6..b54fafa17 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Detail kontak dari <strong>{primaryContactName}</strong> akan disalin ke <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "PESAN_KESALAHAN"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": "Gabungkan Kontak",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Pesan",
       "SEND_MESSAGE": "Kirim Pesan",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontak"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontak berhasil disimpan",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Impor kontak",
           "DESCRIPTION": "Impor kontak melalui file CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index 62a682a52..8abbd0425 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Tandai sebagai tertunda",
       "RESOLVED": "Tandai sebagai terselesaikan",
       "MARK_AS_UNREAD": "Tandai sebagai belum terbaca",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Buka kembali percakapan",
       "SNOOZE": {
         "TITLE": "Tunda",
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index c6d17bb94..9783f164f 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Beralih ke Catatan Pribadi",
       "SWITCH_TO_REPLY": "Beralih ke Balasan",
       "TOGGLE_SNOOZE_DROPDOWN": "Buka/Tutup dropdown penundaan"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/is/contact.json b/app/javascript/dashboard/i18n/locale/is/contact.json
index b2794acee..afa78764b 100644
--- a/app/javascript/dashboard/i18n/locale/is/contact.json
+++ b/app/javascript/dashboard/i18n/locale/is/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Samskiptaupplýsingar <strong>{primaryContactName}</strong> verða afritaðar á <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Sameina tengiliði",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Skilaboð",
       "SEND_MESSAGE": "Senda skilaboð",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Tengiliðir"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Tengiliðurinn var vistaður",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Hlaða inn tengiliðum með CSV skrá.",
diff --git a/app/javascript/dashboard/i18n/locale/is/conversation.json b/app/javascript/dashboard/i18n/locale/is/conversation.json
index 9c051ff7b..8175c4e23 100644
--- a/app/javascript/dashboard/i18n/locale/is/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/is/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Enduropna samtal",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index 399c47e02..a3417e8ce 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index fe8e07aff..3f984ed28 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "I dettagli del contatto di <strong>{primaryContactName}</strong> verranno copiati in <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Unisci contatti",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Messaggio",
       "SEND_MESSAGE": "Invia messaggio",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contatti"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contatto salvato con successo",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importa contatti attraverso un file CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index c3f87b207..467539f7d 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Segna come in sospeso",
       "RESOLVED": "Contrassegna come risolto",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Segna come letto",
       "REOPEN": "Riapri la conversazione",
       "SNOOZE": {
         "TITLE": "Posticipa",
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 758f1538d..2de317ade 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Passa alle note private",
       "SWITCH_TO_REPLY": "Passa a Risposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Attiva/Disattiva sospensione a discesa"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index a21b360c4..d6309a92e 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "<strong>{primaryContactName}</strong> の連絡先情報が <strong>{parentContactName}</strong> にコピーされます。"
     },
     "SEARCH": {
-      "ERROR": "エラーが発生しました。"
+      "ERROR_MESSAGE": "問題が発生しました。もう一度お試しください。"
     },
     "FORM": {
       "SUBMIT": "連絡先をマージ",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "検索...",
       "MESSAGE_BUTTON": "メッセージ",
       "SEND_MESSAGE": "メッセージを送信",
+      "BLOCK_CONTACT": "連絡先をブロック",
+      "UNBLOCK_CONTACT": "連絡先のブロックを解除",
       "BREADCRUMB": {
         "CONTACTS": "連絡先"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "連絡先が正常に保存されました",
           "ERROR_MESSAGE": "連絡先を保存できませんでした。後でもう一度お試しください。"
         },
+        "BLOCK_SUCCESS_MESSAGE": "この連絡先は正常にブロックされました",
+        "BLOCK_ERROR_MESSAGE": "連絡先をブロックできませんでした。再度お試しください。",
+        "UNBLOCK_SUCCESS_MESSAGE": "この連絡先のブロックが正常に解除されました",
+        "UNBLOCK_ERROR_MESSAGE": "連絡先のブロックを解除できませんでした。再度お試しください。",
         "IMPORT_CONTACT": {
           "TITLE": "連絡先をインポート",
           "DESCRIPTION": "CSVファイルを使用して連絡先をインポートします。",
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index 002c04f7f..560158739 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "保留としてマークする",
       "RESOLVED": "解決済みとしてマークする",
       "MARK_AS_UNREAD": "未読にする",
+      "MARK_AS_READ": "既読にする",
       "REOPEN": "会話を再開する",
       "SNOOZE": {
         "TITLE": "スヌーズ",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 173be4dcf..1f799b628 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -391,7 +391,7 @@
     "FINISH": {
       "TITLE": "受信トレイの準備ができました！",
       "MESSAGE": "新しいチャンネルを通じて顧客と交流できます。サポートを楽しんでください",
-      "BUTTON_TEXT": "そこに連れて行って",
+      "BUTTON_TEXT": "受信トレイに移動",
       "MORE_SETTINGS": "その他の設定",
       "WEBSITE_SUCCESS": "ウェブサイトチャンネルの作成が正常に完了しました。以下のコードをコピーしてウェブサイトに貼り付けてください。次回、お客様がライブチャットを使用すると、会話は自動的に受信トレイに表示されます。"
     },
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index b69ec5508..141f2d347 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "プライベートメモに切り替え",
       "SWITCH_TO_REPLY": "返信に切り替え",
       "TOGGLE_SNOOZE_DROPDOWN": "スヌーズドロップダウンを切り替え"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ka/contact.json b/app/javascript/dashboard/i18n/locale/ka/contact.json
index 69e077fbf..fd62731d6 100644
--- a/app/javascript/dashboard/i18n/locale/ka/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ka/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ka/conversation.json b/app/javascript/dashboard/i18n/locale/ka/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/ka/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ka/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 1b3bbb37f..3a70ae1e9 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index c7709433d..80374c12a 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "에러_메시지"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "메시지",
       "SEND_MESSAGE": "메시지 보내기",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "연락처"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "연락처가 성공적으로 저장되었습니다.",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "CSV 파일을 통해 연락처 가져오기",
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index 81fb54278..87821e43b 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "대화 다시 열기",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 354110b60..1d8a66d12 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lt/contact.json b/app/javascript/dashboard/i18n/locale/lt/contact.json
index ff4cb00ac..5dde32ee2 100644
--- a/app/javascript/dashboard/i18n/locale/lt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lt/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Kontakto informacija <strong>{primaryContactName}</strong> bus nukopijuota į <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "KLAIDOS_PRANEŠIMAS"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Apjungti kontaktus",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Žinutė",
       "SEND_MESSAGE": "Išsiųsti pranešimą",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontaktai"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontaktas išsaugotas sėkmingai",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Šis kontaktas sėkmingai atblokuotas",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importuoti kontaktus CSV failo pagalba.",
diff --git a/app/javascript/dashboard/i18n/locale/lt/conversation.json b/app/javascript/dashboard/i18n/locale/lt/conversation.json
index f7930a232..538eedd41 100644
--- a/app/javascript/dashboard/i18n/locale/lt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lt/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Pažymėti kaip laukiantį",
       "RESOLVED": "Pažymėti kaip išspręstą",
       "MARK_AS_UNREAD": "Pažymėti kaip neperskaitytą",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Atidaryti pokalbį",
       "SNOOZE": {
         "TITLE": "Atidėti",
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index a109d9d3a..b643af4b3 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Perjungti į Privatų užrašą",
       "SWITCH_TO_REPLY": "Perjungti į Atsakyti",
       "TOGGLE_SNOOZE_DROPDOWN": "Perjungti snooze išskleidžiamąjį meniu"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 8b96e90a7..9a6877fbd 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Kontaktpersonas <strong>{primaryContactName}</strong> informācija tiks kopēta uz <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "KĻŪDAS_PAZIŅOJUMS"
+      "ERROR_MESSAGE": "Radās kļūda. Lūdzu, vēlāk mēģiniet vēlreiz."
     },
     "FORM": {
       "SUBMIT": " Apvienot kontaktpersonas",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Meklēt...",
       "MESSAGE_BUTTON": "Ziņojums",
       "SEND_MESSAGE": "Sūtīt ziņojumu",
+      "BLOCK_CONTACT": "Bloķēt kontaktpersonu",
+      "UNBLOCK_CONTACT": "Atbloķēt kontaktpersonu",
       "BREADCRUMB": {
         "CONTACTS": "Kontaktpersonas"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontaktpersona ir veiksmīgi saglabāta",
           "ERROR_MESSAGE": "Nevar saglabāt kontaktpersonu. Lūdzu, vēlāk mēģiniet vēlreiz."
         },
+        "BLOCK_SUCCESS_MESSAGE": "Šī kontaktpersona ir veiksmīgi bloķēta",
+        "BLOCK_ERROR_MESSAGE": "Nevar bloķēt kontaktpersonu. Lūdzu, vēlāk mēģiniet vēlreiz.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Šī kontaktpersona ir veiksmīgi atbloķēta",
+        "UNBLOCK_ERROR_MESSAGE": "Nevar atbloķēt kontaktpersonu. Lūdzu, vēlāk mēģiniet vēlreiz.",
         "IMPORT_CONTACT": {
           "TITLE": "Importēt kontaktpersonas",
           "DESCRIPTION": "Importēt kontaktpersonas, izmantojot CSV failu.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index e467f1cb0..659d9d169 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Atzīmēt kā neapstiprinātu",
       "RESOLVED": "Atzīmēt kā atrisinātu",
       "MARK_AS_UNREAD": "Atzīmēt kā nelasītu",
+      "MARK_AS_READ": "Atzīmēt kā lasītu",
       "REOPEN": "Atkārtoti atvērt sarunu",
       "SNOOZE": {
         "TITLE": "Atlikt",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 4fd46dc7e..968ad2f5a 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Pārslēgties uz Privāto Piezīmi",
       "SWITCH_TO_REPLY": "Pārslēgties uz Atbildi",
       "TOGGLE_SNOOZE_DROPDOWN": "Pārslēgt atlikšanas nolaižamo izvēlni"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 7956a218b..c44d1d7b7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "സന്ദേശം",
       "SEND_MESSAGE": "സന്ദേശം അയയ്ക്കുക",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "കോൺ‌ടാക്റ്റുകൾ"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "കോൺടാക്റ്റ് വിജയകരമായി സേവ് ചെയ്തിരിക്കുന്നു",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index 7be2e5daa..c4eddf8cf 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "സംഭാഷണം വീണ്ടും തുറക്കുക",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 5719b6fa1..c5ee33a17 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ms/contact.json b/app/javascript/dashboard/i18n/locale/ms/contact.json
index ba720bd66..d4e7f25dd 100644
--- a/app/javascript/dashboard/i18n/locale/ms/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ms/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ms/conversation.json b/app/javascript/dashboard/i18n/locale/ms/conversation.json
index d24fa0088..64adfcd90 100644
--- a/app/javascript/dashboard/i18n/locale/ms/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ms/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 09cf2707a..4873bb44e 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index c0bb20567..9ec931c87 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 18d52da20..5538daa70 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 8721b06e8..4905588f7 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 6e53f9449..0904cb31a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contactgegevens van <strong>{primaryContactName}</strong> worden gekopieerd naar <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "FOUT_BERICHT"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Contacten samenvoegen",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Bericht",
       "SEND_MESSAGE": "Verstuur bericht",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacten"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact succesvol opgeslagen",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Contacten importeren via een CSV-bestand.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index d5cdac5e4..a14dddd9b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Markeren als in afwachting van",
       "RESOLVED": "Markeer als opgelost",
       "MARK_AS_UNREAD": "Markeer als ongelezen",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Heropen gesprek",
       "SNOOZE": {
         "TITLE": "Sluimeren",
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 67c0a3447..cbcca077e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 12a164f30..0bb082e98 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Melding",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakter"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 47bbf85ee..1f2ea4445 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index a83eaa30b..6c58cadc2 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 8ea36c1c9..b6425127e 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Dane kontaktowe z <strong>{primaryContactName}</strong> zostaną skopiowane do <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "Błąd"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": "Połącz kontakty",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Wiadomość",
       "SEND_MESSAGE": "Wyślij wiadomość",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakty"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt został pomyślnie zapisany",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importuj kontakty z pliku CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index 0a90cb18d..6db8aa686 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Oznacz jako oczekujące",
       "RESOLVED": "Oznacz jako rozwiązane",
       "MARK_AS_UNREAD": "Oznacz jako nieprzeczytane",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Otwórz ponownie",
       "SNOOZE": {
         "TITLE": "Uśpij",
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index ccd9a8b83..6271ce138 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Przełącz do prywatnej notatki",
       "SWITCH_TO_REPLY": "Przełącz do odpowiedzi",
       "TOGGLE_SNOOZE_DROPDOWN": "Przełącz menu rozwijane drzemki"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 68995d63b..ddbc5d4cf 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Detalhes do contacto do <strong>{primaryContactName}</strong> serão copiados para <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "MENSAGEM_ERRO"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Unir contactos",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Messagem",
       "SEND_MESSAGE": "Enviar mensagem",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contactos"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contacto guardado com sucesso",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Este contacto foi desbloqueado",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importar contactos através de um ficheiro CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index e5a796244..68e74c0cb 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Marcar como pendente",
       "RESOLVED": "Marcar como resolvida",
       "MARK_AS_UNREAD": "Marcar como não lida",
+      "MARK_AS_READ": "Marcar como lida",
       "REOPEN": "Reabrir conversa",
       "SNOOZE": {
         "TITLE": "Adiar",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 006d31ad4..ff9b1461a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Alterar para nota privada",
       "SWITCH_TO_REPLY": "Mudar para resposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Ativar/desativar suspensos"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index def7a19f9..e4d6dca36 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -45,13 +45,13 @@
       "FALSE": "Falso"
     },
     "ATTRIBUTES": {
-      "STATUS": "SItuação",
+      "STATUS": "Situação",
       "ASSIGNEE_NAME": "Nome do responsável",
       "INBOX_NAME": "Nome da Caixa de Entrada",
-      "TEAM_NAME": "Nome do Time",
+      "TEAM_NAME": "Nome da equipe",
       "CONVERSATION_IDENTIFIER": "Identificador da conversa",
       "CAMPAIGN_NAME": "Nome da campanha",
-      "LABELS": "Marcadores",
+      "LABELS": "Etiquetas",
       "BROWSER_LANGUAGE": "Idioma do navegador",
       "PRIORITY": "Prioridade",
       "COUNTRY_NAME": "Nome do País",
@@ -93,7 +93,7 @@
         }
       },
       "EDIT": {
-        "EDIT_BUTTON": "Editar Pasta"
+        "EDIT_BUTTON": "Alterar Pasta"
       },
       "DELETE": {
         "DELETE_BUTTON": "Excluir filtro",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
index 8990e1eb4..fb9b8a8ca 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentBots.json
@@ -8,14 +8,14 @@
       "NAME": {
         "LABEL": "Nome do Robô",
         "PLACEHOLDER": "Nomeie seu Robô.",
-        "ERROR": "O nome do bot é obrigatório."
+        "ERROR": "O nome do Robô é obrigatório."
       },
       "DESCRIPTION": {
         "LABEL": "Descrição do Robô",
         "PLACEHOLDER": "O que esse robô faz?"
       },
       "BOT_CONFIG": {
-        "ERROR": "Por favor, insira a configuração CSML do bot acima.",
+        "ERROR": "Por favor, insira a configuração CSML do Robô acima.",
         "API_ERROR": "Sua configuração CSML é inválida. Por favor, corrija e tente novamente."
       },
       "SUBMIT": "Validar e salvar"
@@ -58,10 +58,10 @@
     "EDIT": {
       "BUTTON_TEXT": "Alterar",
       "LOADING": "Buscando robôs...",
-      "TITLE": "Editar Robô",
+      "TITLE": "Alterar Robô",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "API": {
-        "SUCCESS_MESSAGE": "Bot atualizado com sucesso.",
+        "SUCCESS_MESSAGE": "Robô atualizado com sucesso.",
         "ERROR_MESSAGE": "Não foi possível atualizar o robô. Por favor, tente novamente mais tarde."
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index 7618951ab..e283337c5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -15,7 +15,7 @@
       "DESC": "Você pode adicionar e/ou remover agentes de um time.",
       "NAME": "Nome",
       "EMAIL": "E-mail",
-      "STATUS": "SItuação",
+      "STATUS": "Situação",
       "ACTIONS": "Ações",
       "VERIFIED": "Verificado",
       "VERIFICATION_PENDING": "Verificação Pendente",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
index 8986a72d3..6bfd16cba 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/attributesMgmt.json
@@ -115,7 +115,7 @@
         "PLACEHOLDER": "Por favor, insira uma dica para o padrão de expressão regular. (Opcional)"
       },
       "ENABLE_REGEX": {
-        "LABEL": "Habilitar validação do regex"
+        "LABEL": "Habilitar validação da expressão regular"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
index b52a8aa29..f26e31280 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/auditLogs.json
@@ -24,14 +24,14 @@
     "DEFAULT_USER": "Sistema",
     "AUTOMATION_RULE": {
       "ADD": "{agentName} nova regra de automação criada (#{id})",
-      "EDIT": "{agentName} atualizada regra de automação (#{id})",
+      "EDIT": "{agentName} atualizou regra de automação (#{id})",
       "DELETE": "{agentName} excluiu uma regra de automação (#{id})"
     },
     "ACCOUNT_USER": {
       "ADD": "{agentName} Convidou {invitee} para sua conta como {role}",
       "EDIT": {
-        "SELF": "{agentName} Alterado de {attributes} para {values}",
-        "OTHER": "{agentName} Alterado {attributes} por {user} para {values}",
+        "SELF": "{agentName} Alterou seu {attributes} para {values}",
+        "OTHER": "{agentName} Alterou {attributes} de {user} para {values}",
         "DELETED": "{agentName} alterou {attributes} de um usuário excluído para {values}"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
index 69d759edf..a0b7a6d81 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
@@ -32,7 +32,7 @@
     "TEAMS": {
       "TEAM_SELECT_LABEL": "Selecionar time",
       "NONE": "Nenhuma",
-      "NO_TEAMS_AVAILABLE": "Ainda não há equipes adicionadas a esta conta ainda.",
+      "NO_TEAMS_AVAILABLE": "Ainda não há equipes adicionadas a esta conta.",
       "ASSIGN_SELECTED_TEAMS": "Atribuir equipe selecionada.",
       "ASSIGN_SUCCESFUL": "Times atribuídos com sucesso.",
       "ASSIGN_FAILED": "Falha ao atribuir equipe. Por favor, tente novamente."
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json b/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
index 99842b5b1..ec1595200 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/campaign.json
@@ -30,7 +30,7 @@
             "ERROR": "Título é obrigatório"
           },
           "MESSAGE": {
-            "LABEL": "Messagem",
+            "LABEL": "Mensagem",
             "PLACEHOLDER": "Por favor, insira a mensagem da campanha",
             "ERROR": "A mensagem é obrigatória"
           },
@@ -118,7 +118,7 @@
           },
           "AUDIENCE": {
             "LABEL": "Público",
-            "PLACEHOLDER": "Selecionar marcadores dos clientes",
+            "PLACEHOLDER": "Selecionar etiquetas dos clientes",
             "ERROR": "Público é necessário"
           },
           "SCHEDULED_AT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
index 6e62b5ee7..58d05defe 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
@@ -27,7 +27,7 @@
           "ERROR": "O atalho é obrigatório."
         },
         "CONTENT": {
-          "LABEL": "Messagem",
+          "LABEL": "Mensagem",
           "PLACEHOLDER": "Por favor, escreva a mensagem que deseja salvar como um modelo para usar posteriormente.",
           "ERROR": "A mensagem é obrigatória."
         },
@@ -35,7 +35,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Resposta pronta adicionada com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível desconectar o agente robô. Por favor, tente novamente mais tarde."
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
       }
     },
     "EDIT": {
@@ -43,7 +43,7 @@
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Respostas prontas",
+          "LABEL": "Atalho",
           "PLACEHOLDER": "Por favor, insira um atalho.",
           "ERROR": "O atalho é obrigatório."
         },
@@ -57,14 +57,14 @@
       "BUTTON_TEXT": "Alterar",
       "API": {
         "SUCCESS_MESSAGE": "Resposta pronta atualizada com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível desconectar o agente robô. Por favor, tente novamente mais tarde."
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Excluir",
       "API": {
-        "SUCCESS_MESSAGE": "Resposta pronta deletada com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível desconectar o agente robô. Por favor, tente novamente mais tarde."
+        "SUCCESS_MESSAGE": "Resposta pronta excluída com sucesso.",
+        "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot. Por favor, tente novamente."
       },
       "CONFIRM": {
         "TITLE": "Confirmar exclusão",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 5f4b16d1f..431eaafe7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -15,8 +15,8 @@
     },
     "FILTER_ALL": "Todos",
     "ASSIGNEE_TYPE_TABS": {
-      "me": "Minha",
-      "unassigned": "Não atribuída",
+      "me": "Minhas",
+      "unassigned": "Não atribuídas",
       "all": "Todos"
     },
     "CHAT_STATUS_FILTER_ITEMS": {
@@ -24,16 +24,16 @@
         "TEXT": "Abertas"
       },
       "resolved": {
-        "TEXT": "Resolvida"
+        "TEXT": "Resolvidas"
       },
       "pending": {
-        "TEXT": "Pendente"
+        "TEXT": "Pendentes"
       },
       "snoozed": {
-        "TEXT": "Adiado"
+        "TEXT": "Adiadas"
       },
       "all": {
-        "TEXT": "Todos"
+        "TEXT": "Todas"
       }
     },
     "VIEW_FILTER": "Visualizar",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index e8bce3177..b39178b39 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -62,9 +62,9 @@
     "TITLE": "Excluir contato",
     "DESC": "Excluir detalhes do contato",
     "CONFIRM": {
-      "TITLE": "Confirmar exclusão",
+      "TITLE": "Confirmar Exclusão",
       "MESSAGE": "Você tem certeza que deseja excluir ",
-      "YES": "Sim, excluir",
+      "YES": "Sim, Excluir",
       "NO": "Não, Mantenha"
     },
     "API": {
@@ -102,7 +102,7 @@
         "DUPLICATE": "Este número de telefone está em uso para outro contato."
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "Insira a localização do contato",
         "LABEL": "Localização"
       },
       "COMPANY_NAME": {
@@ -149,7 +149,7 @@
     "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Iniciar Conversa",
+    "BUTTON_LABEL": "Iniciar conversa",
     "TITLE": "Nova conversa",
     "DESC": "Iniciar uma nova conversa enviando uma nova mensagem.",
     "NO_INBOX": "Não foi possível encontrar uma caixa de entrada para iniciar uma nova conversa com este contato.",
@@ -198,7 +198,7 @@
     "ACTIONS": {
       "COPY": "Copiar atributo",
       "DELETE": "Excluir atributo",
-      "EDIT": "Editar atributo"
+      "EDIT": "Alterar atributo"
     },
     "ADD": {
       "TITLE": "Criar atributo personalizado",
@@ -208,13 +208,13 @@
       "CREATE": "Adicionar atributo",
       "CANCEL": "Cancelar",
       "NAME": {
-        "LABEL": "Atributos Personalizados",
+        "LABEL": "Nome do Atributo Personalizado",
         "PLACEHOLDER": "Por exemplo: ID shopify",
         "ERROR": "Nome de atributo personalizado inválido"
       },
       "VALUE": {
         "LABEL": "Valor do atributo",
-        "PLACEHOLDER": "Eg: 11901 "
+        "PLACEHOLDER": "Ex: 11901 "
       },
       "ADD": {
         "TITLE": "Criar novo atributo ",
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Detalhes de contato de <strong>{primaryContactName}</strong> serão copiados para <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "Mensagem de erro"
+      "ERROR_MESSAGE": "Algo deu errado. Por favor, tente novamente mais tarde."
     },
     "FORM": {
       "SUBMIT": " Mesclar contatos",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Pesquisar...",
       "MESSAGE_BUTTON": "Enviar Mensagem",
       "SEND_MESSAGE": "Enviar mensagem",
+      "BLOCK_CONTACT": "Bloquear contato",
+      "UNBLOCK_CONTACT": "Desbloquear contato",
       "BREADCRUMB": {
         "CONTACTS": "Contato"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contato salvo com sucesso",
           "ERROR_MESSAGE": "Não foi possível atualizar o contato. Por favor, tente mais tarde."
         },
+        "BLOCK_SUCCESS_MESSAGE": "Este contato foi bloqueado com sucesso",
+        "BLOCK_ERROR_MESSAGE": "Não foi possível bloquear o contato. Tente novamente mais tarde.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Este contato foi desbloqueado com sucesso",
+        "UNBLOCK_ERROR_MESSAGE": "Não foi possível desbloquear o contato. Tente novamente mais tarde.",
         "IMPORT_CONTACT": {
           "TITLE": "Importar contatos",
           "DESCRIPTION": "Importar contatos através de um arquivo CSV.",
@@ -316,13 +322,13 @@
         },
         "EXPORT_CONTACT": {
           "TITLE": "Exportar contatos",
-          "DESCRIPTION": "Exporte rapidamente um arquivo csv com detalhes completos dos seus contatos",
+          "DESCRIPTION": "Exporte rapidamente um arquivo CSV com detalhes completos dos seus contatos",
           "CONFIRM": "Exportar",
-          "SUCCESS_MESSAGE": "Exportando. Você será notificado por e-mail quando o arquivo estiver pronto para download.",
+          "SUCCESS_MESSAGE": "Exportando. Você será notificado por e-mail quando o arquivo estiver pronto para ser baixado.",
           "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
         },
         "SORT_BY": {
-          "LABEL": "Ordenar por",
+          "LABEL": "Classificar por",
           "OPTIONS": {
             "NAME": "Nome",
             "EMAIL": "e-mail",
@@ -347,14 +353,14 @@
             "CONFIRM": "Salvar filtro",
             "LABEL": "Nome",
             "PLACEHOLDER": "Informe o nome para esse filtro",
-            "ERROR": "Digite um nome válido",
+            "ERROR": "Informe um nome válido",
             "SUCCESS_MESSAGE": "Filtro salvo com sucesso",
             "ERROR_MESSAGE": "Não foi possível salvar o filtro. Por favor, tente mais tarde."
           },
           "DELETE_SEGMENT": {
             "TITLE": "Confirmar exclusão",
             "DESCRIPTION": "Tem certeza de que deseja excluir este filtro?",
-            "CONFIRM": "Sim, excluir",
+            "CONFIRM": "Sim, Excluir",
             "CANCEL": "Não, Cancelar",
             "SUCCESS_MESSAGE": "Filtro excluído com sucesso",
             "ERROR_MESSAGE": "Não foi possível excluir o filtro. Por favor, tente mais tarde."
@@ -385,7 +391,7 @@
         "ADD_FILTER": "Adicionar filtro"
       },
       "TITLE": "Filtrar contatos",
-      "EDIT_SEGMENT": "Editar segmento",
+      "EDIT_SEGMENT": "Alterar segmento",
       "SEGMENT": {
         "LABEL": "Nome do segmento",
         "INPUT_PLACEHOLDER": "Digite o nome do segmento"
@@ -422,7 +428,7 @@
             "PLACEHOLDER": "Selecione o país"
           },
           "BIO": {
-            "PLACEHOLDER": "Digite uma bio (apresentação)"
+            "PLACEHOLDER": "Digite uma biografia"
           },
           "COMPANY_NAME": {
             "PLACEHOLDER": "Digite o nome da empresa"
@@ -460,7 +466,7 @@
       "DELETE_CONTACT": "Excluir contato",
       "DELETE_DIALOG": {
         "TITLE": "Confirmar exclusão",
-        "DESCRIPTION": "Excluir permanentemente este contato. Esta ação é irreversível",
+        "DESCRIPTION": "Tem certeza de que deseja excluir este contato {contactName}?",
         "CONFIRM": "Sim, excluir",
         "API": {
           "SUCCESS_MESSAGE": "Contato excluído com sucesso",
@@ -469,8 +475,8 @@
       },
       "AVATAR": {
         "UPLOAD": {
-          "ERROR_MESSAGE": "Não foi possível fazer o “upload” do avatar. Por favor, tente novamente mais tarde.",
-          "SUCCESS_MESSAGE": "Avatar carregado com sucesso"
+          "ERROR_MESSAGE": "Não foi possível enviar o avatar. Por favor, tente novamente mais tarde.",
+          "SUCCESS_MESSAGE": "Avatar enviado com sucesso"
         },
         "DELETE": {
           "SUCCESS_MESSAGE": "Avatar excluído com sucesso",
@@ -543,7 +549,7 @@
     },
     "EMPTY_STATE": {
       "TITLE": "Nenhum contato encontrado nesta conta",
-      "SUBTITLE": "Para adicionar novos contatos clicando no botão abaixo",
+      "SUBTITLE": "Comece a adicionar novos contatos clicando no botão abaixo",
       "BUTTON_LABEL": "Adicionar contato",
       "SEARCH_EMPTY_STATE_TITLE": "Nenhum contato corresponde à sua pesquisa 🔍",
       "LIST_EMPTY_STATE_TITLE": "Não há contatos disponíveis nesta visualização 📋"
@@ -568,7 +574,7 @@
         "BUTTON": "Mostrar Caixas de Entrada"
       },
       "EMAIL_OPTIONS": {
-        "SUBJECT_LABEL": "Assunto :",
+        "SUBJECT_LABEL": "Assunto:",
         "SUBJECT_PLACEHOLDER": "Digite o assunto do seu e-mail aqui",
         "CC_LABEL": "Cc:",
         "CC_PLACEHOLDER": "Pesquisar por um contato com seu endereço de e-mail",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
index 2798e6b4c..9dc1d1b3b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
@@ -2,7 +2,7 @@
   "CONTACTS_FILTER": {
     "TITLE": "Filtrar Contatos",
     "SUBTITLE": "Adicione filtros abaixo e clique em 'Enviar' para filtrar conversas.",
-    "EDIT_CUSTOM_SEGMENT": "Editar segmento",
+    "EDIT_CUSTOM_SEGMENT": "Alterar segmento",
     "CUSTOM_VIEWS_SUBTITLE": "Adicione ou remova filtros e atualize seu segmento.",
     "ADD_NEW_FILTER": "Adicionar filtro",
     "CLEAR_ALL_FILTERS": "Limpar Filtros",
@@ -35,7 +35,7 @@
     },
     "ATTRIBUTES": {
       "NAME": "Nome",
-      "EMAIL": "e-mail",
+      "EMAIL": "E-mail",
       "PHONE_NUMBER": "Número de telefone",
       "IDENTIFIER": "Identificador",
       "CITY": "Cidade",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index f90c0d61d..4d89bbd0f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -35,9 +35,9 @@
     "TWILIO_WHATSAPP_CAN_REPLY": "Você só pode responder a esta conversa usando um modelo de mensagem devido a",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrições de janela de mensagem de 24 horas",
     "REPLYING_TO": "Você está respondendo a:",
-    "REMOVE_SELECTION": "Remover Seleção",
+    "REMOVE_SELECTION": "Remover seleção",
     "DOWNLOAD": "Baixar",
-    "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
+    "UNKNOWN_FILE_TYPE": "Arquivo desconhecido",
     "SAVE_CONTACT": "Salvar contato",
     "NO_CONTENT": "Nenhum conteúdo a ser exibido",
     "SHARED_ATTACHMENT": {
@@ -65,11 +65,11 @@
     "HEADER": {
       "RESOLVE_ACTION": "Resolver",
       "REOPEN_ACTION": "Reabrir",
-      "OPEN_ACTION": "Abrir",
+      "OPEN_ACTION": "Abertas",
       "OPEN": "Mais",
       "CLOSE": "Fechar",
       "DETAILS": "detalhes",
-      "SNOOZED_UNTIL": "Suspender até",
+      "SNOOZED_UNTIL": "Adiar até",
       "SNOOZED_UNTIL_TOMORROW": "Adiado até amanhã",
       "SNOOZED_UNTIL_NEXT_WEEK": "Adiada até a próxima semana",
       "SNOOZED_UNTIL_NEXT_REPLY": "Adiado até a próxima resposta",
@@ -77,8 +77,8 @@
         "FRT": "FRT {status}",
         "NRT": "NRT {status}",
         "RT": "RT {status}",
-        "MISSED": "perdidos(as)",
-        "DUE": "devido"
+        "MISSED": "perdidas",
+        "DUE": "venceu"
       }
     },
     "RESOLVE_DROPDOWN": {
@@ -92,7 +92,7 @@
       }
     },
     "CUSTOM_SNOOZE": {
-      "TITLE": "Suspender até",
+      "TITLE": "Adiar até",
       "APPLY": "Adiar",
       "CANCEL": "Cancelar"
     },
@@ -115,8 +115,9 @@
     },
     "CARD_CONTEXT_MENU": {
       "PENDING": "Marcar como pendente",
-      "RESOLVED": "Marcar como resolvido",
+      "RESOLVED": "Marcar como resolvida",
       "MARK_AS_UNREAD": "Marcar como não lida",
+      "MARK_AS_READ": "Marcar como lida",
       "REOPEN": "Reabrir conversa",
       "SNOOZE": {
         "TITLE": "Adiar",
@@ -134,7 +135,7 @@
           "FAILED": "Não foi possível atribuir agente. Por favor, tente novamente."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Etiqueta ##{labelName} atribuída para a conversa {conversationId}",
+          "SUCCESFUL": "Etiqueta #{labelName} atribuída para a conversa {conversationId}",
           "FAILED": "Não foi possível atribuir etiqueta. Por favor, tente novamente."
         },
         "TEAM_ASSIGNMENT": {
@@ -196,22 +197,22 @@
     },
     "VISIBLE_TO_AGENTS": "Mensagem Privada: Apenas visível para você e sua equipe",
     "CHANGE_STATUS": "Estado da conversa mudou",
-    "CHANGE_STATUS_FAILED": "Mudança de status da conversa falhou",
+    "CHANGE_STATUS_FAILED": "Mudança de situação da conversa falhou",
     "CHANGE_AGENT": "Responsável da conversa alterado",
     "CHANGE_AGENT_FAILED": "Falha ao atribuir outro agente",
     "ASSIGN_LABEL_SUCCESFUL": "Etiqueta atribuída com sucesso",
     "ASSIGN_LABEL_FAILED": "Falha ao atribuir etiqueta",
-    "CHANGE_TEAM": "Estado da conversa mudou",
+    "CHANGE_TEAM": "Situação da conversa mudou",
     "FILE_SIZE_LIMIT": "O arquivo excede os {MAXIMUM_SUPPORTED_FILE_UPLOAD_SIZE} MB do limite para anexos",
     "MESSAGE_ERROR": "Não foi possível enviar esta mensagem, por favor, tente novamente mais tarde",
     "SENT_BY": "Enviado por:",
     "BOT": "Robôs",
     "SEND_FAILED": "Não foi possível enviar a mensagem! Tente novamente",
-    "TRY_AGAIN": "Tentar novamente",
+    "TRY_AGAIN": "tentar novamente",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Selecione Agente",
+      "SELECT_AGENT": "selecionar Agente",
       "REMOVE": "Excluir",
-      "ASSIGN": "Atribua"
+      "ASSIGN": "Atribuir"
     },
     "CONTEXT_MENU": {
       "COPY": "Copiar",
@@ -230,7 +231,7 @@
     },
     "SIDEBAR": {
       "CONTACT": "Contato",
-      "COPILOT": "Copilot"
+      "COPILOT": "Copiloto"
     }
   },
   "EMAIL_TRANSCRIPT": {
@@ -252,7 +253,7 @@
   },
   "ONBOARDING": {
     "TITLE": "Olá, 👋. Bem-vindo ao {installationName}!",
-    "DESCRIPTION": "Obrigado por se inscrever. Queremos que você aproveite o máximo de {installationName}. Aqui estão algumas coisas que você consegue fazer no(a) {installationName} para que tenha uma experiência agradável.",
+    "DESCRIPTION": "Obrigado por se inscrever. Queremos que você aproveite o máximo de {installationName}. Aqui estão algumas coisas que você consegue fazer em {installationName} para que tenha uma experiência agradável.",
     "GREETING_MORNING": "👋 Bom dia, {name}. Bem-vindo a {installationName}.",
     "GREETING_AFTERNOON": "👋 Boa tarde, {name}. Bem-vindo a {installationName}.",
     "GREETING_EVENING": "👋 Boa noite, {name}. Bem-vindo a {installationName}.",
@@ -268,9 +269,9 @@
       "NEW_LINK": "Clique aqui para convidar um membro da equipe"
     },
     "LABELS": {
-      "TITLE": "Organizar conversas com marcadores",
-      "DESCRIPTION": "Etiquetas fornecem uma forma mais fácil de organizar a sua conversa. Criar algumas estiquetas como #solicitação-suporte, #fatura-assunto etc., assim você poderá futuramente utiliza-las em uma conversa posteriormente.",
-      "NEW_LINK": "Clique aqui para criar marcadores"
+      "TITLE": "Organizar conversas com etiquetas",
+      "DESCRIPTION": "Etiquetas fornecem uma forma mais fácil de organizar a sua conversa. Criar algumas etiquetas como #solicitação-suporte, #fatura-assunto etc., assim você poderá futuramente utiliza-las em uma conversa posteriormente.",
+      "NEW_LINK": "Clique aqui para criar etiquetas"
     },
     "CANNED_RESPONSES": {
       "TITLE": "Criar respostas prontas",
@@ -281,14 +282,14 @@
   "CONVERSATION_SIDEBAR": {
     "ASSIGNEE_LABEL": "Agente atribuído",
     "SELF_ASSIGN": "Atribuir a mim",
-    "TEAM_LABEL": "Equipe Atribuída",
+    "TEAM_LABEL": "Equipe atribuída",
     "SELECT": {
       "PLACEHOLDER": "Nenhuma"
     },
     "ACCORDION": {
       "CONTACT_DETAILS": "Detalhes do contato",
       "CONVERSATION_ACTIONS": "Ações da conversa",
-      "CONVERSATION_LABELS": "Marcador da conversa",
+      "CONVERSATION_LABELS": "Etiquetas da conversa",
       "CONVERSATION_INFO": "Informação da conversa",
       "CONTACT_ATTRIBUTES": "Atributos do contato",
       "PREVIOUS_CONVERSATION": "Conversas anteriores",
@@ -312,7 +313,7 @@
       "ERROR": "Não foi possível excluir o atributo. Por favor, tente mais tarde"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Adicionar atributo",
+      "TITLE": "Adicionar atributos",
       "PLACEHOLDER": "Procurar atributos",
       "NO_RESULT": "Nenhum atributo encontrado"
     }
@@ -323,7 +324,7 @@
     "BCC": "CCO",
     "CC": "Cc",
     "SUBJECT": "Assunto",
-    "EXPAND": "Expandir email"
+    "EXPAND": "Expandir e-mail"
   },
   "CONVERSATION_PARTICIPANTS": {
     "SIDEBAR_MENU_TITLE": "Participantes",
@@ -358,6 +359,6 @@
     "TRY_THESE_PROMPTS": "Experimente estes comandos"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": " enter"
+    "ERROR_DOWNLOADING": "Não foi possível baixar o anexo. Por favor, tente novamente"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index bcd29478f..e20558d3a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -29,7 +29,7 @@
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Domínio de recebimento de emails",
+        "LABEL": "Domínio de recebimento de e-mails",
         "PLACEHOLDER": "O domínio onde você receberá os e-mails",
         "ERROR": ""
       },
@@ -39,7 +39,7 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Depois de quantos dias um ticket deve resolver a si mesmo caso não haja nenhuma atividade",
+        "LABEL": "Depois de quantos dias um ticket deve se resolver mesmo caso não haja nenhuma atividade",
         "PLACEHOLDER": "30",
         "ERROR": "Por favor, insira um período de resolução automática válido (mínimo de 1 dia e máximo de 999 dias)"
       },
@@ -79,7 +79,7 @@
         "Nome",
         "Número de Telefone",
         "Conversas",
-        "Último contato"
+        "Último Contactado"
       ]
     },
     "TYPE_LABEL": {
@@ -88,14 +88,14 @@
       "assigned_conversation_new_message": "Nova Mensagem",
       "participating_conversation_new_message": "Nova Mensagem",
       "conversation_mention": "Menção",
-      "sla_missed_first_response": "",
-      "sla_missed_next_response": "",
-      "sla_missed_resolution": ""
+      "sla_missed_first_response": "SLA não alcançado",
+      "sla_missed_next_response": "SLA não alcançado",
+      "sla_missed_resolution": "SLA não alcançado"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "OFFLINE": "Offline",
+      "OFFLINE": "Desconectado",
       "RECONNECTING": "Reconectando...",
       "RECONNECT_SUCCESS": "Reconectado"
     },
@@ -113,10 +113,10 @@
       "CHANGE_ASSIGNEE": "Alterar Responsável",
       "CHANGE_PRIORITY": "Alterar Prioridade",
       "CHANGE_TEAM": "Alterar a Equipe",
-      "SNOOZE_CONVERSATION": "Adiar conversa",
+      "SNOOZE_CONVERSATION": "Adiar Conversa",
       "ADD_LABEL": "Adicionar etiqueta à conversa",
       "REMOVE_LABEL": "Remover etiqueta da conversa",
-      "SETTINGS": "Confirgurações",
+      "SETTINGS": "Configurações",
       "AI_ASSIST": "Assistente IA",
       "APPEARANCE": "Tema",
       "SNOOZE_NOTIFICATION": "Adiar Notificação"
@@ -127,16 +127,16 @@
       "GO_TO_REPORTS_OVERVIEW": "Ir para Resumo de Relatórios",
       "GO_TO_CONVERSATION_REPORTS": "Ir para Relatórios das Conversas",
       "GO_TO_AGENT_REPORTS": "Ir para Relatórios do Agente",
-      "GO_TO_LABEL_REPORTS": "Ir para Relatórios de Rótulos",
+      "GO_TO_LABEL_REPORTS": "Ir para Relatórios de Etiquetas",
       "GO_TO_INBOX_REPORTS": "Ir para Relatórios da Caixa de Entrada",
       "GO_TO_TEAM_REPORTS": "Ir para Relatórios da Equipe",
-      "GO_TO_SETTINGS_AGENTS": "Ir para Configurações do Agente",
+      "GO_TO_SETTINGS_AGENTS": "Ir para Configurações de Agente",
       "GO_TO_SETTINGS_TEAMS": "Ir para as configurações de equipe",
-      "GO_TO_SETTINGS_INBOXES": "Ir para as configurações da caixa de entrada",
-      "GO_TO_SETTINGS_LABELS": "Ir para as configurações de Etiqueta",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Ir para as configurações de resposta pronta",
+      "GO_TO_SETTINGS_INBOXES": "Ir para as configurações da Caixa de Entrada",
+      "GO_TO_SETTINGS_LABELS": "Ir para as Configurações de Etiqueta",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Ir para as configurações de respostas prontas",
       "GO_TO_SETTINGS_APPLICATIONS": "Vá para Configurações do Aplicativo",
-      "GO_TO_SETTINGS_ACCOUNT": "Ir para as configurações da conta",
+      "GO_TO_SETTINGS_ACCOUNT": "Ir para as Configurações da Conta",
       "GO_TO_SETTINGS_PROFILE": "Ir para as Configurações do Perfil",
       "GO_TO_NOTIFICATIONS": "Ir para Notificações",
       "ADD_LABELS_TO_CONVERSATION": "Adicionar etiqueta à conversa",
@@ -145,12 +145,12 @@
       "ASSIGN_PRIORITY": "Atribuir prioridade",
       "ASSIGN_A_TEAM": "Atribuir uma equipe",
       "MUTE_CONVERSATION": "Silenciar conversa",
-      "UNMUTE_CONVERSATION": "Não silenciar conversa",
+      "UNMUTE_CONVERSATION": "Reativar conversa",
       "REMOVE_LABEL_FROM_CONVERSATION": "Remover etiqueta da conversa",
       "REOPEN_CONVERSATION": "Reabrir conversa",
-      "RESOLVE_CONVERSATION": "Reabrir conversa",
+      "RESOLVE_CONVERSATION": "Resolver conversa",
       "SEND_TRANSCRIPT": "Enviar uma transcrição por e-mail",
-      "SNOOZE_CONVERSATION": "Adiar conversa",
+      "SNOOZE_CONVERSATION": "Adiar Conversa",
       "UNTIL_NEXT_REPLY": "Até a próxima resposta",
       "UNTIL_NEXT_WEEK": "Até a próxima semana",
       "UNTIL_TOMORROW": "Até amanhã",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
index 401e419f3..8042c5ebc 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/helpCenter.json
@@ -7,7 +7,7 @@
     },
     "HEADER": {
       "FILTER": "Filtrar por",
-      "SORT": "Ordenar por",
+      "SORT": "Classificar por",
       "LOCALE": "Localidade",
       "SETTINGS_BUTTON": "Confirgurações",
       "NEW_BUTTON": "Novo artigo",
@@ -160,7 +160,7 @@
         }
       },
       "EDIT": {
-        "HEADER_TEXT": "Editar portal",
+        "HEADER_TEXT": "Alterar portal",
         "TABS": {
           "BASIC_SETTINGS": {
             "TITLE": "Informação Básica"
@@ -184,7 +184,7 @@
             "LOCALE": "Localidade",
             "ARTICLE_COUNT": "No. de artigos",
             "ACTION_BUTTON": {
-              "EDIT": "Editar categoria",
+              "EDIT": "Alterar categoria",
               "DELETE": "Excluir categoria"
             },
             "EMPTY_TEXT": "Nenhuma categoria encontrada"
@@ -320,7 +320,7 @@
         "TITLE": "Título",
         "CATEGORY": "Categoria",
         "READ_COUNT": "Visualizações",
-        "STATUS": "SItuação",
+        "STATUS": "Situação",
         "LAST_EDITED": "Última edição"
       },
       "COLUMNS": {
@@ -409,8 +409,8 @@
         }
       },
       "EDIT": {
-        "TITLE": "Editar uma categoria",
-        "SUB_TITLE": "Editar uma categoria atualizará a categoria no portal voltado ao público.",
+        "TITLE": "Alterar uma categoria",
+        "SUB_TITLE": "Alterar uma categoria atualizará a categoria no portal voltado ao público.",
         "PORTAL": "Portal",
         "LOCALE": "Localidade",
         "NAME": {
@@ -512,7 +512,7 @@
       "ARTICLES_HEADER": {
         "TABS": {
           "ALL": "Todos os artigos",
-          "MINE": "Minha",
+          "MINE": "Minhas",
           "DRAFT": "Rascunho",
           "PUBLISHED": "Publicado",
           "ARCHIVED": "Arquivado"
@@ -556,7 +556,7 @@
     "CATEGORY_PAGE": {
       "CATEGORY_HEADER": {
         "NEW_CATEGORY": "Nova categoria",
-        "EDIT_CATEGORY": "Editar categoria",
+        "EDIT_CATEGORY": "Alterar categoria",
         "CATEGORIES_COUNT": "categoria {n} | {n} categorias",
         "BREADCRUMB": {
           "CATEGORY_LOCALE": "Categorias ({localeCode})",
@@ -591,8 +591,8 @@
         },
         "HEADER": {
           "CREATE": "Criar categoria",
-          "EDIT": "Editar categoria",
-          "DESCRIPTION": "Editar uma categoria atualizará a categoria no portal voltado ao público.",
+          "EDIT": "Alterar categoria",
+          "DESCRIPTION": "Alterar uma categoria atualizará a categoria no portal voltado ao público.",
           "PORTAL": "Portal",
           "LOCALE": "Localidade"
         },
@@ -660,14 +660,14 @@
       "EDIT_ARTICLE": {
         "MORE_PROPERTIES": "Mais propriedades",
         "UNCATEGORIZED": "Não categorizado",
-        "EDITOR_PLACEHOLDER": "Escrever algo..."
+        "EDITOR_PLACEHOLDER": "Escreva algo..."
       },
       "ARTICLE_PROPERTIES": {
         "ARTICLE_PROPERTIES": "Propriedades do artigo",
-        "META_DESCRIPTION": "Meta description",
-        "META_DESCRIPTION_PLACEHOLDER": "Adicionar meta description",
+        "META_DESCRIPTION": "Meta descrição",
+        "META_DESCRIPTION_PLACEHOLDER": "Adicionar meta descrição",
         "META_TITLE": "Meta title",
-        "META_TITLE_PLACEHOLDER": "Adicionar meta title",
+        "META_TITLE_PLACEHOLDER": "Adicionar meta título",
         "META_TAGS": "Meta tags",
         "META_TAGS_PLACEHOLDER": "Adicionar meta tags"
       },
@@ -775,7 +775,7 @@
             "CONFIRM_BUTTON_LABEL": "Excluir"
           }
         },
-        "EDIT_CONFIGURATION": "Editar configuração"
+        "EDIT_CONFIGURATION": "Alterar configuração"
       },
       "API": {
         "CREATE_PORTAL": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
index e3099a4ab..008d2c0c7 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inbox.json
@@ -8,7 +8,7 @@
       "NO_NOTIFICATIONS": "Nenhuma notificação",
       "NOTE": "Notificações de todas as caixas inscritas",
       "NO_MESSAGES_AVAILABLE": "Ops! Não é possível obter mensagens",
-      "SNOOZED_UNTIL": "Suspender até",
+      "SNOOZED_UNTIL": "Adiar até",
       "SNOOZED_UNTIL_TOMORROW": "Adiado até amanhã",
       "SNOOZED_UNTIL_NEXT_WEEK": "Adiada até a próxima semana"
     },
@@ -41,24 +41,24 @@
     },
     "NO_CONTENT": "Nenhum conteúdo disponível",
     "MENU_ITEM": {
-      "MARK_AS_READ": "Marcar como lido",
+      "MARK_AS_READ": "Marcar como lida",
       "MARK_AS_UNREAD": "Marcar como não lida",
       "SNOOZE": "Adiar",
       "DELETE": "Excluir",
       "MARK_ALL_READ": "Marcar todas como lidas",
-      "DELETE_ALL": "Excluir todos",
+      "DELETE_ALL": "Excluir todas",
       "DELETE_ALL_READ": "Excluir todas as lidas"
     },
     "DISPLAY_MENU": {
       "SORT": "Ordenar",
       "DISPLAY": "Exibir:",
       "SORT_OPTIONS": {
-        "NEWEST": "Mais recente",
-        "OLDEST": "Mais antigo",
+        "NEWEST": "Recentes",
+        "OLDEST": "Antigas",
         "PRIORITY": "Prioridade"
       },
       "DISPLAY_OPTIONS": {
-        "SNOOZED": "Adiado",
+        "SNOOZED": "Adiadas",
         "READ": "Lida",
         "LABELS": "Etiquetas",
         "CONVERSATION_ID": "ID da conversa"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 17d95c26a..565307715 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -10,7 +10,7 @@
     },
     "CREATE_FLOW": {
       "CHANNEL": {
-        "TITLE": "Escolha o canal",
+        "TITLE": "Escolha o Canal",
         "BODY": "Escolha o provedor que você deseja integrar com o Chatwoot."
       },
       "INBOX": {
@@ -78,7 +78,7 @@
         },
         "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mensagem de saudação do canal",
-          "PLACEHOLDER": "Acme Inc tipicamente retorna em algumas horas."
+          "PLACEHOLDER": "Acme Inc normalmente responde em algumas horas."
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Ativar saudação do canal",
@@ -147,8 +147,8 @@
           "ERROR": "Por favor, forneça um número de telefone válido que comece com o símbolo \"+\" e não contenha espaços."
         },
         "API_CALLBACK": {
-          "TITLE": "URL de retorno",
-          "SUBTITLE": "Você precisa configurar o URL de retorno de mensagem no Twilio com a URL mencionada aqui."
+          "TITLE": "URL de Callback",
+          "SUBTITLE": "Você precisa configurar a URL de Callback de mensagem no Twilio com a URL mencionada aqui."
         },
         "SUBMIT_BUTTON": "Criar canal Twilio",
         "API": {
@@ -157,7 +157,7 @@
       },
       "SMS": {
         "TITLE": "Canal SMS",
-        "DESC": "Comece a apoiar seus clientes via SMS.",
+        "DESC": "Comece a oferecer suporte a seus clientes por SMS.",
         "PROVIDERS": {
           "LABEL": "Provedor de API",
           "TWILIO": "Twilio",
@@ -202,14 +202,14 @@
             "ERROR_MESSAGE": "Não pudemos autenticar as credenciais de Bandwidth, por favor, tente novamente"
           },
           "API_CALLBACK": {
-            "TITLE": "URL de retorno",
-            "SUBTITLE": "Você precisa configurar o URL de retorno de mensagem na banda com a URL mencionada aqui."
+            "TITLE": "URL de Callback",
+            "SUBTITLE": "Você precisa configurar a URL de callback de mensagem no Bandwidth com a URL mencionada aqui."
           }
         }
       },
       "WHATSAPP": {
         "TITLE": "Canal do WhatsApp",
-        "DESC": "Comece a apoiar seus clientes via WhatsApp.",
+        "DESC": "Comece a oferecer suporte a seus clientes pelo WhatsApp.",
         "PROVIDERS": {
           "LABEL": "Provedor de API",
           "TWILIO": "Twilio",
@@ -224,7 +224,7 @@
         "PHONE_NUMBER": {
           "LABEL": "Número de telefone",
           "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
-          "ERROR": "Por favor, forneça um número de telefone válido que começa com uma placa `+` e não contém quaisquer espaços."
+          "ERROR": "Por favor, forneça um número de telefone válido que comece com o símbolo \"+\" e não contém quaisquer espaços."
         },
         "PHONE_NUMBER_ID": {
           "LABEL": "ID do número de telefone",
@@ -248,7 +248,7 @@
           "ERROR": "Por favor, insira um valor válido."
         },
         "API_CALLBACK": {
-          "TITLE": "URL de retorno",
+          "TITLE": "URL de callback",
           "SUBTITLE": "Você deve configurar a URL do webhook e o token de verificação no portal do desenvolvedor do Facebook com os valores mostrados abaixo.",
           "WEBHOOK_URL": "URL do Webhook",
           "WEBHOOK_VERIFICATION_TOKEN": "Token de verificação Webhook"
@@ -268,7 +268,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL do Webhook",
-          "SUBTITLE": "Configure a URL onde você deseja receber retornos de chamada em eventos.",
+          "SUBTITLE": "Configure a URL onde você deseja receber callbacks em eventos.",
           "PLACEHOLDER": "URL do Webhook"
         },
         "SUBMIT_BUTTON": "Criar canal de API",
@@ -417,7 +417,7 @@
         "FOR_EG": "Por ex:",
         "FRIENDLY": {
           "TITLE": "Amigável",
-          "FROM": "De",
+          "FROM": "de",
           "SUBTITLE": "Adicione o nome do agente que enviou a resposta ao nome do remetente para torná-la amigável."
         },
         "PROFESSIONAL": {
@@ -443,7 +443,7 @@
         "DISABLED": "Desativado"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Habilitado"
+        "LABEL": "Ativar"
       }
     },
     "DELETE": {
@@ -720,8 +720,8 @@
       },
       "REPLY_TIME": {
         "IN_A_FEW_MINUTES": "Normalmente responde em alguns minutos",
-        "IN_A_FEW_HOURS": "Responde normalmente em algumas horas",
-        "IN_A_DAY": "Responde normalmente em um dia"
+        "IN_A_FEW_HOURS": "Normalmente responde em algumas horas",
+        "IN_A_DAY": "Normalmente responde em um dia"
       },
       "FOOTER": {
         "START_CONVERSATION_BUTTON_TEXT": "Iniciar Conversa",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 79334d9f7..e63e1311b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -7,8 +7,8 @@
     "CAPTAIN": {
       "DISABLED": "O capitão não está ativado na sua conta.",
       "CLICK_HERE_TO_CONFIGURE": "Clique aqui para configurar",
-      "LOADING_CONSOLE": "Carregando console do Captain...",
-      "FAILED_TO_LOAD_CONSOLE": ""
+      "LOADING_CONSOLE": "Carregando console do Capitão...",
+      "FAILED_TO_LOAD_CONSOLE": "Falha ao carregar o Console do Capitão. Atualize e tente novamente."
     },
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "Eventos Inscritos",
@@ -113,7 +113,7 @@
       "CREATE_ERROR": "Houve um erro ao criar o link da reunião, por favor tente novamente"
     },
     "OPEN_AI": {
-      "AI_ASSIST": "Assistente Open AI",
+      "AI_ASSIST": "Inteligência Artificial",
       "WITH_AI": " {option} com IA ",
       "OPTIONS": {
         "REPLY_SUGGESTION": "Sugestão de resposta",
@@ -129,7 +129,7 @@
       "ASSISTANCE_MODAL": {
         "DRAFT_TITLE": "Conteúdo do rascunho",
         "GENERATED_TITLE": "Conteúdo gerado",
-        "AI_WRITING": "A IA está escrevendo",
+        "AI_WRITING": "A Inteligência Artificial está escrevendo",
         "BUTTONS": {
           "APPLY": "Use esta sugestão",
           "CANCEL": "Cancelar"
@@ -147,10 +147,10 @@
         "DISMISS_MESSAGE": "Você pode configurar a integração com o OpenAI mais tarde.",
         "SUCCESS_MESSAGE": "Integração com o OpenAI configurada com sucesso"
       },
-      "TITLE": "Melhore com IA",
-      "SUMMARY_TITLE": "Resumo com IA",
+      "TITLE": "Melhorar com IA",
+      "SUMMARY_TITLE": "Resumir com IA",
       "REPLY_TITLE": "Responder sugestão com IA",
-      "SUBTITLE": "Uma resposta melhor será gerada usando AI, com base no seu rascunho atual.",
+      "SUBTITLE": "Uma resposta melhor será gerada usando IA, com base no seu rascunho atual.",
       "TONE": {
         "TITLE": "Tom",
         "OPTIONS": {
@@ -187,7 +187,7 @@
           "NAME": "Nome",
           "ENDPOINT": "Endpoint"
         },
-        "EDIT_TOOLTIP": "Editar aplicativo",
+        "EDIT_TOOLTIP": "Alterar aplicativo",
         "DELETE_TOOLTIP": "Excluir aplicativo"
       },
       "FORM": {
@@ -206,7 +206,7 @@
         "API_ERROR": "Não conseguimos criar um aplicativo. Por favor, tente novamente mais tarde"
       },
       "UPDATE": {
-        "HEADER": "Editar aplicativo",
+        "HEADER": "Alterar aplicativo",
         "FORM_SUBMIT": "Atualizar",
         "FORM_CANCEL": "Cancelar",
         "API_SUCCESS": "Aplicativo atualizado com sucesso",
@@ -232,7 +232,7 @@
         "TITLE": "Link",
         "EMPTY_LIST": "",
         "LOADING": "Carregando",
-        "ERROR": "",
+        "ERROR": "Houve um erro ao buscar as questões lineares, por favor, tente novamente",
         "LINK_SUCCESS": "Questão vinculada com sucesso",
         "LINK_ERROR": "Houve um erro ao vincular a questão, tente novamente mais tarde",
         "LINK_TITLE": "Conversa (#{conversationId}) com {name}"
@@ -251,8 +251,8 @@
             "PLACEHOLDER": "Insira a descrição"
           },
           "TEAM": {
-            "LABEL": "Times",
-            "PLACEHOLDER": "Selecionar time",
+            "LABEL": "Equipes",
+            "PLACEHOLDER": "Selecionar equipe",
             "SEARCH": "Pesquisar equipe",
             "REQUIRED_ERROR": "A equipe é obrigatória"
           },
@@ -293,7 +293,7 @@
         "STATUS": "Situação",
         "PRIORITY": "Prioridade",
         "ASSIGNEE": "Responsável",
-        "LABELS": "Marcadores",
+        "LABELS": "Etiquetas",
         "CREATED_AT": "Criado em {createdAt}"
       },
       "UNLINK": {
@@ -315,18 +315,18 @@
     "PAYWALL": {
       "TITLE": "Atualize para usar o Capitão IA",
       "AVAILABLE_ON": "O Capitão não está disponível no plano gratuito.",
-      "UPGRADE_PROMPT": "Atualize seu plano para ter acesso aos nossos assistentes, copilots e muito mais.",
+      "UPGRADE_PROMPT": "Atualize seu plano para ter acesso aos nossos assistentes, copilotos e muito mais.",
       "UPGRADE_NOW": "Atualizar agora",
       "CANCEL_ANYTIME": "Você pode alterar ou cancelar seu plano a qualquer momento"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "",
-      "UPGRADE_PROMPT": "Atualize seu plano para ter acesso aos nossos assistentes, copilots e muito mais.",
+      "AVAILABLE_ON": "A função de Capitão AI só está disponível num plano pago.",
+      "UPGRADE_PROMPT": "Atualize seu plano para ter acesso aos nossos assistentes, copilotos e muito mais.",
       "ASK_ADMIN": "Entre em contato com seu administrador para fazer a atualização."
     },
     "BANNER": {
-      "RESPONSES": "Você usou mais de 80% do seu limite de respostas. Para continuar usando o Captain AI, faça o upgrade.",
-      "DOCUMENTS": "Limite de documentos atingido. Atualize para continuar usando o Captain AI."
+      "RESPONSES": "Você usou mais de 80% do seu limite de respostas. Para continuar usando o Capitão AI, faça o upgrade.",
+      "DOCUMENTS": "Limite de documentos atingido. Atualize para continuar usando o Capitão AI."
     },
     "FORM": {
       "CANCEL": "Cancelar",
@@ -447,7 +447,7 @@
       },
       "STATUS": {
         "TITLE": "Situação",
-        "PENDING": "Pendente",
+        "PENDING": "Pendentes",
         "APPROVED": "Aceito",
         "ALL": "Todos"
       },
@@ -475,14 +475,14 @@
         }
       },
       "EDIT": {
-        "TITLE": "Atualizar FAQ",
-        "SUCCESS_MESSAGE": "A FAQ foi atualizado com sucesso",
+        "TITLE": "Atualizar as Perguntas Frequentes",
+        "SUCCESS_MESSAGE": "As Perguntas Frequentes foram atualizadas com sucesso",
         "ERROR_MESSAGE": "Ocorreu um erro ao atualizar as Perguntas Frequentes, por favor tente novamente",
-        "APPROVE_SUCCESS_MESSAGE": "O FAQ foi marcado como aprovado"
+        "APPROVE_SUCCESS_MESSAGE": "As Perguntas Frequentes foram marcadas como aprovadas"
       },
       "OPTIONS": {
         "APPROVE": "Marcar como aprovado",
-        "EDIT_RESPONSE": "Editar FAQ",
+        "EDIT_RESPONSE": "Editar Perguntas Frequentes",
         "DELETE_RESPONSE": "Excluir FAQ"
       },
       "EMPTY_STATE": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
index 9aba95858..df50e31b0 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
@@ -1,15 +1,15 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Marcadores",
+    "HEADER": "Etiquetas",
     "HEADER_BTN_TXT": "Adicionar marcador",
-    "LOADING": "Buscando marcadores",
+    "LOADING": "Buscando etiquetas",
     "DESCRIPTION": "As etiquetas ajudam você a categorizar e priorizar conversas e leads. Você pode atribuir uma etiqueta a uma conversa ou contato usando o painel lateral.",
     "LEARN_MORE": "Aprenda mais sobre etiquetas",
     "SEARCH_404": "Não existem itens correspondentes a esta consulta",
     "LIST": {
-      "404": "Não há marcadores disponíveis nesta conta.",
-      "TITLE": "Gerenciar marcadores",
-      "DESC": "Marcadores permitem agrupar as conversas.",
+      "404": "Não há etiquetas disponíveis nesta conta.",
+      "TITLE": "Gerenciar etiquetas",
+      "DESC": "Etiquetas permitem agrupar as conversas.",
       "TABLE_HEADER": {
         "NAME": "Nome",
         "DESCRIPTION": "Descrição",
@@ -55,16 +55,16 @@
     },
     "ADD": {
       "TITLE": "Adicionar marcador",
-      "DESC": "Marcadores permitem agrupar as conversas.",
+      "DESC": "Etiquetas permitem agrupar as conversas.",
       "API": {
         "SUCCESS_MESSAGE": "Marcador adicionado com sucesso",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     },
     "EDIT": {
-      "TITLE": "Editar marcador",
+      "TITLE": "Alterar etiqueta",
       "API": {
-        "SUCCESS_MESSAGE": "Marcador atualizado com sucesso",
+        "SUCCESS_MESSAGE": "Etiqueta atualizada com sucesso",
         "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
       }
     },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
index b7eaa07f0..4dba4127b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/macros.json
@@ -2,7 +2,7 @@
   "MACROS": {
     "HEADER": "Macros",
     "DESCRIPTION": "Uma macro é um conjunto de ações salvas que ajudam os agentes de atendimento ao cliente a concluir tarefas com facilidade. Os agentes podem definir um conjunto de ações, como etiquetar uma conversa com um rótulo, enviar uma transcrição de e-mail, atualizar um atributo personalizado, etc., e podem executar essas ações com um único clique.",
-    "LEARN_MORE": "Aprenda mais sobre etiquetas",
+    "LEARN_MORE": "Aprenda mais sobre macros",
     "HEADER_BTN_TXT": "Adicionar uma nova macro",
     "HEADER_BTN_TXT_SAVE": "Salvar macro",
     "LOADING": "Obtendo macros",
@@ -53,7 +53,7 @@
       }
     },
     "EDITOR": {
-      "START_FLOW": "Inicio do fluxo",
+      "START_FLOW": "Inicio do Fluxo",
       "END_FLOW": "Fim do Fluxo",
       "LOADING": "Obtendo macro",
       "ADD_BTN_TOOLTIP": "Adicionar nova ação",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 6359861f9..7f527bfe8 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -20,16 +20,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Tempo da Primeira Resposta",
+        "NAME": "Tempo de Primeira Resposta",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo da primeira resposta é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Primeira Resposta é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo de resolução",
+        "NAME": "Tempo de Resolução",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo de resolução é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Resolução é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -45,7 +45,7 @@
       },
       "REPLY_TIME": {
         "NAME": "Tempo de espera do cliente",
-        "TOOLTIP_TEXT": "O tempo de espera é {metricValue} (com base em {conversationCount} respostas)",
+        "TOOLTIP_TEXT": "O Tempo de Espera é {metricValue} (com base em {conversationCount} respostas)",
         "DESC": ""
       }
     },
@@ -124,7 +124,7 @@
   },
   "AGENT_REPORTS": {
     "HEADER": "Visão Geral de Agentes",
-    "DESCRIPTION": "Acompanhe facilmente o desempenho do agente com métricas chave, como conversas, tempos de resposta, tempos de resolução e casos resolvidos. Clique no nome de um agente para saber mais.",
+    "DESCRIPTION": "Acompanhe facilmente o desempenho do agente com métricas-chave, como conversas, tempos de resposta, tempos de resolução e casos resolvidos. Clique no nome de um agente para saber mais.",
     "LOADING_CHART": "Carregando dados do gráfico...",
     "NO_ENOUGH_DATA": "Não existem dados suficientes para gerar o relatório. Tente novamente mais tarde.",
     "DOWNLOAD_AGENT_REPORTS": "Baixar relatórios de agentes",
@@ -146,13 +146,13 @@
         "NAME": "Tempo da Primeira Resposta",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo da primeira resposta é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Primeira Resposta é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo de resolução",
+        "NAME": "Tempo de Resolução",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo de resolução é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Resolução é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -210,16 +210,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Tempo da Primeira Resposta",
+        "NAME": "Tempo de Primeira Resposta",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo da primeira resposta é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Primeira Resposta é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo de resolução",
+        "NAME": "Tempo de Resolução",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo de resolução é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Resolução é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -259,7 +259,7 @@
   },
   "INBOX_REPORTS": {
     "HEADER": "Visualizar Caixa de Entrada",
-    "DESCRIPTION": "Veja rapidamente o desempenho da caixa de entrada com métricas chave como conversas, tempos de resposta, tempos de resolução, e casos resolvidos - tudo em um só lugar. Clique na caixa de entrada para mais detalhes",
+    "DESCRIPTION": "Veja rapidamente o desempenho da caixa de entrada com métricas-chave como conversas, tempos de resposta, tempos de resolução, e casos resolvidos — tudo em um só lugar. Clique na caixa de entrada para mais detalhes",
     "LOADING_CHART": "Carregando dados do gráfico...",
     "NO_ENOUGH_DATA": "Não existem dados suficientes para gerar o relatório. Tente novamente mais tarde.",
     "DOWNLOAD_INBOX_REPORTS": "Baixar relatórios de entrada",
@@ -281,13 +281,13 @@
         "NAME": "Tempo da Primeira Resposta",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo da primeira resposta é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Primeira Resposta é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo de resolução é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Resolução é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -331,7 +331,7 @@
     "LOADING_CHART": "Carregando dados do gráfico...",
     "NO_ENOUGH_DATA": "Não existem dados suficientes para gerar o relatório. Tente novamente mais tarde.",
     "DOWNLOAD_TEAM_REPORTS": "Baixar relatórios da equipe",
-    "FILTER_DROPDOWN_LABEL": "Selecionar time",
+    "FILTER_DROPDOWN_LABEL": "Selecionar Equipe",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversas",
@@ -349,13 +349,13 @@
         "NAME": "Tempo da Primeira Resposta",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo da primeira resposta é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Primeira Resposta é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Tempo de resolução",
+        "NAME": "Tempo de Resolução",
         "DESC": "(Média)",
         "INFO_TEXT": "Número total de conversas utilizadas para computação:",
-        "TOOLTIP_TEXT": "O tempo de resolução é de {metricValue} (com base em {conversationCount} conversas)"
+        "TOOLTIP_TEXT": "O Tempo de Resolução é de {metricValue} (com base em {conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -449,14 +449,14 @@
   },
   "OVERVIEW_REPORTS": {
     "HEADER": "Visão geral",
-    "LIVE": "Disponível",
+    "LIVE": "Em tempo real",
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Conversas Abertas",
       "LOADING_MESSAGE": "Carregando métricas de conversa...",
       "OPEN": "Abertas",
       "UNATTENDED": "Não atendidas",
-      "UNASSIGNED": "Não atribuída",
-      "PENDING": "Pendente"
+      "UNASSIGNED": "Não atribuídas",
+      "PENDING": "Pendentes"
     },
     "CONVERSATION_HEATMAP": {
       "HEADER": "Tráfego de conversa",
@@ -471,13 +471,13 @@
       "NO_AGENTS": "Não há conversas por agentes",
       "TABLE_HEADER": {
         "AGENT": "Agente",
-        "OPEN": "Abrir",
+        "OPEN": "Abertas",
         "UNATTENDED": "Não atendidas",
-        "STATUS": "SItuação"
+        "STATUS": "Situação"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Status do agente",
+      "HEADER": "Situação do agente",
       "ONLINE": "Disponível",
       "BUSY": "Ocupado",
       "OFFLINE": "Desconectado"
@@ -510,13 +510,13 @@
         "AGENTS": "Nome do Agente",
         "INBOXES": "Nome da Caixa de Entrada",
         "LABELS": "Nome do marcador",
-        "TEAMS": "Nome do departamento"
+        "TEAMS": "Nome da equipe"
       },
       "SLA": "Política SLA",
       "INBOXES": "Caixa de Entrada",
       "AGENTS": "Agente",
       "LABELS": "Nome do campo",
-      "TEAMS": "Times"
+      "TEAMS": "Equipe"
     },
     "WITH": "com",
     "METRICS": {
@@ -545,10 +545,10 @@
   "SUMMARY_REPORTS": {
     "INBOX": "Caixa de Entrada",
     "AGENT": "Agente",
-    "TEAM": "Times",
-    "AVG_RESOLUTION_TIME": "Tempo médio de resolução",
-    "AVG_FIRST_RESPONSE_TIME": "Tempo médio de primeira resposta",
-    "AVG_REPLY_TIME": "Tempo médio de espera do cliente",
+    "TEAM": "Equipe",
+    "AVG_RESOLUTION_TIME": "Tempo Médio de Resolução",
+    "AVG_FIRST_RESPONSE_TIME": "Tempo Médio de Primeira Resposta",
+    "AVG_REPLY_TIME": "Tempo Médio de Rspera do Cliente",
     "RESOLUTION_COUNT": "Contagem de Resolução",
     "CONVERSATIONS": "Nº de Conversas"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/search.json b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
index 729290b6b..27ca80135 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/search.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/search.json
@@ -1,13 +1,13 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "Todos",
-      "CONTACTS": "Contato",
+      "ALL": "Tudo",
+      "CONTACTS": "Contatos",
       "CONVERSATIONS": "Conversas",
       "MESSAGES": "Mensagens"
     },
     "SECTION": {
-      "CONTACTS": "Contato",
+      "CONTACTS": "Contatos",
       "CONVERSATIONS": "Conversas",
       "MESSAGES": "Messagem"
     },
@@ -19,7 +19,7 @@
     "EMPTY_STATE_FULL": "Nenhum resultado encontrado para a consulta '{query}'",
     "PLACEHOLDER_KEYBINDING": "/ para focar",
     "INPUT_PLACEHOLDER": "Digite 3 ou mais caracteres para pesquisar",
-    "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca. ",
+    "EMPTY_STATE_DEFAULT": "Procurar por ID de conversa, e-mail, número de telefone, mensagens para melhores resultados de busca.",
     "BOT_LABEL": "Robôs",
     "READ_MORE": "Saiba mais",
     "WROTE": "escreveu:",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 1fec0c27a..8ec210c62 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -77,9 +77,9 @@
           "ASSIGNED": "Você receberá alertas para conversas atribuídas a você.",
           "UNASSIGNED": "Você receberá alertas para quaisquer conversas não atribuídas.",
           "NOTME": "Você receberá alertas para conversas atribuídas a outras pessoas.",
-          "ASSIGNED+UNASSIGNED": "Receberá alertas de conversas atribuídas e de quaisquer conversas não assistidas.",
+          "ASSIGNED+UNASSIGNED": "Receberá alertas de conversas atribuídas e de quaisquer conversas não atendidas.",
           "ASSIGNED+NOTME": "Você receberá alertas para conversas atribuídas a você e a outros, mas não para conversas não atribuídas.",
-          "NOTME+UNASSIGNED": "Você receberá alertas de conversas não assistidas e aqueles atribuídos a outros.",
+          "NOTME+UNASSIGNED": "Você receberá alertas de conversas não atendidas e aquelas atribuídas a outros.",
           "ASSIGNED+NOTME+UNASSIGNED": "Você receberá alertas para quaisquer conversas não atribuídas."
         },
         "ALERT_TYPE": {
@@ -108,8 +108,8 @@
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Envie notificações por e-mail quando uma nova mensagem for criada numa conversa já atribuída",
         "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Enviar notificações por email quando uma nova mensagem é criada em uma conversa que você participa",
         "SLA_MISSED_FIRST_RESPONSE": "Enviar notificações por e-mail quando uma conversa perder a primeira resposta SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Enviar notificações por e-mail quando uma conversa perder a próxima resposta SLA",
-        "SLA_MISSED_RESOLUTION": "Enviar notificações por e-mail quando uma conversa perder resolução de resolução SLA"
+        "SLA_MISSED_NEXT_RESPONSE": "Enviar notificações por e-mail quando uma conversa perder o próximo SLA de resposta",
+        "SLA_MISSED_RESOLUTION": "Enviar notificações por e-mail quando uma conversa perder o SLA de resolução"
       },
       "NOTIFICATIONS": {
         "TITLE": "Preferências de notificação",
@@ -121,7 +121,7 @@
           "CONVERSATION_ASSIGNED": "Uma conversa foi atribuída a você",
           "CONVERSATION_MENTION": "Você foi mencionado em uma conversa",
           "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Uma nova mensagem foi criada e atribuída",
-          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Uma nova mensagem foi criada em uma conversa participante",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Uma nova mensagem foi criada em uma conversa que você participa",
           "SLA_MISSED_FIRST_RESPONSE": "Uma conversa perde o SLA de primeira resposta",
           "SLA_MISSED_NEXT_RESPONSE": "Uma conversa perde o SLA da próxima resposta",
           "SLA_MISSED_RESOLUTION": "Uma conversa perde o SLA de resolução"
@@ -209,7 +209,7 @@
     "TRAIL_BUTTON": "Comprar agora",
     "DELETED_USER": "Deletar Usuário",
     "EMAIL_VERIFICATION_PENDING": "Parece que você ainda não verificou seu endereço de e-mail. Por favor, verifique sua caixa de entrada pelo e-mail de verificação.",
-    "RESEND_VERIFICATION_MAIL": "Reenviar email de verificação",
+    "RESEND_VERIFICATION_MAIL": "Reenviar e-mail de verificação",
     "EMAIL_VERIFICATION_SENT": "O e-mail de verificação foi enviado. Por favor, verifique sua caixa de entrada.",
     "ACCOUNT_SUSPENDED": {
       "TITLE": "Conta Suspensa",
@@ -272,23 +272,23 @@
     "AUDIT_LOGS": "Registros de Auditoria",
     "INBOXES": "Caixas de Entrada",
     "NOTIFICATIONS": "Notificações",
-    "CANNED_RESPONSES": "Atalhos",
+    "CANNED_RESPONSES": "Respostas Prontas",
     "INTEGRATIONS": "Integrações",
     "PROFILE_SETTINGS": "Configurações do Perfil",
     "ACCOUNT_SETTINGS": "Configurações da conta",
     "APPLICATIONS": "Aplicações",
-    "LABELS": "Marcadores",
+    "LABELS": "Etiquetas",
     "CUSTOM_ATTRIBUTES": "Atributos Personalizados",
     "AUTOMATION": "Automação",
     "MACROS": "Macros",
-    "TEAMS": "Times",
+    "TEAMS": "Equipes",
     "BILLING": "Cobrança",
     "CUSTOM_VIEWS_FOLDER": "Pastas",
     "CUSTOM_VIEWS_SEGMENTS": "Segmentos",
     "ALL_CONTACTS": "Todos os Contatos",
     "TAGGED_WITH": "Marcado com",
     "NEW_LABEL": "Nova etiqueta",
-    "NEW_TEAM": "Novo time",
+    "NEW_TEAM": "Nova equipe",
     "NEW_INBOX": "Nova caixa de entrada",
     "REPORTS_CONVERSATION": "Conversas",
     "CSAT": "CSAT",
@@ -300,9 +300,9 @@
     "REPORTS_SLA": "SLA",
     "REPORTS_BOT": "Robôs",
     "REPORTS_AGENT": "Agentes",
-    "REPORTS_LABEL": "Marcadores",
+    "REPORTS_LABEL": "Etiquetas",
     "REPORTS_INBOX": "Caixa de Entrada",
-    "REPORTS_TEAM": "Times",
+    "REPORTS_TEAM": "Equipe",
     "SET_AVAILABILITY_TITLE": "Defina como",
     "SET_YOUR_AVAILABILITY": "Definir a sua disponibilidade",
     "SLA": "SLA",
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Mudar para Nota Privada",
       "SWITCH_TO_REPLY": "Mudar para resposta",
       "TOGGLE_SNOOZE_DROPDOWN": "Ativar/desativar soneca"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
index b2d661710..40df585c5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/sla.json
@@ -3,7 +3,7 @@
     "HEADER": "Termos do Serviço",
     "ADD_ACTION": "Adicionar SLA",
     "ADD_ACTION_LONG": "Criar uma nova Política de SLA",
-    "DESCRIPTION": "Contratos de Nível de Serviço são contratos que definem expectativas claras entre sua equipe e os clientes. Estabelecem normas para tempos de resposta e de resolução, criando um quadro de responsabilização e garantindo uma experiência coerente e de qualidade.",
+    "DESCRIPTION": "Contratos de Nível de Serviço (SLAs em inglês) são contratos que definem expectativas claras entre sua equipe e os clientes. Estabelecem normas para tempos de resposta e de resolução, criando um quadro de responsabilização e garantindo uma experiência coerente e de qualidade.",
     "LEARN_MORE": "Saiba mais sobre SLA",
     "LOADING": "Buscando SLAs",
     "PAYWALL": {
@@ -52,15 +52,15 @@
         "PLACEHOLDER": ""
       },
       "FIRST_RESPONSE_TIME": {
-        "LABEL": "Tempo da Primeira Resposta",
+        "LABEL": "Tempo de Primeira Resposta",
         "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Próximo tempo de resposta",
+        "LABEL": "Próximo Tempo de Resposta",
         "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
-        "LABEL": "Tempo de resolução",
+        "LABEL": "Tempo de Resolução",
         "PLACEHOLDER": "60"
       },
       "BUSINESS_HOURS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
index aa2c67a98..4a56c77cc 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
@@ -1,7 +1,7 @@
 {
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Criar nova equipe",
-    "HEADER": "Times",
+    "HEADER": "Equipes",
     "LOADING": "Buscando equipes",
     "DESCRIPTION": "As equipes permitem que você organize agentes em grupos com base em suas responsabilidades. Um agente pode pertencer a várias equipes. Ao trabalhar de forma colaborativa, você pode atribuir conversas a equipes específicas.",
     "LEARN_MORE": "Saiba mais sobre equipes",
@@ -40,19 +40,19 @@
         "BUTTON_TEXT": "Atualizar equipe"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Atualizar agentes no departamento",
+        "BUTTON_TEXT": "Atualizar agentes na equipe",
         "TITLE": "Adicionar agentes a equipe: {teamName}",
         "DESC": "Adicionar agentes à sua equipe recém-criada. Todos os agentes adicionados serão notificados quando uma conversa for atribuída a esta equipe."
       },
       "EDIT_WIZARD_DETAILS": {
-        "TITLE": "Detalhes do departamento",
+        "TITLE": "Detalhes da equipe",
         "ROUTE": "ajustes_equipes_editar",
         "BODY": "Alterar nome, descrição e outros detalhes."
       },
       "EDIT_WIZARD_AGENTS": {
-        "TITLE": "Editar agente",
+        "TITLE": "Alterar agentes",
         "ROUTE": "ajustes_equipes_editar_membros",
-        "BODY": "Gerenciar agentes de seu departamento"
+        "BODY": "Gerenciar agentes da sua equipe"
       },
       "EDIT_WIZARD_FINISH": {
         "TITLE": "Finalizar",
@@ -61,7 +61,7 @@
       }
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Não foi possível salvar os detalhes do departamento. Tente novamente."
+      "ERROR_MESSAGE": "Não foi possível salvar os detalhes da equipe. Tente novamente."
     },
     "AGENTS": {
       "AGENT": "AGENTE",
@@ -83,14 +83,14 @@
     },
     "FINISH": {
       "TITLE": "Sua caixa de entrada está pronta!",
-      "MESSAGE": "Agora você pode colaborar como equipe em conversas.",
+      "MESSAGE": "Agora você pode colaborar como equipe em conversas",
       "BUTTON_TEXT": "Finalizar"
     },
     "DELETE": {
       "BUTTON_TEXT": "Excluir",
       "API": {
         "SUCCESS_MESSAGE": "Agente excluído com sucesso.",
-        "ERROR_MESSAGE": "Não foi possível excluir o departamento. Tente novamente."
+        "ERROR_MESSAGE": "Não foi possível excluir a equipe. Tente novamente."
       },
       "CONFIRM": {
         "TITLE": "Tem certeza de que deseja excluir a equipe?",
@@ -103,19 +103,19 @@
     "SETTINGS": "Confirgurações",
     "FORM": {
       "UPDATE": "Atualizar equipe",
-      "CREATE": "Criar novo departamento",
+      "CREATE": "Criar nova equipe",
       "NAME": {
-        "LABEL": "Nome do departamento",
+        "LABEL": "Nome da equipe",
         "PLACEHOLDER": "Exemplo: Vendas, Suporte ao Cliente"
       },
       "DESCRIPTION": {
-        "LABEL": "Descrição do departamento",
-        "PLACEHOLDER": "Breve descrição sobre este departamento."
+        "LABEL": "Descrição da equipe",
+        "PLACEHOLDER": "Breve descrição sobre esta equipe."
       },
       "AUTO_ASSIGN": {
         "LABEL": "Permitir atribuição automática para este departamento."
       },
-      "SUBMIT_CREATE": "Criar novo departamento"
+      "SUBMIT_CREATE": "Criar nova equipe"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 04f197e6f..977e58210 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Datele de contact ale <strong>{primaryContactName}</strong> vor fi copiate la <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "MESAJ_EROARE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Îmbinare contacte",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Mesaj",
       "SEND_MESSAGE": "Trimite mesaj",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacte"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact salvat cu succes",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importă contactele printr-un fișier CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index fd8ac1fc8..2f4a57f5f 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Marchează ca în așteptare",
       "RESOLVED": "Marcați ca rezolvat",
       "MARK_AS_UNREAD": "Marcheaza ca necitit",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Redeschiderea conversației",
       "SNOOZE": {
         "TITLE": "Amânați",
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 1801b39ab..0d5fa194b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Comutarea la Notă privată",
       "SWITCH_TO_REPLY": "Comutarea la Răspuns",
       "TOGGLE_SNOOZE_DROPDOWN": "Comutați snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 0b3b49489..fd8936d11 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -101,7 +101,7 @@
         "CONTENT": "поделился ссылкой"
       },
       "contact": {
-        "CONTENT": "Shared contact"
+        "CONTENT": "Общий контакт"
       }
     },
     "CHAT_SORT_BY_FILTER": {
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index f711152e6..693f0b1b5 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Контактная информация <strong>{primaryContactName}</strong> будет скопирована в <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Объединить контакты",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Поиск...",
       "MESSAGE_BUTTON": "Сообщение",
       "SEND_MESSAGE": "Отправить сообщение",
+      "BLOCK_CONTACT": "Заблокировать контакт",
+      "UNBLOCK_CONTACT": "Разблокировать контакт",
       "BREADCRUMB": {
         "CONTACTS": "Контакты"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Контакт успешно сохранен",
           "ERROR_MESSAGE": "Не удалось сохранить контакт. Пожалуйста, повторите попытку позже."
         },
+        "BLOCK_SUCCESS_MESSAGE": "Этот контакт успешно заблокирован",
+        "BLOCK_ERROR_MESSAGE": "Не удается заблокировать контакт. Пожалуйста, повторите попытку позже.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Этот контакт успешно разблокирован",
+        "UNBLOCK_ERROR_MESSAGE": "Не удается разблокировать контакт. Пожалуйста, повторите попытку позже.",
         "IMPORT_CONTACT": {
           "TITLE": "Импорт контактов",
           "DESCRIPTION": "Импорт контактов из CSV-файла.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 5c573ccd5..bbf64ef54 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -54,7 +54,7 @@
     "SUCCESS_DELETE_MESSAGE": "Сообщение успешно удалено",
     "FAIL_DELETE_MESSSAGE": "Не удалось удалить сообщение! Попробуйте еще раз",
     "NO_RESPONSE": "Нет ответа",
-    "RESPONSE": "Response",
+    "RESPONSE": "Ответ",
     "RATING_TITLE": "Оценка",
     "FEEDBACK_TITLE": "Обратная связь",
     "REPLY_MESSAGE_NOT_FOUND": "Сообщение недоступно",
@@ -117,6 +117,7 @@
       "PENDING": "Отметить как ожидающие",
       "RESOLVED": "Пометить как разрешено",
       "MARK_AS_UNREAD": "Отметить как непрочитанное",
+      "MARK_AS_READ": "Отметить как прочитанное",
       "REOPEN": "Переоткрыть разговор",
       "SNOOZE": {
         "TITLE": "Отложено",
@@ -355,9 +356,9 @@
     "MULTIPLE": "{user} и {count} печатают"
   },
   "COPILOT": {
-    "TRY_THESE_PROMPTS": "Try these prompts"
+    "TRY_THESE_PROMPTS": "Попробуйте эти запросы"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": "Unable to download attachment. Please try again"
+    "ERROR_DOWNLOADING": "Не удалось загрузить вложение, попробуйте еще раз"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index e3802277c..6ac77d02f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -310,23 +310,23 @@
       "LOADER": "Капитан думает",
       "YOU": "Вы",
       "USE": "Использовать это",
-      "RESET": "Reset"
+      "RESET": "Сброс"
     },
     "PAYWALL": {
-      "TITLE": "Upgrade to use Captain AI",
-      "AVAILABLE_ON": "Captain is not available on the free plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
+      "TITLE": "Обновите тарифный план, чтобы использовать Captain AI",
+      "AVAILABLE_ON": "Капитан недоступен на бесплатном тарифном плане.",
+      "UPGRADE_PROMPT": "Обновите тарифный план, чтобы получить доступ к помощникам, Captain AI и другому.",
       "UPGRADE_NOW": "Обновить сейчас",
       "CANCEL_ANYTIME": "Вы можете изменить или отменить ваш тарифный план в любое время"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "Captain AI feature is only available in a paid plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
+      "AVAILABLE_ON": "Функция Captain AI доступна только в платном плане.",
+      "UPGRADE_PROMPT": "Обновите тарифный план, чтобы получить доступ к помощникам, Captain AI и другому.",
       "ASK_ADMIN": "Пожалуйста, обратитесь к вашему администратору для обновления."
     },
     "BANNER": {
-      "RESPONSES": "You've used over 80% of your response limit. To continue using Captain AI, please upgrade.",
-      "DOCUMENTS": "Document limit reached. Upgrade to continue using Captain AI."
+      "RESPONSES": "Вы использовали более 80% лимита ответов. Чтобы продолжить использование Captain AI, пожалуйста, обновите тариф.",
+      "DOCUMENTS": "Достигнут лимит документов. Обновите тарифный план, чтобы продолжить использование Captain AI."
     },
     "FORM": {
       "CANCEL": "Отменить",
@@ -334,81 +334,81 @@
       "EDIT": "Обновить"
     },
     "ASSISTANTS": {
-      "HEADER": "Assistants",
-      "ADD_NEW": "Create a new assistant",
+      "HEADER": "Помощники",
+      "ADD_NEW": "Создать нового помощника",
       "DELETE": {
-        "TITLE": "Are you sure to delete the assistant?",
-        "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
+        "TITLE": "Вы уверены, что хотите удалить помощника?",
+        "DESCRIPTION": "Это действие необратимо. Удаление этого помощника удалит его из всех подключенных источников и навсегда удалит все сгенерированные знания.",
         "CONFIRM": "Да, удалить",
-        "SUCCESS_MESSAGE": "The assistant has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the assistant, please try again."
+        "SUCCESS_MESSAGE": "Помощник успешно удален",
+        "ERROR_MESSAGE": "При удалении помощника произошла ошибка. Пожалуйста, попробуйте еще раз."
       },
-      "FORM_DESCRIPTION": "Fill out the details below to name your assistant, describe its purpose, and specify the product it will support.",
+      "FORM_DESCRIPTION": "Заполните приведенные ниже сведения, чтобы назвать своего помощника, описать его цель и указать поддерживаемый продукт.",
       "CREATE": {
-        "TITLE": "Create an assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the assistant, please try again."
+        "TITLE": "Создать помощника",
+        "SUCCESS_MESSAGE": "Помощник успешно создан",
+        "ERROR_MESSAGE": "При создании помощника произошла ошибка, пожалуйста, попробуйте еще раз."
       },
       "FORM": {
         "NAME": {
-          "LABEL": "Assistant Name",
-          "PLACEHOLDER": "Enter a name for the assistant",
-          "ERROR": "Please provide a name for the assistant"
+          "LABEL": "Имя помощника",
+          "PLACEHOLDER": "Введите имя помощника",
+          "ERROR": "Пожалуйста, укажите имя помощника"
         },
         "DESCRIPTION": {
-          "LABEL": "Assistant Description",
-          "PLACEHOLDER": "Describe how and where this assistant will be used",
-          "ERROR": "A description is required"
+          "LABEL": "Описание помощника",
+          "PLACEHOLDER": "Опишите, как и где будет использоваться этот помощник",
+          "ERROR": "Необходимо описание"
         },
         "PRODUCT_NAME": {
-          "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter the name of the product this assistant is designed for",
-          "ERROR": "The product name is required"
+          "LABEL": "Название продукта",
+          "PLACEHOLDER": "Введите название продукта, для которого предназначен этот помощник",
+          "ERROR": "Требуется название продукта"
         },
         "FEATURES": {
           "TITLE": "Возможности",
-          "ALLOW_CONVERSATION_FAQS": "Generate FAQs from resolved conversations",
-          "ALLOW_MEMORIES": "Capture key details as memories from customer interactions."
+          "ALLOW_CONVERSATION_FAQS": "Создать FAQ из решённых диалогов",
+          "ALLOW_MEMORIES": "Сохраняйте ключевые детали в виде воспоминаний о взаимодействии с клиентами."
         }
       },
       "EDIT": {
-        "TITLE": "Update the assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully updated",
-        "ERROR_MESSAGE": "There was an error updating the assistant, please try again."
+        "TITLE": "Обновить помощника",
+        "SUCCESS_MESSAGE": "Помощник успешно обновлен",
+        "ERROR_MESSAGE": "При обновлении помощника произошла ошибка, пожалуйста, попробуйте еще раз."
       },
       "OPTIONS": {
-        "EDIT_ASSISTANT": "Edit Assistant",
-        "DELETE_ASSISTANT": "Delete Assistant",
-        "VIEW_CONNECTED_INBOXES": "View connected inboxes"
+        "EDIT_ASSISTANT": "Редактировать помощника",
+        "DELETE_ASSISTANT": "Удалить помощника",
+        "VIEW_CONNECTED_INBOXES": "Просмотр подключенных источников"
       },
       "EMPTY_STATE": {
-        "TITLE": "No assistants available",
-        "SUBTITLE": "Create an assistant to provide quick and accurate responses to your users. It can learn from your help articles and past conversations."
+        "TITLE": "Нет доступных помощников",
+        "SUBTITLE": "Создайте помощника, чтобы дать быстрые и точные ответы пользователям. Он может учиться на ваших статьях из центра поддержки и прошлых диалогах."
       }
     },
     "DOCUMENTS": {
-      "HEADER": "Documents",
-      "ADD_NEW": "Create a new document",
+      "HEADER": "Документы",
+      "ADD_NEW": "Создать новый документ",
       "RELATED_RESPONSES": {
-        "TITLE": "Related FAQs",
-        "DESCRIPTION": "These FAQs are generated directly from the document."
+        "TITLE": "Связанные FAQ",
+        "DESCRIPTION": "Эти FAQ генерируются напрямую из документа."
       },
-      "FORM_DESCRIPTION": "Enter the URL of the document to add it as a knowledge source and choose the assistant to associate it with.",
+      "FORM_DESCRIPTION": "Введите URL документа, чтобы добавить его в качестве источника знаний и выберите ассистента, с которым он свяжется.",
       "CREATE": {
-        "TITLE": "Add a document",
-        "SUCCESS_MESSAGE": "The document has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the document, please try again."
+        "TITLE": "Добавить документ",
+        "SUCCESS_MESSAGE": "Документ успешно создан",
+        "ERROR_MESSAGE": "Произошла ошибка при создании документа, пожалуйста, попробуйте еще раз."
       },
       "FORM": {
         "URL": {
           "LABEL": "URL",
-          "PLACEHOLDER": "Enter the URL of the document",
-          "ERROR": "Please provide a valid URL for the document"
+          "PLACEHOLDER": "Введите URL документа",
+          "ERROR": "Пожалуйста, укажите корректный URL для документа"
         },
         "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
+          "LABEL": "Помощник",
+          "PLACEHOLDER": "Выберите помощника",
+          "ERROR": "Необходимо заполнить поле помощника"
         }
       },
       "DELETE": {
@@ -438,38 +438,38 @@
         "DESCRIPTION": "",
         "CONFIRM": "Да, удалить",
         "SUCCESS_MESSAGE": "FAQ успешно удален",
-        "ERROR_MESSAGE": "There was an error deleting the FAQ, please try again."
+        "ERROR_MESSAGE": "Произошла ошибка при удалении FAQ, попробуйте еще раз."
       },
       "FILTER": {
-        "ASSISTANT": "Assistant: {selected}",
-        "STATUS": "Status: {selected}",
+        "ASSISTANT": "Помощник: {selected}",
+        "STATUS": "Статус: {selected}",
         "ALL_ASSISTANTS": "Все"
       },
       "STATUS": {
         "TITLE": "Статус",
         "PENDING": "В ожидании",
-        "APPROVED": "Approved",
+        "APPROVED": "Одобрено",
         "ALL": "Все"
       },
-      "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
+      "FORM_DESCRIPTION": "Добавьте вопрос и соответствующий ему ответ в базу знаний и выберите помощника, с которым он должен связаться.",
       "CREATE": {
-        "TITLE": "Add an FAQ",
-        "SUCCESS_MESSAGE": "The response has been added successfully.",
-        "ERROR_MESSAGE": "An error occurred while adding the response. Please try again."
+        "TITLE": "Добавить FAQ",
+        "SUCCESS_MESSAGE": "Ответ успешно добавлен.",
+        "ERROR_MESSAGE": "При добавлении ответа произошла ошибка. Пожалуйста, попробуйте еще раз."
       },
       "FORM": {
         "QUESTION": {
-          "LABEL": "Question",
-          "PLACEHOLDER": "Enter the question here",
-          "ERROR": "Please provide a valid question."
+          "LABEL": "Вопрос",
+          "PLACEHOLDER": "Введите вопрос",
+          "ERROR": "Пожалуйста, введите корректный вопрос."
         },
         "ANSWER": {
-          "LABEL": "Answer",
-          "PLACEHOLDER": "Enter the answer here",
+          "LABEL": "Ответ",
+          "PLACEHOLDER": "Введите ответ",
           "ERROR": "Please provide a valid answer."
         },
         "ASSISTANT": {
-          "LABEL": "Assistant",
+          "LABEL": "Помощник",
           "PLACEHOLDER": "Select an assistant",
           "ERROR": "Please select an assistant."
         }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 9eca56718..652e22265 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -263,8 +263,8 @@
     "SETTINGS": "Настройки",
     "CONTACTS": "Контакты",
     "CAPTAIN": "Капитан",
-    "CAPTAIN_ASSISTANTS": "Assistants",
-    "CAPTAIN_DOCUMENTS": "Documents",
+    "CAPTAIN_ASSISTANTS": "Помощники",
+    "CAPTAIN_DOCUMENTS": "Документы",
     "CAPTAIN_RESPONSES": "FAQs",
     "HOME": "Главная",
     "AGENTS": "Операторы",
@@ -344,7 +344,7 @@
       "TITLE": "Капитан",
       "DESCRIPTION": "Manage usage and credits for Captain AI.",
       "BUTTON_TXT": "Buy more credits",
-      "DOCUMENTS": "Documents",
+      "DOCUMENTS": "Документы",
       "RESPONSES": "Responses",
       "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more."
     },
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Переключиться на заметку",
       "SWITCH_TO_REPLY": "Переключиться на ответ",
       "TOGGLE_SNOOZE_DROPDOWN": "Вкл/выкл повтор"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sh/contact.json b/app/javascript/dashboard/i18n/locale/sh/contact.json
index fcfd74529..5b679c1be 100644
--- a/app/javascript/dashboard/i18n/locale/sh/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sh/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/sh/conversation.json b/app/javascript/dashboard/i18n/locale/sh/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/sh/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sh/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index db8a36c49..35fe2fafe 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Kontaktné údaje <strong>{primaryContactName}</strong> budú skopírované do <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Zlúčiť kontakty",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Správa",
       "SEND_MESSAGE": "Poslať správu",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakty"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt bol úspešne uložený",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importovať kontakty prostredníctvom súboru CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 653fa3040..97f491aac 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Označiť ako čakajúce na vybavenie",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 662e291de..745d31229 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Prepnúť na súkromnú poznámku",
       "SWITCH_TO_REPLY": "Prepnúť na odpoveď",
       "TOGGLE_SNOOZE_DROPDOWN": "Prepínanie módu \"snooze\""
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sl/contact.json b/app/javascript/dashboard/i18n/locale/sl/contact.json
index 376c4b034..c953d8c03 100644
--- a/app/javascript/dashboard/i18n/locale/sl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sl/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Iskanje ...",
       "MESSAGE_BUTTON": "Sporočilo",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakti"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/sl/conversation.json b/app/javascript/dashboard/i18n/locale/sl/conversation.json
index bf23eb793..563e9b0b2 100644
--- a/app/javascript/dashboard/i18n/locale/sl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sl/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/sl/settings.json b/app/javascript/dashboard/i18n/locale/sl/settings.json
index 6d965ea46..2a094cebc 100644
--- a/app/javascript/dashboard/i18n/locale/sl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sq/contact.json b/app/javascript/dashboard/i18n/locale/sq/contact.json
index 2fa7a5858..b1cff8591 100644
--- a/app/javascript/dashboard/i18n/locale/sq/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sq/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/sq/conversation.json b/app/javascript/dashboard/i18n/locale/sq/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/sq/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sq/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/sq/settings.json b/app/javascript/dashboard/i18n/locale/sq/settings.json
index f238bb14d..7932c6fea 100644
--- a/app/javascript/dashboard/i18n/locale/sq/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index b7c6b5a35..ce709d4a9 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Detalji kontakta <strong>{primaryContactName}</strong> će biti iskopirani u <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Spajanje kontakata",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Poruka",
       "SEND_MESSAGE": "Pošalji poruku",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakti"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt je uspešno sačuvan",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Uvezi kontakte uz pomoć CSV datoteke.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index a43f2e79b..0e131dbd1 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Označeno na čekanju",
       "RESOLVED": "Označi kao rešeno",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Ponovo otvori razgovor",
       "SNOOZE": {
         "TITLE": "Odloži",
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 860d7f115..5be53132f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Prebaci se na privatnu belešku",
       "SWITCH_TO_REPLY": "Prebaci se na odgovor",
       "TOGGLE_SNOOZE_DROPDOWN": "Uključite padajućim menijom odlaganja"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index c52b60e5b..909f79df8 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Kontaktuppgifter till <strong>{primaryContactName}</strong> kommer att kopieras till <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "FEL_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Slå samman kontakter",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Meddelande",
       "SEND_MESSAGE": "Skicka meddelande",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kontakter"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kontakt har sparats",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Importera kontakter via en CSV-fil.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 09c83d4a6..f6fa029ba 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Markera som väntande",
       "RESOLVED": "Markera som löst",
       "MARK_AS_UNREAD": "Markera som oläst",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Återöppna konversationen",
       "SNOOZE": {
         "TITLE": "Snooza",
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index a25d46727..66b3f958d 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 2242be4c2..eab8f25cb 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index f0582404b..33475f2a7 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index c06432e9e..4a769430a 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index cb9dfbc76..6f1ca28e9 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "ข้อมูลผู้ติดต่อของ <strong>{primaryContactName}</strong> จะถูกคัดลอกไปยัง <strong>{parentContactName}</strong>"
     },
     "SEARCH": {
-      "ERROR": "ข้อความผิดพลาด"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " รวมผู้ติดต่อ",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "ข้อความ",
       "SEND_MESSAGE": "ส่วข้อความ",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "ผู้ติดต่อ"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "สร้างการติดต่อเรียบร้อยเเล้ว",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "นำเข้ารายชื่อผู้ติดต่อผ่านไฟล์ CSV",
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 8e60bc6a9..11c68abe4 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างดำเนินการ",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "เปิดการสนทนาอีกครั้ง",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 525252573..65e9a43ed 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "สลับเป็นโน้ตส่วนตัว",
       "SWITCH_TO_REPLY": "สลับเป็นการตอบกลับ",
       "TOGGLE_SNOOZE_DROPDOWN": "เปิดหรือปิดเมนูพักการสนทนา"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tl/contact.json b/app/javascript/dashboard/i18n/locale/tl/contact.json
index 6bfb9ed23..f5925eda3 100644
--- a/app/javascript/dashboard/i18n/locale/tl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tl/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/tl/conversation.json b/app/javascript/dashboard/i18n/locale/tl/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/tl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tl/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/tl/settings.json b/app/javascript/dashboard/i18n/locale/tl/settings.json
index 15388a54a..8971287ab 100644
--- a/app/javascript/dashboard/i18n/locale/tl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 03f42006f..f190e6ece 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Şu: <strong>{primaryContactName}</strong> kişinin iletişim bilgileri, şu<strong>{parentContactName}</strong> kişiye kopyalanacaktır."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Kişileri birleştir",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Mesaj",
       "SEND_MESSAGE": "Mesajı Gönder",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Kişiler"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Kişi bilgileri başarıyla kaydedildi",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Kişileri CSV dosyası olarak içe aktar.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 9d0695666..3ce294610 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Beklemede olarak işaretle",
       "RESOLVED": "Çözüldü olarak işaretle",
       "MARK_AS_UNREAD": "Okunmamış olarak işaretle",
+      "MARK_AS_READ": "Okundu olarak işaretle",
       "REOPEN": "Görüşmeyi yeniden açın",
       "SNOOZE": {
         "TITLE": "Sustur",
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 265d6132b..5fe13dbd2 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Özel Not'a geç",
       "SWITCH_TO_REPLY": "Yanıt'a geç",
       "TOGGLE_SNOOZE_DROPDOWN": "Snooze açılır menüsünü aç/kapat"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index ebaed2c11..3f01f7ccb 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Контактні дані <strong>{primaryContactName}</strong> буде скопійовано до <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Об'єднати контакти",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Текст повідомлення",
       "SEND_MESSAGE": "Надіслати",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Контакти"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Контакт успішно збережено",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "Цей контакт успішно розблоковано",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Імпортувати контакти через файл CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index b0d61fb98..6f0f1fa8b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Позначити як \"В очікуванні\"",
       "RESOLVED": "Позначити як вирішене",
       "MARK_AS_UNREAD": "Позначити як непрочитане",
+      "MARK_AS_READ": "Позначити як прочитане",
       "REOPEN": "Повторно відкрити розмову",
       "SNOOZE": {
         "TITLE": "Відкласти",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index b7eed40c7..f8bac651b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Перейти до приватних заміток",
       "SWITCH_TO_REPLY": "Перейти до відповіді",
       "TOGGLE_SNOOZE_DROPDOWN": "Перемкнути випадаючий список відкладення"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index a00a44ae8..f6f5ad8eb 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "<strong>{primaryContactName}</strong> کے کانٹیکٹ کی تفصیلات <strong>{parentContactName}</strong> پر کاپی کی جائیں گی۔."
     },
     "SEARCH": {
-      "ERROR": "خامی کا پیغام"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " کانٹیکٹ ضم کریں۔",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "پیغام",
       "SEND_MESSAGE": "پیغام بھیجیں",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "کانٹیکٹس"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "کانٹیکٹ کامیابی سے محفوظ ہو گیا۔",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "سی ایس وی فائل کے ذریعے کانٹیکٹ درآمد کریں۔.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index 511267aa0..d61a05ff6 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index af50de43a..0d53beaa4 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
index fcfd74529..5b679c1be 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Merge contacts",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "Message",
       "SEND_MESSAGE": "Send message",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Contacts"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Contact saved successfully",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Import contacts through a CSV file.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index 6afe57648..faa78c8a7 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Mark as pending",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Reopen conversation",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 1b3bbb37f..3a70ae1e9 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index 4f17b02d0..311f38114 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "\bChi tiết liên hệ của <strong>{primaryContactName}</strong> \bsẽ được sao chép đến <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " Hợp nhất các liên hệ",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Tìm kiếm...",
       "MESSAGE_BUTTON": "Tin nhắn",
       "SEND_MESSAGE": "Gửi tin nhắn",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "Liên hệ"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "Liên hệ được lưu thành công",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "Nhập liên hệ bằng một file CSV.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index e74e0621a..2ee822d98 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "Đánh dấu chưa giải quyết",
       "RESOLVED": "Đánh dấu là đã giải quyết",
       "MARK_AS_UNREAD": "Đánh dấu là chưa đọc",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "Mở lại hội thoại",
       "SNOOZE": {
         "TITLE": "Báo lại",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 4242904bf..a67bc1847 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Chuyển sang Ghi chú Riêng tư",
       "SWITCH_TO_REPLY": "Chuyển sang phản hồi",
       "TOGGLE_SNOOZE_DROPDOWN": "Chuyển đổi thả xuống tạm dừng"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 41d34586e..405a28b10 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "<strong>{primaryContactName}</strong> 的联系信息将拷贝到 <strong>{parentContactName}</strong>。"
     },
     "SEARCH": {
-      "ERROR": "错误消息"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " 合并联系人",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "消息",
       "SEND_MESSAGE": "发送消息",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "联系人"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "联系人保存成功",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "通过 CSV 文件导入联系人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index beff1b380..261a971dc 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "标记为待处理",
       "RESOLVED": "标记为已解决",
       "MARK_AS_UNREAD": "标记为未读",
+      "MARK_AS_READ": "Mark as read",
       "REOPEN": "重新打开会话",
       "SNOOZE": {
         "TITLE": "推迟",
@@ -151,7 +152,7 @@
       "PRIVATE_MSG_INPUT": "Shift + 输入新行。这只对客服可见",
       "MESSAGE_SIGNATURE_NOT_CONFIGURED": "未设置消息签名，请在个人资料中进行设置。",
       "CLICK_HERE": "点击此处更新",
-      "WHATSAPP_TEMPLATES": "Whatsapp Templates"
+      "WHATSAPP_TEMPLATES": "Whatsapp 模板列表"
     },
     "REPLYBOX": {
       "REPLY": "回复",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 04a7c695a..87502c7f8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
index cf95de2a4..3135b08ee 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
@@ -1,8 +1,8 @@
 {
   "SLA": {
-    "HEADER": "Service Level Agreements",
-    "ADD_ACTION": "Add SLA",
-    "ADD_ACTION_LONG": "Create a new SLA Policy",
+    "HEADER": "服务协议",
+    "ADD_ACTION": "添加服务协议",
+    "ADD_ACTION_LONG": "创建一个新的服务协议",
     "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
     "LEARN_MORE": "Learn more about SLA",
     "LOADING": "Fetching SLAs",
@@ -41,10 +41,10 @@
     },
     "FORM": {
       "NAME": {
-        "LABEL": "SLA Name",
-        "PLACEHOLDER": "SLA Name",
-        "REQUIRED_ERROR": "SLA name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
+        "LABEL": "服务协议标题",
+        "PLACEHOLDER": "请在这里输入协议标题",
+        "REQUIRED_ERROR": "请填写服务协议标题",
+        "MINIMUM_LENGTH_ERROR": "最少2个字符",
         "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
       },
       "DESCRIPTION": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json
index fc0bd97a1..6d1b67022 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process {templateName}"
+            "TITLE": "Whatsapp 模板列表",
+            "SUBTITLE": "请选择想要发送的 Whatsapp 消息模板",
+            "TEMPLATE_SELECTED_SUBTITLE": "{templateName} 处理中"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "查找模板",
+            "NO_TEMPLATES_FOUND": "没有找到对应的模版",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
+                "LANGUAGE": "语言",
+                "TEMPLATE_BODY": "模板内容",
                 "CATEGORY": "类别"
             }
         },
         "PARSER": {
             "VARIABLES_LABEL": "参数",
-            "VARIABLE_PLACEHOLDER": "Enter {variable} value",
+            "VARIABLE_PLACEHOLDER": "请填写 {variable}",
             "GO_BACK_LABEL": "返回",
             "SEND_MESSAGE_LABEL": "发送消息",
-            "FORM_ERROR_MESSAGE": "Please fill all variables before sending"
+            "FORM_ERROR_MESSAGE": "你必须填写所有参数才能发送"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 1ff279f47..b07710249 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Contact details of <strong>{primaryContactName}</strong> will be copied to <strong>{parentContactName}</strong>."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR_MESSAGE": "Something went wrong. Please try again later."
     },
     "FORM": {
       "SUBMIT": " 合併聯絡人",
@@ -288,6 +288,8 @@
       "SEARCH_PLACEHOLDER": "Search...",
       "MESSAGE_BUTTON": "訊息",
       "SEND_MESSAGE": "傳送訊息",
+      "BLOCK_CONTACT": "Block contact",
+      "UNBLOCK_CONTACT": "Unblock contact",
       "BREADCRUMB": {
         "CONTACTS": "聯絡人"
       },
@@ -302,6 +304,10 @@
           "SUCCESS_MESSAGE": "聯絡人儲存成功",
           "ERROR_MESSAGE": "Unable to save contact. Please try again later."
         },
+        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
+        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
+        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
         "IMPORT_CONTACT": {
           "TITLE": "Import contacts",
           "DESCRIPTION": "透過 CSV 匯入聯絡人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index 07c12fb88..03fb536fc 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -117,6 +117,7 @@
       "PENDING": "標記為待處理",
       "RESOLVED": "Mark as resolved",
       "MARK_AS_UNREAD": "Mark as unread",
+      "MARK_AS_READ": "標記為已讀取",
       "REOPEN": "重新開啟對話",
       "SNOOZE": {
         "TITLE": "Snooze",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 8479de614..a47c2b15d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -389,11 +389,6 @@
       "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
       "SWITCH_TO_REPLY": "Switch to Reply",
       "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
-    },
-    "KEYS": {
-      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
-      "ALT_OR_OPTION_KEY": "Alt / ⌥",
-      "FORWARD_SLASH_KEY": "/"
     }
   }
 }
diff --git a/app/javascript/survey/i18n/locale/am.json b/app/javascript/survey/i18n/locale/am.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/am.json
+++ b/app/javascript/survey/i18n/locale/am.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/ar.json b/app/javascript/survey/i18n/locale/ar.json
index 9cd0cc6d1..02029b265 100644
--- a/app/javascript/survey/i18n/locale/ar.json
+++ b/app/javascript/survey/i18n/locale/ar.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "نسعد بخدمتكم دائما 🤍\nشاركنا تجربتك بتقييم أداء الخدمة للارتقاء وتقديم الأفضل \nشكراً لوقتك %{inboxName}.",
+    "DESCRIPTION": "نسعد بخدمتكم دائما 🤍\nشاركنا تجربتك بتقييم أداء الخدمة للارتقاء وتقديم الأفضل \nشكراً لوقتك {inboxName}.",
     "RATING": {
       "LABEL": "قيم محادثتك",
       "SUCCESS_MESSAGE": "شكرا لك على تقييم المحادثة"
diff --git a/app/javascript/survey/i18n/locale/az.json b/app/javascript/survey/i18n/locale/az.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/az.json
+++ b/app/javascript/survey/i18n/locale/az.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/bg.json b/app/javascript/survey/i18n/locale/bg.json
index 0187b7848..08842add8 100644
--- a/app/javascript/survey/i18n/locale/bg.json
+++ b/app/javascript/survey/i18n/locale/bg.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Оценете този разговор",
       "SUCCESS_MESSAGE": "Благодарим ви, че оценихте разговора"
diff --git a/app/javascript/survey/i18n/locale/ca.json b/app/javascript/survey/i18n/locale/ca.json
index d74c7f84d..4d36ebc3d 100644
--- a/app/javascript/survey/i18n/locale/ca.json
+++ b/app/javascript/survey/i18n/locale/ca.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Benvolgut client 👋, preneu-vos un moment per compartir uns comentaris sobre la conversa que heu tingut amb %{inboxName}.",
+    "DESCRIPTION": "Benvolgut client 👋, preneu-vos un moment per compartir uns comentaris sobre la conversa que heu tingut amb {inboxName}.",
     "RATING": {
       "LABEL": "Valora la teva conversa",
       "SUCCESS_MESSAGE": "Gràcies per enviar la qualificació"
diff --git a/app/javascript/survey/i18n/locale/cs.json b/app/javascript/survey/i18n/locale/cs.json
index 7809d99e8..c2df0d47f 100644
--- a/app/javascript/survey/i18n/locale/cs.json
+++ b/app/javascript/survey/i18n/locale/cs.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Vážený zákazníku 👋, věnujte prosím několik okamžiků zpětné vazbě na konverzaci, kterou jste vedli s %{inboxName}.",
+    "DESCRIPTION": "Vážený zákazníku 👋, věnujte prosím několik okamžiků zpětné vazbě na konverzaci, kterou jste vedli s {inboxName}.",
     "RATING": {
       "LABEL": "Ohodnoťte svou konverzaci",
       "SUCCESS_MESSAGE": "Děkujeme Vám za odeslání hodnocení"
diff --git a/app/javascript/survey/i18n/locale/da.json b/app/javascript/survey/i18n/locale/da.json
index 46893ad45..b2741f7be 100644
--- a/app/javascript/survey/i18n/locale/da.json
+++ b/app/javascript/survey/i18n/locale/da.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Kære kunde 👋, tag et øjeblik på at dele feedback om den samtale, du havde med %{inboxName}.",
+    "DESCRIPTION": "Kære kunde 👋, tag et øjeblik på at dele feedback om den samtale, du havde med {inboxName}.",
     "RATING": {
       "LABEL": "Bedøm din samtale",
       "SUCCESS_MESSAGE": "Tak for din bedømmelse"
diff --git a/app/javascript/survey/i18n/locale/de.json b/app/javascript/survey/i18n/locale/de.json
index d31a19a36..bd5c51345 100644
--- a/app/javascript/survey/i18n/locale/de.json
+++ b/app/javascript/survey/i18n/locale/de.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Sehr geehrter Kunde 👋, bitte nehmen Sie sich einen Moment Zeit, um Feedback zu dem Gespräch zu geben, das Sie mit %{inboxName} geführt haben.",
+    "DESCRIPTION": "Sehr geehrter Kunde 👋, bitte nehmen Sie sich einen Moment Zeit, um Feedback zu dem Gespräch zu geben, das Sie mit {inboxName} geführt haben.",
     "RATING": {
       "LABEL": "Bewerten Sie ihre Unterhaltung",
       "SUCCESS_MESSAGE": "Danke, dass Sie die Bewertung eingereicht haben"
diff --git a/app/javascript/survey/i18n/locale/el.json b/app/javascript/survey/i18n/locale/el.json
index 4516b806b..0814c4383 100644
--- a/app/javascript/survey/i18n/locale/el.json
+++ b/app/javascript/survey/i18n/locale/el.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Αγαπητέ πελάτη 👋, παρακαλώ διαθέστε λόγο χρόνο για να σχολιάσετε τη συζήτηση που είχατε με στο %{inboxName}.",
+    "DESCRIPTION": "Αγαπητέ πελάτη 👋, παρακαλώ διαθέστε λόγο χρόνο για να σχολιάσετε τη συζήτηση που είχατε με στο {inboxName}.",
     "RATING": {
       "LABEL": "Αξιολογήστε τη συνομιλία σας",
       "SUCCESS_MESSAGE": "Ευχαριστούμε για την υποβολή της αξιολόγησης"
diff --git a/app/javascript/survey/i18n/locale/es.json b/app/javascript/survey/i18n/locale/es.json
index 9e020d8d0..dedf9212d 100644
--- a/app/javascript/survey/i18n/locale/es.json
+++ b/app/javascript/survey/i18n/locale/es.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Estimado cliente 👋, por favor tómate unos momentos para compartir tus comentarios sobre la conversación que tuviste con %{inboxName}.",
+    "DESCRIPTION": "Estimado cliente 👋, por favor tómate unos momentos para compartir tus comentarios sobre la conversación que tuviste con {inboxName}.",
     "RATING": {
       "LABEL": "Califica tu conversación",
       "SUCCESS_MESSAGE": "Gracias por enviar la valoración"
diff --git a/app/javascript/survey/i18n/locale/fa.json b/app/javascript/survey/i18n/locale/fa.json
index 581c790fe..e6f18f6ab 100644
--- a/app/javascript/survey/i18n/locale/fa.json
+++ b/app/javascript/survey/i18n/locale/fa.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "مشتری عزیز 👋، لطفاً چند لحظه وقت بگذارید و درباره مکالمه ای که با %{inboxName} داشتید، بازخورد خود را به اشتراک بگذارید.",
+    "DESCRIPTION": "مشتری عزیز 👋، لطفاً چند لحظه وقت بگذارید و درباره مکالمه ای که با {inboxName} داشتید، بازخورد خود را به اشتراک بگذارید.",
     "RATING": {
       "LABEL": "به مکالمه خود امتیاز دهید",
       "SUCCESS_MESSAGE": "با تشکر از شما برای ثبت رتبه"
diff --git a/app/javascript/survey/i18n/locale/fi.json b/app/javascript/survey/i18n/locale/fi.json
index a0371bd74..e0e425f20 100644
--- a/app/javascript/survey/i18n/locale/fi.json
+++ b/app/javascript/survey/i18n/locale/fi.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Arvoisa asiakas 👋, käytäthän hetken aikaasi ja annat palautetta keskustelusta, jonka kävit %{inboxName} kanssa.",
+    "DESCRIPTION": "Arvoisa asiakas 👋, käytäthän hetken aikaasi ja annat palautetta keskustelusta, jonka kävit {inboxName} kanssa.",
     "RATING": {
       "LABEL": "Anna arvio palvelusta",
       "SUCCESS_MESSAGE": "Kiitos, että lähetit arvion"
diff --git a/app/javascript/survey/i18n/locale/fr.json b/app/javascript/survey/i18n/locale/fr.json
index 9a6a6824a..8387d67ac 100644
--- a/app/javascript/survey/i18n/locale/fr.json
+++ b/app/javascript/survey/i18n/locale/fr.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Cher client 👋, veuillez prendre quelques instants pour partager vos commentaires sur la conversation que vous avez eue avec %{inboxName}.",
+    "DESCRIPTION": "Cher client 👋, veuillez prendre quelques instants pour partager vos commentaires sur la conversation que vous avez eue avec {inboxName}.",
     "RATING": {
       "LABEL": "Évaluer votre conversation",
       "SUCCESS_MESSAGE": "Merci d'avoir soumis votre évaluation"
diff --git a/app/javascript/survey/i18n/locale/he.json b/app/javascript/survey/i18n/locale/he.json
index 8b683e926..720d32936 100644
--- a/app/javascript/survey/i18n/locale/he.json
+++ b/app/javascript/survey/i18n/locale/he.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "לקוח יקר 👋, אנא הקדישו כמה רגעים כדי לשתף משוב על השיחה שניהלתם עם %{inboxName}.",
+    "DESCRIPTION": "לקוח יקר 👋, אנא הקדישו כמה רגעים כדי לשתף משוב על השיחה שניהלתם עם {inboxName}.",
     "RATING": {
       "LABEL": "דרג את השיחה",
       "SUCCESS_MESSAGE": "תודה על שליחת הדירוג"
diff --git a/app/javascript/survey/i18n/locale/hi.json b/app/javascript/survey/i18n/locale/hi.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/hi.json
+++ b/app/javascript/survey/i18n/locale/hi.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/hr.json b/app/javascript/survey/i18n/locale/hr.json
index b575782e4..29e94db20 100644
--- a/app/javascript/survey/i18n/locale/hr.json
+++ b/app/javascript/survey/i18n/locale/hr.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dragi korisniče 👋, odvojite nekoliko trenutaka i podijelite dojam razogovora koji ste imali s %{inboxName}.",
+    "DESCRIPTION": "Dragi korisniče 👋, odvojite nekoliko trenutaka i podijelite dojam razogovora koji ste imali s {inboxName}.",
     "RATING": {
       "LABEL": "Ocijeni svoj razgovor",
       "SUCCESS_MESSAGE": "Hvala Vam na ocjeni"
diff --git a/app/javascript/survey/i18n/locale/hu.json b/app/javascript/survey/i18n/locale/hu.json
index 43646f2fd..c6c61c557 100644
--- a/app/javascript/survey/i18n/locale/hu.json
+++ b/app/javascript/survey/i18n/locale/hu.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Kedves felhasználónk 👋, kérlek szánj rá kis időt, és értékeld a beszélgetést %{inboxName} munkatársunkkal.",
+    "DESCRIPTION": "Kedves felhasználónk 👋, kérlek szánj rá kis időt, és értékeld a beszélgetést {inboxName} munkatársunkkal.",
     "RATING": {
       "LABEL": "Értékeld a beszélgetést",
       "SUCCESS_MESSAGE": "Köszönjük, hogy elküldted az értékelést"
diff --git a/app/javascript/survey/i18n/locale/hy.json b/app/javascript/survey/i18n/locale/hy.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/hy.json
+++ b/app/javascript/survey/i18n/locale/hy.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/id.json b/app/javascript/survey/i18n/locale/id.json
index 86fdd4670..47edd5f9f 100644
--- a/app/javascript/survey/i18n/locale/id.json
+++ b/app/javascript/survey/i18n/locale/id.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Pelanggan yang terhormat 👋, harap luangkan waktu sejenak untuk memberikan umpan balik tentang percakapan yang Anda lakukan %{inboxName}.",
+    "DESCRIPTION": "Pelanggan yang terhormat 👋, harap luangkan waktu sejenak untuk memberikan umpan balik tentang percakapan yang Anda lakukan {inboxName}.",
     "RATING": {
       "LABEL": "Nilai percakapan Anda",
       "SUCCESS_MESSAGE": "Terima kasih telah mengirimkan penilaian"
diff --git a/app/javascript/survey/i18n/locale/is.json b/app/javascript/survey/i18n/locale/is.json
index 2f16a5fa9..d3bee9c17 100644
--- a/app/javascript/survey/i18n/locale/is.json
+++ b/app/javascript/survey/i18n/locale/is.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Ef þú hefur tíma viljum við biðja þig um að skilja eftir endurgjöf eftir samtalið sem þú áttir við %{inboxName}.",
+    "DESCRIPTION": "Ef þú hefur tíma viljum við biðja þig um að skilja eftir endurgjöf eftir samtalið sem þú áttir við {inboxName}.",
     "RATING": {
       "LABEL": "Gefðu samtalinu einkunn",
       "SUCCESS_MESSAGE": "Takk fyrir"
diff --git a/app/javascript/survey/i18n/locale/it.json b/app/javascript/survey/i18n/locale/it.json
index 0b0222681..55459b9da 100644
--- a/app/javascript/survey/i18n/locale/it.json
+++ b/app/javascript/survey/i18n/locale/it.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Caro cliente 👋, si prega di prendere qualche minuto per condividere i commenti sulla conversazione che hai avuto con %{inboxName}.",
+    "DESCRIPTION": "Caro cliente 👋, si prega di prendere qualche minuto per condividere i commenti sulla conversazione che hai avuto con {inboxName}.",
     "RATING": {
       "LABEL": "Valuta la conversazione",
       "SUCCESS_MESSAGE": "Grazie per aver inviato la valutazione"
diff --git a/app/javascript/survey/i18n/locale/ja.json b/app/javascript/survey/i18n/locale/ja.json
index b35fe78cb..8bf84210b 100644
--- a/app/javascript/survey/i18n/locale/ja.json
+++ b/app/javascript/survey/i18n/locale/ja.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "お問い合わせありがとうございました。今回の %{inboxName} とのやり取りについて、ご意見をお寄せいただけますと幸いです。",
+    "DESCRIPTION": "お問い合わせありがとうございました。今回の {inboxName} とのやり取りについて、ご意見をお寄せいただけますと幸いです。",
     "RATING": {
       "LABEL": "次の5段階からお選びください",
       "SUCCESS_MESSAGE": "評価のご協力ありがとうございます。"
diff --git a/app/javascript/survey/i18n/locale/ka.json b/app/javascript/survey/i18n/locale/ka.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/ka.json
+++ b/app/javascript/survey/i18n/locale/ka.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/ko.json b/app/javascript/survey/i18n/locale/ko.json
index 4fb91258a..563d1a02d 100644
--- a/app/javascript/survey/i18n/locale/ko.json
+++ b/app/javascript/survey/i18n/locale/ko.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "고객님 👋, 잠시 시간을 내어 %{inboxName}에서 나눈 대화에 대한 경험을 알려주세요.",
+    "DESCRIPTION": "고객님 👋, 잠시 시간을 내어 {inboxName}에서 나눈 대화에 대한 경험을 알려주세요.",
     "RATING": {
       "LABEL": "대화를 평가해주세요.",
       "SUCCESS_MESSAGE": "평가해주셔서 감사합니다!"
diff --git a/app/javascript/survey/i18n/locale/lt.json b/app/javascript/survey/i18n/locale/lt.json
index 5298e0eeb..c1a093365 100644
--- a/app/javascript/survey/i18n/locale/lt.json
+++ b/app/javascript/survey/i18n/locale/lt.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Gerbiamas kliente 👋, skirkite kelias minutes ir pasidalykite atsiliepimais apie pokalbį su %{inboxName}.",
+    "DESCRIPTION": "Gerbiamas kliente 👋, skirkite kelias minutes ir pasidalykite atsiliepimais apie pokalbį su {inboxName}.",
     "RATING": {
       "LABEL": "Įvertinkite savo pokalbį",
       "SUCCESS_MESSAGE": "Dėkojame, kad pateikėte įvertinimą"
diff --git a/app/javascript/survey/i18n/locale/lv.json b/app/javascript/survey/i18n/locale/lv.json
index 4902a3d33..4bd56279f 100644
--- a/app/javascript/survey/i18n/locale/lv.json
+++ b/app/javascript/survey/i18n/locale/lv.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Cienījamais klient 👋, lūdzu, veltiet savu laiku, lai sniegtu atsauksmes par sarunu, kas Jums bija ar %{inboxName}.",
+    "DESCRIPTION": "Cienījamais klient 👋, lūdzu, veltiet savu laiku, lai sniegtu atsauksmes par sarunu, kas Jums bija ar {inboxName}.",
     "RATING": {
       "LABEL": "Novērtējiet savu sarunu",
       "SUCCESS_MESSAGE": "Paldies, ka iesniedzāt vērtējumu"
diff --git a/app/javascript/survey/i18n/locale/ml.json b/app/javascript/survey/i18n/locale/ml.json
index 8ffab5992..29ef82a52 100644
--- a/app/javascript/survey/i18n/locale/ml.json
+++ b/app/javascript/survey/i18n/locale/ml.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "നിങ്ങളുടെ സംഭാഷണം റേറ്റുചെയ്യുക",
       "SUCCESS_MESSAGE": "റേറ്റിംഗ് സമർപ്പിച്ചതിന് നന്ദി"
diff --git a/app/javascript/survey/i18n/locale/ms.json b/app/javascript/survey/i18n/locale/ms.json
index 31be29315..fee5a5548 100644
--- a/app/javascript/survey/i18n/locale/ms.json
+++ b/app/javascript/survey/i18n/locale/ms.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/ne.json b/app/javascript/survey/i18n/locale/ne.json
index 4bb26ef06..f82a6510c 100644
--- a/app/javascript/survey/i18n/locale/ne.json
+++ b/app/javascript/survey/i18n/locale/ne.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/nl.json b/app/javascript/survey/i18n/locale/nl.json
index 5acde4c6d..3702d974b 100644
--- a/app/javascript/survey/i18n/locale/nl.json
+++ b/app/javascript/survey/i18n/locale/nl.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Beste klant 👋, neem even de tijd om feedback te delen over het gesprek dat u met %{inboxName} hebt gehad.",
+    "DESCRIPTION": "Beste klant 👋, neem even de tijd om feedback te delen over het gesprek dat u met {inboxName} hebt gehad.",
     "RATING": {
       "LABEL": "Beoordeel uw gesprek",
       "SUCCESS_MESSAGE": "Bedankt voor het indienen van een beoordeling"
diff --git a/app/javascript/survey/i18n/locale/no.json b/app/javascript/survey/i18n/locale/no.json
index 21a53855a..501066c2d 100644
--- a/app/javascript/survey/i18n/locale/no.json
+++ b/app/javascript/survey/i18n/locale/no.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Kjære kunde 👋, vennligst ta noen øyeblikk å dele tilbakemelding om samtalen du hadde med %{inboxName}.",
+    "DESCRIPTION": "Kjære kunde 👋, vennligst ta noen øyeblikk å dele tilbakemelding om samtalen du hadde med {inboxName}.",
     "RATING": {
       "LABEL": "Vurder samtalen din",
       "SUCCESS_MESSAGE": "Takk for at du ga din vurdering"
diff --git a/app/javascript/survey/i18n/locale/pl.json b/app/javascript/survey/i18n/locale/pl.json
index e5d58b254..a67902d0d 100644
--- a/app/javascript/survey/i18n/locale/pl.json
+++ b/app/javascript/survey/i18n/locale/pl.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Droga Klientko, Drogi Kliencie 👋, poświęć proszę kilka chwil, aby podzielić się opinią na temat rozmowy, którą odbyłeś(aś) z %{inboxName}.",
+    "DESCRIPTION": "Droga Klientko, Drogi Kliencie 👋, poświęć proszę kilka chwil, aby podzielić się opinią na temat rozmowy, którą odbyłeś(aś) z {inboxName}.",
     "RATING": {
       "LABEL": "Oceń udzielone Ci wsparcie",
       "SUCCESS_MESSAGE": "Dziękujemy za przesłanie oceny"
diff --git a/app/javascript/survey/i18n/locale/pt.json b/app/javascript/survey/i18n/locale/pt.json
index 48bbb0968..814c91597 100644
--- a/app/javascript/survey/i18n/locale/pt.json
+++ b/app/javascript/survey/i18n/locale/pt.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar a sua opinião sobre a conversa que teve com %{inboxName}.",
+    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar a sua opinião sobre a conversa que teve com {inboxName}.",
     "RATING": {
       "LABEL": "Avalie a sua conversa",
       "SUCCESS_MESSAGE": "Obrigado pela sua Avaliação"
diff --git a/app/javascript/survey/i18n/locale/pt_BR.json b/app/javascript/survey/i18n/locale/pt_BR.json
index 98739cdb7..b999fd9b0 100644
--- a/app/javascript/survey/i18n/locale/pt_BR.json
+++ b/app/javascript/survey/i18n/locale/pt_BR.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar feedback sobre a conversa que você teve com %{inboxName}.",
+    "DESCRIPTION": "Caro cliente 👋, por favor, reserve alguns instantes para compartilhar feedback sobre a conversa que você teve com {inboxName}.",
     "RATING": {
       "LABEL": "Avalie sua conversa",
       "SUCCESS_MESSAGE": "Obrigado por enviar a classificação"
diff --git a/app/javascript/survey/i18n/locale/ro.json b/app/javascript/survey/i18n/locale/ro.json
index 76482b79b..2b1fd54af 100644
--- a/app/javascript/survey/i18n/locale/ro.json
+++ b/app/javascript/survey/i18n/locale/ro.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Stimate client 👋, vă rugăm să luați câteva momente pentru a împărtăși feedback despre conversația pe care ați avut-o cu %{inboxName}.",
+    "DESCRIPTION": "Stimate client 👋, vă rugăm să luați câteva momente pentru a împărtăși feedback despre conversația pe care ați avut-o cu {inboxName}.",
     "RATING": {
       "LABEL": "Evaluează conversația ta",
       "SUCCESS_MESSAGE": "Vă mulțumim pentru trimiterea de rating"
diff --git a/app/javascript/survey/i18n/locale/ru.json b/app/javascript/survey/i18n/locale/ru.json
index 54c01693e..9fad2c9c2 100644
--- a/app/javascript/survey/i18n/locale/ru.json
+++ b/app/javascript/survey/i18n/locale/ru.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Уважаемый клиент 👋, пожалуйста, поделитесь отзывом о разговоре с %{inboxName}.",
+    "DESCRIPTION": "Уважаемый клиент 👋, пожалуйста, поделитесь отзывом о разговоре с {inboxName}.",
     "RATING": {
       "LABEL": "Оцените разговор",
       "SUCCESS_MESSAGE": "Спасибо за оценку"
diff --git a/app/javascript/survey/i18n/locale/sh.json b/app/javascript/survey/i18n/locale/sh.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/sh.json
+++ b/app/javascript/survey/i18n/locale/sh.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/sk.json b/app/javascript/survey/i18n/locale/sk.json
index e9480a58f..5a419c0ca 100644
--- a/app/javascript/survey/i18n/locale/sk.json
+++ b/app/javascript/survey/i18n/locale/sk.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Ohodnoťte konverzáciu",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/sl.json b/app/javascript/survey/i18n/locale/sl.json
index 99650e20b..9eaab33bc 100644
--- a/app/javascript/survey/i18n/locale/sl.json
+++ b/app/javascript/survey/i18n/locale/sl.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Draga stranka 👋, vzemite si nekaj trenutkov in nam posredujte povratne informacije o pogovoru, ki ste ga imeli z %{inboxName}.",
+    "DESCRIPTION": "Draga stranka 👋, vzemite si nekaj trenutkov in nam posredujte povratne informacije o pogovoru, ki ste ga imeli z {inboxName}.",
     "RATING": {
       "LABEL": "Ocenite svoj pogovor",
       "SUCCESS_MESSAGE": "Hvala za oddano oceno"
diff --git a/app/javascript/survey/i18n/locale/sq.json b/app/javascript/survey/i18n/locale/sq.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/sq.json
+++ b/app/javascript/survey/i18n/locale/sq.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/sr.json b/app/javascript/survey/i18n/locale/sr.json
index 6ffe37e02..87d58eff4 100644
--- a/app/javascript/survey/i18n/locale/sr.json
+++ b/app/javascript/survey/i18n/locale/sr.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Poštovani korisniče 👋, molim vas izdvojite jedan trenutak da podelite iskustvo o razgovoru koje ste obavili sa %{inboxName}.",
+    "DESCRIPTION": "Poštovani korisniče 👋, molim vas izdvojite jedan trenutak da podelite iskustvo o razgovoru koje ste obavili sa {inboxName}.",
     "RATING": {
       "LABEL": "Ocenite razgovor",
       "SUCCESS_MESSAGE": "Hvala vam na dostavljenoj oceni"
diff --git a/app/javascript/survey/i18n/locale/sv.json b/app/javascript/survey/i18n/locale/sv.json
index 8c5ef92a4..444048a60 100644
--- a/app/javascript/survey/i18n/locale/sv.json
+++ b/app/javascript/survey/i18n/locale/sv.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Ge feedback om den konversation du hade med %{inboxName}.",
+    "DESCRIPTION": "Ge feedback om den konversation du hade med {inboxName}.",
     "RATING": {
       "LABEL": "Betygsätt din konversation",
       "SUCCESS_MESSAGE": "Tack för att du lämnat in omdömet"
diff --git a/app/javascript/survey/i18n/locale/ta.json b/app/javascript/survey/i18n/locale/ta.json
index 54645c854..662e177c4 100644
--- a/app/javascript/survey/i18n/locale/ta.json
+++ b/app/javascript/survey/i18n/locale/ta.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/th.json b/app/javascript/survey/i18n/locale/th.json
index b785d5a4e..55e0c0a58 100644
--- a/app/javascript/survey/i18n/locale/th.json
+++ b/app/javascript/survey/i18n/locale/th.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "โปรดสละเวลา เพื่อแสดงความคิดเห็นกับการสนทนากับ %{inboxName} ครั้งนี้",
+    "DESCRIPTION": "โปรดสละเวลา เพื่อแสดงความคิดเห็นกับการสนทนากับ {inboxName} ครั้งนี้",
     "RATING": {
       "LABEL": "ให้คะแนนการสนทนาครั้งนี้",
       "SUCCESS_MESSAGE": "ขอบคุณที่ร่วมมือให้คะแนนการสนทนากับเรา"
diff --git a/app/javascript/survey/i18n/locale/tl.json b/app/javascript/survey/i18n/locale/tl.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/tl.json
+++ b/app/javascript/survey/i18n/locale/tl.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/tr.json b/app/javascript/survey/i18n/locale/tr.json
index 7b3461b63..9de36bbe5 100644
--- a/app/javascript/survey/i18n/locale/tr.json
+++ b/app/javascript/survey/i18n/locale/tr.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Değerli misafirimiz 👋, %{inboxName} ile yaptığınız görüşmeyi değerlendirmek için lütfen kısa bir süre ayırın.",
+    "DESCRIPTION": "Değerli misafirimiz 👋, {inboxName} ile yaptığınız görüşmeyi değerlendirmek için lütfen kısa bir süre ayırın.",
     "RATING": {
       "LABEL": "Konuşmanızı oylayın",
       "SUCCESS_MESSAGE": "Konuşmanızı oyladığınız için teşekkürler"
diff --git a/app/javascript/survey/i18n/locale/uk.json b/app/javascript/survey/i18n/locale/uk.json
index 99a61bf55..bf4aa0472 100644
--- a/app/javascript/survey/i18n/locale/uk.json
+++ b/app/javascript/survey/i18n/locale/uk.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Шановний клієнт 👋, будь ласка, приділіть кілька хвилин щоб поділитися відгуком про бесіду, що була з %{inboxName}.",
+    "DESCRIPTION": "Шановний клієнт 👋, будь ласка, приділіть кілька хвилин щоб поділитися відгуком про бесіду, що була з {inboxName}.",
     "RATING": {
       "LABEL": "Оцініть вашу бесіду",
       "SUCCESS_MESSAGE": "Дякуємо за оцінку"
diff --git a/app/javascript/survey/i18n/locale/ur.json b/app/javascript/survey/i18n/locale/ur.json
index 152b6c7c1..6ee5cbd58 100644
--- a/app/javascript/survey/i18n/locale/ur.json
+++ b/app/javascript/survey/i18n/locale/ur.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/ur_IN.json b/app/javascript/survey/i18n/locale/ur_IN.json
index 2473f114e..beee65ac5 100644
--- a/app/javascript/survey/i18n/locale/ur_IN.json
+++ b/app/javascript/survey/i18n/locale/ur_IN.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with {inboxName}.",
     "RATING": {
       "LABEL": "Rate your conversation",
       "SUCCESS_MESSAGE": "Thank you for submitting the rating"
diff --git a/app/javascript/survey/i18n/locale/vi.json b/app/javascript/survey/i18n/locale/vi.json
index 7c5be268c..9161d2937 100644
--- a/app/javascript/survey/i18n/locale/vi.json
+++ b/app/javascript/survey/i18n/locale/vi.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Quý khách \u001dk\u001dính \u001dmếm 👋, vui lòng dành một chút thời gian để chia sẻ phản hồi về hội thoại mà bạn đã có với %{inboxName}.",
+    "DESCRIPTION": "Quý khách \u001dk\u001dính \u001dmếm 👋, vui lòng dành một chút thời gian để chia sẻ phản hồi về hội thoại mà bạn đã có với {inboxName}.",
     "RATING": {
       "LABEL": "Đánh giá cuộc trò chuyện",
       "SUCCESS_MESSAGE": "Cảm ơn vì đã đánh giá"
diff --git a/app/javascript/survey/i18n/locale/zh_CN.json b/app/javascript/survey/i18n/locale/zh_CN.json
index dcd6dc920..327aa4654 100644
--- a/app/javascript/survey/i18n/locale/zh_CN.json
+++ b/app/javascript/survey/i18n/locale/zh_CN.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "亲爱的客户 👋, 请花一点时间分享您与 %{inboxName} 的对话反馈。",
+    "DESCRIPTION": "亲爱的客户 👋, 请花一点时间分享您与 {inboxName} 的对话反馈。",
     "RATING": {
       "LABEL": "评价您的对话",
       "SUCCESS_MESSAGE": "感谢您的评分"
diff --git a/app/javascript/survey/i18n/locale/zh_TW.json b/app/javascript/survey/i18n/locale/zh_TW.json
index 6051ace18..29a4ddd22 100644
--- a/app/javascript/survey/i18n/locale/zh_TW.json
+++ b/app/javascript/survey/i18n/locale/zh_TW.json
@@ -1,6 +1,6 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "親愛的客戶👋，請花一些時間分享您與 %{inboxName} 對話的反饋。",
+    "DESCRIPTION": "親愛的客戶👋，請花一些時間分享您與 {inboxName} 對話的反饋。",
     "RATING": {
       "LABEL": "為此對話評分",
       "SUCCESS_MESSAGE": "感謝您提交的評分"
diff --git a/app/javascript/widget/i18n/locale/am.json b/app/javascript/widget/i18n/locale/am.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/am.json
+++ b/app/javascript/widget/i18n/locale/am.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 12535e792..66f271cdd 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "عادة نقوم بالرد خلال يوم واحد",
     "BACK_IN": "سوف نعود إلى الإنترنت"
   },
-  "DAY_NAMES": [
-    "الأحد",
-    "الإثنين",
-    "الثلاثاء",
-    "الأربعاء",
-    "الخميس",
-    "الجمعة",
-    "السبت"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "ابدأ المحادثة",
   "END_CONVERSATION": "إنهاء المحادثة",
   "CONTINUE_CONVERSATION": "متابعة المحادثة",
diff --git a/app/javascript/widget/i18n/locale/az.json b/app/javascript/widget/i18n/locale/az.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/az.json
+++ b/app/javascript/widget/i18n/locale/az.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/bg.json b/app/javascript/widget/i18n/locale/bg.json
index 40697981a..f289bf5eb 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Обикновено отговаряме до един ден",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Започнете разговор",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index db577ebdb..4e464a6eb 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Normalment respon en un dia",
     "BACK_IN": "Tornarem a estar en línia"
   },
-  "DAY_NAMES": [
-    "Diumenge",
-    "Dilluns",
-    "Dimarts",
-    "Dimecres",
-    "Dijous",
-    "Divendres",
-    "Dissabte"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Diumenge",
+    "MONDAY": "Dilluns",
+    "TUESDAY": "Dimarts",
+    "WEDNESDAY": "Dimecres",
+    "THURSDAY": "Dijous",
+    "FRIDAY": "Divendres",
+    "SATURDAY": "Dissabte"
+  },
   "START_CONVERSATION": "Inicia la conversa",
   "END_CONVERSATION": "Finalitzar la conversa",
   "CONTINUE_CONVERSATION": "Continua la conversa",
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 74df23bd0..e33d963f1 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Obvykle odpoví za den",
     "BACK_IN": "Budem online zase"
   },
-  "DAY_NAMES": [
-    "Neděle",
-    "Pondělí",
-    "Úterý",
-    "Středa",
-    "Čtvrtek",
-    "Pátek",
-    "Sobota"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Neděle",
+    "MONDAY": "Pondělí",
+    "TUESDAY": "Úterý",
+    "WEDNESDAY": "Středa",
+    "THURSDAY": "Čtvrtek",
+    "FRIDAY": "Pátek",
+    "SATURDAY": "Sobota"
+  },
   "START_CONVERSATION": "Zahájit konverzaci",
   "END_CONVERSATION": "Ukončit konverzaci",
   "CONTINUE_CONVERSATION": "Pokračovat v konverzaci",
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
index c1b6056d6..0b5cb5722 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Svarer typisk på en dag",
     "BACK_IN": "Vi er tilbage online"
   },
-  "DAY_NAMES": [
-    "Søndag",
-    "Mandag",
-    "Tirsdag",
-    "Onsdag",
-    "Torsdag",
-    "Fredag",
-    "Lørdag"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "søndag",
+    "MONDAY": "mandag",
+    "TUESDAY": "tirsdag",
+    "WEDNESDAY": "onsdag",
+    "THURSDAY": "torsdag",
+    "FRIDAY": "fredag",
+    "SATURDAY": "lørdag"
+  },
   "START_CONVERSATION": "Start Samtale",
   "END_CONVERSATION": "Afslut Samtale",
   "CONTINUE_CONVERSATION": "Fortsæt samtale",
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index d7925662a..7508c1f77 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Wir antworten üblicherweise innerhalb eines Tages",
     "BACK_IN": "Wir werden wieder online sein"
   },
-  "DAY_NAMES": [
-    "Sonntag",
-    "Montag",
-    "Dienstag",
-    "Mittwoch",
-    "Donnerstag",
-    "Freitag",
-    "Samstag"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sonntag",
+    "MONDAY": "Montag",
+    "TUESDAY": "Dienstag",
+    "WEDNESDAY": "Mittwoch",
+    "THURSDAY": "Donnerstag",
+    "FRIDAY": "Freitag",
+    "SATURDAY": "Samstag"
+  },
   "START_CONVERSATION": "Unterhaltung beginnen",
   "END_CONVERSATION": "Konversation beenden",
   "CONTINUE_CONVERSATION": "Konversation fortsetzen",
diff --git a/app/javascript/widget/i18n/locale/el.json b/app/javascript/widget/i18n/locale/el.json
index e9fd814c1..5ca095053 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Τυπικά έχετε απάντηση σε μία ημέρα",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Έναρξη Συνομιλίας",
   "END_CONVERSATION": "Τέλος Συνομιλίας",
   "CONTINUE_CONVERSATION": "Συνέχιση συνομιλίας",
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index 47032f8f1..62837335b 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Normalmente responde en un día",
     "BACK_IN": "Volveremos a estar en línea"
   },
-  "DAY_NAMES": [
-    "Domingo",
-    "Lunes",
-    "Martes",
-    "Miércoles",
-    "Jueves",
-    "Viernes",
-    "Sábado"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Domingo",
+    "MONDAY": "Lunes",
+    "TUESDAY": "Martes",
+    "WEDNESDAY": "Miércoles",
+    "THURSDAY": "Jueves",
+    "FRIDAY": "Viernes",
+    "SATURDAY": "Sábado"
+  },
   "START_CONVERSATION": "Iniciar conversación",
   "END_CONVERSATION": "Finalizar conversación",
   "CONTINUE_CONVERSATION": "Continuar conversación",
diff --git a/app/javascript/widget/i18n/locale/fa.json b/app/javascript/widget/i18n/locale/fa.json
index ec923fa0f..bd1854fc5 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "به طور معمول در یک روز پاسخ می دهند",
     "BACK_IN": "دوباره آنلاین خواهیم شد"
   },
-  "DAY_NAMES": [
-    "یک‌شنبه",
-    "دوشنبه",
-    "سه‌شنبه",
-    "چهارشنبه",
-    "پنج‌شنبه",
-    "جمعه",
-    "شنبه"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "یک‌شنبه",
+    "MONDAY": "دوشنبه",
+    "TUESDAY": "سه‌شنبه",
+    "WEDNESDAY": "چهارشنبه",
+    "THURSDAY": "پنج‌شنبه",
+    "FRIDAY": "جمعه",
+    "SATURDAY": "شنبه"
+  },
   "START_CONVERSATION": "شروع گفتگو",
   "END_CONVERSATION": "پایان گفتگو",
   "CONTINUE_CONVERSATION": "ادامه گفتگو",
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
index 95c664da5..59b827bac 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Vastaa tyypillisesti päivässä",
     "BACK_IN": "Tulemme olemaan takaisin linjoilla"
   },
-  "DAY_NAMES": [
-    "Sunnuntai",
-    "Maanantai",
-    "Tiistai",
-    "Keskiviikko",
-    "Torstai",
-    "Perjantai",
-    "Lauantai"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunnuntai",
+    "MONDAY": "Maanantai",
+    "TUESDAY": "Tiistai",
+    "WEDNESDAY": "Keskiviikko",
+    "THURSDAY": "Torstai",
+    "FRIDAY": "Perjantai",
+    "SATURDAY": "Lauantai"
+  },
   "START_CONVERSATION": "Aloita keskustelu",
   "END_CONVERSATION": "Lopeta keskustelu",
   "CONTINUE_CONVERSATION": "Jatka keskustelua",
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index b1ef601f4..4552a55cc 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Répond généralement dans la journée",
     "BACK_IN": "Nous serons de retour en ligne"
   },
-  "DAY_NAMES": [
-    "Dimanche",
-    "Lundi",
-    "Mardi",
-    "Mercredi",
-    "Jeudi",
-    "Vendredi",
-    "Samedi"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Dimanche",
+    "MONDAY": "Lundi",
+    "TUESDAY": "Mardi",
+    "WEDNESDAY": "Mercredi",
+    "THURSDAY": "Jeudi",
+    "FRIDAY": "Vendredi",
+    "SATURDAY": "Samedi"
+  },
   "START_CONVERSATION": "Démarrer la conversation",
   "END_CONVERSATION": "Clôturer la conversation",
   "CONTINUE_CONVERSATION": "Continuer la conversation",
diff --git a/app/javascript/widget/i18n/locale/he.json b/app/javascript/widget/i18n/locale/he.json
index 1cde15079..8b235cffc 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "מענה ממוצע לאחר יום",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "יום ראשון",
-    "יום שני",
-    "יום שלישי",
-    "יום רביעי",
-    "יום חמישי",
-    "שישי",
-    "יום שבת"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "יום ראשון",
+    "MONDAY": "יום שני",
+    "TUESDAY": "יום שלישי",
+    "WEDNESDAY": "יום רביעי",
+    "THURSDAY": "יום חמישי",
+    "FRIDAY": "שישי",
+    "SATURDAY": "יום שבת"
+  },
   "START_CONVERSATION": "התחל שיחה",
   "END_CONVERSATION": "סיים שיחה",
   "CONTINUE_CONVERSATION": "המשך שיחה",
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/hr.json b/app/javascript/widget/i18n/locale/hr.json
index 32a11c51e..7d468f407 100644
--- a/app/javascript/widget/i18n/locale/hr.json
+++ b/app/javascript/widget/i18n/locale/hr.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Obično odgovara u roku jednog dana",
     "BACK_IN": "Bit ćemo ponovno online"
   },
-  "DAY_NAMES": [
-    "Nedjelja",
-    "Ponedjeljak",
-    "Utorak",
-    "Srijeda",
-    "Četvrtak",
-    "Petak",
-    "Subota"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Nedjelja",
+    "MONDAY": "Ponedjeljak",
+    "TUESDAY": "Utorak",
+    "WEDNESDAY": "Srijeda",
+    "THURSDAY": "Četvrtak",
+    "FRIDAY": "Petak",
+    "SATURDAY": "Subota"
+  },
   "START_CONVERSATION": "Započnite razgovor",
   "END_CONVERSATION": "Završite razgovor",
   "CONTINUE_CONVERSATION": "Nastavite razgovor",
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
index 33c5e61d8..578639c1e 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Általánban egy napon belül válaszol",
     "BACK_IN": "Legközelebb online leszünk ekkor:"
   },
-  "DAY_NAMES": [
-    "vasárnap",
-    "hétfő",
-    "kedd",
-    "szerda",
-    "csütörtök",
-    "péntek",
-    "szombat"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "vasárnap",
+    "MONDAY": "hétfő",
+    "TUESDAY": "kedd",
+    "WEDNESDAY": "szerda",
+    "THURSDAY": "csütörtök",
+    "FRIDAY": "péntek",
+    "SATURDAY": "szombat"
+  },
   "START_CONVERSATION": "Beszélgetés megkezdése",
   "END_CONVERSATION": "Beszélgetés befejezése",
   "CONTINUE_CONVERSATION": "Beszélgetés folytatása",
diff --git a/app/javascript/widget/i18n/locale/hy.json b/app/javascript/widget/i18n/locale/hy.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/hy.json
+++ b/app/javascript/widget/i18n/locale/hy.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/id.json b/app/javascript/widget/i18n/locale/id.json
index 0e9fdd04b..363fff802 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Biasanya membalas dalam sehari",
     "BACK_IN": "Kami akan kembali online"
   },
-  "DAY_NAMES": [
-    "Minggu",
-    "Senin",
-    "Selasa",
-    "Rabu",
-    "Kamis",
-    "Jumat",
-    "Sabtu"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Minggu",
+    "MONDAY": "Senin",
+    "TUESDAY": "Selasa",
+    "WEDNESDAY": "Rabu",
+    "THURSDAY": "Kamis",
+    "FRIDAY": "Jumat",
+    "SATURDAY": "Sabtu"
+  },
   "START_CONVERSATION": "Mulai Percakapan",
   "END_CONVERSATION": "Akhiri Percakapan",
   "CONTINUE_CONVERSATION": "Lanjutkan Percakapan",
diff --git a/app/javascript/widget/i18n/locale/is.json b/app/javascript/widget/i18n/locale/is.json
index fd0fb68fc..f2d295418 100644
--- a/app/javascript/widget/i18n/locale/is.json
+++ b/app/javascript/widget/i18n/locale/is.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Svarar iðulega samdægurs",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Hefja samtal",
   "END_CONVERSATION": "Ljúka samtali",
   "CONTINUE_CONVERSATION": "Halda samtali áfram",
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index c7755be9d..0e58af2de 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "In genere risponde in un giorno",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Avvia conversazione",
   "END_CONVERSATION": "Termina conversazione",
   "CONTINUE_CONVERSATION": "Continua conversazione",
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
index 913b34116..fa97a8d63 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "通常数日以内にご返信します。",
     "BACK_IN": "オンラインに戻ります"
   },
-  "DAY_NAMES": [
-    "日曜日",
-    "月曜日",
-    "火曜日",
-    "水曜日",
-    "木曜日",
-    "金曜日",
-    "土曜日"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "日",
+    "MONDAY": "月",
+    "TUESDAY": "火",
+    "WEDNESDAY": "水",
+    "THURSDAY": "木",
+    "FRIDAY": "金",
+    "SATURDAY": "土"
+  },
   "START_CONVERSATION": "チャットを開始する",
   "END_CONVERSATION": "会話を終了",
   "CONTINUE_CONVERSATION": "会話を続行",
diff --git a/app/javascript/widget/i18n/locale/ka.json b/app/javascript/widget/i18n/locale/ka.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/ka.json
+++ b/app/javascript/widget/i18n/locale/ka.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index bde1e9400..f1c189070 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "보통 하루 안에 응답",
     "BACK_IN": "곧 돌아오겠습니다."
   },
-  "DAY_NAMES": [
-    "일요일",
-    "월요일",
-    "화요일",
-    "수요일",
-    "목요일",
-    "금요일",
-    "토요일"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "일요일",
+    "MONDAY": "월요일",
+    "TUESDAY": "화요일",
+    "WEDNESDAY": "수요일",
+    "THURSDAY": "목요일",
+    "FRIDAY": "금요일",
+    "SATURDAY": "토요일"
+  },
   "START_CONVERSATION": "대화 시작",
   "END_CONVERSATION": "대화 끝내기",
   "CONTINUE_CONVERSATION": "대화 계속하기",
diff --git a/app/javascript/widget/i18n/locale/lt.json b/app/javascript/widget/i18n/locale/lt.json
index 83c1a36fd..98b89da99 100644
--- a/app/javascript/widget/i18n/locale/lt.json
+++ b/app/javascript/widget/i18n/locale/lt.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Paprastai atsako per dieną",
     "BACK_IN": "Mes grįšime"
   },
-  "DAY_NAMES": [
-    "Sekmadienis",
-    "Pirmadienis",
-    "Antradienis",
-    "Trečiadienis",
-    "Ketvirtadienis",
-    "Penktadienis",
-    "Šeštadienis"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sekmadienis",
+    "MONDAY": "Pirmadienis",
+    "TUESDAY": "Antradienis",
+    "WEDNESDAY": "Trečiadienis",
+    "THURSDAY": "Ketvirtadienis",
+    "FRIDAY": "Penktadienis",
+    "SATURDAY": "Šeštadienis"
+  },
   "START_CONVERSATION": "Pradėti Pokalbį",
   "END_CONVERSATION": "Užbaigti Pokalbį",
   "CONTINUE_CONVERSATION": "Tęsti pokalbį",
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
index 1ab9f51c4..19ca42914 100644
--- a/app/javascript/widget/i18n/locale/lv.json
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Parasti atbild vienas dienas laikā",
     "BACK_IN": "Mēs atgriezīsimies tiešsaistē"
   },
-  "DAY_NAMES": [
-    "Svētdiena",
-    "Pirmdiena",
-    "Otrdiena",
-    "Trešdiena",
-    "Ceturtdiena",
-    "Piektdiena",
-    "Sestdiena"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Svētdiena",
+    "MONDAY": "Pirmdiena",
+    "TUESDAY": "Otrdiena",
+    "WEDNESDAY": "Trešdiena",
+    "THURSDAY": "Ceturtdiena",
+    "FRIDAY": "Piektdiena",
+    "SATURDAY": "Sestdiena"
+  },
   "START_CONVERSATION": "Sākt Sarunu",
   "END_CONVERSATION": "Beigt Sarunu",
   "CONTINUE_CONVERSATION": "Turpināt Sarunu",
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index f838f63a1..c1071b35a 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "സാധാരണയായി ഒരു ദിവസത്തിൽ മറുപടി നൽകുന്നു",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "സംഭാഷണം ആരംഭിക്കുക",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ms.json b/app/javascript/widget/i18n/locale/ms.json
index 4d4e1dc00..78747073d 100644
--- a/app/javascript/widget/i18n/locale/ms.json
+++ b/app/javascript/widget/i18n/locale/ms.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index c51014099..a6041a758 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "धेरै जसो एक दिनमा जवाफ हुन्छ",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "कुराकानी सुरु गर्नुहोस्",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index 98b7a9aee..48f62678d 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Reageert meestal binnen een dag",
     "BACK_IN": "We zullen weer online zijn"
   },
-  "DAY_NAMES": [
-    "zondag",
-    "maandag",
-    "dinsdag",
-    "woensdag",
-    "donderdag",
-    "vrijdag",
-    "zaterdag"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "zondag",
+    "MONDAY": "maandag",
+    "TUESDAY": "dinsdag",
+    "WEDNESDAY": "woensdag",
+    "THURSDAY": "donderdag",
+    "FRIDAY": "vrijdag",
+    "SATURDAY": "zaterdag"
+  },
   "START_CONVERSATION": "Start Chat",
   "END_CONVERSATION": "Gesprek beëindigen",
   "CONTINUE_CONVERSATION": "Verdergaan met gesprek",
diff --git a/app/javascript/widget/i18n/locale/no.json b/app/javascript/widget/i18n/locale/no.json
index 8eb0c101f..f9d46a712 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Svarer vanligvis innen en dag",
     "BACK_IN": "Vi vil være tilbake online"
   },
-  "DAY_NAMES": [
-    "Søndag",
-    "Mandag",
-    "Tirsdag",
-    "Onsdag",
-    "Torsdag",
-    "Fredag",
-    "Lørdag"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Søndag",
+    "MONDAY": "Mandag",
+    "TUESDAY": "Tirsdag",
+    "WEDNESDAY": "Onsdag",
+    "THURSDAY": "Torsdag",
+    "FRIDAY": "Fredag",
+    "SATURDAY": "Lørdag"
+  },
   "START_CONVERSATION": "Start samtale",
   "END_CONVERSATION": "Avslutt samtale",
   "CONTINUE_CONVERSATION": "Fortsett samtalen",
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 476462d08..704eb0567 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia",
     "BACK_IN": "Będziemy dostępni ponownie"
   },
-  "DAY_NAMES": [
-    "Niedziela",
-    "Poniedziałek",
-    "Wtorek",
-    "Środa",
-    "Czwartek",
-    "Piątek",
-    "Sobota"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Niedziela",
+    "MONDAY": "Poniedziałek",
+    "TUESDAY": "Wtorek",
+    "WEDNESDAY": "Środa",
+    "THURSDAY": "Czwartek",
+    "FRIDAY": "Piątek",
+    "SATURDAY": "Sobota"
+  },
   "START_CONVERSATION": "Rozpocznij rozmowę",
   "END_CONVERSATION": "Zakończ rozmowę",
   "CONTINUE_CONVERSATION": "Kontynuuj rozmowę",
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index 9569932eb..fd320fbf9 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Normalmente respondemos num dia",
     "BACK_IN": "Voltaremos online"
   },
-  "DAY_NAMES": [
-    "Domingo",
-    "Segunda-feira",
-    "Terça-feira",
-    "Quarta-feira",
-    "Quinta-feira",
-    "Sexta-feira",
-    "Sábado"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Domingo",
+    "MONDAY": "Segunda-feira",
+    "TUESDAY": "Terça-feira",
+    "WEDNESDAY": "Quarta-feira",
+    "THURSDAY": "Quinta-feira",
+    "FRIDAY": "Sexta-feira",
+    "SATURDAY": "Sábado"
+  },
   "START_CONVERSATION": "Iniciar Conversa",
   "END_CONVERSATION": "Terminar Conversa",
   "CONTINUE_CONVERSATION": "Continuar conversa",
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 2792f75f9..c3dde21aa 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -18,19 +18,19 @@
   },
   "REPLY_TIME": {
     "IN_A_FEW_MINUTES": "Normalmente responde em alguns minutos",
-    "IN_A_FEW_HOURS": "Responde normalmente em algumas horas",
-    "IN_A_DAY": "Responde normalmente em um dia",
+    "IN_A_FEW_HOURS": "Normalmente responde em algumas horas",
+    "IN_A_DAY": "Normalmente responde em um dia",
     "BACK_IN": "Estaremos de volta on-line"
   },
-  "DAY_NAMES": [
-    "Domingo",
-    "Segunda-Feira",
-    "Terça-feira",
-    "Quarta-feira",
-    "Quinta-feira",
-    "Sexta-feira",
-    "Sábado"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Domingo",
+    "MONDAY": "Segunda-Feira",
+    "TUESDAY": "Terça-feira",
+    "WEDNESDAY": "Quarta-feira",
+    "THURSDAY": "Quinta-feira",
+    "FRIDAY": "Sexta-feira",
+    "SATURDAY": "Sábado"
+  },
   "START_CONVERSATION": "Iniciar Conversa",
   "END_CONVERSATION": "Finalizar Conversa",
   "CONTINUE_CONVERSATION": "Continuar conversa",
@@ -74,7 +74,7 @@
         "DROPDOWN_SEARCH": "Selecione o país"
       },
       "MESSAGE": {
-        "LABEL": "Messagem",
+        "LABEL": "Mensagem",
         "PLACEHOLDER": "Por favor, digite sua mensagem",
         "ERROR": "Mensagem muito curta"
       }
diff --git a/app/javascript/widget/i18n/locale/ro.json b/app/javascript/widget/i18n/locale/ro.json
index 9b6a49da8..35150d67a 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "De obicei, răspunsurile într-o zi",
     "BACK_IN": "Vom reveni online"
   },
-  "DAY_NAMES": [
-    "Duminică",
-    "Luni",
-    "Marți",
-    "Miercuri",
-    "Joi",
-    "Vineri",
-    "Sâmbătă"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Duminică",
+    "MONDAY": "Luni",
+    "TUESDAY": "Marți",
+    "WEDNESDAY": "Miercuri",
+    "THURSDAY": "Joi",
+    "FRIDAY": "Vineri",
+    "SATURDAY": "Sâmbătă"
+  },
   "START_CONVERSATION": "Începe conversația",
   "END_CONVERSATION": "Terminați conversația",
   "CONTINUE_CONVERSATION": "Continuați conversația",
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index dda129d43..de468106d 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Обычно отвечаем в течение дня",
     "BACK_IN": "Мы будем онлайн"
   },
-  "DAY_NAMES": [
-    "Воскресенье",
-    "Понедельник",
-    "Вторник",
-    "Среда",
-    "Четверг",
-    "Пятница",
-    "Суббота"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Воскресенье",
+    "MONDAY": "Понедельник",
+    "TUESDAY": "Вторник",
+    "WEDNESDAY": "Среда",
+    "THURSDAY": "Четверг",
+    "FRIDAY": "Пятница",
+    "SATURDAY": "Суббота"
+  },
   "START_CONVERSATION": "Начать диалог",
   "END_CONVERSATION": "Завершить диалог",
   "CONTINUE_CONVERSATION": "Продолжить беседу",
diff --git a/app/javascript/widget/i18n/locale/sh.json b/app/javascript/widget/i18n/locale/sh.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/sh.json
+++ b/app/javascript/widget/i18n/locale/sh.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
index aaccb08bd..e61b9a498 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Zvyčajne odpovedá do dňa",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Nedeľa",
-    "Pondelok",
-    "Tuesday",
-    "Streda",
-    "Thursday",
-    "Piatok",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Nedeľa",
+    "MONDAY": "Pondelok",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Streda",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Piatok",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Začať konverzáciu",
   "END_CONVERSATION": "Ukončiť konverzáciu",
   "CONTINUE_CONVERSATION": "Pokračovať v konverzácii",
diff --git a/app/javascript/widget/i18n/locale/sl.json b/app/javascript/widget/i18n/locale/sl.json
index 41da8bdd0..365132414 100644
--- a/app/javascript/widget/i18n/locale/sl.json
+++ b/app/javascript/widget/i18n/locale/sl.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Običajno odgovorimo v enem dnevu",
     "BACK_IN": "Kmalu se vrnemo"
   },
-  "DAY_NAMES": [
-    "Nedelja",
-    "Ponedeljek",
-    "Torek",
-    "Sreda",
-    "Četrtek",
-    "Petek",
-    "Sobota"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Nedelja",
+    "MONDAY": "Ponedeljek",
+    "TUESDAY": "Torek",
+    "WEDNESDAY": "Sreda",
+    "THURSDAY": "Četrtek",
+    "FRIDAY": "Petek",
+    "SATURDAY": "Sobota"
+  },
   "START_CONVERSATION": "Začni pogovor",
   "END_CONVERSATION": "Končaj pogovor",
   "CONTINUE_CONVERSATION": "Nadaljuj pogovor",
diff --git a/app/javascript/widget/i18n/locale/sq.json b/app/javascript/widget/i18n/locale/sq.json
index b1966b82d..994317343 100644
--- a/app/javascript/widget/i18n/locale/sq.json
+++ b/app/javascript/widget/i18n/locale/sq.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Zakonisht përgjigjemi brenda një dite",
     "BACK_IN": "Ne do të kthehemi serish online"
   },
-  "DAY_NAMES": [
-    "E diele",
-    "E Hënë",
-    "E Martë",
-    "E Mërkurë",
-    "E Enjte",
-    "E Premte",
-    "E Shtunë"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "E diele",
+    "MONDAY": "E Hënë",
+    "TUESDAY": "E Martë",
+    "WEDNESDAY": "E Mërkurë",
+    "THURSDAY": "E Enjte",
+    "FRIDAY": "E Premte",
+    "SATURDAY": "E Shtunë"
+  },
   "START_CONVERSATION": "Hap Bisedën",
   "END_CONVERSATION": "Mbyll bisedën",
   "CONTINUE_CONVERSATION": "Vazhdo bisedën",
diff --git a/app/javascript/widget/i18n/locale/sr.json b/app/javascript/widget/i18n/locale/sr.json
index 20ac2b2f0..8ac036a95 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Obično odgovaramo u roku od jednog dana",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Započnite razgovor",
   "END_CONVERSATION": "Završi razgovor",
   "CONTINUE_CONVERSATION": "Nastavi razgovor",
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index a4882685e..91e6c682f 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Svar vanligtvis inom en dag",
     "BACK_IN": "Vi kommer tillbaka online"
   },
-  "DAY_NAMES": [
-    "Söndag",
-    "Måndag",
-    "Tisdag",
-    "Onsdag",
-    "Torsdag",
-    "Fredag",
-    "Lördag"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Söndag",
+    "MONDAY": "Måndag",
+    "TUESDAY": "Tisdag",
+    "WEDNESDAY": "Onsdag",
+    "THURSDAY": "Torsdag",
+    "FRIDAY": "Fredag",
+    "SATURDAY": "Lördag"
+  },
   "START_CONVERSATION": "Starta konversation",
   "END_CONVERSATION": "Avsluta konversation",
   "CONTINUE_CONVERSATION": "Fortsätt konversation",
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
index 974fa8aeb..5cb9152f9 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/th.json b/app/javascript/widget/i18n/locale/th.json
index 13ea666dd..f562571fe 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "ปกติจะตอบกลับภายใน 1 วัน",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "เริ่มการสนทนา",
   "END_CONVERSATION": "จบการสนทนา",
   "CONTINUE_CONVERSATION": "สนทนาต่อ",
diff --git a/app/javascript/widget/i18n/locale/tl.json b/app/javascript/widget/i18n/locale/tl.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/tl.json
+++ b/app/javascript/widget/i18n/locale/tl.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index e73e4fc7b..be37c488b 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Genellikle bir gün içinde yanıtlar",
     "BACK_IN": "Tekrar çevrim içi olacağız"
   },
-  "DAY_NAMES": [
-    "Pazar",
-    "Pazartesi",
-    "Salı",
-    "Çarşamba",
-    "Perşembe",
-    "Cuma",
-    "Cumartesi"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Pazar",
+    "MONDAY": "Pazartesi",
+    "TUESDAY": "Salı",
+    "WEDNESDAY": "Çarşamba",
+    "THURSDAY": "Perşembe",
+    "FRIDAY": "Cuma",
+    "SATURDAY": "Cumartesi"
+  },
   "START_CONVERSATION": "Görüşmeyi Başlatın",
   "END_CONVERSATION": "Görüşmeyi Sonlandır",
   "CONTINUE_CONVERSATION": "Görüşmeye devam et",
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index cf4f08b07..679761f6a 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Зазвичай, відповідаємо протягом доби",
     "BACK_IN": "Ми повернемось в мережу"
   },
-  "DAY_NAMES": [
-    "Неділя",
-    "Понеділок",
-    "Вівторок",
-    "Середа",
-    "Четвер",
-    "П'ятниця",
-    "Субота"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Неділя",
+    "MONDAY": "Понеділок",
+    "TUESDAY": "Вівторок",
+    "WEDNESDAY": "Середа",
+    "THURSDAY": "Четвер",
+    "FRIDAY": "П'ятниця",
+    "SATURDAY": "Субота"
+  },
   "START_CONVERSATION": "Розпочати розмову",
   "END_CONVERSATION": "Закінчити спілкування",
   "CONTINUE_CONVERSATION": "Продовжити спілкування",
diff --git a/app/javascript/widget/i18n/locale/ur.json b/app/javascript/widget/i18n/locale/ur.json
index f377605b7..8e3c7687c 100644
--- a/app/javascript/widget/i18n/locale/ur.json
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/ur_IN.json b/app/javascript/widget/i18n/locale/ur_IN.json
index 33399e09b..279ead47e 100644
--- a/app/javascript/widget/i18n/locale/ur_IN.json
+++ b/app/javascript/widget/i18n/locale/ur_IN.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Typically replies in a day",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Sunday",
+    "MONDAY": "Monday",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "Start Conversation",
   "END_CONVERSATION": "End Conversation",
   "CONTINUE_CONVERSATION": "Continue conversation",
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index c996ae852..952a16f1f 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "Thường trả lời trong một ngày",
     "BACK_IN": "Chúng tôi sẽ quay lại"
   },
-  "DAY_NAMES": [
-    "Chủ Nhật",
-    "Thứ Hai",
-    "Thứ Ba",
-    "Thứ Tư",
-    "Thứ Năm",
-    "Thứ Sáu",
-    "Thứ Bảy"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "Chủ Nhật",
+    "MONDAY": "Thứ Hai",
+    "TUESDAY": "Thứ Ba",
+    "WEDNESDAY": "Thứ Tư",
+    "THURSDAY": "Thứ Năm",
+    "FRIDAY": "Thứ Sáu",
+    "SATURDAY": "Thứ Bảy"
+  },
   "START_CONVERSATION": "Bắt đầu một cuộc trò chuyện",
   "END_CONVERSATION": "Kết thúc hội thoại",
   "CONTINUE_CONVERSATION": "Tiếp tục hội thoại",
diff --git a/app/javascript/widget/i18n/locale/zh_CN.json b/app/javascript/widget/i18n/locale/zh_CN.json
index 825680b5c..504659251 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "通常在一天之内回复您",
     "BACK_IN": "我们回到了线上"
   },
-  "DAY_NAMES": [
-    "周日",
-    "周一",
-    "周二",
-    "周三",
-    "周四",
-    "周五",
-    "周六"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "周日",
+    "MONDAY": "周一",
+    "TUESDAY": "周二",
+    "WEDNESDAY": "周三",
+    "THURSDAY": "周四",
+    "FRIDAY": "周五",
+    "SATURDAY": "周六"
+  },
   "START_CONVERSATION": "开始会话",
   "END_CONVERSATION": "结束对话",
   "CONTINUE_CONVERSATION": "继续对话",
diff --git a/app/javascript/widget/i18n/locale/zh_TW.json b/app/javascript/widget/i18n/locale/zh_TW.json
index f25a31748..85f08a135 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -22,15 +22,15 @@
     "IN_A_DAY": "通常在一天內回覆",
     "BACK_IN": "We will be back online"
   },
-  "DAY_NAMES": [
-    "星期日",
-    "星期一",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday"
-  ],
+  "DAY_NAMES": {
+    "SUNDAY": "星期日",
+    "MONDAY": "星期一",
+    "TUESDAY": "Tuesday",
+    "WEDNESDAY": "Wednesday",
+    "THURSDAY": "Thursday",
+    "FRIDAY": "Friday",
+    "SATURDAY": "Saturday"
+  },
   "START_CONVERSATION": "開始對話",
   "END_CONVERSATION": "結束對話",
   "CONTINUE_CONVERSATION": "繼續對話",
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 166524f28..51cc4bbcd 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -66,7 +66,7 @@ es:
       number_of_records: Límite alcanzado. El número máximo de filtros personalizados permitidos para un usuario por cuenta es de 50.
       invalid_attribute: Clave de atributo no válida - [%{key}]. La clave debe ser una de [%{allowed_keys}] o un atributo personalizado definido en la cuenta.
       invalid_operator: Operador no válido. Los operadores permitidos para %{attribute_name} son [%{allowed_keys}].
-      invalid_query_operator: El operador de consulta debe ser "AND" o "OR".
+      invalid_query_operator: El operador de consulta debe ser "Y" o "O".
       invalid_value: Valor no válido. Los valores proporcionados para %{attribute_name} no son válidos
   reports:
     period: Reportando el periodo desde %{since} hasta %{until}
@@ -165,7 +165,7 @@ es:
         removed: '%{user_name} eliminó la política de SLA %{sla_name}'
       muted: '%{user_name} ha silenciado la conversación'
       unmuted: '%{user_name} ha anulado el silenciado de la conversación'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: 'Resolviendo la conversación, ya que ha estado inactiva durante un tiempo. Por favor, inicia una nueva conversación si necesitas más ayuda.'
     templates:
       greeting_message_body: '%{account_name} normalmente responde en unas pocas horas.'
       ways_to_reach_you_message_body: 'Dale al equipo una forma de llegar a ti.'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 37ce00de8..2ebf3b232 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -165,7 +165,7 @@ ja:
         removed: '%{user_name} がSLAポリシー "%{sla_name}" を削除しました'
       muted: '%{user_name} が会話をミュートしました'
       unmuted: '%{user_name} が会話のミュートを解除しました'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: '会話がしばらく非アクティブのため、解決済みとして処理します。引き続きサポートが必要な場合は、新しい会話を開始してください。'
     templates:
       greeting_message_body: '%{account_name} は通常数時間以内に返信します。'
       ways_to_reach_you_message_body: 'ご連絡先をご入力ください。'
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 084956d42..68b8816d4 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -165,7 +165,7 @@ lv:
         removed: '%{user_name} noņēma SLA politiku %{sla_name}'
       muted: '%{user_name} izslēdza sarunu'
       unmuted: '%{user_name} ieslēdza sarunu'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: 'Saruna tiek pabeigta, jo tā kādu laiku ir bijusi neaktīva. Ja nepieciešama papildu palīdzība, lūdzu, sāciet jaunu sarunu.'
     templates:
       greeting_message_body: '%{account_name} parasti atbild dažu stundu laikā.'
       ways_to_reach_you_message_body: 'Dodiet komandai iespēju ar jums sazināties.'
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index dcd4dc05a..6e471537f 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -85,12 +85,12 @@ pt_BR:
       avg_first_response_time: Tempo médio de primeira resposta
       avg_resolution_time: Tempo médio de resolução
     label_csv:
-      label_title: Nome do campo
+      label_title: Etiqueta
       conversations_count: Nº de Conversas
       avg_first_response_time: Tempo médio de primeira resposta
       avg_resolution_time: Tempo médio de resolução
     team_csv:
-      team_name: Nome do departamento
+      team_name: Nome da equipe
       conversations_count: Contagem de conversas
       avg_first_response_time: Tempo médio de primeira resposta
       avg_resolution_time: Tempo médio de resolução
@@ -102,10 +102,10 @@ pt_BR:
       conversation_id: ID da conversa
       sla_policy_breached: Política SLA
       assignee: Responsável
-      team: Times
+      team: Equipe
       inbox: Caixa de Entrada
-      labels: Marcadores
-      conversation_link: Link para a conversa
+      labels: Etiquetas
+      conversation_link: Link para a Conversa
       breached_events: Eventos Violados
     default_group_by: dia
     csat:
@@ -124,9 +124,9 @@ pt_BR:
       conversation_assignment: 'Uma conversa (#%{display_id}) foi atribuída a você'
       assigned_conversation_new_message: 'Uma nova mensagem foi criada na conversa (#%{display_id})'
       conversation_mention: 'Você foi mencionado em uma conversa (#%{display_id})'
-      sla_missed_first_response: 'Primeira resposta da meta de SLA perdida para conversa (#%{display_id})'
-      sla_missed_next_response: ''
-      sla_missed_resolution: 'Resolução de meta de SLA perdida para conversa (#%{display_id})'
+      sla_missed_first_response: 'Meta de SLA de Primeira Resposta não alcançada para a conversa (#%{display_id})'
+      sla_missed_next_response: 'Meta de SLA de Próxima Resposta não alcançada para a conversa (#%{display_id})'
+      sla_missed_resolution: 'Meta de SLA de Resolução não alcançada para a conversa (#%{display_id})'
     attachment: 'Anexo'
     no_content: 'Sem conteúdo'
   conversations:
@@ -142,7 +142,7 @@ pt_BR:
         contact_resolved: 'A conversa foi resolvida por %{contact_name}'
         open: 'Conversa foi reaberta por %{user_name}'
         pending: 'Conversa foi marcada como pendente por %{user_name}'
-        snoozed: 'Conversa não atribuída por %{user_name}'
+        snoozed: 'Conversa foi adiada por %{user_name}'
         auto_resolved: 'Conversa foi marcada como resolvida pelo sistema por ter %{duration} dias de inatividade'
         system_auto_open: O sistema reabriu a conversa devido a uma nova mensagem recebida.
       priority:
@@ -152,7 +152,7 @@ pt_BR:
       assignee:
         self_assigned: '%{user_name} atribuiu a si mesmo essa conversa'
         assigned: 'Atribuído a %{assignee_name} por %{user_name}'
-        removed: 'Conversa não atribuída por %{user_name}'
+        removed: 'Conversa desatribuída por %{user_name}'
       team:
         assigned: 'Atribuído a %{team_name} por %{user_name}'
         assigned_with_assignee: 'Atribuído a %{assignee_name} via %{team_name} por %{user_name}'
@@ -165,7 +165,7 @@ pt_BR:
         removed: '%{user_name} removeu a política de SLA %{sla_name}'
       muted: '%{user_name} silenciou a conversa'
       unmuted: '%{user_name} reativou a conversa'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: 'Resolvendo a conversa dado que está inativa por um tempo. Por favor, inicie uma nova conversa se precisar de mais ajuda.'
     templates:
       greeting_message_body: '%{account_name} normalmente responde em algumas horas.'
       ways_to_reach_you_message_body: 'Informe uma forma para entrarmos em contato com você.'
@@ -180,7 +180,7 @@ pt_BR:
           professional_name: '%{business_name} <%{from_email}>'
       channel_email:
         header:
-          reply_with_name: '%{assignee_name} de %{inbox_name} <reply+%{from_email}>'
+          reply_with_name: '%{assignee_name} de %{inbox_name} <%{from_email}>'
           reply_with_inbox_name: '%{inbox_name} <%{from_email}>'
       email_subject: 'Novas mensagens nesta conversa'
       transcript_subject: 'Transcrição da conversa'
@@ -204,7 +204,7 @@ pt_BR:
       name: 'Webhooks'
       description: 'Eventos webhook fornecem atualizações sobre atividades em tempo real na sua conta Chatwoot. Você pode se inscrever em seus eventos preferidos, e o Chatwoot enviará as chamadas HTTP com as atualizações.'
     dialogflow:
-      name: 'Fluxo de diálogo'
+      name: 'Dialogflow'
       description: 'Construa chatbots com o Dialogflow e integre-os facilmente na sua caixa de entrada. Esses bots podem lidar com as consultas iniciais antes de transferi-las para um agente de atendimento ao cliente.'
     google_translate:
       name: 'Tradutor do Google'

From 80c87da8c99bcc2113787e5f6c25be0e79c3db0c Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Thu, 27 Feb 2025 16:11:04 -0800
Subject: [PATCH 09/27] feat: Add new APIs for live reports with team filter
 (#10994)

This PR is part of the larger #10849 implementation and introduces a new
Live Reports API to provide real-time conversation metrics.

The /live_reports/conversation_metrics endpoint returns account-level or
team-level conversation statistics, including open, pending, unattended,
and unassigned conversation counts.

The /live_reports/grouped_conversation_metrics endpoint accepts a group
parameter, either team_id or assignee_id, and returns open and
unattended conversation counts based on the specified grouping.
---
 .../v2/accounts/live_reports_controller.rb    |  64 +++++++
 config/routes.rb                              |   6 +
 .../accounts/live_reports_controller_spec.rb  | 171 ++++++++++++++++++
 spec/factories/teams.rb                       |   2 +-
 4 files changed, 242 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/api/v2/accounts/live_reports_controller.rb
 create mode 100644 spec/controllers/api/v2/accounts/live_reports_controller_spec.rb

diff --git a/app/controllers/api/v2/accounts/live_reports_controller.rb b/app/controllers/api/v2/accounts/live_reports_controller.rb
new file mode 100644
index 000000000..1c703764b
--- /dev/null
+++ b/app/controllers/api/v2/accounts/live_reports_controller.rb
@@ -0,0 +1,64 @@
+class Api::V2::Accounts::LiveReportsController < Api::V1::Accounts::BaseController
+  before_action :load_conversations, only: [:conversation_metrics, :grouped_conversation_metrics]
+  before_action :set_group_scope, only: [:grouped_conversation_metrics]
+
+  before_action :check_authorization
+
+  def conversation_metrics
+    render json: {
+      open: @conversations.open.count,
+      unattended: @conversations.open.unattended.count,
+      unassigned: @conversations.open.unassigned.count,
+      pending: @conversations.pending.count
+    }
+  end
+
+  def grouped_conversation_metrics
+    count_by_group = @conversations.open.group(@group_scope).count
+    unattended_by_group = @conversations.open.unattended.group(@group_scope).count
+    unassigned_by_group = @conversations.open.unassigned.group(@group_scope).count
+
+    group_metrics = count_by_group.map do |group_id, count|
+      metric = {
+        open: count,
+        unattended: unattended_by_group[group_id] || 0,
+        unassigned: unassigned_by_group[group_id] || 0
+      }
+      metric[@group_scope] = group_id
+      metric
+    end
+
+    render json: group_metrics
+  end
+
+  private
+
+  def check_authorization
+    authorize :report, :view?
+  end
+
+  def set_group_scope
+    render json: { error: 'invalid group_by' }, status: :unprocessable_entity and return unless %w[
+      team_id
+      assignee_id
+    ].include?(permitted_params[:group_by])
+
+    @group_scope = permitted_params[:group_by]
+  end
+
+  def team
+    return unless permitted_params[:team_id]
+
+    @team ||= Current.account.teams.find(permitted_params[:team_id])
+  end
+
+  def load_conversations
+    scope = Current.account.conversations
+    scope = scope.where(team_id: team.id) if team.present?
+    @conversations = scope
+  end
+
+  def permitted_params
+    params.permit(:team_id, :group_by)
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 5340ec9cd..3e2616a46 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -337,6 +337,12 @@ Rails.application.routes.draw do
               get :bot_metrics
             end
           end
+          resources :live_reports, only: [] do
+            collection do
+              get :conversation_metrics
+              get :grouped_conversation_metrics
+            end
+          end
         end
       end
     end
diff --git a/spec/controllers/api/v2/accounts/live_reports_controller_spec.rb b/spec/controllers/api/v2/accounts/live_reports_controller_spec.rb
new file mode 100644
index 000000000..4e070ac5b
--- /dev/null
+++ b/spec/controllers/api/v2/accounts/live_reports_controller_spec.rb
@@ -0,0 +1,171 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V2::Accounts::LiveReports', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let!(:team) { create(:team, account: account) }
+  let(:team_member) { create(:team_member, team: team, user: admin) }
+
+  describe 'GET /api/v2/accounts/{account.id}/live_reports/conversation_metrics' do
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/live_reports/conversation_metrics"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated but not authorized' do
+      it 'returns forbidden' do
+        get "/api/v2/accounts/#{account.id}/live_reports/conversation_metrics",
+            headers: agent.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated and authorized' do
+      before do
+        create(:conversation, :with_assignee, account: account, status: :open)
+        create(:conversation, account: account, status: :open)
+        create(:conversation, :with_assignee, account: account, status: :pending)
+        create(:conversation, :with_assignee, account: account, status: :open) do |conversation|
+          create(:message, account: account, conversation: conversation, message_type: :outgoing)
+        end
+      end
+
+      it 'returns conversation metrics' do
+        get "/api/v2/accounts/#{account.id}/live_reports/conversation_metrics",
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        response_data = response.parsed_body
+        expect(response_data['open']).to eq(3)
+        expect(response_data['unattended']).to eq(2)
+        expect(response_data['unassigned']).to eq(1)
+        expect(response_data['pending']).to eq(1)
+      end
+
+      context 'with team_id parameter' do
+        before do
+          create(:conversation, account: account, status: :open, team_id: team.id)
+          create(:conversation, account: account, status: :open)
+        end
+
+        it 'returns metrics filtered by team' do
+          get "/api/v2/accounts/#{account.id}/live_reports/conversation_metrics",
+              params: { team_id: team.id },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:success)
+
+          response_data = response.parsed_body
+          expect(response_data['open']).to eq(1)
+          expect(response_data['unattended']).to eq(1)
+          expect(response_data['unassigned']).to eq(1)
+          expect(response_data['pending']).to eq(0)
+        end
+      end
+    end
+  end
+
+  describe 'GET /api/v2/accounts/{account.id}/live_reports/grouped_conversation_metrics' do
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        get "/api/v2/accounts/#{account.id}/live_reports/grouped_conversation_metrics",
+            params: { group_by: 'team_id' }
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated but not authorized' do
+      it 'returns forbidden' do
+        get "/api/v2/accounts/#{account.id}/live_reports/grouped_conversation_metrics",
+            params: { group_by: 'team_id' },
+            headers: agent.create_new_auth_token,
+            as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'with invalid group_by parameter' do
+      it 'returns unprocessable_entity error' do
+        get "/api/v2/accounts/#{account.id}/live_reports/grouped_conversation_metrics",
+            params: { group_by: 'invalid_param' },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.parsed_body['error']).to eq('invalid group_by')
+      end
+    end
+
+    context 'when grouped by team_id' do
+      let(:assignee1) { create(:user, account: account) }
+
+      before do
+        create(:conversation, account: account, status: :open, team_id: team.id)
+        create(:conversation, account: account, status: :open, team_id: team.id)
+        create(:conversation, account: account, status: :open, team_id: team.id) do |conversation|
+          create(:message, account: account, conversation: conversation, message_type: :outgoing)
+        end
+
+        create(:conversation, account: account, status: :open, assignee_id: assignee1.id)
+        create(:conversation, account: account, status: :open) do |conversation|
+          create(:message, account: account, conversation: conversation, message_type: :outgoing)
+        end
+      end
+
+      it 'returns metrics grouped by team' do
+        get "/api/v2/accounts/#{account.id}/live_reports/grouped_conversation_metrics",
+            params: { group_by: 'team_id' },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        response_data = response.parsed_body
+        expect(response_data.size).to eq(2)
+        expect(response_data).to include(
+          { 'team_id' => nil, 'open' => 2, 'unattended' => 1, 'unassigned' => 1 }
+        )
+        expect(response_data).to include(
+          { 'team_id' => team.id, 'open' => 3, 'unattended' => 2, 'unassigned' => 3 }
+        )
+      end
+    end
+
+    context 'when filtering by assignee_id' do
+      let(:assignee1) { create(:user, account: account) }
+
+      before do
+        create(:conversation, assignee_id: agent.id, account: account, status: :open)
+        create(:conversation, account: account, status: :open)
+        create(:conversation, assignee_id: agent.id, account: account, status: :open) do |conversation|
+          create(:message, account: account, conversation: conversation, message_type: :outgoing)
+        end
+      end
+
+      it 'returns metrics grouped by assignee' do
+        get "/api/v2/accounts/#{account.id}/live_reports/grouped_conversation_metrics",
+            params: { group_by: 'assignee_id' },
+            headers: admin.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+
+        response_data = response.parsed_body
+        expect(response_data.size).to eq 2
+        expect(response_data).to include(
+          { 'assignee_id' => agent.id, 'open' => 2, 'unassigned' => 0, 'unattended' => 1 }
+        )
+        expect(response_data).to include(
+          { 'assignee_id' => nil, 'open' => 1, 'unassigned' => 1, 'unattended' => 1 }
+        )
+      end
+    end
+  end
+end
diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb
index 597396a82..f51269a61 100644
--- a/spec/factories/teams.rb
+++ b/spec/factories/teams.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :team do
-    name { 'MyString' }
+    sequence(:name) { |n| "Team #{n}" }
     description { 'MyText' }
     allow_auto_assign { true }
     account

From a8febc00d3a640069d3077af49349f551d4d49cb Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 27 Feb 2025 16:57:25 -0800
Subject: [PATCH 10/27] chore: Add Swagger endpoint for updating custom
 attributes (#10995)

- Add swagger endpoint for updating custom attributes in a conversation
---
 .gitignore                                    |  1 +
 .../conversation/custom_attributes.yml        | 36 +++++++++
 swagger/paths/index.yml                       |  7 ++
 swagger/swagger.json                          | 73 +++++++++++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 swagger/paths/application/conversation/custom_attributes.yml

diff --git a/.gitignore b/.gitignore
index 5eb883db0..77c4a4740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,7 @@ test/cypress/videos/*
 
 #ignore files under .vscode directory
 .vscode
+.cursor
 
 # yalc for local testing
 .yalc
diff --git a/swagger/paths/application/conversation/custom_attributes.yml b/swagger/paths/application/conversation/custom_attributes.yml
new file mode 100644
index 000000000..bfd416138
--- /dev/null
+++ b/swagger/paths/application/conversation/custom_attributes.yml
@@ -0,0 +1,36 @@
+tags:
+  - Conversations
+operationId: update-custom-attributes-of-a-conversation
+summary: Update Custom Attributes
+description: Updates the custom attributes of a conversation
+security:
+  - userApiKey: []
+  - agentBotApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      required:
+        - custom_attributes
+      properties:
+        custom_attributes:
+          type: object
+          description: The custom attributes to be set for the conversation
+          example:
+            order_id: "12345"
+            previous_conversation: "67890"
+responses:
+  200:
+    description: Success
+    schema:
+      type: object
+      properties:
+        custom_attributes:
+          type: object
+          description: The custom attributes of the conversation
+  404:
+    description: Conversation not found
+  401:
+    description: Unauthorized 
\ No newline at end of file
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 6df22d06e..769f38c27 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -354,6 +354,13 @@
   post:
     $ref: ./application/conversation/toggle_priority.yml
 
+/api/v1/accounts/{account_id}/conversations/{conversation_id}/custom_attributes:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/conversation_id'
+  post:
+    $ref: ./application/conversation/custom_attributes.yml
+
 # Conversations Assignments
 
 /api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index d5f94f730..19ef5c904 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -3514,6 +3514,79 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/conversations/{conversation_id}/custom_attributes": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/conversation_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "update-custom-attributes-of-a-conversation",
+        "summary": "Update Custom Attributes",
+        "description": "Updates the custom attributes of a conversation",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "custom_attributes"
+              ],
+              "properties": {
+                "custom_attributes": {
+                  "type": "object",
+                  "description": "The custom attributes to be set for the conversation",
+                  "example": {
+                    "order_id": "12345",
+                    "previous_conversation": "67890"
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "custom_attributes": {
+                  "type": "object",
+                  "description": "The custom attributes of the conversation"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Conversation not found"
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/assignments": {
       "parameters": [
         {

From 6eecd84b22fd1978b000fb4c957f445c2d47751d Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 28 Feb 2025 06:35:33 +0530
Subject: [PATCH 11/27] feat: Add support for bulk action for Captain FAQs
 (#10905)

Co-authored-by: Pranav <pranav@chatwoot.com>
Co-authored-by: Pranav <pranavrajs@gmail.com>
---
 .../dashboard/api/captain/bulkActions.js      |   9 +
 .../dashboard/components-next/CardLayout.vue  |  13 +-
 .../captain/assistant/ResponseCard.vue        |  31 ++-
 .../pageComponents/BulkDeleteDialog.vue       |  59 ++++++
 .../checkbox/Checkbox.story.vue               |  47 +++++
 .../components-next/checkbox/Checkbox.vue     |  63 ++++++
 .../i18n/locale/en/integrations.json          |  14 ++
 .../dashboard/captain/responses/Index.vue     | 182 +++++++++++++++---
 .../dashboard/store/captain/bulkActions.js    |  56 ++++++
 .../dashboard/store/captain/response.js       |  25 +++
 app/javascript/dashboard/store/index.js       |   2 +
 config/routes.rb                              |   1 +
 .../captain/bulk_actions_controller.rb        |  51 +++++
 .../captain/tools/firecrawl_service.rb        |   2 +-
 .../captain/bulk_actions/create.json.jbuilder |   3 +
 .../captain/bulk_actions_controller_spec.rb   | 143 ++++++++++++++
 .../captain/tools/firecrawl_service_spec.rb   |  10 +
 17 files changed, 680 insertions(+), 31 deletions(-)
 create mode 100644 app/javascript/dashboard/api/captain/bulkActions.js
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue
 create mode 100644 app/javascript/dashboard/components-next/checkbox/Checkbox.story.vue
 create mode 100644 app/javascript/dashboard/components-next/checkbox/Checkbox.vue
 create mode 100644 app/javascript/dashboard/store/captain/bulkActions.js
 create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/bulk_actions/create.json.jbuilder
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb

diff --git a/app/javascript/dashboard/api/captain/bulkActions.js b/app/javascript/dashboard/api/captain/bulkActions.js
new file mode 100644
index 000000000..fd69a1108
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/bulkActions.js
@@ -0,0 +1,9 @@
+import ApiClient from '../ApiClient';
+
+class CaptainBulkActionsAPI extends ApiClient {
+  constructor() {
+    super('captain/bulk_actions', { accountScoped: true });
+  }
+}
+
+export default new CaptainBulkActionsAPI();
diff --git a/app/javascript/dashboard/components-next/CardLayout.vue b/app/javascript/dashboard/components-next/CardLayout.vue
index 0fd3f5986..462402167 100644
--- a/app/javascript/dashboard/components-next/CardLayout.vue
+++ b/app/javascript/dashboard/components-next/CardLayout.vue
@@ -4,6 +4,10 @@ defineProps({
     type: String,
     default: 'col',
   },
+  selectable: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(['click']);
@@ -18,10 +22,11 @@ const handleClick = () => {
     class="flex flex-col w-full shadow outline-1 outline outline-n-container group/cardLayout rounded-2xl bg-n-solid-2"
   >
     <div
-      class="flex w-full gap-3 px-6 py-5"
-      :class="
-        layout === 'col' ? 'flex-col' : 'flex-row justify-between items-center'
-      "
+      class="flex w-full gap-3 py-5"
+      :class="[
+        layout === 'col' ? 'flex-col' : 'flex-row justify-between items-center',
+        selectable ? 'px-10 py-6' : 'px-6',
+      ]"
       @click="handleClick"
     >
       <slot />
diff --git a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
index 312f2ad34..f00354105 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/ResponseCard.vue
@@ -7,6 +7,7 @@ import { dynamicTime } from 'shared/helpers/timeHelper';
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
+import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import Policy from 'dashboard/components/policy.vue';
 
 const props = defineProps({
@@ -46,14 +47,27 @@ const props = defineProps({
     type: Number,
     required: true,
   },
+  isSelected: {
+    type: Boolean,
+    default: false,
+  },
+  selectable: {
+    type: Boolean,
+    default: false,
+  },
 });
 
-const emit = defineEmits(['action', 'navigate']);
+const emit = defineEmits(['action', 'navigate', 'select', 'hover']);
 
 const { t } = useI18n();
 
 const [showActionsDropdown, toggleDropdown] = useToggle();
 
+const modelValue = computed({
+  get: () => props.isSelected,
+  set: () => emit('select', props.id),
+});
+
 const statusAction = computed(() => {
   if (props.status === 'pending') {
     return [
@@ -102,8 +116,17 @@ const handleDocumentableClick = () => {
 </script>
 
 <template>
-  <CardLayout :class="{ 'rounded-md': compact }">
-    <div class="flex justify-between w-full gap-1">
+  <CardLayout
+    selectable
+    class="relative"
+    :class="{ 'rounded-md': compact }"
+    @mouseenter="emit('hover', true)"
+    @mouseleave="emit('hover', false)"
+  >
+    <div v-show="selectable" class="absolute top-7 ltr:left-4 rtl:right-4">
+      <Checkbox v-model="modelValue" />
+    </div>
+    <div class="flex relative justify-between w-full gap-1">
       <span class="text-base text-n-slate-12 line-clamp-1">
         {{ question }}
       </span>
@@ -148,7 +171,7 @@ const handleDocumentableClick = () => {
             v-if="documentable.type === 'Captain::Document'"
             class="inline-flex items-center gap-1 truncate over"
           >
-            <i class="i-ph-chat-circle-dots text-base" />
+            <i class="i-ph-files-light text-base" />
             <span class="max-w-96 truncate" :title="documentable.name">
               {{ documentable.name }}
             </span>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue b/app/javascript/dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue
new file mode 100644
index 000000000..82f8fa308
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue
@@ -0,0 +1,59 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useStore } from 'dashboard/composables/store';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+
+const props = defineProps({
+  type: {
+    type: String,
+    required: true,
+  },
+  bulkIds: {
+    type: Object,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['deleteSuccess']);
+
+const { t } = useI18n();
+const store = useStore();
+const bulkDeleteDialogRef = ref(null);
+const i18nKey = computed(() => props.type.toUpperCase());
+
+const handleBulkDelete = async ids => {
+  if (!ids) return;
+
+  try {
+    await store.dispatch(
+      'captainBulkActions/handleBulkDelete',
+      Array.from(props.bulkIds)
+    );
+
+    emit('deleteSuccess');
+    useAlert(t(`CAPTAIN.${i18nKey.value}.BULK_DELETE.SUCCESS_MESSAGE`));
+  } catch (error) {
+    useAlert(t(`CAPTAIN.${i18nKey.value}.BULK_DELETE.ERROR_MESSAGE`));
+  }
+};
+
+const handleDialogConfirm = async () => {
+  await handleBulkDelete(Array.from(props.bulkIds));
+  bulkDeleteDialogRef.value?.close();
+};
+
+defineExpose({ dialogRef: bulkDeleteDialogRef });
+</script>
+
+<template>
+  <Dialog
+    ref="bulkDeleteDialogRef"
+    type="alert"
+    :title="t(`CAPTAIN.${i18nKey}.BULK_DELETE.TITLE`)"
+    :description="t(`CAPTAIN.${i18nKey}.BULK_DELETE.DESCRIPTION`)"
+    :confirm-button-label="t(`CAPTAIN.${i18nKey}.BULK_DELETE.CONFIRM`)"
+    @confirm="handleDialogConfirm"
+  />
+</template>
diff --git a/app/javascript/dashboard/components-next/checkbox/Checkbox.story.vue b/app/javascript/dashboard/components-next/checkbox/Checkbox.story.vue
new file mode 100644
index 000000000..553700bf1
--- /dev/null
+++ b/app/javascript/dashboard/components-next/checkbox/Checkbox.story.vue
@@ -0,0 +1,47 @@
+<script setup>
+import Checkbox from './Checkbox.vue';
+import { ref } from 'vue';
+
+const defaultValue = ref(false);
+const isChecked = ref(false);
+const checkedValue = ref(true);
+const indeterminateValue = ref(true);
+</script>
+
+<template>
+  <Story title="Components/Checkbox" :layout="{ type: 'grid', width: '250px' }">
+    <Variant title="States">
+      <div class="p-2 space-y-4">
+        <div class="flex items-center justify-between gap-4">
+          <span>Default:</span>
+          <Checkbox v-model="defaultValue" />
+        </div>
+
+        <div class="flex items-center justify-between gap-4">
+          <span>Checked:</span>
+          <Checkbox v-model="checkedValue" />
+        </div>
+
+        <div class="flex items-center justify-between gap-4">
+          <span>Indeterminate:</span>
+          <Checkbox v-model="indeterminateValue" indeterminate />
+        </div>
+
+        <div class="flex items-center justify-between gap-4">
+          <span>Indeterminate disabled:</span>
+          <Checkbox v-model="indeterminateValue" indeterminate disabled />
+        </div>
+
+        <div class="flex items-center justify-between gap-4">
+          <span>Disabled:</span>
+          <Checkbox v-model="defaultValue" disabled />
+        </div>
+
+        <div class="flex items-center justify-between gap-4">
+          <span>Disabled Checked:</span>
+          <Checkbox v-model="isChecked" disabled />
+        </div>
+      </div>
+    </Variant>
+  </Story>
+</template>
diff --git a/app/javascript/dashboard/components-next/checkbox/Checkbox.vue b/app/javascript/dashboard/components-next/checkbox/Checkbox.vue
new file mode 100644
index 000000000..986867c37
--- /dev/null
+++ b/app/javascript/dashboard/components-next/checkbox/Checkbox.vue
@@ -0,0 +1,63 @@
+<script setup>
+defineProps({
+  indeterminate: {
+    type: Boolean,
+    default: false,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['change']);
+
+const modelValue = defineModel('modelValue', {
+  type: Boolean,
+  default: false,
+});
+
+const handleChange = event => {
+  modelValue.value = event.target.checked;
+  emit('change', event);
+};
+</script>
+
+<template>
+  <div class="relative w-4 h-4">
+    <input
+      :checked="modelValue"
+      :indeterminate="indeterminate"
+      type="checkbox"
+      :disabled="disabled"
+      class="peer absolute inset-0 z-10 h-4 w-4 disabled:opacity-50 appearance-none rounded border border-n-slate-6 ring-transparent transition-all duration-200 checked:border-n-brand checked:bg-n-brand dark:border-gray-600 dark:checked:border-n-brand indeterminate:border-n-brand indeterminate:bg-n-brand hover:enabled:bg-n-blue-border cursor-pointer"
+      @change="handleChange"
+    />
+    <!-- Checkmark SVG -->
+    <svg
+      viewBox="0 0 14 14"
+      fill="none"
+      class="pointer-events-none absolute w-3.5 h-3.5 z-20 stroke-white opacity-0 peer-checked:opacity-100 transition-opacity duration-200 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2"
+    >
+      <path
+        d="M3 8L6 11L11 3.5"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </svg>
+    <!-- Minus/Indeterminate SVG -->
+    <svg
+      viewBox="0 0 14 14"
+      fill="none"
+      class="pointer-events-none absolute w-3.5 h-3.5 z-20 stroke-white opacity-0 peer-indeterminate:opacity-100 transition-opacity duration-200 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2"
+    >
+      <path
+        d="M3 7L11 7"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </svg>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 58e70db8b..c95820731 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -437,6 +437,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
index 6aaee965e..c087da817 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
@@ -8,8 +8,10 @@ import { useRouter } from 'vue-router';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 
 import Button from 'dashboard/components-next/button/Button.vue';
+import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
+import BulkDeleteDialog from 'dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue';
 import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
 import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
 import AssistantSelector from 'dashboard/components-next/captain/pageComponents/AssistantSelector.vue';
@@ -28,6 +30,7 @@ const isFetching = computed(() => uiFlags.value.fetchingList);
 
 const selectedResponse = ref(null);
 const deleteDialog = ref(null);
+const bulkDeleteDialog = ref(null);
 
 const selectedStatus = ref('all');
 const selectedAssistant = ref('all');
@@ -129,7 +132,69 @@ const fetchResponses = (page = 1) => {
   store.dispatch('captainResponses/get', filterParams);
 };
 
-const onPageChange = page => fetchResponses(page);
+// Bulk action
+const bulkSelectedIds = ref(new Set());
+const hoveredCard = ref(null);
+
+const bulkSelectionState = computed(() => {
+  const selectedCount = bulkSelectedIds.value.size;
+  const totalCount = responses.value?.length || 0;
+
+  return {
+    hasSelected: selectedCount > 0,
+    isIndeterminate: selectedCount > 0 && selectedCount < totalCount,
+    allSelected: totalCount > 0 && selectedCount === totalCount,
+  };
+});
+
+const bulkCheckbox = computed({
+  get: () => bulkSelectionState.value.allSelected,
+  set: value => {
+    bulkSelectedIds.value = value
+      ? new Set(responses.value.map(r => r.id))
+      : new Set();
+  },
+});
+
+const handleCardHover = (isHovered, id) => {
+  hoveredCard.value = isHovered ? id : null;
+};
+
+const handleCardSelect = id => {
+  const selected = new Set(bulkSelectedIds.value);
+  selected[selected.has(id) ? 'delete' : 'add'](id);
+  bulkSelectedIds.value = selected;
+};
+
+const handleBulkApprove = async () => {
+  try {
+    await store.dispatch(
+      'captainBulkActions/handleBulkApprove',
+      Array.from(bulkSelectedIds.value)
+    );
+
+    // Clear selection
+    bulkSelectedIds.value = new Set();
+    useAlert(t('CAPTAIN.RESPONSES.BULK_APPROVE.SUCCESS_MESSAGE'));
+  } catch (error) {
+    useAlert(
+      error?.message || t('CAPTAIN.RESPONSES.BULK_APPROVE.ERROR_MESSAGE')
+    );
+  }
+};
+
+const onPageChange = page => {
+  // Store current selection state before fetching new page
+  const wasAllPageSelected = bulkSelectionState.value.allSelected;
+  const hadPartialSelection = bulkSelectedIds.value.size > 0;
+
+  fetchResponses(page);
+
+  // Reset selection if we had any selections on page change
+  if (wasAllPageSelected || hadPartialSelection) {
+    bulkSelectedIds.value = new Set();
+  }
+};
 
 const onDeleteSuccess = () => {
   if (responses.value?.length === 0 && responseMeta.value?.page > 1) {
@@ -137,6 +202,20 @@ const onDeleteSuccess = () => {
   }
 };
 
+const onBulkDeleteSuccess = () => {
+  // Only fetch if no records left
+  if (responses.value?.length === 0) {
+    const page =
+      responseMeta.value?.page > 1
+        ? responseMeta.value.page - 1
+        : responseMeta.value.page;
+    fetchResponses(page);
+  }
+
+  // Clear selection
+  bulkSelectedIds.value = new Set();
+};
+
 const handleStatusFilterChange = ({ value }) => {
   selectedStatus.value = value;
   isStatusFilterOpen.value = false;
@@ -177,29 +256,76 @@ onMounted(() => {
     </template>
 
     <template #controls>
-      <div v-if="shouldShowDropdown" class="mb-4 -mt-3 flex gap-3">
-        <OnClickOutside @trigger="isStatusFilterOpen = false">
-          <Button
-            :label="selectedStatusLabel"
-            icon="i-lucide-chevron-down"
-            size="sm"
-            color="slate"
-            trailing-icon
-            class="max-w-48"
-            @click="isStatusFilterOpen = !isStatusFilterOpen"
-          />
+      <div
+        v-if="shouldShowDropdown"
+        class="mb-4 -mt-3 flex justify-between items-center"
+      >
+        <div v-if="!bulkSelectionState.hasSelected" class="flex gap-3">
+          <OnClickOutside @trigger="isStatusFilterOpen = false">
+            <Button
+              :label="selectedStatusLabel"
+              icon="i-lucide-chevron-down"
+              size="sm"
+              color="slate"
+              trailing-icon
+              class="max-w-48"
+              @click="isStatusFilterOpen = !isStatusFilterOpen"
+            />
 
-          <DropdownMenu
-            v-if="isStatusFilterOpen"
-            :menu-items="statusOptions"
-            class="mt-2"
-            @action="handleStatusFilterChange"
+            <DropdownMenu
+              v-if="isStatusFilterOpen"
+              :menu-items="statusOptions"
+              class="mt-2"
+              @action="handleStatusFilterChange"
+            />
+          </OnClickOutside>
+          <AssistantSelector
+            :assistant-id="selectedAssistant"
+            @update="handleAssistantFilterChange"
           />
-        </OnClickOutside>
-        <AssistantSelector
-          :assistant-id="selectedAssistant"
-          @update="handleAssistantFilterChange"
-        />
+        </div>
+
+        <transition
+          name="slide-fade"
+          enter-active-class="transition-all duration-300 ease-out"
+          enter-from-class="opacity-0 transform ltr:-translate-x-4 rtl:translate-x-4"
+          enter-to-class="opacity-100 transform translate-x-0"
+          leave-active-class="hidden opacity-0"
+        >
+          <div
+            v-if="bulkSelectionState.hasSelected"
+            class="flex items-center gap-3 ltr:pl-4 rtl:pr-4"
+          >
+            <div class="flex items-center gap-1.5">
+              <Checkbox
+                v-model="bulkCheckbox"
+                :indeterminate="bulkSelectionState.isIndeterminate"
+              />
+              <span class="text-sm text-n-slate-10 tabular-nums">
+                {{
+                  $t('CAPTAIN.RESPONSES.SELECTED', {
+                    count: bulkSelectedIds.size,
+                  })
+                }}
+              </span>
+            </div>
+            <div class="h-4 w-px bg-n-strong" />
+            <div class="flex gap-2">
+              <Button
+                :label="$t('CAPTAIN.RESPONSES.BULK_APPROVE_BUTTON')"
+                sm
+                slate
+                @click="handleBulkApprove"
+              />
+              <Button
+                :label="$t('CAPTAIN.RESPONSES.BULK_DELETE_BUTTON')"
+                sm
+                slate
+                @click="bulkDeleteDialog.dialogRef.open()"
+              />
+            </div>
+          </div>
+        </transition>
       </div>
     </template>
 
@@ -218,8 +344,12 @@ onMounted(() => {
           :status="response.status"
           :created-at="response.created_at"
           :updated-at="response.updated_at"
+          :is-selected="bulkSelectedIds.has(response.id)"
+          :selectable="hoveredCard === response.id || bulkSelectedIds.size > 0"
           @action="handleAction"
           @navigate="handleNavigationAction"
+          @select="handleCardSelect"
+          @hover="isHovered => handleCardHover(isHovered, response.id)"
         />
       </div>
     </template>
@@ -232,6 +362,14 @@ onMounted(() => {
       @delete-success="onDeleteSuccess"
     />
 
+    <BulkDeleteDialog
+      v-if="bulkSelectedIds"
+      ref="bulkDeleteDialog"
+      :bulk-ids="bulkSelectedIds"
+      type="Responses"
+      @delete-success="onBulkDeleteSuccess"
+    />
+
     <CreateResponseDialog
       v-if="dialogType"
       ref="createDialog"
diff --git a/app/javascript/dashboard/store/captain/bulkActions.js b/app/javascript/dashboard/store/captain/bulkActions.js
new file mode 100644
index 000000000..7c8ea058f
--- /dev/null
+++ b/app/javascript/dashboard/store/captain/bulkActions.js
@@ -0,0 +1,56 @@
+import CaptainBulkActionsAPI from 'dashboard/api/captain/bulkActions';
+import { createStore } from './storeFactory';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+
+export default createStore({
+  name: 'CaptainBulkAction',
+  API: CaptainBulkActionsAPI,
+  actions: mutations => ({
+    processBulkAction: async function processBulkAction(
+      { commit },
+      { type, actionType, ids }
+    ) {
+      commit(mutations.SET_UI_FLAG, { isUpdating: true });
+      try {
+        const response = await CaptainBulkActionsAPI.create({
+          type: type,
+          ids,
+          fields: { status: actionType },
+        });
+        commit(mutations.SET_UI_FLAG, { isUpdating: false });
+        return response.data;
+      } catch (error) {
+        commit(mutations.SET_UI_FLAG, { isUpdating: false });
+        return throwErrorMessage(error);
+      }
+    },
+
+    handleBulkDelete: async function handleBulkDelete({ dispatch }, ids) {
+      const response = await dispatch('processBulkAction', {
+        type: 'AssistantResponse',
+        actionType: 'delete',
+        ids,
+      });
+
+      // Update the response store after successful API call
+      await dispatch('captainResponses/removeBulkResponses', ids, {
+        root: true,
+      });
+      return response;
+    },
+
+    handleBulkApprove: async function handleBulkApprove({ dispatch }, ids) {
+      const response = await dispatch('processBulkAction', {
+        type: 'AssistantResponse',
+        actionType: 'approve',
+        ids,
+      });
+
+      // Update response store after successful API call
+      await dispatch('captainResponses/updateBulkResponses', response, {
+        root: true,
+      });
+      return response;
+    },
+  }),
+});
diff --git a/app/javascript/dashboard/store/captain/response.js b/app/javascript/dashboard/store/captain/response.js
index 6280e417e..5f8c2eee1 100644
--- a/app/javascript/dashboard/store/captain/response.js
+++ b/app/javascript/dashboard/store/captain/response.js
@@ -4,4 +4,29 @@ import { createStore } from './storeFactory';
 export default createStore({
   name: 'CaptainResponse',
   API: CaptainResponseAPI,
+  actions: mutations => ({
+    removeBulkResponses: ({ commit, state }, ids) => {
+      const updatedRecords = state.records.filter(
+        record => !ids.includes(record.id)
+      );
+      commit(mutations.SET, updatedRecords);
+    },
+    updateBulkResponses: ({ commit, state }, approvedResponses) => {
+      // Create a map of updated responses for faster lookup
+      const updatedResponsesMap = approvedResponses.reduce((map, response) => {
+        map[response.id] = response;
+        return map;
+      }, {});
+
+      // Update existing records with updated data
+      const updatedRecords = state.records.map(record => {
+        if (updatedResponsesMap[record.id]) {
+          return updatedResponsesMap[record.id]; // Replace with the updated response
+        }
+        return record;
+      });
+
+      commit(mutations.SET, updatedRecords);
+    },
+  }),
 });
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 379ff21f1..5daf73ae1 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -50,6 +50,7 @@ import captainAssistants from './captain/assistant';
 import captainDocuments from './captain/document';
 import captainResponses from './captain/response';
 import captainInboxes from './captain/inboxes';
+import captainBulkActions from './captain/bulkActions';
 const plugins = [];
 
 export default createStore({
@@ -104,6 +105,7 @@ export default createStore({
     captainDocuments,
     captainResponses,
     captainInboxes,
+    captainBulkActions,
   },
   plugins,
 });
diff --git a/config/routes.rb b/config/routes.rb
index 3e2616a46..3b5435ed9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -54,6 +54,7 @@ Rails.application.routes.draw do
             end
             resources :documents, only: [:index, :show, :create, :destroy]
             resources :assistant_responses
+            resources :bulk_actions, only: [:create]
           end
           resources :agent_bots, only: [:index, :create, :show, :update, :destroy] do
             delete :avatar, on: :member
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
new file mode 100644
index 000000000..3130a68cc
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
@@ -0,0 +1,51 @@
+class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::BaseController
+  before_action :current_account
+  before_action -> { check_authorization(Captain::Assistant) }
+  before_action :validate_params
+  before_action :type_matches?
+
+  MODEL_TYPE = ['AssistantResponse'].freeze
+
+  def create
+    @responses = process_bulk_action
+  end
+
+  private
+
+  def validate_params
+    return if params[:type].present? && params[:ids].present? && params[:fields].present?
+
+    render json: { success: false }, status: :unprocessable_entity
+  end
+
+  def type_matches?
+    return if MODEL_TYPE.include?(params[:type])
+
+    render json: { success: false }, status: :unprocessable_entity
+  end
+
+  def process_bulk_action
+    case params[:type]
+    when 'AssistantResponse'
+      handle_assistant_responses
+    end
+  end
+
+  def handle_assistant_responses
+    responses = Current.account.captain_assistant_responses.where(id: params[:ids])
+    return unless responses.exists?
+
+    case params[:fields][:status]
+    when 'approve'
+      responses.pending.update(status: 'approved')
+      responses
+    when 'delete'
+      responses.destroy_all
+      []
+    end
+  end
+
+  def permitted_params
+    params.permit(:type, ids: [], fields: [:status])
+  end
+end
diff --git a/enterprise/app/services/captain/tools/firecrawl_service.rb b/enterprise/app/services/captain/tools/firecrawl_service.rb
index a32f1d630..397c3ad63 100644
--- a/enterprise/app/services/captain/tools/firecrawl_service.rb
+++ b/enterprise/app/services/captain/tools/firecrawl_service.rb
@@ -1,7 +1,7 @@
 class Captain::Tools::FirecrawlService
   def initialize
     @api_key = InstallationConfig.find_by!(name: 'CAPTAIN_FIRECRAWL_API_KEY').value
-    raise 'Missing API key' if @api_key.nil?
+    raise 'Missing API key' if @api_key.empty?
   end
 
   def perform(url, webhook_url, crawl_limit = 10)
diff --git a/enterprise/app/views/api/v1/accounts/captain/bulk_actions/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/bulk_actions/create.json.jbuilder
new file mode 100644
index 000000000..4ba4b1ad6
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/bulk_actions/create.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @responses do |response|
+  json.partial! 'api/v1/models/captain/assistant_response', formats: [:json], resource: response
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
new file mode 100644
index 000000000..968649085
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
@@ -0,0 +1,143 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
+  let(:account) { create(:account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let!(:pending_responses) do
+    create_list(
+      :captain_assistant_response,
+      2,
+      assistant: assistant,
+      account: account,
+      status: 'pending'
+    )
+  end
+
+  def json_response
+    JSON.parse(response.body, symbolize_names: true)
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/captain/bulk_actions' do
+    context 'when approving responses' do
+      let(:valid_params) do
+        {
+          type: 'AssistantResponse',
+          ids: pending_responses.map(&:id),
+          fields: { status: 'approve' }
+        }
+      end
+
+      it 'approves the responses and returns the updated records' do
+        post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+             params: valid_params,
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(json_response).to be_an(Array)
+        expect(json_response.length).to eq(2)
+
+        # Verify responses were approved
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('approved')
+        end
+      end
+    end
+
+    context 'when deleting responses' do
+      let(:delete_params) do
+        {
+          type: 'AssistantResponse',
+          ids: pending_responses.map(&:id),
+          fields: { status: 'delete' }
+        }
+      end
+
+      it 'deletes the responses and returns an empty array' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+               params: delete_params,
+               headers: admin.create_new_auth_token,
+               as: :json
+        end.to change(Captain::AssistantResponse, :count).by(-2)
+
+        expect(response).to have_http_status(:ok)
+        expect(json_response).to eq([])
+
+        # Verify responses were deleted
+        pending_responses.each do |response|
+          expect { response.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        end
+      end
+    end
+
+    context 'with invalid type' do
+      let(:invalid_params) do
+        {
+          type: 'InvalidType',
+          ids: pending_responses.map(&:id),
+          fields: { status: 'approve' }
+        }
+      end
+
+      it 'returns unprocessable entity status' do
+        post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+             params: invalid_params,
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(json_response[:success]).to be(false)
+
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
+      end
+    end
+
+    context 'with missing parameters' do
+      let(:missing_params) do
+        {
+          type: 'AssistantResponse',
+          fields: { status: 'approve' }
+        }
+      end
+
+      it 'returns unprocessable entity status' do
+        post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+             params: missing_params,
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(json_response[:success]).to be(false)
+
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
+      end
+    end
+
+    context 'with unauthorized user' do
+      let(:unauthorized_user) { create(:user, account: create(:account)) }
+
+      it 'returns unauthorized status' do
+        post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+             params: { type: 'AssistantResponse', ids: [1], fields: { status: 'approve' } },
+             headers: unauthorized_user.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
index 8b358a655..d6563b163 100644
--- a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
@@ -32,6 +32,16 @@ RSpec.describe Captain::Tools::FirecrawlService do
         InstallationConfig.find_by(name: 'CAPTAIN_FIRECRAWL_API_KEY').update(value: nil)
       end
 
+      it 'raises an error' do
+        expect { described_class.new }.to raise_error(NoMethodError)
+      end
+    end
+
+    context 'when API key is empty' do
+      before do
+        InstallationConfig.find_by(name: 'CAPTAIN_FIRECRAWL_API_KEY').update(value: '')
+      end
+
       it 'raises an error' do
         expect { described_class.new }.to raise_error('Missing API key')
       end

From f57c9279aa0fc4405e15aaebfb9678138eac7e7e Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Thu, 27 Feb 2025 20:56:42 -0800
Subject: [PATCH 12/27] chore: Update translations (#10997)

- Update translations
---
 .../i18n/locale/am/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/am/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ar/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ar/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/az/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/az/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/bg/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/bg/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ca/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ca/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/cs/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/cs/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/da/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/da/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/de/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/de/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/el/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/el/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/es/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/es/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/fa/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/fa/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/fi/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/fi/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/fr/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/fr/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/he/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/he/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/hi/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/hi/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/hr/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/hr/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/hu/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/hu/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/hy/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/hy/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/id/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/id/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/is/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/is/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/it/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/it/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ja/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ja/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ka/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ka/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ko/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ko/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/lt/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/lt/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/lv/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/lv/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ml/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ml/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ms/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ms/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ne/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ne/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/nl/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/nl/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/no/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/no/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/pl/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/pl/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/pt/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/pt/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/pt_BR/integrations.json       | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/pt_BR/settings.json | 18 +++++++++++++++++
 .../i18n/locale/ro/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ro/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ru/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ru/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sh/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sh/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sk/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sk/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sl/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sl/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sq/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sq/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sr/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sr/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/sv/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/sv/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ta/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ta/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/th/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/th/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/tl/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/tl/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/tr/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/tr/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/uk/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/uk/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ur/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ur/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/ur_IN/integrations.json       | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/ur_IN/settings.json | 18 +++++++++++++++++
 .../i18n/locale/vi/integrations.json          | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/vi/settings.json    | 18 +++++++++++++++++
 .../i18n/locale/zh_CN/integrations.json       | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/zh_CN/settings.json | 18 +++++++++++++++++
 .../i18n/locale/zh_TW/integrations.json       | 20 +++++++++++++++++++
 .../dashboard/i18n/locale/zh_TW/settings.json | 18 +++++++++++++++++
 104 files changed, 1976 insertions(+)

diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index 0126d6721..8177fdab5 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/am/settings.json b/app/javascript/dashboard/i18n/locale/am/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/am/settings.json
+++ b/app/javascript/dashboard/i18n/locale/am/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index c77f23a84..a3ea8042a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "إلغاء الربط",
         "SUCCESS": "تم إلغاء ربط المشكلة بنجاح",
         "ERROR": "حدث خطأ أثناء إلغاء ربط المشكلة، الرجاء المحاولة مرة أخرى"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "نعم، احذف",
+        "CANCEL": "إلغاء"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "حذف",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index fbcd1bdf2..2713dce3a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "افتراضي",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "توقيع الرسالة الشخصية",
         "NOTE": "إنشاء توقيع رسالة فريدة تظهر في نهاية كل رسالة ترسلها من أي صندوق وارد. يمكنك أيضًا تضمين صورة داخلية، مدعومة في الدردشة المباشرة، والبريد الإلكتروني، وصناديق API الواردة.",
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index 0126d6721..8177fdab5 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/az/settings.json b/app/javascript/dashboard/i18n/locale/az/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/az/settings.json
+++ b/app/javascript/dashboard/i18n/locale/az/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index ecd6b370b..efc274826 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Отмени"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Изтрий",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 38502c9ae..f01a20248 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index 590271285..ec6caf9ce 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Desenllaça",
         "SUCCESS": "S'ha desenllaçat la issue correctament",
         "ERROR": "S'ha produït un error en desenllaçar la issue, torna-ho a provar"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Sí, esborra",
+        "CANCEL": "Cancel·la"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Esborrar",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 383ccbd3e..9dc944f43 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Per defecte",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Signatura personal del missatge",
         "NOTE": "Crea una signatura de missatge única per aparèixer al final de cada missatge que envieu des de qualsevol safata d'entrada. També pots incloure una imatge en línia, que és compatible amb el xat en directe, el correu electrònic i les bústies d'entrada de l'API.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 753ffb3fc..c615ee572 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Zrušit"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Vymazat",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index 5d7a82e92..2cd2fe6f1 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index d89dc01ad..178085d3f 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Annuller"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Slet",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 27ca0e865..d371c0f66 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Standard",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personlig beskedsignatur",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index a78d72b1e..a0d75f833 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Verknüpfung aufheben",
         "SUCCESS": "Problem erfolgreich getrennt",
         "ERROR": "Beim Aufheben der Verknüpfung des Problems ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Ja, löschen",
+        "CANCEL": "Stornieren"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Löschen",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 531083087..c3c21576c 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Standard",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Persönliche Nachrichtensignatur",
         "NOTE": "Erstellen Sie eine einzigartige Nachrichtensignatur, die am Ende jeder Nachricht angezeigt wird, die Sie aus einem beliebigen Posteingang senden. Sie können auch ein Inline-Bild einfügen, das in Live-Chat-, E-Mail- und API-Postfächern unterstützt wird.",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index de6daeb19..557e13add 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Άκυρο"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Διαγραφή",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index fc2d8e609..e0ce27983 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Προεπιλογή",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Προσωπική υπογραφή μηνύματος",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 4eb4ee4e7..b0ba160d6 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Desenlazar",
         "SUCCESS": "Problema desvinculado con éxito",
         "ERROR": "Se ha producido un error al desvincular el problema, inténtelo de nuevo"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Sí, eliminar",
+        "CANCEL": "Cancelar"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Eliminar",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 25ccfc1fb..932632957 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Predeterminado",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma de mensaje personal",
         "NOTE": "Crea una firma de mensaje única para que aparezca al final de cada mensaje que envíes desde cualquier bandeja de entrada. También puede incluir una imagen en línea, que es soportada en las bandejas de entrada de live-chat, correo electrónico y API.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 8bfff0283..6769451f3 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "بله، حذف شود",
+        "CANCEL": "انصراف"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "حذف",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index d448e55d2..a56dd85f3 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "پیش‌فرض",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "امضای پیام شخصی",
         "NOTE": "یک امضای منحصر به فرد ایجاد کنید تا در انتهای تمام پیام هایی که از هر صندوق ورودی ارسال می کنید نمایش داده شود. همچنین می‌توانید یک تصویر درون خطی اضافه کنید که در چت، ایمیل و صندوق‌های ورودی API پشتیبانی می‌شود.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index 65e6f3e17..2959943ca 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Peruuta"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Poista",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index afe261db7..35807f524 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 5148394ba..2e44fd22d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Oui, supprimer",
+        "CANCEL": "Annuler"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Supprimer",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index adbb0ff6e..d5dcf06dd 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Par défaut",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Signature du message personnel",
         "NOTE": "Créez une signature de message unique qui apparaîtra à la fin de chaque message que vous envoyez à partir de n'importe quelle boîte de réception. Vous pouvez également inclure une image en ligne, qui est prise en charge dans les boîtes de réception en direct, les e-mails et les API.",
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 4981518a6..227f436ac 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "ביטול"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "מחק",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 9fc083fb0..452edfc8f 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "ברירת מחדל",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "חתימת הודעה אישית",
         "NOTE": "צור חתימת הודעה ייחודית שתופיע בסוף כל הודעה שתשלח מכל תיבת דואר נכנס. ניתן לכלול גם תמונה מוטמעת, הנתמכת בצ'אט חי, דוא\"ל ותיבות דואר נכנסות של API.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index bea7597ea..63061f021 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "रद्द करें"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 3a70ae1e9..a05b20d4c 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 785673bf4..8d990e32c 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Da, izbriši",
+        "CANCEL": "Odustani"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Izbriši",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/hr/settings.json b/app/javascript/dashboard/i18n/locale/hr/settings.json
index 24a62aaea..e46b08394 100644
--- a/app/javascript/dashboard/i18n/locale/hr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hr/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index b68b9f830..e4e1dad09 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Igen, törlés",
+        "CANCEL": "Mégse"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Törlés",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 1b22986a3..d89dfe378 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Alapértelmezett",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Személyes üzenet aláírás",
         "NOTE": "Hozzon létre egyedi üzenetaláírást, amely bármelyik postafiókból küldött üzenet végén megjelenik. Beilleszthet egy soron belüli képet is, amelyet az élő chat, az e-mail és az API bejövő üzenetek támogatnak.",
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index c1ef3c433..32cbfd150 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/hy/settings.json b/app/javascript/dashboard/i18n/locale/hy/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/hy/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hy/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 18893393e..02ee1dfce 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Ya, hapus",
+        "CANCEL": "Batalkan"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Hapus",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 9783f164f..0a8812d58 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Tanda tangan pesan pribadi",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index 3e31a6892..9fb4c8b0b 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Hætta við"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Eyða",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/is/settings.json b/app/javascript/dashboard/i18n/locale/is/settings.json
index a3417e8ce..3f585bc67 100644
--- a/app/javascript/dashboard/i18n/locale/is/settings.json
+++ b/app/javascript/dashboard/i18n/locale/is/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Persónuleg undirskrift á skilaboðum",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index f0064d9af..9fb347f9f 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "annulla"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Elimina",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 2de317ade..57f6a1cc6 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Predefinito",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma del messaggio personale",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index b18be6d15..100aeb45d 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "リンク解除",
         "SUCCESS": "課題のリンクが正常に解除されました",
         "ERROR": "課題のリンク解除中にエラーが発生しました。もう一度お試しください"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "はい、削除します",
+        "CANCEL": "キャンセル"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "会話 #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "削除",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "FAQを削除してもよろしいですか？",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 141f2d347..765f956b0 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "個人メッセージ署名",
         "NOTE": "送信するすべてのメッセージの末尾に表示されるユニークな署名を作成します。インライン画像を含めることができ、ライブチャット、メール、API受信トレイでサポートされています。",
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index c1ef3c433..32cbfd150 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ka/settings.json b/app/javascript/dashboard/i18n/locale/ka/settings.json
index 3a70ae1e9..a05b20d4c 100644
--- a/app/javascript/dashboard/i18n/locale/ka/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ka/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 12cb73fbf..a9cb63e00 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "취소"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "삭제",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 1d8a66d12..2035762d8 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 8e0c8a2f1..3561deb39 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Taip, Trinti",
+        "CANCEL": "Atšaukti"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Ištrinti",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/lt/settings.json b/app/javascript/dashboard/i18n/locale/lt/settings.json
index b643af4b3..eb3bd2333 100644
--- a/app/javascript/dashboard/i18n/locale/lt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lt/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Pagal nutylėjimą",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Asmeninis pranešimo parašas",
         "NOTE": "Sukurkite unikalų pranešimo parašą, kuris bus rodomas kiekvieno pranešimo pabaigoje, siunčiamo iš bet kurio gautųjų laiškų aplanko. Taip pat galite įdėti paveikslėlį, kuris rodomas tiesioginio pokalbio, el. pašto ir API.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index 8c82815df..66007b66f 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Atsaistīt",
         "SUCCESS": "Problēma ir veiksmīgi atsaistīta",
         "ERROR": "Atsaistot jautājumu radās kļūda. Lūdzu, mēģiniet vēlreiz"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Jā, dzēst",
+        "CANCEL": "Atcelt"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Saruna #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Dzēst",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Vai tiešām vēlaties izdzēst šos bieži uzdotos jautājumus?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 968ad2f5a..01ba915d6 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Noklusējums",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personīgais ziņojuma paraksts",
         "NOTE": "Izveidot unikālu ziņojuma parakstu, kas parādās katra ziņojuma beigās, kuru sūtāt no jebkuras iesūtnes. Varat arī iekļaut attēlu, kas tiek atbalstīts tiešraidē, e-pastā un API iesūtnēs.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index ae48eb8ce..4cf79620a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "റദ്ദാക്കുക"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "ഇല്ലാതാക്കുക",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index c5ee33a17..dd0f40fc3 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index 74d0fab93..eb35e257b 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Batalkan"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Padamkan",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ms/settings.json b/app/javascript/dashboard/i18n/locale/ms/settings.json
index 4873bb44e..0f39116d6 100644
--- a/app/javascript/dashboard/i18n/locale/ms/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ms/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index 65ffda552..b8f145688 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index 4905588f7..50ba5d9f1 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index 7c03d8205..835a5602c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Ja, verwijderen",
+        "CANCEL": "Annuleren"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Verwijderen",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index cbcca077e..847ed7aa4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Handtekening persoonlijke berichten",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 2913e7f61..e3ae4be24 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Ja, slett",
+        "CANCEL": "Avbryt"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Slett",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 6c58cadc2..0e0a6614b 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index e9a7605ed..2f1d33425 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Tak, usuń",
+        "CANCEL": "Anuluj"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Usuń",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 6271ce138..574c8b8c5 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Domyślny",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Osobisty podpis wiadomości",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 190cda558..6ddbdf3cd 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Desvincular",
         "SUCCESS": "Problema desvinculado com sucesso",
         "ERROR": "Houve um erro ao desvincular o problema, por favor, tente novamente"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Sim, excluir",
+        "CANCEL": "Cancelar"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Excluir",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index ff9b1461a..4e9019b36 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Padrão",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Assinatura de mensagem pessoal",
         "NOTE": "Crie uma assinatura de mensagem única para aparecer no final de todas as mensagens que enviar de qualquer caixa de entrada. Pode incluir uma imagem embutida, que será suportada nos canais de live-chat, e-mail e caixas de entrada API.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index e63e1311b..69bc3e94e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Desvincular",
         "SUCCESS": "Issue desvinculada com sucesso",
         "ERROR": "Houve um erro ao desvincular o atributo, por favor, tente novamente"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Sim, excluir",
+        "CANCEL": "Cancelar"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversação #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Excluir",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Tem certeza que deseja excluir o FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 8ec210c62..e43b52389 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Padrão",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Assinatura de mensagens pessoais",
         "NOTE": "Crie uma assinatura de mensagem única para aparecer no final de cada mensagem que você enviar de qualquer caixa de entrada. Você também pode incluir uma imagem anexada, suportada em live-chat, e-mail e caixas de entrada de API.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index fea3a618e..9410961e9 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Renunță"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Şterge",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 0d5fa194b..b2a74007b 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Implicit",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Semnătura mesajului personal",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index 6ac77d02f..ae4cddd10 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Отвязать",
         "SUCCESS": "Задача успешно отвязана",
         "ERROR": "Произошла ошибка при отвязке задачи, пожалуйста, попробуйте ещё раз"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Да, удалить",
+        "CANCEL": "Отменить"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Диалог #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Удалить",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Вы действительно хотите удалить FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 652e22265..2c9a65207 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "По умолчанию",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Личная подпись сообщения",
         "NOTE": "Создайте уникальную подпись, которая будет отображаться в конце каждого сообщения, отправляемого из любого почтового ящика. Вы также можете добавить встроенное изображение, которое поддерживается в чате, электронной почте и API-почтовых ящиках.",
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index c1ef3c433..32cbfd150 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sh/settings.json b/app/javascript/dashboard/i18n/locale/sh/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/sh/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sh/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index a2577b083..624606c6b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Zrušiť"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Vymazať",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 745d31229..ab1aab464 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index 8d22e306b..5a680aab1 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Da, izbriši",
+        "CANCEL": "Prekliči"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Izbriši",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sl/settings.json b/app/javascript/dashboard/i18n/locale/sl/settings.json
index 2a094cebc..b85f57b97 100644
--- a/app/javascript/dashboard/i18n/locale/sl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sl/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index b76c91e37..94a456f5b 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sq/settings.json b/app/javascript/dashboard/i18n/locale/sq/settings.json
index 7932c6fea..1c15d5294 100644
--- a/app/javascript/dashboard/i18n/locale/sq/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sq/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index b20c7c12c..022f5de87 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Otkaži"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Izbriši",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index 5be53132f..3383632df 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Predefinisano",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Potpis privatne poruke",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 567ebfde1..7ec55ff84 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Ja, ta bort",
+        "CANCEL": "Avbryt"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Radera",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 66b3f958d..eaa29c82e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 608598e26..0d7045e8c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "ரத்துசெய்"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 4a769430a..2c34f8d25 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index 0a0439905..9df1c45ce 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "ยกเลิก"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "ลบ",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 65e9a43ed..60e733f31 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "ลายเซ็นส่วนตัว",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index 0126d6721..8177fdab5 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/tl/settings.json b/app/javascript/dashboard/i18n/locale/tl/settings.json
index 8971287ab..7108c1610 100644
--- a/app/javascript/dashboard/i18n/locale/tl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tl/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index 330b977bf..b1e94ec9b 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Evet, sil",
+        "CANCEL": "İptal Et"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Sil",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 5fe13dbd2..d3136cc8c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Varsayılan",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "İmzanız",
         "NOTE": "Her gönderdiğiniz mesajın sonunda görünen benzersiz bir mesaj imzası oluşturun. Ayrıca, canlı sohbet, e-posta ve API gelen kutularında desteklenen iç içe bir resim ekleyebilirsiniz.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index e06806570..5c33e2666 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Так, видалити",
+        "CANCEL": "Скасувати"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Видалити",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index f8bac651b..452571703 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "За замовчуванням",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Підпис особистого повідомлення",
         "NOTE": "Створити унікальний підпис повідомлення для кожного повідомлення, яке ви надсилаєте з будь-якої поштової скриньки. Ви також можете включити вбудоване зображення, яке підтримується у живому чаті, електронній пошті та API-поштових скриньках.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index 3de9c07e0..aa8f9ce78 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "منسوخ کریں۔"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "حذف کریں۔",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 0d53beaa4..df973a0ba 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index c1ef3c433..32cbfd150 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Yes, delete",
+        "CANCEL": "Cancel"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 3a70ae1e9..a05b20d4c 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index e7b5cb40f..2bd680e58 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "Có, xoá",
+        "CANCEL": "Huỷ"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "Xoá",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index a67bc1847..9650bc330 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Mặc định",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Chữ ký tin nhắn cá nhân",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index 50c944896..eb5eb1b43 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "是的，删除",
+        "CANCEL": "取消"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "删除",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 87502c7f8..969e874df 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "默认",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "个人消息签名",
         "NOTE": "创建一个唯一的消息签名来显示在您从任何收件箱发送的消息的末尾。 您也可以包含一个内联图片，它支持在直播聊天、电子邮件和API收件箱中。",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 2028ba631..5d1e632ba 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -300,6 +300,12 @@
         "TITLE": "Unlink",
         "SUCCESS": "Issue unlinked successfully",
         "ERROR": "There was an error unlinking the issue, please try again"
+      },
+      "DELETE": {
+        "TITLE": "Are you sure you want to delete the integration?",
+        "MESSAGE": "Are you sure you want to delete the integration?",
+        "CONFIRM": "是的，刪除",
+        "CANCEL": "取消"
       }
     }
   },
@@ -433,6 +439,20 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
       },
+      "SELECTED": "{count} selected",
+      "BULK_APPROVE_BUTTON": "Approve",
+      "BULK_DELETE_BUTTON": "刪除",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
+      "BULK_DELETE": {
+        "TITLE": "Delete FAQs?",
+        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
+        "CONFIRM": "Yes, delete all",
+        "SUCCESS_MESSAGE": "FAQs deleted successfully",
+        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+      },
       "DELETE": {
         "TITLE": "Are you sure to delete the FAQ?",
         "DESCRIPTION": "",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index a47c2b15d..e8896322c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -35,6 +35,24 @@
           }
         }
       },
+      "INTERFACE_SECTION": {
+        "TITLE": "Interface",
+        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "FONT_SIZE": {
+          "TITLE": "Font size",
+          "NOTE": "Adjust the text size across the dashboard based on your preference.",
+          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
+          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "OPTIONS": {
+            "SMALLER": "Smaller",
+            "SMALL": "Small",
+            "DEFAULT": "Default",
+            "LARGE": "Large",
+            "LARGER": "Larger",
+            "EXTRA_LARGE": "Extra Large"
+          }
+        }
+      },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
         "NOTE": "Create a unique message signature to appear at the end of every message you send from any inbox. You can also include an inline image, which is supported in live-chat, email, and API inboxes.",

From 100d39d58a71464f0c9c5c35ad8e684a99dbd942 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Thu, 27 Feb 2025 21:03:31 -0800
Subject: [PATCH 13/27]  Bump version to 4.0.3

---
 config/app.yml | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/app.yml b/config/app.yml
index 668ffcbaf..f655afca7 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.0.2'
+  version: '4.0.3'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 624b77686..f1ab1c234 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",

From ef24eef0b90dabc9eab2c21d6e86aedabe461d72 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 28 Feb 2025 14:20:27 +0530
Subject: [PATCH 14/27] feat: move Linear config to installation_config
 (#10999)

This PR has the following changes

- Add `LINEAR_CLIENT_ID` and `LINEAR_CLIENT_SECRET` to installation
config
- Add Linear config to super_admin/features.yml
- Replace usage of ENV.fetch with GlobalConfigService.load for fetch
Client Id and Secret.
---
 .env.example                                        |  4 ----
 app/controllers/linear/callbacks_controller.rb      |  7 +++++--
 .../super_admin/app_configs_controller.rb           |  2 ++
 app/helpers/linear/integration_helper.rb            |  2 +-
 app/models/integrations/app.rb                      |  3 ++-
 app/views/super_admin/application/_icons.html.erb   |  4 ++++
 config/installation_config.yml                      | 13 +++++++++++++
 enterprise/app/helpers/super_admin/features.yml     |  6 ++++++
 8 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index 6e2b7fe56..b7ba0920d 100644
--- a/.env.example
+++ b/.env.example
@@ -155,10 +155,6 @@ TWITTER_ENVIRONMENT=
 SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
 
-#Linear Integration
-LINEAR_CLIENT_ID=
-LINEAR_CLIENT_SECRET=
-
 # Google OAuth
 GOOGLE_OAUTH_CLIENT_ID=
 GOOGLE_OAUTH_CLIENT_SECRET=
diff --git a/app/controllers/linear/callbacks_controller.rb b/app/controllers/linear/callbacks_controller.rb
index c0688cefc..2eea49333 100644
--- a/app/controllers/linear/callbacks_controller.rb
+++ b/app/controllers/linear/callbacks_controller.rb
@@ -16,9 +16,12 @@ class Linear::CallbacksController < ApplicationController
   private
 
   def oauth_client
+    app_id = GlobalConfigService.load('LINEAR_CLIENT_ID', nil)
+    app_secret = GlobalConfigService.load('LINEAR_CLIENT_SECRET', nil)
+
     OAuth2::Client.new(
-      ENV.fetch('LINEAR_CLIENT_ID', nil),
-      ENV.fetch('LINEAR_CLIENT_SECRET', nil),
+      app_id,
+      app_secret,
       {
         site: 'https://api.linear.app',
         token_url: '/oauth/token',
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index b8f3bd9a9..43157fa0e 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -39,6 +39,8 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
                          %w[AZURE_APP_ID AZURE_APP_SECRET]
                        when 'email'
                          ['MAILER_INBOUND_EMAIL_DOMAIN']
+                       when 'linear'
+                         %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET]
                        else
                          %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS]
                        end
diff --git a/app/helpers/linear/integration_helper.rb b/app/helpers/linear/integration_helper.rb
index 19f16832d..67df836ce 100644
--- a/app/helpers/linear/integration_helper.rb
+++ b/app/helpers/linear/integration_helper.rb
@@ -32,7 +32,7 @@ module Linear::IntegrationHelper
   private
 
   def client_secret
-    @client_secret ||= ENV.fetch('LINEAR_CLIENT_SECRET', nil)
+    @client_secret ||= GlobalConfigService.load('LINEAR_CLIENT_SECRET', nil)
   end
 
   def decode_token(token, secret)
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
index b57a109db..84844b38a 100644
--- a/app/models/integrations/app.rb
+++ b/app/models/integrations/app.rb
@@ -55,9 +55,10 @@ class Integrations::App
   end
 
   def build_linear_action
+    app_id = GlobalConfigService.load('LINEAR_CLIENT_ID', nil)
     [
       "#{params[:action]}?response_type=code",
-      "client_id=#{ENV.fetch('LINEAR_CLIENT_ID', nil)}",
+      "client_id=#{app_id}",
       "redirect_uri=#{self.class.linear_integration_url}",
       "state=#{encode_state}",
       'scope=read,write',
diff --git a/app/views/super_admin/application/_icons.html.erb b/app/views/super_admin/application/_icons.html.erb
index b39ffe4f0..4472701ee 100644
--- a/app/views/super_admin/application/_icons.html.erb
+++ b/app/views/super_admin/application/_icons.html.erb
@@ -147,4 +147,8 @@
   <symbol id="icon-gear" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M3.50498 13.75C3.18794 13.2017 2.94148 12.6156 2.77148 12.0055C3.14146 11.8173 3.45218 11.5305 3.66926 11.1767C3.88633 10.8229 4.00131 10.4159 4.00146 10.0008C4.00162 9.58574 3.88695 9.1787 3.67014 8.82474C3.45332 8.47078 3.14282 8.18369 2.77298 7.99524C3.11201 6.76935 3.75753 5.64995 4.64873 4.74249C4.9968 4.96878 5.4007 5.09436 5.81572 5.10532C6.23074 5.11629 6.6407 5.01221 7.00023 4.80461C7.35976 4.59701 7.65485 4.29399 7.85283 3.92907C8.05081 3.56415 8.14396 3.15157 8.12198 2.73699C9.35357 2.41871 10.6459 2.41922 11.8772 2.73849C11.8554 3.15306 11.9488 3.56558 12.1469 3.9304C12.3451 4.29521 12.6403 4.59809 12.9999 4.80553C13.3595 5.01297 13.7694 5.11688 14.1844 5.10575C14.5994 5.09463 15.0033 4.9689 15.3512 4.74249C15.7855 5.18499 16.171 5.68824 16.495 6.24999C16.8197 6.81174 17.0627 7.39749 17.2285 7.99449C16.8585 8.18267 16.5478 8.46952 16.3307 8.82332C16.1136 9.17712 15.9987 9.58407 15.9985 9.99915C15.9984 10.4142 16.113 10.8213 16.3298 11.1752C16.5466 11.5292 16.8571 11.8163 17.227 12.0047C16.888 13.2306 16.2424 14.35 15.3512 15.2575C15.0032 15.0312 14.5993 14.9056 14.1843 14.8947C13.7692 14.8837 13.3593 14.9878 12.9997 15.1954C12.6402 15.403 12.3451 15.706 12.1471 16.0709C11.9492 16.4358 11.856 16.8484 11.878 17.263C10.6464 17.5813 9.35406 17.5808 8.12273 17.2615C8.14452 16.8469 8.05118 16.4344 7.85305 16.0696C7.65492 15.7048 7.35972 15.4019 7.00011 15.1944C6.64051 14.987 6.23053 14.8831 5.81553 14.8942C5.40053 14.9054 4.99671 15.0311 4.64873 15.2575C4.20548 14.8052 3.82118 14.2987 3.50498 13.75V13.75ZM7.74998 13.897C8.5492 14.358 9.15012 15.0978 9.43748 15.9745C9.81173 16.0097 10.1875 16.0105 10.5617 15.9752C10.8493 15.0984 11.4505 14.3586 12.25 13.8977C13.0489 13.4355 13.9904 13.2846 14.8937 13.474C15.1112 13.168 15.2987 12.8417 15.4547 12.5005C14.8393 11.8131 14.4993 10.9226 14.5 9.99999C14.5 9.05499 14.8525 8.17224 15.4547 7.49949C15.2976 7.15835 15.1093 6.83246 14.8922 6.52599C13.9894 6.71522 13.0486 6.5646 12.25 6.10299C11.4508 5.64202 10.8499 4.90223 10.5625 4.02549C10.1882 3.99024 9.81248 3.98949 9.43823 4.02474C9.15068 4.9016 8.54949 5.64141 7.74998 6.10224C6.95107 6.56448 6.00959 6.71538 5.10623 6.52599C4.88916 6.8322 4.70133 7.15814 4.54523 7.49949C5.16066 8.18691 5.50065 9.07733 5.49998 9.99999C5.49998 10.945 5.14748 11.8277 4.54523 12.5005C4.70234 12.8416 4.89064 13.1675 5.10773 13.474C6.01052 13.2848 6.95139 13.4354 7.74998 13.897ZM9.99998 12.25C9.40325 12.25 8.83095 12.0129 8.40899 11.591C7.98704 11.169 7.74998 10.5967 7.74998 9.99999C7.74998 9.40325 7.98704 8.83096 8.40899 8.409C8.83095 7.98704 9.40325 7.74999 9.99998 7.74999C10.5967 7.74999 11.169 7.98704 11.591 8.409C12.0129 8.83096 12.25 9.40325 12.25 9.99999C12.25 10.5967 12.0129 11.169 11.591 11.591C11.169 12.0129 10.5967 12.25 9.99998 12.25ZM9.99998 10.75C10.1989 10.75 10.3897 10.671 10.5303 10.5303C10.671 10.3897 10.75 10.1989 10.75 9.99999C10.75 9.80108 10.671 9.61031 10.5303 9.46966C10.3897 9.32901 10.1989 9.24999 9.99998 9.24999C9.80107 9.24999 9.61031 9.32901 9.46965 9.46966C9.329 9.61031 9.24998 9.80108 9.24998 9.99999C9.24998 10.1989 9.329 10.3897 9.46965 10.5303C9.61031 10.671 9.80107 10.75 9.99998 10.75V10.75Z" fill="#868C98"/>
   </symbol>
+
+  <symbol id="icon-linear" viewBox="0 0 24 24">
+  <path d="M0.294 14.765c-0.053-0.228 0.218-0.371 0.383-0.206l8.762 8.762c0.165 0.165 0.022 0.436-0.206 0.383C4.812 22.668 1.332 19.188 0.294 14.765zM0 11.253c-0.004 0.068 0.021 0.134 0.07 0.183l12.494 12.494c0.048 0.048 0.115 0.074 0.183 0.07c0.568-0.035 1.127-0.11 1.671-0.222c0.183-0.038 0.247-0.263 0.115-0.396l-13.847-13.847c-0.132-0.132-0.358-0.068-0.396 0.115c-0.112 0.544-0.187 1.102-0.222 1.671zM1.011 7.129c-0.04 0.09-0.02 0.195 0.05 0.264l15.546 15.546c0.069 0.069 0.174 0.09 0.264 0.05c0.429-0.191 0.844-0.406 1.244-0.644c0.133-0.079 0.153-0.261 0.044-0.37l-16.134-16.134c-0.109-0.109-0.291-0.089-0.37 0.044c-0.238 0.4-0.453 0.816-0.644 1.244zM3.038 4.338c-0.089-0.089-0.094-0.231-0.011-0.325c2.2-2.46 5.4-4.013 8.973-4.013 6.627 0 12 5.373 12 12c0 3.562-1.55 6.76-4.013 8.961c-0.094 0.084-0.236 0.078-0.325-0.011l-16.624-16.612z"/>
+</symbol>
 </svg>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 1a804b707..57a5a5faf 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -243,3 +243,16 @@
   locked: false
   description: 'Contents on your firebase credentials json file'
 ## ------ End of Configs added for FCM v1 notifications ------ ##
+
+## ------ Configs added for Linear ------ ##
+- name: LINEAR_CLIENT_ID
+  display_title: 'Linear Client ID'
+  value:
+  locked: false
+  description: 'Linear client ID'
+- name: LINEAR_CLIENT_SECRET
+  display_title: 'Linear Client Secret'
+  value:
+  locked: false
+  description: 'Linear client secret'
+## ------ End of Configs added for Linear ------ ##
diff --git a/enterprise/app/helpers/super_admin/features.yml b/enterprise/app/helpers/super_admin/features.yml
index 506b95832..5aa5fc160 100644
--- a/enterprise/app/helpers/super_admin/features.yml
+++ b/enterprise/app/helpers/super_admin/features.yml
@@ -79,3 +79,9 @@ microsoft:
   enabled: true
   icon: 'icon-microsoft'
   config_key: 'microsoft'
+linear:
+  name: 'Linear'
+  description: 'Configuration for setting up Linear'
+  enabled: true
+  icon: 'icon-linear'
+  config_key: 'linear'

From 24f49b9b5aae21553271d7e46d6dcc8a96b63980 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Fri, 28 Feb 2025 13:33:48 -0800
Subject: [PATCH 15/27] fix: Process non-image inline attachments as regular
 attachments (#10998)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Chatwoot, we rely on the Content-ID for inline attachments to replace
the link with the uploaded attachment URL. Our expectation was that only
images would be inline, while other attachments would not. However,
email clients like Apple Mail (sigh) allow users to send inline
attachments that are not images, and these attachments often lack a
Content-ID. This creates significant issues in rendering.

I investigated how other email clients handle this scenario. When
viewing the same email (sent from Apple Mail) in Gmail, only one image
appears—and it’s treated as an attachment, not inline. This happens
because both attachments are the same image, and Apple Mail only sends
one copy. See the screenshot below.

| Apple Mail | Gmail |
| -- | -- |
| <img width="646" alt="Screenshot 2025-02-27 at 8 20 17 PM"
src="https://github.com/user-attachments/assets/e0d1cd2d-e47c-4081-a53b-7a67106341b3"
/> | <img width="360" alt="Screenshot 2025-02-27 at 8 20 51 PM"
src="https://github.com/user-attachments/assets/b206e56e-8f86-43e9-867b-d895c36aff78"
/> |

A good fix for this would be to check if the Content-ID is missing and
then upload the file as a regular attachment. However, the Mail gem (for
some reason) automatically adds a default Content-ID to inline parts. I
need to dig into the source code to understand why this happens.

For now, I’ve implemented a check to treat non-image attachments as
regular attachments. Inline image attachments are already handled by
appending an image tag at the end if the content-id is not found in the
body. A sample conversation to test this behavior is
[here](https://app.chatwoot.com/app/accounts/1/conversations/46732).
---
 app/mailboxes/mailbox_helper.rb               |   7 +-
 spec/fixtures/files/email_with_inline_pdf.eml | 261 ++++++++++++++++++
 spec/mailboxes/imap/imap_mailbox_spec.rb      |  16 ++
 3 files changed, 282 insertions(+), 2 deletions(-)
 create mode 100644 spec/fixtures/files/email_with_inline_pdf.eml

diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 35f075983..2b5fa1a26 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -35,8 +35,11 @@ module MailboxHelper
   end
 
   def group_attachments(attachments)
-    # If the email lacks a text body, treat inline attachments as standard attachments for processing.
-    inline_attachments = attachments.select { |attachment| attachment[:original].inline? && mail_content.present? }
+    # If the email lacks a text body or if inline attachments aren't images,
+    # treat them as standard attachments for processing.
+    inline_attachments = attachments.select do |attachment|
+      mail_content.present? && attachment[:original].inline? && attachment[:original].content_type.to_s.start_with?('image/')
+    end
 
     regular_attachments = attachments - inline_attachments
     { inline: inline_attachments, regular: regular_attachments }
diff --git a/spec/fixtures/files/email_with_inline_pdf.eml b/spec/fixtures/files/email_with_inline_pdf.eml
new file mode 100644
index 000000000..cea726f5b
--- /dev/null
+++ b/spec/fixtures/files/email_with_inline_pdf.eml
@@ -0,0 +1,261 @@
+From: user@icloud.com
+Content-Type: multipart/mixed;
+	boundary="Apple-Mail=_3D8DCB41-DA29-4339-A8F6-FC6D71948931"
+Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.200.121\))
+Subject: Sample PDF
+Message-Id: <827-314S13-SSS2310@example.com>
+Date: Thu, 27 Feb 2025 18:17:31 -0800
+To: User <user@example.com>
+X-Mailer: Apple Mail (2.3826.200.121)
+X-Proofpoint-ORIG-GUID: v-XMwNZMeEI5CGyn18czwpSt3GHLgcEC
+
+--Apple-Mail=_3D8DCB41-DA29-4339-A8F6-FC6D71948931
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain;
+	charset=us-ascii
+
+Here is an example mail with inline PDF
+
+
+--Apple-Mail=_3D8DCB41-DA29-4339-A8F6-FC6D71948931
+Content-Disposition: inline;
+	filename=dummy.pdf
+Content-Type: application/pdf;
+	x-unix-mode=0644;
+	name="dummy.pdf"
+Content-Transfer-Encoding: base64
+
+JVBERi0xLjQKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURl
+Y29kZT4+CnN0cmVhbQp4nD2OywoCMQxF9/mKu3YRk7bptDAIDuh+oOAP+AAXgrOZ37etjmSTe3IS
+IljpDYGwwrKxRwrKGcsNlx1e31mt5UFTIYucMFiqcrlif1ZobP0do6g48eIPKE+ydk6aM0roJG/R
+egwcNhDr5tChd+z+miTJnWqoT/3oUabOToVmmvEBy5IoCgplbmRzdHJlYW0KZW5kb2JqCgozIDAg
+b2JqCjEzNAplbmRvYmoKCjUgMCBvYmoKPDwvTGVuZ3RoIDYgMCBSL0ZpbHRlci9GbGF0ZURlY29k
+ZS9MZW5ndGgxIDIzMTY0Pj4Kc3RyZWFtCnic7Xx5fFvVlf+59z0tdrzIu7xFz1G8Kl7i2HEWE8vx
+QlI3iRM71A6ksSwrsYptKZYUE9omYStgloZhaSlMMbTsbSPLAZwEGgNlusxQ0mHa0k4Z8muhlJb8
+ynQoZVpi/b736nkjgWlnfn/8Pp9fpNx3zz33bPecc899T4oVHA55KIEOkUJO96DLvyQxM5WI/omI
+pbr3BbU/3J61FPBpItOa3f49g1948t/vI4rLIzL8dM/A/t3vn77ZSpT0LlH8e/0eV98jn3k0mSj7
+bchY2Q/EpdNXm4hyIIOW9g8Gr+gyrq3EeAPGVQM+t+uw5VrQ51yBcc6g6wr/DywvGAHegbE25Br0
+bFR/ezPGR4kq6/y+QPCnVBYl2ijka/5hjz95S8kmok8kEFl8wDG8xQtjZhRjrqgGo8kcF7+I/r98
+GY5TnmwPU55aRIhb9PWZNu2Nvi7mRM9/C2flx5r+itA36KeshGk0wf5MWfQ+y2bLaSOp9CdkyxE6
+S3dSOnXSXSyVllImbaeNTAWNg25m90T3Rd+ii+jv6IHoU+zq6GOY/yL9A70PC/5NZVRHm0G/nTz0
+lvIGdUe/Qma6nhbRWtrGMslFP8H7j7DhdrqDvs0+F30fWtPpasirp0ZqjD4b/YDK6Gb1sOGVuCfo
+NjrBjFF31EuLaQmNckf0J9HXqIi66Wv0DdjkYFPqBiqgy+k6+jLLVv4B0J30dZpmCXyn0mQ4CU0b
+6RIaohEapcfoByyVtRteMbwT/Wz0TTJSGpXAJi+9xWrZJv6gmhBdF/05XUrH6HtYr3hPqZeqDxsu
+nW6I/n30Ocqgp1g8e5o9a6g23Hr2quj90W8hI4toOTyyGXp66Rp6lr5P/05/4AejB2kDdUDzCyyf
+aawIHv8Jz+YH+AHlZarAanfC2hDdR2FE5DidoGfgm3+l0/QGS2e57BOsl93G/sATeB9/SblHOar8
+i8rUR+FvOxXCR0F6kJ7Efn6RXmIGyK9i7ewzzMe+xP6eneZh/jb/k2pWr1H/op41FE2fnv5LdHP0
+j2SlHPokXUkH4duv0QQdpR/Sj+kP9B/0HrOwVayf3c/C7DR7m8fxJXwL9/O7+IP8m8pm5TblWbVW
+Xa9err6o/tzwBcNNJpdp+oOHpm+f/ub0j6JPRX+E3EmC/CJqhUevQlY8SCfpZUj/Gb1KvxT5A/lr
+2Q72aWgJsBvYHeyb7AX2I/ZbrJLkewlfy5uh1ceH4aer+e38Dmh/Ce9T/Of8Vf47/kfFoCxRVip7
+lfuVsDKpnFJ+rVrUIrVCXa5uUXeoUUSm2nCxocPwiOFxw3OGd4z1xj6j3/gb09Wma83/dLbs7L9N
+03T/dHh6ArlrRiZdCU98lR5A3h9FDH4Aj/4QFp+mdxGFHFbAimH3atbK2tgm9il2GfOwq9n17O/Y
+l9k97AH2LawAa+Am2O7gjbyDu7iHX8uv57fwo3gf59/nP+Gv8DOwPEuxKw5lubJR2aFcqgxhDUHl
+gHItPHub8pjykvKy8qbyG+UMopalLlZD6pXq3erD6lH1R4ZPGgbxfsBw0jBl+JHhA8MHRm7MMeYZ
+K42fMT5i/KXJaFppajfdaPoX03+Y/SyPlcFybX614NnYg4v5YzxdPcjOAJHPVErGyh2IQwd2xX9Q
+gzKNuCSJediWwbPVNMFpdKph8AfZCaplL9BBI1dQidXTFGG/4KfV5/lF9GPWw7LVh5Uhww94AT2O
+anSYP81PsPV0lNfzS/i9CrE32CP0BvL9CrqDXc4C9Dg7w9awz7M6dpD+hWcqHexaqo8+wFUWxzay
+dwgW0FVqH33646sgW02/oLemv6omqp9DfZqkuxDRb9Br7FH6MzNE30Z1U1CNXKgyNyPfryNR9XZi
+nx3EfsxGBRkwvkRHxYliqjOuU6+kd+g/6S3DcWTUelTSN6e96lfVX0XrouXYYdhl9Aj2XT9djB3z
+BrLkGYzF6DLs9HjUkmrs6nbaQX30eVS926Lh6L3Ra6L7oz76R/D+mS1jf2Zj2BGT4Kin7+H9RfoZ
+uwn78OL/3ikw3UdT9FtmZYWsGvvhjGGf4bDhMcNRw7cNLxqXw9vX0j3I6F8im+OxAjf9iH5Lf2Jm
+xCabllEN7F0F27togHcrz1ATyyE/9mwJ6vh6fSUBSLka3rsX+/kZ7I13UCcuo2/TK4yzLKzIDf1m
+yGmDn3eB+iFE8Bo2AUwfqnYZ/Q7rTmKreBD6nJB0F6rWFGz6Bf0a3o5Ku5ahLjSzSyDrT/Qp6oOG
+ldTOxhGBJ2k1Kmuz8k/w91JmofVsCfs6+HqwQ5Mon1YbfsU4LZveHF3FvcozOGOiwI/h9Mqli9he
+WJGMdZylDLaFaqe3wYaXiZyNnc6GdRfVr12zelVdbc2K6uVVlRXlyxxlpSXFRYVL7UsKNNvi/Lzc
+nGxrVmZGelpqiiU5KTFhUXyc2WQ0qApntKzF3tqjhYt6wmqRfcOGcjG2u4BwzUP0hDWgWhfShLUe
+SaYtpHSCcveHKJ0xSucsJbNo9VRfvkxrsWvhF5vt2iTbsbUL8C3N9m4tfEbCmyR8WMKJgAsKwKC1
+WPubtTDr0VrCrfv6R1t6miFufFF8k73JE1++jMbjFwFcBCicZfePs6x1TAI8q2XNOCdzIowK59ib
+W8LZ9mZhQVgpbHH1hdu3drU05xYUdJcvC7Mmt703TPb14WSHJKEmqSZsbAqbpBrNK1ZDN2njy6ZG
+b560UG+PI6HP3ue6rCusuLqFjhQH9DaHs6583To3hPDUpq7r58/mKqMtVq8mhqOj12vhqa1d82cL
+xLW7GzLAywtbe0ZbofpmOLGtQ4M2fl13V5hdB5WaWIlYVWx9HnuLwPR8RgvH2dfb+0c/04PQ5IyG
+adv+gkhOjvNY9DTltGijnV32gnBDrr3b1Zw3nk6j2/ZPZDu17IUz5cvGLSkxx44nJetAQuJ8wDM7
+JyFJLqC2bbOeZcIi+0YkRFhza7Cky441rRIXzyoada8CGV7dDFzhPkTEG45r6hm1rBF4wR82FFrs
+2ugfCRlgP/P2QoxLxxgLLX8kAYo8mU01zM/AYYcjXFYmUsTUhJjCxnVyXFu+bN8kX2n3WzR0cB+1
+w7eu7jWVcH9BgQjwTZNO6sUgfGhrV2ysUW9uhJyVju4w7xEzUzMzGdvFzKGZmVn2Hjsy+ah8EMgI
+m4tm/yVbMtNa+teEWebHTHti820d9ratO7q0ltEe3bdtnQtGsflVs3M6FE5r6lJyuQ7xXEXOIikv
+myUWg66EsFqIf0aZ1H1hBUkpEUxrDVt6NsSu3fEFBR/JM2kyz2OajL4juGQ3x6ZbGV7jWDheu2C8
+wLqEUQX2qkW8rXPH6Gj8grlWFKDR0Va71jraM+qajB7qtWsW++gx/jB/eNTf0jMT0Mno8Ztyw603
+d2MR/WwNkpXT+nE7u2HruJPd0LGj65gFT283dHZFOONNPeu7x5dirusYbkWcEstnsWKkiRG1MSR6
+hJvlVO4xJ9EhOatKhBy7JxlJnHkGx8g9yWM4i8ThVY7bFBF8A9449U20/ihn00bTJG9wppFBnVYo
+3qROM8o2Gw3TXHmaFVEcbnatZHVY3qs/W7/Z8m79prP11ADY8gEuy6sKUgpSCnFhuIH4QFOmPnAa
+6C+kqVPQhScYMrjwnGUhGx10rigxlMRfnOVRPQmGsqzVWRsyuzP7Mw2rs1bmXp97t+GuRQZbSiEj
+npZamGwxZxcfMTHTZHRqIm5RDUy82Zl2qIBpBVUFvCAlVSPNUmXhlkl+04S2vMPqgGk7hW2bLDv3
+vufYu+mMNLJB2kg797KdaQXVWZmZqRnpuBfE217AUlZU163jtTVFRcVF9jt4/lM9V032lNft3nRN
+79fPvsxKXv1c3YZd9fUDHeueMBzPK3pu+s0fPnHNmLutzKY+90FtUuolLzz22JO7U5PEs/ct0d+o
+Hbivy6R7nVmfStmTcpdBiTNmG+t5fUobb0t5k5uSJ3nQmaIuyqT4jPT0+DhjWnpRRgZNslJnUqZT
+W1pzJJNFM1lmjhWLdmYuWVpz2Dpm5X7rO1b+eyuzxi8qijOLqWTQjpnZO2Zmzs5qqJdr3zvsEKvf
+jNUPO95D23Sm3iIjVW+BFxrOCC+wnQW1RqN9SVFRLaKWnpm5onrlSgEqm9c84738sU+ybNu2hg3D
+ZSz7vu29n37sLj42bT3tWbsl9Dqb+svPxToP4H73y+o6KmZrj1EpjNmZEt9gMBoTMoyZCTVKjbnG
+WmNv5i3mFmuzPUFTKks74npKD5XeV/p148OmhxKeMD6REC49VXq6NIlKK0vbMXGy9LVSY6kzJ6+m
+AeNDctJgKlBNOfmZcFkk3lQgPLdYNVlSUopz8/KKiuMZGZMtRakpzh21PSnMl8JSJnmrMzkntyg/
+DzhfHuvJY3nAHS1EdBl8HCEqFsmUHNcgeudK2F0M0mJnI1o92tLimmLnmotqKotfKn6tWEkuthUf
+KlaoWCuuKo4Wq8XZJb+K+Vq4OPZCtp2Bl9/budeBRHtv707RwefS6+LdcKbhDEtJXU1oy6vYsGPv
+ToTBkVaQsXJFdWbWSnnNzEAIapCDS4xGCRbNgAeYctPU7ruqWh+4LPRASf70m/nFW9f2V0y/ubhh
+ZWN/+fSbatFtj3Zu396567LmL5/t5ru+WlG/4aa7pjlvvWfHstZr7z77AWKWNL1V3YbcTGM1R1NL
+DCxtMnraaU1IrjFnJibXmMTFKC6GTOC4cI4tZ00NgqomLkoyWjilGdU0rioKg9vTeizMMsmOOFMX
+JSdWJpWQllGV0ZOhvJPBMoR/lxTViN6Zmre4JiMrK0ddrTit2TUHFaZMsmJnHJcjVD8xSsXTiTNv
+ZY1GVagW2enfGYs52LHpbDau+Gc9u7nF0/xrh2Pv8CbLu69Tw5mdlQ3StSx1dYr0a+pqAKYki9jo
+DibjsrMtbOloC69BxY+oFjoefYdY9J1xBc/veHXjRDlGhuhvnEmJKQ1plrRsXFKtDQacIRMYiD6C
+cUxWd1pBWloBMyUp9iXFxWLL1CUxx/T7zD59Y1Nh06cOtm/dnL2+tvfT2WrR2ST+hw/4sZ29Fy1J
++UVioFvUwDvxLPg+amAy7rdHnIVGw7H0Y1blYgPbY/iJgaemFCYmJVGupRAuSSZz5jlVL9OWX5Xf
+k+/PP5RvyLckayzmLFH48hYWvtm6J6pe6urKudq3IqVAQ/HLSDeKymfP5nLj14i6dyf7V5a07cBj
+vV/a/JnvP/vAkX1Nn95QO2Y4nlnw6pHrJ70pGWd/qj433VPR29jenxiPbPoS1nMt1hNHw84Gs0E1
+GgpNmrnKfNL8mlmtNB82c7OZFFWsJ47MpgbjFjyKb1Nw8vAcbVHVIr5IjZu/iPj5i0D9eg8ABnPL
+2LkXvWKw1GM1WEhGgWxfUs6cXcv7zt5rOP7+9IPvn71NVCcrHP5rw8uowpPO6pUqK1M1i5bSrR6y
+GszqSSvPyEzh6amZKUlpyWRJSmNk4elx5uRFbNeiKAwTZSbeyFKSY4VYVh2c13jYFomPkr2iwbzF
+3G5WzCWWypRdKTxlkqnOxKS0Ip6+i8YypzJ5JkL3ZFxCTWZ21hXHuJfk0hx76zeJ0/KDnfXv7sx+
+naxYm1gVWgMuq6uT8UJ5EMUhbUVtjSgLWSZRBDIyVmTYURLs1ntX3x26IlDUtO6i2n/+5+k371WL
+2r9wbcfS71hWb2179YOnlI0i126Hsd9AbMTZPnKM4rAPG1DnnHHtcfxQXDhuKu5U3O/jDLa4nriD
+cWNAGBSjCQe/kkzMSafwxKjQTtwiGA1GkxrPTUVMFXs5rmBpjZpt1o8ah34LIAOEJcjQyOhgAcOO
+NJjL0G5n2dNvsmz1SaZOf/CXT6hFOEDYPAs7xBaccpYK+wztBn7IEDZMGU4Zfm8w2Aw9hoOGMSAM
+MAY3JVwpYjRjCWWr51ii614R02s4/udWeKMRZ3Ixzqp0ymNfO0aW6PvO1kWr7477SuJdlkcMD8ef
+iDuROJljNqezDfxiY2v8lsWPJD5pfDLnu/HfS/hJ/CsJ75v+lJiYl5yX4czNr8lwJqXUJGeczHgp
+Q5GFLnlxg+yTstDzW5wJyUmp7Uk9STzJmspEFmTn1rAVqcLsiXytRvZLSmO9ozzWW/Nk70xOSq4Z
+E/flFpi9KzUVmTehLkq1igxcushEBawyo2BLEkvKqVy8a7Fv8X2L1cXJBWYnirY5O9/bGPPGpjNy
++2w68y6KwBkUOWe61VmS3mB1Lk7GJdeCS15KgyxqDWdlEUyFEaBIFcaASPagE31khhTnnSyEkoEw
+geNMzGeJLjwRF79ODhsLGhwk6F93oCjvlOqTnPBSklCaJNQnOeEskkJRnBwOHKP1uAtD8HbupZ0O
+hiPHrhUX1VpoRTUpBfL+JE0chiZjFv8zs65868j0767zsvSXz7BU41mncrVr/Y5i5YpLLquvZ2xb
+5Vfuf+K2V5kZ1fm70898/qYNbODKg01NAfkxmPiI79d7nvlx/8ldyfV/NGeb5adDD/yqfu5Tf5re
+avwyqgdDbWMzH58RmdZNb6amuQ/UPvQBU4IRKMN36Q71V3SLKZ8OqAFK4qtx53sJ3Qncl/hjZMX4
+dtEw1wielfQ4s7H/5JN8UtGUIeV/qw1qyPBZXXoClSANxIsjISppO+65Nlt82AgCu0u9ksTduzRY
+XhXJFy9HiuTCnaEOK9TFLDqsUjrr12EDWdnndNgI+A4dNtF32Dd02ExF3K/DcTTK79LhePU5RdPh
+RdRr+qUOJ9Buc7MOJxqPmh/T4SS6LPnTs347mHxch+E2y2od5qRa1umwQsss63VYpXjLkA4bKMFy
+hQ4bAV+rwybqtRzWYTOlWf6gw3HUkmLQ4XjuSvmEDi+i5WmPz35btiLtFzqcqOxIT9bhJKrI8sIS
+pgqvJ2V9SYdVysl6UMIG4OOzTuqwSplZ35ewEXhj1ms6rFJq1hsSNom4ZP1JhxGLrKiEzcAnWNN0
+WCWr1SbhOBFfa50OI77ZtToMOdkNOoz4Zl+sw5CZfZ8OI77ZEzqM+Gb/ow4jvtm/0mHEN+dhHUZ8
+c17UYcQ391M6jPhq2TqM+Gqf1WHEV/tfOoz4Ft8p4Xjhq+J/12H4qji2xkXAp5Zk67BKi0scEk4Q
+aynZqMOwv2SrhJNE5pd4dFilvJKQhC1Szm06LOR8TcJpwuclz+owfF7yXQmnC3tKfqbDsKfkTQln
+AJ9eynRYJa00Q8KZgr60VodBX9ok4WxJv1OHBf1eCeeKHCi9TYeRA6X3SDhf2FM6rsOwp/QpCdsk
+/fd1WNC/LOGlIgdK39Jh5EDpHyVcJvxTlqjD8E9ZzM5yUQnKSnVYnYHN0v+zMOwvk/ljlusq26rD
+Ar9LwAkx+v06LPDXS1jGpex+HRZ6H6VO2k9+8tBucpEbvUaPonVSv4Q3kY+G0II6lYaK6aNhwOLq
+At4rKTRgBsBfAahZ4l3/Q0mVs5Zp1IGZAQrN0gSA24g+pm85rca7isp1qFpiG8ExgH4bePbAhqDk
+2gZ5AbRh2odrH6iGMe8C5Xqpo+8cO9fMo9FmqdbQJVJKYNbqFdBahbeGKr8JWDdmfZj3wbNBKj2v
+lI+SMUdbPs+uznn4b0nPCr/1QcYg+mG6HDih7b/vcw1YD7zlhU1BaZvwkYaxoAnqUrcjHhq1S36N
+iqS+Tbhuge7d0vcu0As+D6QKb49ITiGt4jw2xeLsg15hkx+0+z+SyiPzS9CNSKv2zOr16tlbLqPs
+o17d6s1ypl960QVrls3aPixnvDJTO3ANSatjEYll1SrkUpO0JCi9POO3Ydiigcql52Iso7zS930y
+w0TODUld8+Pu1mW5pG2Cc1BKFHb3Q/+glBjzviatdkl9bj0asRlhdUCPh0uuMca3fzb+Xj3b/XoE
+PdI3AZmNsdXNRMil2x+S2jSpYb5VM5EXvhHjESm7f142CFqflBXTPYOPeTuoe8StZ2rgHLogZHqk
+V7zoY7LdOiYkPS0yai6nfXLnDkuPDkh+YamI56DONaPBLfn36Vq9+kpj+1FImPPCblAKaTHsnF+9
+und9+kq8kj4kR3NRDcgsHZDWnT8nZmprYHYtYm5QypuTIerF5bq1Lt3/bln1NH2XzvisT+reI7Ex
+frHDvHoM++W+8+s54sNV7Oh9urdjEuaqvUvGKpYdmvShW1+/V0ZtQNL45d6LZeOQ5IytZH52e2cz
+S+z8K/TIDEprRG7u0/dWrO4MzNoxKEdz2Rv80IkU+ND63LqOXikhJD3dtyA3PbQX+BnPitx2z65w
+t8xtTebAFdK3AZl3wdl6Eou6sD2234N61YjtpoCeZXPVMzY7KCPioislf8xqIdctZ+cyLaa9T3rL
+L3fJ/tlVzOgekjVTzLukJ4Z1HWIPxbwYlPwzFs9I98scGpR1c8a2Cnn2BTG3BmdqJeSKd4Wkml9h
+K2R1GgRFv9xLA4AGAQ3JCHnkKEC7ZA7EIl4xS/l/V8OIzJgYrWeels2o9J0491vRmpB5At4CrDgB
+WnH9pMS3ANOBq8jNi3EStOC9SWI7KRFPU6J1ymwKnCfXtFl8bJ/EPOrXfT6Xo3/dKTYXmZmKPBPn
+Xjm7H/ShWZ3u2doWy+e582h+tYxVjrk6Gtu/Xr1mBvQ9vUdK8czWRLFbu3VtYnfv02tp7+xpFNMZ
+/BjPzNTOkdnq5NF3nGc2p4dl/Qjq+3m3no/n89fMLhQe88yTMreLz9XXp5+AIgN7ZWWMWd2rR2ZI
+l3y+CBXLVS30VKwin5sV52qeqW2iirnkvagLWgd0bwf0GvJRuoX3twMzV2f3nxMLj36XMf+eK1a9
+XdIiv/SsV7/T+Wtirum5ODSvts3oFZWkT3raO+8UGZ53r7xslnp4Xt7Ond0f7ylh3aCUP5NXvgXy
+RmT8L5fRnH8fOlMf5yh9oI3doYakx4X8/tn1xOyan92DekWN+T+2q/x6fsxV3oU59HErmsuPjXLt
+50Zu5t5LnDke/Q4ttprY/Z5bRnXoQzEY/pC/5yQH5N1qSN71x86hffLeaITm313919GfkTes3/95
+9Wee893FnRvHmLfm7ljdUua5+3gmYq4P+Xr332TtnJfP1bDwvF9okUe/iw3i7JmRIJ5PGin2JFCC
+e/gaqsPzl4brcozK8XxVI5+yxKcj26lNp6zC7HLM1OhwHZ7G6iTXSqrFs4BoQvrfdtb990/GmbnK
+D3lv9jzs3O/37Ha5PdqjWme/R9vkG/IFgdKafMN+37Ar6PUNaf4Bd4XW7Aq6/guiSiFM6/ANhAQm
+oG0cAt/y1aurynGprtAaBwa0bd49/cGAts0T8Azv8/Q1DntdA+t9A30zMtdIjCZQay7xDAeE6BUV
+VVVaySave9gX8O0Ols6RzKeQ2HIpq1PCj2idw64+z6Br+HLNt/tjLdeGPXu8gaBn2NOneYe0IEi3
+d2jtrqBWpHVu0rbs3l2huYb6NM9AwDPSD7KKWUlYs2/PsMvfv38+yqM1D7tGvEN7BK8X7i3Xtvl6
+IXqz193vG3AFlgnpw16316V1uEJDfVgIXLWqusk3FPQMCtuG92sBF7wIR3l3a32egHfP0DIttnY3
+qFxeTA76hj1af2jQNQTzNXe/a9jlxjIw8LoDWIdrSMPcfrF+L9zuxwI9bk8g4IM6sSAX5Ifc/ZpX
+FyUWHxryaCPeYL90w6DP1ye4BQyzgzDEDacGZnDBEc9Q0OsBtRtAaHh/hSY97dvnGXYh3sFhjys4
+iCnB4A4h5gGhTMTRMyxN2B0aGAAobYX6QR+UeIf6QoGgXGoguH/AM98TIlsDQotneNA7JCmGfZdD
+rAv2u0NQFAtgn9e1xyfmR/rhc63fM+CHR3zaHu8+jySQae/SBuAObdAD3w153SB3+f0euHHI7YGS
+mLu9wlma5wosZtAzsF/D2gLInQEhY9A7IN0b1DdSQNfnBkevRwsFkFLSm569IWFsyC38r+32YcmQ
+iEUFgyJPsPRhD+IeRGogTAG4TKYnhoOuPa4rvUMQ7Qm6l8WcBvY+b8A/4NovVAjuIc9IwO/ywzSQ
+9MHEoDcgBAty/7Bv0CelVfQHg/41lZUjIyMVg3rCVrh9g5X9wcGBysGg+NuSysHALpdYeIVA/pUM
+I54BYD2SZfOWzo2tG5saOzdu2axtadU+ubGpZXNHi9Z48baWlk0tmzsT4xPjO/vh1hmvCReLmMBQ
+rCAoPXqeLSYXIxJZrLl3v7bfFxKcbpFt8LPcR7G0RHLIHEV8sf2GQO7aM+zxiEys0LrB1u9CGvh6
+xTYCZ3CBMSI7R0Q6eRA4j/D0sMcdRJx3w49zdokQ+vZ4JIkM8SwfQoPs7Q0FIRpm+rCj5i2oODBj
+FBJ51hWzzCLbtH2ugZCrFxnmCiBD5nNXaNuHZM7un1kF1qRXLqS3Swv4PW4vis65K9fgxSGZbYLX
+1dfnFTmBrByWVXmZQA9L38rd/SGjBryDXrEgKJF0I77hywOxJJX5KJG+ERTUUO+AN9Av9EBWzN2D
+SFTYj1D592ux5NU9tFCR9MfG3XOLE9Vrb8gTkGpQ99ye4SF9BcO63ZI40O8LDfRhD+3zekZi5eqc
+5Qs6RNKDCtA3V+Jm1wizZGF1B+diLBbm0q3efX6x0uRZBn3f64KgxxVcIwi2dzTiEChZVVNXqtUt
+X1VeVVNVFRe3vQ3IquXLa2pwrVtRp9WtrF1duzox/iN23cduRjGq1M2T+xCPqx79Jknc6sz/mGXh
+TJBCLBG3Bm8toJnD7qaFH3NrOqZV/9Bj/oyOU25QnlG+o5zEdXz+/AL8ha8NLnxtcOFrgwtfG1z4
+2uDC1wYXvja48LXBha8NLnxtcOFrgwtfG1z42uDC1wYXvjb4f/hrg9nPD7z0UZ8sxGY+iT6WrT6J
+CS2gPXf2Ylk1AguoZnCt9BbGl9N7oH8LuIWfOiycm+GZub/ynVfi3OwlEppPE8NskKN98vOOhfML
+Z9r10zckn/18clfOpz7f/HxP+T7Shz7Vpq5T16pN6kp1lepUL1Lb1NXzqc8733neT3TmsK3nrCeG
+aRMjthw08+fmsG36venlH7J4Hp6l0C8VO7Jk3vws7q/Nm7/SN3+1vI/LK/3/y1O0mH5K53l9mzqV
+r1AyY2SLTilfnrCkVzsnlbsnktOqnY0W5U5qR+MUVjbRFBonn3IbHUTjIG+LlC+vPiaAifikagvo
+byIN7RCaQmO4Mjl2ogn6mybSMoX4ayLJKZLvs5GqmhgwYbFWtzemK1cQUzzKENnJphxAvxi9G30+
++l6lD5VC2OmcSLZUH4K+BpA3KBkoQzalUcmkavTNSg7lSrJQJCmmJxQpKatujFeaFKskSVYSUY9s
+ilkxRapt2glF/NmwU7lhIm6RsO+GiCWj+hnlOsVE6aA6BKosW/IzSjxVoomVdE7EJVYfbkxQOrHM
+TrjFpoj/rH+fvDqVoQgEQV+LkkeZmLtcyacM9K3K4kiGbeqEcrsk+zshBfrWRcwrRDeRmFQ91Rin
+iL8HCCu3wuO3Sm2HJ4pWVVNjkVJCVYr4EwlNOQjooPjP4soooFGEaRShGUVoRmHFKBkR+RsxcyNo
+KpUrya+M0GG0+wCrEJkRgQePSWBpSfUxJVuxwhOWE/AdAzZnIi5JWGaNpKZJMutEQlJ1wzNKgLag
+cRgfnMiyVvtOKGVyKcsmrLmCwR+JS4DrsmKxAGOmiMEzSp6yWHoiX3og3GjDmFGyYiPGf8BPCe/w
+l/mPRXzFT/rI/h/1/kW9/2Gsj07xUxPQ4pzk/yz60415/A0I28VfpfsAcX6CP4+jxsZ/zieFFfxn
+/Bg1oH8F4z70x9CvQH88UvA92ySfnEAH2++JJGaKxfLnI45KHbAV6kBWrg6kZlY3FvLn+LOUBxE/
+Rb8U/bN8ipagP4nein6KB+l76J/gtbQW/VG9/w5/WuQ0f4o/iTPTxiciScKEcMQkuiMRo+i+FaHY
+qL3S9jT/Fn+cckD6zUhRDrCPTBQttSWfgDzGH+TBSL4ttTGe38+62LsgGqNXRE+p/IFInRByOPK0
+ZjvGD/PDTmuds9BZ7nxIqSqsKq96SNEKtXKtTntIa7TwW8kA52HD8ptwxfnMkT1oTrTD/MaIWhdu
+PIs1iXVxOoTrmIR6cPVLiHC1zM6+I6EGfh1tQeOQcQDtINohtKtIxfVKtM+ifQ7t8xITRAuhjaB8
++MHhB4cfHH7J4QeHHxx+cPglh19qD6EJjh5w9ICjBxw9kqMHHD3g6AFHj+QQ9vaAo0dytIOjHRzt
+4GiXHO3gaAdHOzjaJUc7ONrB0S45nOBwgsMJDqfkcILDCQ4nOJySwwkOJzickqMKHFXgqAJHleSo
+AkcVOKrAUSU5qsBRBY4qyaGBQwOHBg5Ncmjg0MChgUOTHBo4NHBoksMCDgs4LOCwSA4LOCzgsIDD
+IjksMj4hNMFxGhynwXEaHKclx2lwnAbHaXCclhynwXEaHKf5yLhyqvEFsJwCyymwnJIsp8ByCiyn
+wHJKspwCyymwnNKXHpTO4EibA2gH0Q6hCd4p8E6Bdwq8U5J3SqZXCE3whsERBkcYHGHJEQZHGBxh
+cIQlRxgcYXCEJccYOMbAMQaOMckxBo4xcIyBY0xyjMnEDaEJjr89Kf/m0PCrWJcZhys/xEplf5De
+lv0BekX2n6dx2X+OHpL9Z+lq2V9JdbIfoSLZQ57sg2Qzs4itLrkxEyVgC9ouNB/afWhH0E6imST0
+EtpraFFe61yiJpu2mO4zHTGdNBmOmE6beLJxi/E+4xHjSaPhiPG0kWuNuTxR1lGUFvqivB7E9fdo
+OERwbZBQA6+B3hrU2Vq8a3iNM+WM9vsy9lIZO1nGjpSxL5axxjh+MVNlpcOdPofhrMuZULTO9gpa
+XVHxOlSmW598O8sWKVppm2RPx7pSpwP922jjaA+hXY1Wh1aNVo5WiGaTuDLQdzmX6CKfRitGK0DT
+hArKzMTdTWqK2XmMJ7KHJl5IpDihp7gEfCcixVXoJiPFW9A9FSnutTXGsSepWNwGsScQucfRH4nY
+Xsf0N2PdNyK2E+geidhq0O2MFFeguzRS/KKtMZFtJ5sqWDv1vgPrFv22iO0SkG2N2ErROSLFRYK6
+DIoKMVvKuuh19IU619KYJnvEthbdkohttaA2U7EIPDNSuTTPgCZ6ZQIG/f4Y61KZc5HtjO1229tg
+/x0ci/T4mTaponupcJJd4oy3PV3+VRA32iKN8YIe58O43odF/4TtocIbbfdAFit80na3rcJ2a/mk
+GehbYPeNUkXEdrU2yR93ptkO2apswfLXbQHbJ2wu2zbbzkLgI7bLbE8LM6mbdfHHn7S1Q+BGrKIw
+Yru4cFKa2Grbb3Paim2rtaeFf2lVTG5d+dPCA1Qd074M/i0rnBQ5vr1ukqU4y0zvmA6bLjWtN601
+2U1LTItN+aZ0c6rZYk4yJ5jjzWaz0ayauZnM6eLnHRzizyvTjeKv18moiqsqYQsXVx77S1POzJw+
+QeE0pY23daxnbeEpN7X1auH3OuyTLH7rjrDBvp6FU9uorXN9eJWjbdIU3Rauc7SFTe2Xdo0zdms3
+sGF+wySjzq5JFhWo63LFD1GNM7rultxjxFj2dbd0d5M1c1+DtSF1Xcrq1ubzXHr0q2PuZZ0P5ofv
+auvoCj+W3x2uFkA0v7stfJX4mapjPJkntjQf40mi6+46pvp5css2gVf9zd0ge12SIZuTQEbFogOZ
+eT1pggz1ZL0gQ4xidEVgB12B6EAXn0hFkq4oPlHSqUzQjb+itTSPa5qkKSR6RdK8UkjzaJAx4G0e
+LyqSVHaNdQkq1mXXpGGlUpDNBpJymyTBk5tNCrIxqSxcOUdSqJPUzpLUSl0Km6OxxWjSS2Zo0ktA
+4/gfvjzrHWxieejA8+KXv3rsLR60nvBN+/qt4UO9mjZ+IKT/JFhRT6+7X/QuTzhk9zSHD9ibtfHl
+z59n+nkxvdzePE7Pt3R2jT/v9DRHljuXt9hdzd0TDfVdjQt03Tirq6v+PMLqhbAuoauh8TzTjWK6
+QehqFLoaha4GZ4PU1eIVed/eNW6m9eJ3QWQ/wRfFI4d7cgu612da/OtEQh9bW2A9kHtcJfYILXJ0
+hxPs68OJaGKqvLG8UUxhn4mpJPHzbvqU9cDagtzj7BF9ygJ0in09zbiWBFFbuHZrW7igY0eXSJWw
+03X+mAXES05bqcXbjH8YB2XDez4lBc77Cp7vFQqFAuIScuApuS1c1tEWXrkVlphMUNXT3A1cxQxO
+USRuPC6uZTI6hUkHjGBBoU5ADiZ+I8AZj6cuEx8zjpm4eFQITuTkV/uewQl+EA3PcXwkUimfl/nI
+xJJC8fwSnKisjfV4PhV9JKegWvwUQR1YRV8Y650p5QAOFx4uP1w3VjhWPlZnFD+08BCQtofEURqp
+fEihoCMw4wiAwW6K/XQB9N0fycuXiscE4HB0OwLyN17ow6526L8jA6fPOjagSw1I8cGZgMTwAYoR
+xyYdoRmmkM4iJ0OSRSr8P1jbNhMKZW5kc3RyZWFtCmVuZG9iagoKNiAwIG9iagoxMDgyNQplbmRv
+YmoKCjcgMCBvYmoKPDwvVHlwZS9Gb250RGVzY3JpcHRvci9Gb250TmFtZS9CQUFBQUErQXJpYWwt
+Qm9sZE1UCi9GbGFncyA0Ci9Gb250QkJveFstNjI3IC0zNzYgMjAwMCAxMDExXS9JdGFsaWNBbmds
+ZSAwCi9Bc2NlbnQgOTA1Ci9EZXNjZW50IDIxMQovQ2FwSGVpZ2h0IDEwMTAKL1N0ZW1WIDgwCi9G
+b250RmlsZTIgNSAwIFI+PgplbmRvYmoKCjggMCBvYmoKPDwvTGVuZ3RoIDI3Mi9GaWx0ZXIvRmxh
+dGVEZWNvZGU+PgpzdHJlYW0KeJxdkc9uhCAQxu88BcftYQNadbuJMdm62cRD/6S2D6AwWpKKBPHg
+2xcG2yY9QH7DzDf5ZmB1c220cuzVzqIFRwelpYVlXq0A2sOoNElSKpVwe4S3mDpDmNe22+JgavQw
+lyVhbz63OLvRw0XOPdwR9mIlWKVHevioWx+3qzFfMIF2lJOqohIG3+epM8/dBAxVx0b6tHLb0Uv+
+Ct43AzTFOIlWxCxhMZ0A2+kRSMl5RcvbrSKg5b9cskv6QXx21pcmvpTzLKs8p8inPPA9cnENnMX3
+c+AcOeWBC+Qc+RT7FIEfohb5HBm1l8h14MfIOZrc3QS7YZ8/a6BitdavAJeOs4eplYbffzGzCSo8
+3zuVhO0KZW5kc3RyZWFtCmVuZG9iagoKOSAwIG9iago8PC9UeXBlL0ZvbnQvU3VidHlwZS9UcnVl
+VHlwZS9CYXNlRm9udC9CQUFBQUErQXJpYWwtQm9sZE1UCi9GaXJzdENoYXIgMAovTGFzdENoYXIg
+MTEKL1dpZHRoc1s3NTAgNzIyIDYxMCA4ODkgNTU2IDI3NyA2NjYgNjEwIDMzMyAyNzcgMjc3IDU1
+NiBdCi9Gb250RGVzY3JpcHRvciA3IDAgUgovVG9Vbmljb2RlIDggMCBSCj4+CmVuZG9iagoKMTAg
+MCBvYmoKPDwKL0YxIDkgMCBSCj4+CmVuZG9iagoKMTEgMCBvYmoKPDwvRm9udCAxMCAwIFIKL1By
+b2NTZXRbL1BERi9UZXh0XT4+CmVuZG9iagoKMSAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDQg
+MCBSL1Jlc291cmNlcyAxMSAwIFIvTWVkaWFCb3hbMCAwIDU5NSA4NDJdL0dyb3VwPDwvUy9UcmFu
+c3BhcmVuY3kvQ1MvRGV2aWNlUkdCL0kgdHJ1ZT4+L0NvbnRlbnRzIDIgMCBSPj4KZW5kb2JqCgox
+MiAwIG9iago8PC9Db3VudCAxL0ZpcnN0IDEzIDAgUi9MYXN0IDEzIDAgUgo+PgplbmRvYmoKCjEz
+IDAgb2JqCjw8L1RpdGxlPEZFRkYwMDQ0MDA3NTAwNkQwMDZEMDA3OTAwMjAwMDUwMDA0NDAwNDYw
+MDIwMDA2NjAwNjkwMDZDMDA2NT4KL0Rlc3RbMSAwIFIvWFlaIDU2LjcgNzczLjMgMF0vUGFyZW50
+IDEyIDAgUj4+CmVuZG9iagoKNCAwIG9iago8PC9UeXBlL1BhZ2VzCi9SZXNvdXJjZXMgMTEgMCBS
+Ci9NZWRpYUJveFsgMCAwIDU5NSA4NDIgXQovS2lkc1sgMSAwIFIgXQovQ291bnQgMT4+CmVuZG9i
+agoKMTQgMCBvYmoKPDwvVHlwZS9DYXRhbG9nL1BhZ2VzIDQgMCBSCi9PdXRsaW5lcyAxMiAwIFIK
+Pj4KZW5kb2JqCgoxNSAwIG9iago8PC9BdXRob3I8RkVGRjAwNDUwMDc2MDA2MTAwNkUwMDY3MDA2
+NTAwNkMwMDZGMDA3MzAwMjAwMDU2MDA2QzAwNjEwMDYzMDA2ODAwNkYwMDY3MDA2OTAwNjEwMDZF
+MDA2RTAwNjkwMDczPgovQ3JlYXRvcjxGRUZGMDA1NzAwNzIwMDY5MDA3NDAwNjUwMDcyPgovUHJv
+ZHVjZXI8RkVGRjAwNEYwMDcwMDA2NTAwNkUwMDRGMDA2NjAwNjYwMDY5MDA2MzAwNjUwMDJFMDA2
+RjAwNzIwMDY3MDAyMDAwMzIwMDJFMDAzMT4KL0NyZWF0aW9uRGF0ZShEOjIwMDcwMjIzMTc1NjM3
+KzAyJzAwJyk+PgplbmRvYmoKCnhyZWYKMCAxNgowMDAwMDAwMDAwIDY1NTM1IGYgCjAwMDAwMTE5
+OTcgMDAwMDAgbiAKMDAwMDAwMDAxOSAwMDAwMCBuIAowMDAwMDAwMjI0IDAwMDAwIG4gCjAwMDAw
+MTIzMzAgMDAwMDAgbiAKMDAwMDAwMDI0NCAwMDAwMCBuIAowMDAwMDExMTU0IDAwMDAwIG4gCjAw
+MDAwMTExNzYgMDAwMDAgbiAKMDAwMDAxMTM2OCAwMDAwMCBuIAowMDAwMDExNzA5IDAwMDAwIG4g
+CjAwMDAwMTE5MTAgMDAwMDAgbiAKMDAwMDAxMTk0MyAwMDAwMCBuIAowMDAwMDEyMTQwIDAwMDAw
+IG4gCjAwMDAwMTIxOTYgMDAwMDAgbiAKMDAwMDAxMjQyOSAwMDAwMCBuIAowMDAwMDEyNDk0IDAw
+MDAwIG4gCnRyYWlsZXIKPDwvU2l6ZSAxNi9Sb290IDE0IDAgUgovSW5mbyAxNSAwIFIKL0lEIFsg
+PEY3RDc3QjNEMjJCOUY5MjgyOUQ0OUZGNUQ3OEI4RjI4Pgo8RjdENzdCM0QyMkI5RjkyODI5RDQ5
+RkY1RDc4QjhGMjg+IF0KPj4Kc3RhcnR4cmVmCjEyNzg3CiUlRU9GCg==
+--Apple-Mail=_3D8DCB41-DA29-4339-A8F6-FC6D71948931--
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index fdea5b9d4..cc72be18b 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -59,6 +59,22 @@ RSpec.describe Imap::ImapMailbox do
       end
     end
 
+    context 'when the email has inline attachments other than images' do
+      let(:inbound_mail) { create_inbound_email_from_fixture('email_with_inline_pdf.eml') }
+
+      it 'creates a conversation and a message with non-image files as regular attachments' do
+        expect do
+          class_instance.process(inbound_mail.mail, channel)
+        end.to change(Conversation, :count).by(1)
+
+        last_message = conversation.messages.last
+        expect(last_message.attachments.count).to be 1
+
+        attachment = last_message.attachments.first
+        expect(attachment.file.blob.filename.to_s).to eq 'dummy.pdf'
+      end
+    end
+
     context 'when the email has 15 or more attachments' do
       let(:inbound_mail) { create_inbound_email_from_fixture('multiple_attachments.eml') }
 

From 616bbced9caa7ae5302209c90b942b86fb1da7d7 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Sat, 1 Mar 2025 04:50:39 +0530
Subject: [PATCH 16/27] feat: allow copilot use without connecting an inbox
 (#10992)

This PR allows Copilot to be used without connecting the Captain assistant to an inbox. Currently, if Captain is enabled on an account, it takes over conversations and responds directly to users. This PR enables the use of Captain as a Copilot without allowing it to respond to users. Additionally, it allows using a different assistant for Copilot instead of the default Captain assistant.

The selection logic for the Copilot assistant follows this order of preference:

- If the user has selected a specific assistant, it takes first preference for Copilot.
- If the above is not available, the assistant connected to the inbox takes preference.
- If neither of the above is available, the first assistant in the account takes preference.
---
 .../dashboard/api/inbox/conversation.js       |  4 +
 .../components-next/copilot/Copilot.vue       | 35 ++++++--
 .../copilot/ToggleCopilotAssistant.vue        | 81 +++++++++++++++++++
 .../dropdown-menu/base/DropdownBody.vue       |  2 +-
 .../components/copilot/CopilotContainer.vue   | 59 +++++++++++++-
 .../i18n/locale/en/integrations.json          |  3 +-
 .../store/modules/conversations/actions.js    |  9 +++
 .../store/modules/conversations/getters.js    |  4 +
 .../store/modules/conversations/index.js      |  4 +
 .../specs/conversations/actions.spec.js       | 19 +++++
 .../specs/conversations/getters.spec.js       | 17 ++++
 .../specs/conversations/mutations.spec.js     | 16 ++++
 .../dashboard/store/mutation-types.js         |  3 +
 config/routes.rb                              |  1 +
 .../v1/accounts/conversations_controller.rb   | 22 ++++-
 15 files changed, 265 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/dashboard/components-next/copilot/ToggleCopilotAssistant.vue

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 8b9eacf3f..39546096f 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -137,6 +137,10 @@ class ConversationApi extends ApiClient {
   requestCopilot(conversationId, body) {
     return axios.post(`${this.url}/${conversationId}/copilot`, body);
   }
+
+  getInboxAssistant(conversationId) {
+    return axios.get(`${this.url}/${conversationId}/inbox_assistant`);
+  }
 }
 
 export default new ConversationApi();
diff --git a/app/javascript/dashboard/components-next/copilot/Copilot.vue b/app/javascript/dashboard/components-next/copilot/Copilot.vue
index cf867789b..e284bb983 100644
--- a/app/javascript/dashboard/components-next/copilot/Copilot.vue
+++ b/app/javascript/dashboard/components-next/copilot/Copilot.vue
@@ -7,6 +7,7 @@ import CopilotInput from './CopilotInput.vue';
 import CopilotLoader from './CopilotLoader.vue';
 import CopilotAgentMessage from './CopilotAgentMessage.vue';
 import CopilotAssistantMessage from './CopilotAssistantMessage.vue';
+import ToggleCopilotAssistant from './ToggleCopilotAssistant.vue';
 import Icon from '../icon/Icon.vue';
 
 const props = defineProps({
@@ -26,9 +27,17 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  assistants: {
+    type: Array,
+    default: () => [],
+  },
+  activeAssistant: {
+    type: Object,
+    default: () => ({}),
+  },
 });
 
-const emit = defineEmits(['sendMessage', 'reset']);
+const emit = defineEmits(['sendMessage', 'reset', 'setAssistant']);
 
 const COPILOT_USER_ROLES = ['assistant', 'system'];
 
@@ -97,14 +106,18 @@ watch(
 
       <CopilotLoader v-if="isCaptainTyping" />
     </div>
-    <div>
-      <div v-if="!messages.length" class="flex-1 px-3 py-3 space-y-1">
+
+    <div
+      v-if="!messages.length"
+      class="h-full w-full flex items-center justify-center"
+    >
+      <div class="h-fit px-3 py-3 space-y-1">
         <span class="text-xs text-n-slate-10">
           {{ $t('COPILOT.TRY_THESE_PROMPTS') }}
         </span>
         <button
           v-for="prompt in promptOptions"
-          :key="prompt"
+          :key="prompt.label"
           class="px-2 py-1 rounded-md border border-n-weak bg-n-slate-2 text-n-slate-11 flex items-center gap-1"
           @click="() => useSuggestion(prompt)"
         >
@@ -112,7 +125,17 @@ watch(
           <Icon icon="i-lucide-chevron-right" />
         </button>
       </div>
-      <div class="mx-3 mt-px mb-2 flex flex-col items-end flex-1">
+    </div>
+
+    <div class="mx-3 mt-px mb-2">
+      <div class="flex items-center gap-2 justify-between w-full mb-1">
+        <ToggleCopilotAssistant
+          v-if="assistants.length"
+          :assistants="assistants"
+          :active-assistant="activeAssistant"
+          @set-assistant="$event => emit('setAssistant', $event)"
+        />
+        <div v-else />
         <button
           v-if="messages.length"
           class="text-xs flex items-center gap-1 hover:underline"
@@ -121,8 +144,8 @@ watch(
           <i class="i-lucide-refresh-ccw" />
           <span>{{ $t('CAPTAIN.COPILOT.RESET') }}</span>
         </button>
-        <CopilotInput class="mb-1 flex-1 w-full" @send="sendMessage" />
       </div>
+      <CopilotInput class="mb-1 w-full" @send="sendMessage" />
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/copilot/ToggleCopilotAssistant.vue b/app/javascript/dashboard/components-next/copilot/ToggleCopilotAssistant.vue
new file mode 100644
index 000000000..ec21cec9f
--- /dev/null
+++ b/app/javascript/dashboard/components-next/copilot/ToggleCopilotAssistant.vue
@@ -0,0 +1,81 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import DropdownContainer from 'next/dropdown-menu/base/DropdownContainer.vue';
+import DropdownSection from 'next/dropdown-menu/base/DropdownSection.vue';
+import DropdownBody from 'next/dropdown-menu/base/DropdownBody.vue';
+import DropdownItem from 'next/dropdown-menu/base/DropdownItem.vue';
+
+const props = defineProps({
+  assistants: {
+    type: Array,
+    required: true,
+  },
+  activeAssistant: {
+    type: Object,
+    required: true,
+  },
+});
+
+const emit = defineEmits(['setAssistant']);
+
+const { t } = useI18n();
+
+const activeAssistantLabel = computed(() => {
+  return props.activeAssistant
+    ? props.activeAssistant.name
+    : t('CAPTAIN.COPILOT.SELECT_ASSISTANT');
+});
+</script>
+
+<template>
+  <div>
+    <DropdownContainer>
+      <template #trigger="{ toggle, isOpen }">
+        <Button
+          :label="activeAssistantLabel"
+          icon="i-woot-captain"
+          ghost
+          slate
+          xs
+          :class="{ 'bg-n-alpha-2': isOpen }"
+          @click="toggle"
+        />
+      </template>
+      <DropdownBody class="bottom-9 min-w-64 z-50" strong>
+        <DropdownSection class="max-h-80 overflow-scroll">
+          <DropdownItem
+            v-for="assistant in assistants"
+            :key="assistant.id"
+            class="!items-start !gap-1 flex-col cursor-pointer"
+            @click="() => emit('setAssistant', assistant)"
+          >
+            <template #label>
+              <div class="flex gap-1 justify-between w-full">
+                <div class="items-start flex gap-1 flex-col">
+                  <span class="text-n-slate-12 text-sm">
+                    {{ assistant.name }}
+                  </span>
+                  <span class="line-clamp-2 text-n-slate-11 text-xs">
+                    {{ assistant.description }}
+                  </span>
+                </div>
+
+                <div
+                  v-if="assistant.id === activeAssistant?.id"
+                  class="flex items-center justify-center flex-shrink-0 w-4 h-4 rounded-full bg-n-slate-12 dark:bg-n-slate-11"
+                >
+                  <i
+                    class="i-lucide-check text-white dark:text-n-slate-1 size-3"
+                  />
+                </div>
+              </div>
+            </template>
+          </DropdownItem>
+        </DropdownSection>
+      </DropdownBody>
+    </DropdownContainer>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
index 246eba5aa..1a67aaa68 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownBody.vue
@@ -19,7 +19,7 @@ const beforeClass = computed(() => {
 
   // Add extra blur layer only when strong prop is true, as a hack for Chrome's stacked backdrop-blur limitation
   // https://issues.chromium.org/issues/40835530
-  return "before:content-['\x00A0'] before:absolute before:bottom-0 before:left-0 before:w-full before:h-full before:backdrop-contrast-70 before:backdrop-blur-sm before:z-0 [&>*]:relative";
+  return "before:content-['\x00A0'] before:absolute before:bottom-0 before:left-0 before:w-full before:h-full before:rounded-xl before:backdrop-contrast-70 before:backdrop-blur-sm before:z-0 [&>*]:relative";
 });
 </script>
 
diff --git a/app/javascript/dashboard/components/copilot/CopilotContainer.vue b/app/javascript/dashboard/components/copilot/CopilotContainer.vue
index 17d35d82a..0a4638730 100644
--- a/app/javascript/dashboard/components/copilot/CopilotContainer.vue
+++ b/app/javascript/dashboard/components/copilot/CopilotContainer.vue
@@ -1,8 +1,11 @@
 <script setup>
+import { ref, computed, onMounted, watchEffect } from 'vue';
+import { useStore } from 'dashboard/composables/store';
 import Copilot from 'dashboard/components-next/copilot/Copilot.vue';
 import ConversationAPI from 'dashboard/api/inbox/conversation';
 import { useMapGetter } from 'dashboard/composables/store';
-import { ref } from 'vue';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+
 const props = defineProps({
   conversationId: {
     type: [Number, String],
@@ -13,10 +16,44 @@ const props = defineProps({
     required: true,
   },
 });
-const currentUser = useMapGetter('getCurrentUser');
-const messages = ref([]);
 
+const store = useStore();
+const currentUser = useMapGetter('getCurrentUser');
+const assistants = useMapGetter('captainAssistants/getRecords');
+const inboxAssistant = useMapGetter('getCopilotAssistant');
+const { uiSettings, updateUISettings } = useUISettings();
+
+const messages = ref([]);
 const isCaptainTyping = ref(false);
+const selectedAssistantId = ref(null);
+
+const activeAssistant = computed(() => {
+  const preferredId = uiSettings.value.preferred_captain_assistant_id;
+
+  // If the user has selected a specific assistant, it takes first preference for Copilot.
+  if (preferredId) {
+    const preferredAssistant = assistants.value.find(a => a.id === preferredId);
+    // Return the preferred assistant if found, otherwise continue to next cases
+    if (preferredAssistant) return preferredAssistant;
+  }
+
+  // If the above is not available, the assistant connected to the inbox takes preference.
+  if (inboxAssistant.value) {
+    const inboxMatchedAssistant = assistants.value.find(
+      a => a.id === inboxAssistant.value.id
+    );
+    if (inboxMatchedAssistant) return inboxMatchedAssistant;
+  }
+  // If neither of the above is available, the first assistant in the account takes preference.
+  return assistants.value[0];
+});
+
+const setAssistant = async assistant => {
+  selectedAssistantId.value = assistant.id;
+  await updateUISettings({
+    preferred_captain_assistant_id: assistant.id,
+  });
+};
 
 const handleReset = () => {
   messages.value = [];
@@ -42,7 +79,7 @@ const sendMessage = async message => {
           }))
           .slice(0, -1),
         message,
-        assistant_id: 16,
+        assistant_id: selectedAssistantId.value,
       }
     );
     messages.value.push({
@@ -57,6 +94,17 @@ const sendMessage = async message => {
     isCaptainTyping.value = false;
   }
 };
+
+onMounted(() => {
+  store.dispatch('captainAssistants/get');
+});
+
+watchEffect(() => {
+  if (props.conversationId) {
+    store.dispatch('getInboxCaptainAssistantById', props.conversationId);
+    selectedAssistantId.value = activeAssistant.value?.id;
+  }
+});
 </script>
 
 <template>
@@ -65,6 +113,9 @@ const sendMessage = async message => {
     :support-agent="currentUser"
     :is-captain-typing="isCaptainTyping"
     :conversation-inbox-type="conversationInboxType"
+    :assistants="assistants"
+    :active-assistant="activeAssistant"
+    @set-assistant="setAssistant"
     @send-message="sendMessage"
     @reset="handleReset"
   />
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index c95820731..8db6e4428 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -313,7 +313,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index de12c0077..8296f25de 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -489,6 +489,15 @@ const actions = {
     commit(types.SET_CONTEXT_MENU_CHAT_ID, chatId);
   },
 
+  getInboxCaptainAssistantById: async ({ commit }, conversationId) => {
+    try {
+      const response = await ConversationApi.getInboxAssistant(conversationId);
+      commit(types.SET_INBOX_CAPTAIN_ASSISTANT, response.data);
+    } catch (error) {
+      // Handle error
+    }
+  },
+
   ...messageReadActions,
   ...messageTranslateActions,
 };
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index 3695de6a1..9329ef5dc 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -108,6 +108,10 @@ const getters = {
   getContextMenuChatId: _state => {
     return _state.contextMenuChatId;
   },
+
+  getCopilotAssistant: _state => {
+    return _state.copilotAssistant;
+  },
 };
 
 export default getters;
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 22f9256b9..1d7fdbe46 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -21,6 +21,7 @@ const state = {
   conversationLastSeen: null,
   syncConversationsMessages: {},
   conversationFilters: {},
+  copilotAssistant: {},
 };
 
 // mutations
@@ -309,6 +310,9 @@ export const mutations = {
   [types.UPDATE_CHAT_LIST_FILTERS](_state, data) {
     _state.conversationFilters = { ..._state.conversationFilters, ...data };
   },
+  [types.SET_INBOX_CAPTAIN_ASSISTANT](_state, data) {
+    _state.copilotAssistant = data.assistant;
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index b0c9d2480..dc2bf8d3a 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -687,4 +687,23 @@ describe('#addMentions', () => {
       ]);
     });
   });
+
+  describe('#getInboxCaptainAssistantById', () => {
+    it('fetches inbox assistant by id', async () => {
+      axios.get.mockResolvedValue({
+        data: {
+          id: 1,
+          name: 'Assistant',
+          description: 'Assistant description',
+        },
+      });
+      await actions.getInboxCaptainAssistantById({ commit }, 1);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.SET_INBOX_CAPTAIN_ASSISTANT,
+          { id: 1, name: 'Assistant', description: 'Assistant description' },
+        ],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
index cded29329..8ac89f49a 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
@@ -308,4 +308,21 @@ describe('#getters', () => {
       });
     });
   });
+
+  describe('#getCopilotAssistant', () => {
+    it('get copilot assistant', () => {
+      const state = {
+        copilotAssistant: {
+          id: 1,
+          name: 'Assistant',
+          description: 'Assistant description',
+        },
+      };
+      expect(getters.getCopilotAssistant(state)).toEqual({
+        id: 1,
+        name: 'Assistant',
+        description: 'Assistant description',
+      });
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index 6340e4de9..02d2b0f55 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -1,3 +1,4 @@
+import { describe } from 'vitest';
 import types from '../../../mutation-types';
 import { mutations } from '../../conversations';
 
@@ -553,4 +554,19 @@ describe('#mutations', () => {
       });
     });
   });
+
+  describe('#SET_INBOX_CAPTAIN_ASSISTANT', () => {
+    it('set inbox captain assistant', () => {
+      const state = { copilotAssistant: {} };
+      const data = {
+        assistant: {
+          id: 1,
+          name: 'Assistant',
+          description: 'Assistant description',
+        },
+      };
+      mutations[types.SET_INBOX_CAPTAIN_ASSISTANT](state, data);
+      expect(state.copilotAssistant).toEqual(data.assistant);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 7416ca9a3..c5b06f1ad 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -64,6 +64,9 @@ export default {
   SET_CHAT_LIST_FILTERS: 'SET_CHAT_LIST_FILTERS',
   UPDATE_CHAT_LIST_FILTERS: 'UPDATE_CHAT_LIST_FILTERS',
 
+  // Conversation inbox connected copilot assistant
+  SET_INBOX_CAPTAIN_ASSISTANT: 'SET_INBOX_CAPTAIN_ASSISTANT',
+
   // Inboxes
   SET_INBOXES_UI_FLAG: 'SET_INBOXES_UI_FLAG',
   SET_INBOXES: 'SET_INBOXES',
diff --git a/config/routes.rb b/config/routes.rb
index 3b5435ed9..56704d9aa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -119,6 +119,7 @@ Rails.application.routes.draw do
               post :custom_attributes
               get :attachments
               post :copilot
+              get :inbox_assistant
             end
           end
 
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
index e9113f4d0..a9dcb0b67 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/conversations_controller.rb
@@ -5,9 +5,17 @@ module Enterprise::Api::V1::Accounts::ConversationsController
   end
 
   def copilot
-    assistant = @conversation.inbox.captain_assistant
+    # First try to get the user's preferred assistant from UI settings or from the request
+    assistant_id = copilot_params[:assistant_id] || current_user.ui_settings&.dig('preferred_captain_assistant_id')
+
+    # Find the assistant either by ID or from inbox
+    assistant = if assistant_id.present?
+                  Captain::Assistant.find_by(id: assistant_id, account_id: Current.account.id)
+                else
+                  @conversation.inbox.captain_assistant
+                end
+
     return render json: { message: I18n.t('captain.copilot_error') } unless assistant
-    return render json: { message: I18n.t('captain.copilot_limit') } unless @conversation.inbox.captain_active?
 
     response = Captain::Copilot::ChatService.new(
       assistant,
@@ -18,6 +26,16 @@ module Enterprise::Api::V1::Accounts::ConversationsController
     render json: { message: response['response'] }
   end
 
+  def inbox_assistant
+    assistant = @conversation.inbox.captain_assistant
+
+    if assistant
+      render json: { assistant: { id: assistant.id, name: assistant.name } }
+    else
+      render json: { assistant: nil }
+    end
+  end
+
   def permitted_update_params
     super.merge(params.permit(:sla_policy_id))
   end

From ecfa6bf6a25b94e273940b63ba5c75be2cac52e9 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Fri, 28 Feb 2025 15:28:19 -0800
Subject: [PATCH 17/27] feat: Add support for account abuse detection (#11001)

This PR adds service to automate account abuse detection. Currently
based on the signup name and URL, could potentially add more context
such as usage analysis, message metadata etc.
---
 app/models/account.rb                         |  26 ++--
 config/installation_config.yml                |   4 +
 ...548_add_internal_attributes_to_accounts.rb |   5 +
 db/schema.rb                                  |   3 +-
 .../super_admin/app_configs_controller.rb     |   2 +-
 .../app/jobs/internal/account_analysis_job.rb |   9 ++
 .../services/captain/copilot/chat_service.rb  |   2 +-
 .../captain/llm/assistant_chat_service.rb     |   2 +-
 .../captain/llm/contact_attributes_service.rb |   2 +-
 .../captain/llm/contact_notes_service.rb      |   2 +-
 .../captain/llm/conversation_faq_service.rb   |   2 +-
 .../services/captain/llm/embedding_service.rb |   2 +-
 .../captain/llm/faq_generator_service.rb      |   2 +-
 .../account_updater_service.rb                |  54 ++++++++
 .../content_evaluator_service.rb              |  73 ++++++++++
 .../discord_notifier_service.rb               |  47 +++++++
 .../account_analysis/prompts_service.rb       |  31 +++++
 .../threat_analyser_service.rb                |  43 ++++++
 .../website_scraper_service.rb                |  32 +++++
 .../{captain => }/llm/base_open_ai_service.rb |   2 +-
 .../account_updater_service_spec.rb           | 130 ++++++++++++++++++
 .../content_evaluator_service_spec.rb         | 111 +++++++++++++++
 .../discord_notifier_service_spec.rb          |  73 ++++++++++
 .../threat_analyser_service_spec.rb           |  62 +++++++++
 .../website_scraper_service_spec.rb           |  45 ++++++
 25 files changed, 744 insertions(+), 22 deletions(-)
 create mode 100644 db/migrate/20250228185548_add_internal_attributes_to_accounts.rb
 create mode 100644 enterprise/app/jobs/internal/account_analysis_job.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/account_updater_service.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/discord_notifier_service.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/prompts_service.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/threat_analyser_service.rb
 create mode 100644 enterprise/app/services/internal/account_analysis/website_scraper_service.rb
 rename enterprise/app/services/{captain => }/llm/base_open_ai_service.rb (93%)
 create mode 100644 spec/enterprise/services/internal/account_analysis/account_updater_service_spec.rb
 create mode 100644 spec/enterprise/services/internal/account_analysis/content_evaluator_service_spec.rb
 create mode 100644 spec/enterprise/services/internal/account_analysis/discord_notifier_service_spec.rb
 create mode 100644 spec/enterprise/services/internal/account_analysis/threat_analyser_service_spec.rb
 create mode 100644 spec/enterprise/services/internal/account_analysis/website_scraper_service_spec.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index 419ccc471..a35affb3e 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -2,18 +2,20 @@
 #
 # Table name: accounts
 #
-#  id                    :integer          not null, primary key
-#  auto_resolve_duration :integer
-#  custom_attributes     :jsonb
-#  domain                :string(100)
-#  feature_flags         :bigint           default(0), not null
-#  limits                :jsonb
-#  locale                :integer          default("en")
-#  name                  :string           not null
-#  status                :integer          default("active")
-#  support_email         :string(100)
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
+#  id                         :integer          not null, primary key
+#  auto_resolve_duration      :integer
+#  contactable_contacts_count :integer          default(0)
+#  custom_attributes          :jsonb
+#  domain                     :string(100)
+#  feature_flags              :bigint           default(0), not null
+#  internal_attributes        :jsonb            not null
+#  limits                     :jsonb
+#  locale                     :integer          default("en")
+#  name                       :string           not null
+#  status                     :integer          default("active")
+#  support_email              :string(100)
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
 #
 # Indexes
 #
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 57a5a5faf..70c07ce60 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -212,6 +212,10 @@
 - name: CHATWOOT_SUPPORT_IDENTIFIER_HASH
   value:
   description: 'The Chatwoot identifier hash, to validate the contact in the live chat window.'
+- name: ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL
+  display_title: Webhook URL to post security analysis
+  value:
+  description: Used to notify Chatwoot about account abuses, potential threads (Should be a Discord Webhook URL)
 # ------- End of Chatwoot Internal Config for Self Hosted ----#
 
 ## ------ Configs added for enterprise clients ------ ##
diff --git a/db/migrate/20250228185548_add_internal_attributes_to_accounts.rb b/db/migrate/20250228185548_add_internal_attributes_to_accounts.rb
new file mode 100644
index 000000000..6912c0825
--- /dev/null
+++ b/db/migrate/20250228185548_add_internal_attributes_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddInternalAttributesToAccounts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :accounts, :internal_attributes, :jsonb, null: false, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6bea44c8b..a68593c68 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2025_02_07_040150) do
+ActiveRecord::Schema[7.0].define(version: 2025_02_28_185548) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -57,6 +57,7 @@ ActiveRecord::Schema[7.0].define(version: 2025_02_07_040150) do
     t.jsonb "limits", default: {}
     t.jsonb "custom_attributes", default: {}
     t.integer "status", default: 0
+    t.jsonb "internal_attributes", default: {}, null: false
     t.index ["status"], name: "index_accounts_on_status"
   end
 
diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
index 21617aa83..1cbf2c6ca 100644
--- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
+++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb
@@ -33,6 +33,6 @@ module Enterprise::SuperAdmin::AppConfigsController
 
   def internal_config_options
     %w[CHATWOOT_INBOX_TOKEN CHATWOOT_INBOX_HMAC_KEY ANALYTICS_TOKEN CLEARBIT_API_KEY DASHBOARD_SCRIPTS BLOCKED_EMAIL_DOMAINS
-       CAPTAIN_CLOUD_PLAN_LIMITS]
+       CAPTAIN_CLOUD_PLAN_LIMITS ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL]
   end
 end
diff --git a/enterprise/app/jobs/internal/account_analysis_job.rb b/enterprise/app/jobs/internal/account_analysis_job.rb
new file mode 100644
index 000000000..49ddaa2b5
--- /dev/null
+++ b/enterprise/app/jobs/internal/account_analysis_job.rb
@@ -0,0 +1,9 @@
+class Internal::AccountAnalysisJob < ApplicationJob
+  queue_as :low
+
+  def perform(account)
+    return if GlobalConfig.get_value('DEPLOYMENT_ENV') != 'cloud'
+
+    Internal::AccountAnalysis::ThreatAnalyserService.new(account).perform
+  end
+end
diff --git a/enterprise/app/services/captain/copilot/chat_service.rb b/enterprise/app/services/captain/copilot/chat_service.rb
index 019136540..3d53d7b5c 100644
--- a/enterprise/app/services/captain/copilot/chat_service.rb
+++ b/enterprise/app/services/captain/copilot/chat_service.rb
@@ -1,6 +1,6 @@
 require 'openai'
 
-class Captain::Copilot::ChatService < Captain::Llm::BaseOpenAiService
+class Captain::Copilot::ChatService < Llm::BaseOpenAiService
   include Captain::ChatHelper
 
   def initialize(assistant, config)
diff --git a/enterprise/app/services/captain/llm/assistant_chat_service.rb b/enterprise/app/services/captain/llm/assistant_chat_service.rb
index ef5ae2c0f..3d2b0da44 100644
--- a/enterprise/app/services/captain/llm/assistant_chat_service.rb
+++ b/enterprise/app/services/captain/llm/assistant_chat_service.rb
@@ -1,6 +1,6 @@
 require 'openai'
 
-class Captain::Llm::AssistantChatService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::AssistantChatService < Llm::BaseOpenAiService
   include Captain::ChatHelper
 
   def initialize(assistant: nil)
diff --git a/enterprise/app/services/captain/llm/contact_attributes_service.rb b/enterprise/app/services/captain/llm/contact_attributes_service.rb
index e942a2a56..e7976bf27 100644
--- a/enterprise/app/services/captain/llm/contact_attributes_service.rb
+++ b/enterprise/app/services/captain/llm/contact_attributes_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ContactAttributesService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::ContactAttributesService < Llm::BaseOpenAiService
   def initialize(assistant, conversation)
     super()
     @assistant = assistant
diff --git a/enterprise/app/services/captain/llm/contact_notes_service.rb b/enterprise/app/services/captain/llm/contact_notes_service.rb
index 245e0d96a..75aee412f 100644
--- a/enterprise/app/services/captain/llm/contact_notes_service.rb
+++ b/enterprise/app/services/captain/llm/contact_notes_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ContactNotesService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::ContactNotesService < Llm::BaseOpenAiService
   def initialize(assistant, conversation)
     super()
     @assistant = assistant
diff --git a/enterprise/app/services/captain/llm/conversation_faq_service.rb b/enterprise/app/services/captain/llm/conversation_faq_service.rb
index ea33493f2..682818f73 100644
--- a/enterprise/app/services/captain/llm/conversation_faq_service.rb
+++ b/enterprise/app/services/captain/llm/conversation_faq_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::ConversationFaqService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::ConversationFaqService < Llm::BaseOpenAiService
   DISTANCE_THRESHOLD = 0.3
 
   def initialize(assistant, conversation)
diff --git a/enterprise/app/services/captain/llm/embedding_service.rb b/enterprise/app/services/captain/llm/embedding_service.rb
index ca2ebdc1b..74f3079bf 100644
--- a/enterprise/app/services/captain/llm/embedding_service.rb
+++ b/enterprise/app/services/captain/llm/embedding_service.rb
@@ -1,6 +1,6 @@
 require 'openai'
 
-class Captain::Llm::EmbeddingService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::EmbeddingService < Llm::BaseOpenAiService
   class EmbeddingsError < StandardError; end
 
   DEFAULT_MODEL = 'text-embedding-3-small'.freeze
diff --git a/enterprise/app/services/captain/llm/faq_generator_service.rb b/enterprise/app/services/captain/llm/faq_generator_service.rb
index 6462f5c47..c26ffa2a3 100644
--- a/enterprise/app/services/captain/llm/faq_generator_service.rb
+++ b/enterprise/app/services/captain/llm/faq_generator_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::FaqGeneratorService < Captain::Llm::BaseOpenAiService
+class Captain::Llm::FaqGeneratorService < Llm::BaseOpenAiService
   def initialize(content)
     super()
     @content = content
diff --git a/enterprise/app/services/internal/account_analysis/account_updater_service.rb b/enterprise/app/services/internal/account_analysis/account_updater_service.rb
new file mode 100644
index 000000000..feb54881b
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/account_updater_service.rb
@@ -0,0 +1,54 @@
+class Internal::AccountAnalysis::AccountUpdaterService
+  def initialize(account)
+    @account = account
+  end
+
+  def update_with_analysis(analysis, error_message = nil)
+    if error_message
+      save_error(error_message)
+      notify_on_discord
+      return
+    end
+
+    save_analysis_results(analysis)
+    flag_account_if_needed(analysis)
+  end
+
+  private
+
+  def save_error(error_message)
+    @account.internal_attributes['security_flagged'] = true
+    @account.internal_attributes['security_flag_reason'] = "Error: #{error_message}"
+    @account.save
+  end
+
+  def save_analysis_results(analysis)
+    @account.internal_attributes['last_threat_scan_at'] = Time.current
+    @account.internal_attributes['last_threat_scan_level'] = analysis['threat_level']
+    @account.internal_attributes['last_threat_scan_summary'] = analysis['threat_summary']
+    @account.internal_attributes['last_threat_scan_recommendation'] = analysis['recommendation']
+    @account.save!
+  end
+
+  def flag_account_if_needed(analysis)
+    return if analysis['threat_level'] == 'none'
+
+    if %w[high medium].include?(analysis['threat_level']) ||
+       analysis['illegal_activities_detected'] == true ||
+       analysis['recommendation'] == 'block'
+
+      @account.internal_attributes['security_flagged'] = true
+      @account.internal_attributes['security_flag_reason'] = "Threat detected: #{analysis['threat_summary']}"
+      @account.save!
+
+      Rails.logger.info("Flagging account #{@account.id} due to threat level: #{analysis['threat_level']}")
+    end
+
+    notify_on_discord
+  end
+
+  def notify_on_discord
+    Rails.logger.info("Account #{@account.id} has been flagged for security review")
+    Internal::AccountAnalysis::DiscordNotifierService.new.notify_flagged_account(@account)
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb b/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
new file mode 100644
index 000000000..e88c46091
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/content_evaluator_service.rb
@@ -0,0 +1,73 @@
+class Internal::AccountAnalysis::ContentEvaluatorService < Llm::BaseOpenAiService
+  def initialize
+    super()
+
+    @model = 'gpt-4o-mini'.freeze
+  end
+
+  def evaluate(content)
+    return default_evaluation if content.blank?
+
+    begin
+      response = send_to_llm(content)
+      evaluation = handle_response(response)
+      log_evaluation_results(evaluation)
+      evaluation
+    rescue StandardError => e
+      handle_evaluation_error(e)
+    end
+  end
+
+  private
+
+  def send_to_llm(content)
+    Rails.logger.info('Sending content to LLM for security evaluation')
+    @client.chat(
+      parameters: {
+        model: @model,
+        messages: llm_messages(content),
+        response_format: { type: 'json_object' }
+      }
+    )
+  end
+
+  def handle_response(response)
+    return default_evaluation if response.nil?
+
+    parsed = JSON.parse(response.dig('choices', 0, 'message', 'content').strip)
+
+    {
+      'threat_level' => parsed['threat_level'] || 'unknown',
+      'threat_summary' => parsed['threat_summary'] || 'No threat summary provided',
+      'detected_threats' => parsed['detected_threats'] || [],
+      'illegal_activities_detected' => parsed['illegal_activities_detected'] || false,
+      'recommendation' => parsed['recommendation'] || 'review'
+    }
+  end
+
+  def default_evaluation(error_type = nil)
+    {
+      'threat_level' => 'unknown',
+      'threat_summary' => 'Failed to complete content evaluation',
+      'detected_threats' => error_type ? [error_type] : [],
+      'illegal_activities_detected' => false,
+      'recommendation' => 'review'
+    }
+  end
+
+  def log_evaluation_results(evaluation)
+    Rails.logger.info("LLM evaluation - Level: #{evaluation['threat_level']}, Illegal activities: #{evaluation['illegal_activities_detected']}")
+  end
+
+  def handle_evaluation_error(error)
+    Rails.logger.error("Error evaluating content: #{error.message}")
+    default_evaluation('evaluation_failure')
+  end
+
+  def llm_messages(content)
+    [
+      { role: 'system', content: 'You are a security analysis system that evaluates content for potential threats and scams.' },
+      { role: 'user', content: Internal::AccountAnalysis::PromptsService.threat_analyser(content.to_s[0...10_000]) }
+    ]
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/discord_notifier_service.rb b/enterprise/app/services/internal/account_analysis/discord_notifier_service.rb
new file mode 100644
index 000000000..01ad09b36
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/discord_notifier_service.rb
@@ -0,0 +1,47 @@
+class Internal::AccountAnalysis::DiscordNotifierService
+  def notify_flagged_account(account)
+    if webhook_url.blank?
+      Rails.logger.error('Cannot send Discord notification: No webhook URL configured')
+      return
+    end
+
+    HTTParty.post(
+      webhook_url,
+      body: build_message(account).to_json,
+      headers: { 'Content-Type' => 'application/json' }
+    )
+
+    Rails.logger.info("Discord notification sent for flagged account #{account.id}")
+  rescue StandardError => e
+    Rails.logger.error("Error sending Discord notification: #{e.message}")
+  end
+
+  private
+
+  def build_message(account)
+    analysis = account.internal_attributes
+    user = account.users.order(id: :asc).first
+
+    content = <<~MESSAGE
+      ---
+      An account has been flagged in our security system with the following details:
+
+      🆔 **Account Details:**
+      Account ID: #{account.id}
+      User Email: #{user&.email || 'N/A'}
+      Threat Level: #{analysis['last_threat_scan_level']}
+
+      🔎 **System Recommendation:** #{analysis['last_threat_scan_recommendation']}
+      #{analysis['illegal_activities_detected'] ? '⚠️ Potential illegal activities detected' : 'No illegal activities detected'}
+
+      📝 **Findings:**
+      #{analysis['last_threat_scan_summary']}
+    MESSAGE
+
+    { content: content }
+  end
+
+  def webhook_url
+    @webhook_url ||= InstallationConfig.find_by(name: 'ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL')&.value
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/prompts_service.rb b/enterprise/app/services/internal/account_analysis/prompts_service.rb
new file mode 100644
index 000000000..3bd49f334
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/prompts_service.rb
@@ -0,0 +1,31 @@
+class Internal::AccountAnalysis::PromptsService
+  class << self
+    def threat_analyser(content)
+      <<~PROMPT
+        Analyze the following website content for potential security threats, scams, or illegal activities.
+
+        Focus on identifying:
+        1. Phishing attempts
+        2. Fraudulent business practices
+        3. Malware distribution
+        4. Illegal product/service offerings
+        5. Money laundering indicators
+        6. Identity theft schemes
+
+        Always classify websites under construction or without content to be a medium.
+
+        Website content:
+        #{content}
+
+        Provide your analysis in the following JSON format:
+        {
+          "threat_level": "none|low|medium|high",
+          "threat_summary": "Brief summary of findings",
+          "detected_threats": ["threat1", "threat2"],
+          "illegal_activities_detected": true|false,
+          "recommendation": "approve|review|block"
+        }
+      PROMPT
+    end
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/threat_analyser_service.rb b/enterprise/app/services/internal/account_analysis/threat_analyser_service.rb
new file mode 100644
index 000000000..2ec4845c4
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/threat_analyser_service.rb
@@ -0,0 +1,43 @@
+class Internal::AccountAnalysis::ThreatAnalyserService
+  def initialize(account)
+    @account = account
+    @user = account.users.order(id: :asc).first
+    @domain = extract_domain_from_email(@user&.email)
+  end
+
+  def perform
+    if @domain.blank?
+      Rails.logger.info("Skipping threat analysis for account #{@account.id}: No domain found")
+      return
+    end
+
+    website_content = Internal::AccountAnalysis::WebsiteScraperService.new(@domain).perform
+    if website_content.blank?
+      Rails.logger.info("Skipping threat analysis for account #{@account.id}: No website content found")
+      Internal::AccountAnalysis::AccountUpdaterService.new(@account).update_with_analysis(nil, 'Scraping error: No content found')
+      return
+    end
+
+    content = <<~MESSAGE
+      Domain: #{@domain}
+      Content: #{website_content}
+    MESSAGE
+    threat_analysis = Internal::AccountAnalysis::ContentEvaluatorService.new.evaluate(content)
+    Rails.logger.info("Completed threat analysis: level=#{threat_analysis['threat_level']} for account-id: #{@account.id}")
+
+    Internal::AccountAnalysis::AccountUpdaterService.new(@account).update_with_analysis(threat_analysis)
+
+    threat_analysis
+  end
+
+  private
+
+  def extract_domain_from_email(email)
+    return nil if email.blank?
+
+    email.split('@').last
+  rescue StandardError => e
+    Rails.logger.error("Error extracting domain from email #{email}: #{e.message}")
+    nil
+  end
+end
diff --git a/enterprise/app/services/internal/account_analysis/website_scraper_service.rb b/enterprise/app/services/internal/account_analysis/website_scraper_service.rb
new file mode 100644
index 000000000..d03ef8049
--- /dev/null
+++ b/enterprise/app/services/internal/account_analysis/website_scraper_service.rb
@@ -0,0 +1,32 @@
+class Internal::AccountAnalysis::WebsiteScraperService
+  def initialize(domain)
+    @domain = domain
+  end
+
+  def perform
+    return nil if @domain.blank?
+
+    Rails.logger.info("Scraping website: #{external_link}")
+
+    begin
+      response = HTTParty.get(external_link, follow_redirects: true)
+      response.to_s
+    rescue StandardError => e
+      Rails.logger.error("Error scraping website for domain #{@domain}: #{e.message}")
+      nil
+    end
+  end
+
+  private
+
+  def external_link
+    sanitize_url(@domain)
+  end
+
+  def sanitize_url(domain)
+    url = domain
+    url = "https://#{domain}" unless domain.start_with?('http://', 'https://')
+    Rails.logger.info("Sanitized URL: #{url}")
+    url
+  end
+end
diff --git a/enterprise/app/services/captain/llm/base_open_ai_service.rb b/enterprise/app/services/llm/base_open_ai_service.rb
similarity index 93%
rename from enterprise/app/services/captain/llm/base_open_ai_service.rb
rename to enterprise/app/services/llm/base_open_ai_service.rb
index 7b542c0f2..1f229f182 100644
--- a/enterprise/app/services/captain/llm/base_open_ai_service.rb
+++ b/enterprise/app/services/llm/base_open_ai_service.rb
@@ -1,4 +1,4 @@
-class Captain::Llm::BaseOpenAiService
+class Llm::BaseOpenAiService
   DEFAULT_MODEL = 'gpt-4o-mini'.freeze
 
   def initialize
diff --git a/spec/enterprise/services/internal/account_analysis/account_updater_service_spec.rb b/spec/enterprise/services/internal/account_analysis/account_updater_service_spec.rb
new file mode 100644
index 000000000..37da7d070
--- /dev/null
+++ b/spec/enterprise/services/internal/account_analysis/account_updater_service_spec.rb
@@ -0,0 +1,130 @@
+require 'rails_helper'
+
+RSpec.describe Internal::AccountAnalysis::AccountUpdaterService do
+  let(:account) { create(:account) }
+  let(:service) { described_class.new(account) }
+  let(:discord_notifier) { instance_double(Internal::AccountAnalysis::DiscordNotifierService, notify_flagged_account: true) }
+
+  before do
+    allow(Internal::AccountAnalysis::DiscordNotifierService).to receive(:new).and_return(discord_notifier)
+    allow(Rails.logger).to receive(:info)
+  end
+
+  describe '#update_with_analysis' do
+    context 'when error_message is provided' do
+      it 'saves the error and notifies Discord' do
+        service.update_with_analysis({}, 'Analysis failed')
+
+        expect(account.internal_attributes['security_flagged']).to be true
+        expect(account.internal_attributes['security_flag_reason']).to eq('Error: Analysis failed')
+        expect(discord_notifier).to have_received(:notify_flagged_account).with(account)
+      end
+    end
+
+    context 'when analysis is successful' do
+      let(:analysis) do
+        {
+          'threat_level' => 'none',
+          'threat_summary' => 'No threats detected',
+          'recommendation' => 'allow'
+        }
+      end
+
+      it 'saves the analysis results' do
+        allow(Time).to receive(:current).and_return('2023-01-01 12:00:00')
+
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes['last_threat_scan_at']).to eq('2023-01-01 12:00:00')
+        expect(account.internal_attributes['last_threat_scan_level']).to eq('none')
+        expect(account.internal_attributes['last_threat_scan_summary']).to eq('No threats detected')
+        expect(account.internal_attributes['last_threat_scan_recommendation']).to eq('allow')
+      end
+
+      it 'does not flag the account when threat level is none' do
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes).not_to include('security_flagged')
+        expect(discord_notifier).not_to have_received(:notify_flagged_account)
+      end
+    end
+
+    context 'when analysis detects high threat level' do
+      let(:analysis) do
+        {
+          'threat_level' => 'high',
+          'threat_summary' => 'Suspicious activity detected',
+          'recommendation' => 'review',
+          'illegal_activities_detected' => false
+        }
+      end
+
+      it 'flags the account and notifies Discord' do
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes['security_flagged']).to be true
+        expect(account.internal_attributes['security_flag_reason']).to eq('Threat detected: Suspicious activity detected')
+        expect(discord_notifier).to have_received(:notify_flagged_account).with(account)
+        expect(Rails.logger).to have_received(:info).with("Flagging account #{account.id} due to threat level: high")
+        expect(Rails.logger).to have_received(:info).with("Account #{account.id} has been flagged for security review")
+      end
+    end
+
+    context 'when analysis detects medium threat level' do
+      let(:analysis) do
+        {
+          'threat_level' => 'medium',
+          'threat_summary' => 'Potential issues found',
+          'recommendation' => 'review',
+          'illegal_activities_detected' => false
+        }
+      end
+
+      it 'flags the account and notifies Discord' do
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes['security_flagged']).to be true
+        expect(account.internal_attributes['security_flag_reason']).to eq('Threat detected: Potential issues found')
+        expect(discord_notifier).to have_received(:notify_flagged_account).with(account)
+      end
+    end
+
+    context 'when analysis detects illegal activities' do
+      let(:analysis) do
+        {
+          'threat_level' => 'low',
+          'threat_summary' => 'Minor issues found',
+          'recommendation' => 'review',
+          'illegal_activities_detected' => true
+        }
+      end
+
+      it 'flags the account and notifies Discord' do
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes['security_flagged']).to be true
+        expect(account.internal_attributes['security_flag_reason']).to eq('Threat detected: Minor issues found')
+        expect(discord_notifier).to have_received(:notify_flagged_account).with(account)
+      end
+    end
+
+    context 'when analysis recommends blocking' do
+      let(:analysis) do
+        {
+          'threat_level' => 'low',
+          'threat_summary' => 'Minor issues found',
+          'recommendation' => 'block',
+          'illegal_activities_detected' => false
+        }
+      end
+
+      it 'flags the account and notifies Discord' do
+        service.update_with_analysis(analysis)
+
+        expect(account.internal_attributes['security_flagged']).to be true
+        expect(account.internal_attributes['security_flag_reason']).to eq('Threat detected: Minor issues found')
+        expect(discord_notifier).to have_received(:notify_flagged_account).with(account)
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/internal/account_analysis/content_evaluator_service_spec.rb b/spec/enterprise/services/internal/account_analysis/content_evaluator_service_spec.rb
new file mode 100644
index 000000000..d7bf26c35
--- /dev/null
+++ b/spec/enterprise/services/internal/account_analysis/content_evaluator_service_spec.rb
@@ -0,0 +1,111 @@
+require 'rails_helper'
+
+RSpec.describe Internal::AccountAnalysis::ContentEvaluatorService do
+  let(:service) { described_class.new }
+  let(:content) { 'This is some test content' }
+
+  before do
+    create(:installation_config, name: 'CAPTAIN_OPEN_AI_API_KEY', value: 'test-key')
+  end
+
+  describe '#evaluate' do
+    context 'when content is present' do
+      let(:llm_response) do
+        {
+          'choices' => [
+            {
+              'message' => {
+                'content' => {
+                  'threat_level' => 'low',
+                  'threat_summary' => 'No significant threats detected',
+                  'detected_threats' => ['minor_concern'],
+                  'illegal_activities_detected' => false,
+                  'recommendation' => 'approve'
+                }.to_json
+              }
+            }
+          ]
+        }
+      end
+
+      before do
+        allow(service).to receive(:send_to_llm).and_return(llm_response)
+        allow(Rails.logger).to receive(:info)
+      end
+
+      it 'returns the evaluation results' do
+        result = service.evaluate(content)
+
+        expect(result).to include(
+          'threat_level' => 'low',
+          'threat_summary' => 'No significant threats detected',
+          'detected_threats' => ['minor_concern'],
+          'illegal_activities_detected' => false,
+          'recommendation' => 'approve'
+        )
+      end
+
+      it 'logs the evaluation results' do
+        service.evaluate(content)
+
+        expect(Rails.logger).to have_received(:info).with('LLM evaluation - Level: low, Illegal activities: false')
+      end
+    end
+
+    context 'when content is blank' do
+      let(:blank_content) { '' }
+
+      it 'returns the default evaluation without calling the LLM' do
+        expect(service).not_to receive(:send_to_llm)
+
+        result = service.evaluate(blank_content)
+
+        expect(result).to include(
+          'threat_level' => 'unknown',
+          'threat_summary' => 'Failed to complete content evaluation',
+          'detected_threats' => [],
+          'illegal_activities_detected' => false,
+          'recommendation' => 'review'
+        )
+      end
+    end
+
+    context 'when LLM response is nil' do
+      before do
+        allow(service).to receive(:send_to_llm).and_return(nil)
+      end
+
+      it 'returns the default evaluation' do
+        result = service.evaluate(content)
+
+        expect(result).to include(
+          'threat_level' => 'unknown',
+          'threat_summary' => 'Failed to complete content evaluation',
+          'detected_threats' => [],
+          'illegal_activities_detected' => false,
+          'recommendation' => 'review'
+        )
+      end
+    end
+
+    context 'when error occurs during evaluation' do
+      before do
+        allow(service).to receive(:send_to_llm).and_raise(StandardError.new('Test error'))
+        allow(Rails.logger).to receive(:error)
+      end
+
+      it 'logs the error and returns default evaluation with error type' do
+        result = service.evaluate(content)
+
+        expect(Rails.logger).to have_received(:error).with('Error evaluating content: Test error')
+        expect(result).to include(
+          'threat_level' => 'unknown',
+          'threat_summary' => 'Failed to complete content evaluation',
+          'detected_threats' => ['evaluation_failure'],
+          'illegal_activities_detected' => false,
+          'recommendation' => 'review'
+        )
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/internal/account_analysis/discord_notifier_service_spec.rb b/spec/enterprise/services/internal/account_analysis/discord_notifier_service_spec.rb
new file mode 100644
index 000000000..6591185d9
--- /dev/null
+++ b/spec/enterprise/services/internal/account_analysis/discord_notifier_service_spec.rb
@@ -0,0 +1,73 @@
+require 'rails_helper'
+
+RSpec.describe Internal::AccountAnalysis::DiscordNotifierService do
+  let(:service) { described_class.new }
+  let(:webhook_url) { 'https://discord.com/api/webhooks/123456789/some-token' }
+  let(:account) do
+    create(
+      :account,
+      internal_attributes: {
+        'last_threat_scan_level' => 'high',
+        'last_threat_scan_recommendation' => 'review',
+        'illegal_activities_detected' => true,
+        'last_threat_scan_summary' => 'Suspicious activity detected'
+      }
+    )
+  end
+  let!(:user) { create(:user, account: account) }
+
+  before do
+    allow(Rails.logger).to receive(:info)
+    allow(Rails.logger).to receive(:error)
+  end
+
+  describe '#notify_flagged_account' do
+    context 'when webhook URL is configured' do
+      before do
+        create(:installation_config, name: 'ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL', value: webhook_url)
+        stub_request(:post, webhook_url).to_return(status: 200)
+      end
+
+      it 'sends notification to Discord webhook' do
+        service.notify_flagged_account(account)
+        expect(WebMock).to have_requested(:post, webhook_url)
+          .with(
+            body: hash_including(
+              content: include(
+                "Account ID: #{account.id}",
+                "User Email: #{user.email}",
+                'Threat Level: high',
+                '**System Recommendation:** review',
+                '⚠️ Potential illegal activities detected',
+                'Suspicious activity detected'
+              )
+            )
+          )
+      end
+    end
+
+    context 'when webhook URL is not configured' do
+      it 'logs error and does not make HTTP request' do
+        service.notify_flagged_account(account)
+
+        expect(Rails.logger).to have_received(:error)
+          .with('Cannot send Discord notification: No webhook URL configured')
+        expect(WebMock).not_to have_requested(:post, webhook_url)
+      end
+    end
+
+    context 'when HTTP request fails' do
+      before do
+        create(:installation_config, name: 'ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL', value: webhook_url)
+        stub_request(:post, webhook_url).to_raise(StandardError.new('Connection failed'))
+      end
+
+      it 'catches exception and logs error' do
+        service.notify_flagged_account(account)
+
+        expect(Rails.logger).to have_received(:error)
+          .with('Error sending Discord notification: Connection failed')
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/internal/account_analysis/threat_analyser_service_spec.rb b/spec/enterprise/services/internal/account_analysis/threat_analyser_service_spec.rb
new file mode 100644
index 000000000..65d106215
--- /dev/null
+++ b/spec/enterprise/services/internal/account_analysis/threat_analyser_service_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Internal::AccountAnalysis::ThreatAnalyserService do
+  subject { described_class.new(account) }
+
+  let(:account) { create(:account) }
+  let(:user) { create(:user, email: 'test@example.com', account: account) }
+  let(:website_scraper) { instance_double(Internal::AccountAnalysis::WebsiteScraperService) }
+  let(:content_evaluator) { instance_double(Internal::AccountAnalysis::ContentEvaluatorService) }
+  let(:account_updater) { instance_double(Internal::AccountAnalysis::AccountUpdaterService) }
+  let(:website_content) { 'This is the website content' }
+  let(:threat_analysis) { { 'threat_level' => 'medium' } }
+
+  before do
+    user
+
+    allow(Internal::AccountAnalysis::WebsiteScraperService).to receive(:new).with('example.com').and_return(website_scraper)
+    allow(Internal::AccountAnalysis::ContentEvaluatorService).to receive(:new).and_return(content_evaluator)
+    allow(Internal::AccountAnalysis::AccountUpdaterService).to receive(:new).with(account).and_return(account_updater)
+  end
+
+  describe '#perform' do
+    before do
+      allow(website_scraper).to receive(:perform).and_return(website_content)
+      allow(content_evaluator).to receive(:evaluate).and_return(threat_analysis)
+      allow(account_updater).to receive(:update_with_analysis)
+      allow(Rails.logger).to receive(:info)
+    end
+
+    it 'performs threat analysis and updates the account' do
+      expected_content = <<~MESSAGE
+        Domain: example.com
+        Content: This is the website content
+      MESSAGE
+
+      expect(website_scraper).to receive(:perform)
+      expect(content_evaluator).to receive(:evaluate).with(expected_content)
+      expect(account_updater).to receive(:update_with_analysis).with(threat_analysis)
+      expect(Rails.logger).to receive(:info).with("Completed threat analysis: level=medium for account-id: #{account.id}")
+
+      result = subject.perform
+      expect(result).to eq(threat_analysis)
+    end
+
+    context 'when website content is blank' do
+      before do
+        allow(website_scraper).to receive(:perform).and_return(nil)
+      end
+
+      it 'logs info and updates account with error' do
+        expect(Rails.logger).to receive(:info).with("Skipping threat analysis for account #{account.id}: No website content found")
+        expect(account_updater).to receive(:update_with_analysis).with(nil, 'Scraping error: No content found')
+        expect(content_evaluator).not_to receive(:evaluate)
+
+        result = subject.perform
+        expect(result).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/services/internal/account_analysis/website_scraper_service_spec.rb b/spec/enterprise/services/internal/account_analysis/website_scraper_service_spec.rb
new file mode 100644
index 000000000..6d218e44d
--- /dev/null
+++ b/spec/enterprise/services/internal/account_analysis/website_scraper_service_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+RSpec.describe Internal::AccountAnalysis::WebsiteScraperService do
+  describe '#perform' do
+    let(:service) { described_class.new(domain) }
+    let(:html_content) { '<html><body>This is sample website content</body></html>' }
+
+    before do
+      allow(Rails.logger).to receive(:info)
+      allow(Rails.logger).to receive(:error)
+    end
+
+    context 'when domain is nil' do
+      let(:domain) { nil }
+
+      it 'returns nil' do
+        expect(service.perform).to be_nil
+      end
+    end
+
+    context 'when domain is present' do
+      let(:domain) { 'example.com' }
+
+      before do
+        allow(HTTParty).to receive(:get).and_return(html_content)
+      end
+
+      it 'returns the stripped and normalized content' do
+        expect(service.perform).to eq(html_content)
+      end
+    end
+
+    context 'when an error occurs' do
+      let(:domain) { 'example.com' }
+
+      before do
+        allow(HTTParty).to receive(:get).and_raise(StandardError.new('Error'))
+      end
+
+      it 'returns nil' do
+        expect(service.perform).to be_nil
+      end
+    end
+  end
+end

From bca8c99148347848e2d488db7ef06ca102a34a2f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 3 Mar 2025 13:33:11 +0530
Subject: [PATCH 18/27] feat: Add June events for linear integration (#11007)

Fixes https://linear.app/chatwoot/issue/CW-3415/june-sdk-events
---
 .../components/widgets/conversation/linear/CreateIssue.vue  | 3 +++
 .../components/widgets/conversation/linear/LinkIssue.vue    | 3 +++
 .../components/widgets/conversation/linear/index.vue        | 3 +++
 app/javascript/dashboard/helper/AnalyticsHelper/events.js   | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue b/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
index 51ce2ae9a..02a3db763 100644
--- a/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/linear/CreateIssue.vue
@@ -2,11 +2,13 @@
 import { reactive, computed, onMounted, ref } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
 import { useI18n } from 'vue-i18n';
+import { useTrack } from 'dashboard/composables';
 import { useAlert } from 'dashboard/composables';
 import LinearAPI from 'dashboard/api/integrations/linear';
 import validations from './validations';
 import { parseLinearAPIErrorResponse } from 'dashboard/store/utils/api';
 import SearchableDropdown from './SearchableDropdown.vue';
+import { LINEAR_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
 const props = defineProps({
   conversationId: {
@@ -188,6 +190,7 @@ const createIssue = async () => {
     const { id: issueId } = response.data;
     await LinearAPI.link_issue(props.conversationId, issueId, props.title);
     useAlert(t('INTEGRATION_SETTINGS.LINEAR.ADD_OR_LINK.CREATE_SUCCESS'));
+    useTrack(LINEAR_EVENTS.CREATE_ISSUE);
     onClose();
   } catch (error) {
     const errorMessage = parseLinearAPIErrorResponse(
diff --git a/app/javascript/dashboard/components/widgets/conversation/linear/LinkIssue.vue b/app/javascript/dashboard/components/widgets/conversation/linear/LinkIssue.vue
index 81b8c94ee..09496a1e4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/linear/LinkIssue.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/linear/LinkIssue.vue
@@ -1,11 +1,13 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useTrack } from 'dashboard/composables';
 import { useAlert } from 'dashboard/composables';
 import LinearAPI from 'dashboard/api/integrations/linear';
 import FilterButton from 'dashboard/components/ui/Dropdown/DropdownButton.vue';
 import FilterListDropdown from 'dashboard/components/ui/Dropdown/DropdownList.vue';
 import { parseLinearAPIErrorResponse } from 'dashboard/store/utils/api';
+import { LINEAR_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 
 const props = defineProps({
   conversationId: {
@@ -85,6 +87,7 @@ const linkIssue = async () => {
     searchQuery.value = '';
     issues.value = [];
     onClose();
+    useTrack(LINEAR_EVENTS.LINK_ISSUE);
   } catch (error) {
     const errorMessage = parseLinearAPIErrorResponse(
       error,
diff --git a/app/javascript/dashboard/components/widgets/conversation/linear/index.vue b/app/javascript/dashboard/components/widgets/conversation/linear/index.vue
index 0599cd9be..40b79d503 100644
--- a/app/javascript/dashboard/components/widgets/conversation/linear/index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/linear/index.vue
@@ -6,6 +6,8 @@ import { useI18n } from 'vue-i18n';
 import LinearAPI from 'dashboard/api/integrations/linear';
 import CreateOrLinkIssue from './CreateOrLinkIssue.vue';
 import Issue from './Issue.vue';
+import { useTrack } from 'dashboard/composables';
+import { LINEAR_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
 import { parseLinearAPIErrorResponse } from 'dashboard/store/utils/api';
 
 const props = defineProps({
@@ -56,6 +58,7 @@ const unlinkIssue = async linkId => {
   try {
     isUnlinking.value = true;
     await LinearAPI.unlinkIssue(linkId);
+    useTrack(LINEAR_EVENTS.UNLINK_ISSUE);
     linkedIssue.value = null;
     useAlert(t('INTEGRATION_SETTINGS.LINEAR.UNLINK.SUCCESS'));
   } catch (error) {
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index bd14ce161..64dfb89e5 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -124,3 +124,9 @@ export const SLA_EVENTS = Object.freeze({
   UPDATE: 'Updated an SLA',
   DELETED: 'Deleted an SLA',
 });
+
+export const LINEAR_EVENTS = Object.freeze({
+  CREATE_ISSUE: 'Created a linear issue',
+  LINK_ISSUE: 'Linked a linear issue',
+  UNLINK_ISSUE: 'Unlinked a linear issue',
+});

From 7c2ca1a07ec046c2c38efb954d0b7c8c7921e241 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:22:27 +0530
Subject: [PATCH 19/27] fix: Not using saved `order_by` when fetching
 conversation list (#11008)

# Pull Request Template

## Description

This PR fixes the issue where the saved `order_by` value for the
conversation list is not being applied. The feature was originally added
in PR https://github.com/chatwoot/chatwoot/pull/8237 but broke after
merging the Vue 3 migration PR
https://github.com/chatwoot/chatwoot/pull/10047

Fixes
https://linear.app/chatwoot/issue/CW-4110/not-using-the-saved-sort-order-by-option-from-ui-settings

**Cause of the Issue:**
The previous implementation checked `orderBy` against the keys of the
sorting constants instead of their values. Since `orderBy` stores a
sorting value, this caused the condition to fail, leading to fallback to
the default sorting option.

**Solution:**
The fix ensures that `orderBy` is validated against the values of the
sorting constants rather than the keys. This correctly applies the saved
sorting preference, while still falling back to the default if needed.

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

**Loom video**

https://www.loom.com/share/ebe8a4d3f1c041c6862334dc3b6d43a3?sid=5167feb7-eb4a-4f2c-8211-662830ba946c




## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 app/javascript/dashboard/components/ChatList.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 84f4635da..a0b86176d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -353,10 +353,11 @@ function setFiltersFromUISettings() {
   const { conversations_filter_by: filterBy = {} } = uiSettings.value;
   const { status, order_by: orderBy } = filterBy;
   activeStatus.value = status || wootConstants.STATUS_TYPE.OPEN;
-  activeSortBy.value =
-    Object.keys(wootConstants.SORT_BY_TYPE).find(
-      sortField => sortField === orderBy
-    ) || wootConstants.SORT_BY_TYPE.LAST_ACTIVITY_AT_DESC;
+  activeSortBy.value = Object.values(wootConstants.SORT_BY_TYPE).includes(
+    orderBy
+  )
+    ? orderBy
+    : wootConstants.SORT_BY_TYPE.LAST_ACTIVITY_AT_DESC;
 }
 
 function emitConversationLoaded() {

From 488c334b72ca93d7944cde18fd6683bd42fa7417 Mon Sep 17 00:00:00 2001
From: Chatwoot Bot <92152627+chatwoot-bot@users.noreply.github.com>
Date: Mon, 3 Mar 2025 00:57:33 -0800
Subject: [PATCH 20/27] chore: Update translations (#11002)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../i18n/locale/am/integrations.json          |   3 +-
 .../i18n/locale/ar/integrations.json          |   3 +-
 .../i18n/locale/az/integrations.json          |   3 +-
 .../i18n/locale/bg/integrations.json          |   3 +-
 .../i18n/locale/ca/integrations.json          |   3 +-
 .../i18n/locale/cs/integrations.json          |   3 +-
 .../i18n/locale/da/integrations.json          |   3 +-
 .../dashboard/i18n/locale/de/agentMgmt.json   |   4 +-
 .../dashboard/i18n/locale/de/automation.json  |   2 +-
 .../dashboard/i18n/locale/de/chatlist.json    |   6 +-
 .../dashboard/i18n/locale/de/contact.json     | 184 +++---
 .../i18n/locale/de/conversation.json          |  28 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   8 +-
 .../i18n/locale/de/integrations.json          |   3 +-
 .../i18n/locale/el/integrations.json          |   3 +-
 .../i18n/locale/es/integrations.json          |   3 +-
 .../i18n/locale/fa/integrations.json          |   3 +-
 .../i18n/locale/fi/integrations.json          |   3 +-
 .../i18n/locale/fr/integrations.json          |   3 +-
 .../i18n/locale/he/integrations.json          |   3 +-
 .../i18n/locale/hi/integrations.json          |   3 +-
 .../i18n/locale/hr/integrations.json          |   3 +-
 .../i18n/locale/hu/integrations.json          |   3 +-
 .../i18n/locale/hy/integrations.json          |   3 +-
 .../i18n/locale/id/integrations.json          |   3 +-
 .../i18n/locale/is/integrations.json          |   3 +-
 .../i18n/locale/it/integrations.json          |   3 +-
 .../i18n/locale/ja/integrations.json          |   3 +-
 .../i18n/locale/ka/integrations.json          |   3 +-
 .../i18n/locale/ko/integrations.json          |   3 +-
 .../i18n/locale/lt/integrations.json          |   3 +-
 .../i18n/locale/lv/integrations.json          |  25 +-
 .../dashboard/i18n/locale/lv/settings.json    |  22 +-
 .../i18n/locale/ml/integrations.json          |   3 +-
 .../i18n/locale/ms/integrations.json          |   3 +-
 .../i18n/locale/ne/integrations.json          |   3 +-
 .../i18n/locale/nl/integrations.json          |   3 +-
 .../i18n/locale/no/integrations.json          |   3 +-
 .../i18n/locale/pl/integrations.json          |   3 +-
 .../i18n/locale/pt/integrations.json          |   3 +-
 .../i18n/locale/pt_BR/cannedMgmt.json         |   6 +-
 .../i18n/locale/pt_BR/integrations.json       |   3 +-
 .../i18n/locale/ro/integrations.json          |   3 +-
 .../i18n/locale/ru/integrations.json          |   3 +-
 .../i18n/locale/sh/integrations.json          |   3 +-
 .../i18n/locale/sk/integrations.json          |   3 +-
 .../i18n/locale/sl/integrations.json          |   3 +-
 .../i18n/locale/sq/integrations.json          |   3 +-
 .../i18n/locale/sr/integrations.json          |   3 +-
 .../i18n/locale/sv/integrations.json          |   3 +-
 .../i18n/locale/ta/integrations.json          |   3 +-
 .../i18n/locale/th/integrations.json          |   3 +-
 .../i18n/locale/tl/integrations.json          |   3 +-
 .../i18n/locale/tr/integrations.json          |   3 +-
 .../i18n/locale/uk/integrations.json          |   3 +-
 .../i18n/locale/ur/integrations.json          |   3 +-
 .../i18n/locale/ur_IN/integrations.json       |   3 +-
 .../i18n/locale/vi/integrations.json          |   3 +-
 .../i18n/locale/zh_CN/advancedFilters.json    |   4 +-
 .../i18n/locale/zh_CN/agentBots.json          |   2 +-
 .../i18n/locale/zh_CN/agentMgmt.json          |   2 +-
 .../i18n/locale/zh_CN/automation.json         |   4 +-
 .../dashboard/i18n/locale/zh_CN/campaign.json | 118 ++--
 .../i18n/locale/zh_CN/cannedMgmt.json         |   6 +-
 .../dashboard/i18n/locale/zh_CN/chatlist.json |   8 +-
 .../i18n/locale/zh_CN/components.json         |  28 +-
 .../dashboard/i18n/locale/zh_CN/contact.json  | 210 +++----
 .../i18n/locale/zh_CN/contactFilters.json     |  28 +-
 .../i18n/locale/zh_CN/conversation.json       |  50 +-
 .../dashboard/i18n/locale/zh_CN/csatMgmt.json |  10 +-
 .../i18n/locale/zh_CN/customRole.json         |  86 +--
 .../i18n/locale/zh_CN/datePicker.json         |  18 +-
 .../dashboard/i18n/locale/zh_CN/general.json  |   2 +-
 .../i18n/locale/zh_CN/generalSettings.json    |  30 +-
 .../i18n/locale/zh_CN/helpCenter.json         | 552 +++++++++---------
 .../dashboard/i18n/locale/zh_CN/inbox.json    |  82 +--
 .../i18n/locale/zh_CN/inboxMgmt.json          | 282 ++++-----
 .../i18n/locale/zh_CN/integrationApps.json    |  28 +-
 .../i18n/locale/zh_CN/integrations.json       | 543 ++++++++---------
 .../i18n/locale/zh_CN/labelsMgmt.json         |  34 +-
 .../dashboard/i18n/locale/zh_CN/macros.json   |   8 +-
 .../dashboard/i18n/locale/zh_CN/report.json   | 302 +++++-----
 .../dashboard/i18n/locale/zh_CN/search.json   |  26 +-
 .../dashboard/i18n/locale/zh_CN/settings.json | 324 +++++-----
 .../dashboard/i18n/locale/zh_CN/signup.json   |   2 +-
 .../dashboard/i18n/locale/zh_CN/sla.json      |  74 +--
 .../i18n/locale/zh_CN/teamsSettings.json      |  24 +-
 .../i18n/locale/zh_TW/integrations.json       |   3 +-
 config/locales/zh_CN.yml                      | 114 ++--
 89 files changed, 1744 insertions(+), 1692 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/am/integrations.json b/app/javascript/dashboard/i18n/locale/am/integrations.json
index 8177fdab5..3df5c3bd1 100644
--- a/app/javascript/dashboard/i18n/locale/am/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/am/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index a3ea8042a..70b1234b6 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "أنت",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/az/integrations.json b/app/javascript/dashboard/i18n/locale/az/integrations.json
index 8177fdab5..3df5c3bd1 100644
--- a/app/javascript/dashboard/i18n/locale/az/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/az/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index efc274826..db49f1938 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index ec6caf9ce..10d0d86f9 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Tu",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index c615ee572..69092f3ce 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Vy",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 178085d3f..4731703b5 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Dig",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
index a74ff1256..6abf13fdf 100644
--- a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
@@ -19,7 +19,7 @@
       "ACTIONS": "Aktionen",
       "VERIFIED": "Verifiziert",
       "VERIFICATION_PENDING": "Überprüfung ausstehend",
-      "AVAILABLE_CUSTOM_ROLE": "Available custom role permissions"
+      "AVAILABLE_CUSTOM_ROLE": "Verfügbare Berechtigungen der benutzerdefinierten Rolle"
     },
     "ADD": {
       "TITLE": "Fügen Sie Ihrem Team einen Agenten hinzu",
@@ -78,7 +78,7 @@
         },
         "AGENT_AVAILABILITY": {
           "LABEL": "Verfügbarkeit",
-          "PLACEHOLDER": "Bitte wählen Sie den Online Status",
+          "PLACEHOLDER": "Bitte wählen Sie Ihre Verfügbarkeit aus",
           "ERROR": "Verfügbarkeit ist erforderlich"
         },
         "SUBMIT": "Agent bearbeiten"
diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json
index 06f1810c6..92556540a 100644
--- a/app/javascript/dashboard/i18n/locale/de/automation.json
+++ b/app/javascript/dashboard/i18n/locale/de/automation.json
@@ -1,7 +1,7 @@
 {
   "AUTOMATION": {
     "HEADER": "Automatisierung",
-    "DESCRIPTION": "Automation can replace and streamline existing processes that require manual effort, such as adding labels and assigning conversations to the most suitable agent. This allows the team to focus on their strengths while reducing time spent on routine tasks.",
+    "DESCRIPTION": "Mittels Automatisierung können bestehende Prozesse ersetzt und rationalisiert werden, die manuellen Aufwand erfordern, z. B. das Hinzufügen von Etiketten und die Zuweisung von Gesprächen an den am besten geeigneten Agenten. So kann sich das Team auf seine Stärken konzentrieren und gleichzeitig den Zeitaufwand für Routineaufgaben reduzieren.",
     "LEARN_MORE": "Learn more about automation",
     "HEADER_BTN_TXT": "Automatisierungsregel hinzufügen",
     "LOADING": "Automatisierungsregeln abrufen",
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index af796dda3..bae75207d 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -6,7 +6,7 @@
     "LIST": {
       "404": "In dieser Gruppe existieren keine aktiven Gespräche."
     },
-    "FAILED_TO_SEND": "Failed to send",
+    "FAILED_TO_SEND": "Fehler beim Senden",
     "TAB_HEADING": "Gespräche",
     "MENTION_HEADING": "Erwähnungen",
     "UNATTENDED_HEADING": "Unbeaufsichtigt",
@@ -101,7 +101,7 @@
         "CONTENT": "hat eine URL geteilt"
       },
       "contact": {
-        "CONTENT": "Shared contact"
+        "CONTENT": "Geteilter Kontakt"
       }
     },
     "CHAT_SORT_BY_FILTER": {
@@ -134,6 +134,6 @@
     "HIDE_QUOTED_TEXT": "Zitierten Text ausblenden",
     "SHOW_QUOTED_TEXT": "Zitierten Text anzeigen",
     "MESSAGE_READ": "Lesen",
-    "SENDING": "Sending"
+    "SENDING": "Sende"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 924799aa4..58c03b3b9 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "Details von Kontakt <strong>{primaryContactName}</strong> wird zu <strong>{parentContactName}</strong> kopiert."
     },
     "SEARCH": {
-      "ERROR_MESSAGE": "Something went wrong. Please try again later."
+      "ERROR_MESSAGE": "Etwas ist schiefgelaufen. Bitte später erneut versuchen."
     },
     "FORM": {
       "SUBMIT": " Kontakte zusammenführen",
@@ -284,36 +284,36 @@
   "CONTACTS_LAYOUT": {
     "HEADER": {
       "TITLE": "Kontakte",
-      "SEARCH_TITLE": "Search contacts",
-      "SEARCH_PLACEHOLDER": "Search...",
+      "SEARCH_TITLE": "Kontakte suchen",
+      "SEARCH_PLACEHOLDER": "Suchen...",
       "MESSAGE_BUTTON": "Nachricht",
       "SEND_MESSAGE": "Nachricht senden",
-      "BLOCK_CONTACT": "Block contact",
-      "UNBLOCK_CONTACT": "Unblock contact",
+      "BLOCK_CONTACT": "Kontakt blockieren",
+      "UNBLOCK_CONTACT": "Kontakt entsperren",
       "BREADCRUMB": {
         "CONTACTS": "Kontakte"
       },
       "ACTIONS": {
         "CONTACT_CREATION": {
-          "ADD_CONTACT": "Add contact",
-          "EXPORT_CONTACT": "Export contacts",
-          "IMPORT_CONTACT": "Import contacts",
-          "SAVE_CONTACT": "Save contact",
+          "ADD_CONTACT": "Kontakt hinzufügen",
+          "EXPORT_CONTACT": "Kontakte exportieren",
+          "IMPORT_CONTACT": "Kontakte importieren",
+          "SAVE_CONTACT": "Kontakt speichern",
           "EMAIL_ADDRESS_DUPLICATE": "Diese E-Mail-Adresse wird bereits für einen anderen Kontakt verwendet.",
           "PHONE_NUMBER_DUPLICATE": "Diese Telefonnummer wird für einen anderen Kontakt verwendet.",
           "SUCCESS_MESSAGE": "Kontakt erfolgreich gespeichert",
-          "ERROR_MESSAGE": "Unable to save contact. Please try again later."
+          "ERROR_MESSAGE": "Kontakt konnte nicht gespeichert werden. Bitte versuchen Sie es später erneut."
         },
-        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
-        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
+        "BLOCK_SUCCESS_MESSAGE": "Dieser Kontakt wurde erfolgreich blockiert",
+        "BLOCK_ERROR_MESSAGE": "Kontakt konnte nicht blockiert werden. Bitte versuchen Sie es später erneut.",
         "UNBLOCK_SUCCESS_MESSAGE": "Dieser Kontakt wurde erfolgreich entsperrt",
-        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
+        "UNBLOCK_ERROR_MESSAGE": "Kontakt konnte nicht entsperrt werden. Bitte versuchen Sie es später erneut.",
         "IMPORT_CONTACT": {
-          "TITLE": "Import contacts",
+          "TITLE": "Kontakte importieren",
           "DESCRIPTION": "Kontakte über CSV-Datei importieren.",
           "DOWNLOAD_LABEL": "Ein CSV-Beispiel herunterladen.",
           "LABEL": "CSV-Datei:",
-          "CHOOSE_FILE": "Choose file",
+          "CHOOSE_FILE": "Datei auswählen",
           "CHANGE": "Ändern",
           "CANCEL": "Stornieren",
           "IMPORT": "Importieren",
@@ -321,8 +321,8 @@
           "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
         },
         "EXPORT_CONTACT": {
-          "TITLE": "Export contacts",
-          "DESCRIPTION": "Quickly export a csv file with comprehensive details of your contacts",
+          "TITLE": "Kontakte exportieren",
+          "DESCRIPTION": "Exportieren Sie schnell eine CSV-Datei mit umfassenden Daten Ihrer Kontakte",
           "CONFIRM": "Exportieren",
           "SUCCESS_MESSAGE": "Export is in progress, You will be notified via email when export file is ready to dowanlod.",
           "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
@@ -341,10 +341,10 @@
           }
         },
         "ORDER": {
-          "LABEL": "Ordering",
+          "LABEL": "Bestellen",
           "OPTIONS": {
-            "ASCENDING": "Ascending",
-            "DESCENDING": "Descending"
+            "ASCENDING": "Aufsteigend",
+            "DESCENDING": "Absteigend"
           }
         },
         "FILTERS": {
@@ -352,24 +352,24 @@
             "TITLE": "Möchten Sie diesen Filter speichern?",
             "CONFIRM": "Filter speichern",
             "LABEL": "Name",
-            "PLACEHOLDER": "Enter the name of the filter",
-            "ERROR": "Enter a valid name",
-            "SUCCESS_MESSAGE": "Filter saved successfully",
-            "ERROR_MESSAGE": "Unable to save filter. Please try again later."
+            "PLACEHOLDER": "Geben Sie einen Namen für diesen Filter ein",
+            "ERROR": "Gib einen gültigen Namen ein",
+            "SUCCESS_MESSAGE": "Filter erfolgreich gespeichert",
+            "ERROR_MESSAGE": "Filter konnte nicht gespeichert werden. Bitte versuchen Sie es später erneut."
           },
           "DELETE_SEGMENT": {
             "TITLE": "Löschung bestätigen",
-            "DESCRIPTION": "Are you sure you want to delete this filter?",
+            "DESCRIPTION": "Möchten Sie diesen Filter wirklich löschen?",
             "CONFIRM": "Ja, löschen",
             "CANCEL": "Nein, abbrechen",
-            "SUCCESS_MESSAGE": "Filter deleted successfully",
-            "ERROR_MESSAGE": "Unable to delete filter. Please try again later."
+            "SUCCESS_MESSAGE": "Filter erfolgreich gelöscht",
+            "ERROR_MESSAGE": "Filter konnte nicht gelöscht werden. Bitte versuchen Sie es später erneut."
           }
         }
       }
     },
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} - {endItem} of {totalItems} contacts"
+      "SHOWING": "Zeige {startItem} - {endItem} von {totalItems} Kontakten"
     },
     "FILTER": {
       "NAME": "Name",
@@ -386,87 +386,87 @@
       "BLOCKED_FALSE": "Nein",
       "BUTTONS": {
         "CLEAR_FILTERS": "Filter zurücksetzen",
-        "UPDATE_SEGMENT": "Update segment",
+        "UPDATE_SEGMENT": "Segment aktualisieren",
         "APPLY_FILTERS": "Filter übernehmen",
         "ADD_FILTER": "Filter hinzufügen"
       },
       "TITLE": "Kontakte filtern",
       "EDIT_SEGMENT": "Segment bearbeiten",
       "SEGMENT": {
-        "LABEL": "Segment name",
-        "INPUT_PLACEHOLDER": "Enter the name of the segment"
+        "LABEL": "Segmentname",
+        "INPUT_PLACEHOLDER": "Geben Sie den Namen des Segments ein"
       },
       "ACTIVE_FILTERS": {
-        "MORE_FILTERS": "+ {count} more filters",
+        "MORE_FILTERS": "+ {count} weitere Filter",
         "CLEAR_FILTERS": "Filter zurücksetzen"
       }
     },
     "CARD": {
-      "OF": "of",
+      "OF": "von",
       "VIEW_DETAILS": "Details anzeigen",
       "EDIT_DETAILS_FORM": {
         "TITLE": "Kontaktdetails bearbeiten",
         "FORM": {
           "FIRST_NAME": {
-            "PLACEHOLDER": "Enter the first name"
+            "PLACEHOLDER": "Vorname eingeben"
           },
           "LAST_NAME": {
-            "PLACEHOLDER": "Enter the last name"
+            "PLACEHOLDER": "Nachname eingeben"
           },
           "EMAIL_ADDRESS": {
-            "PLACEHOLDER": "Enter the email address",
+            "PLACEHOLDER": "E-Mail-Adresse eingeben",
             "DUPLICATE": "Diese E-Mail-Adresse wird bereits für einen anderen Kontakt verwendet."
           },
           "PHONE_NUMBER": {
-            "PLACEHOLDER": "Enter the phone number",
+            "PLACEHOLDER": "Telefonnummer eingeben",
             "DUPLICATE": "Diese Telefonnummer wird für einen anderen Kontakt verwendet."
           },
           "CITY": {
             "PLACEHOLDER": "Geben Sie den Ortsnamen ein"
           },
           "COUNTRY": {
-            "PLACEHOLDER": "Select country"
+            "PLACEHOLDER": "Land auswählen"
           },
           "BIO": {
-            "PLACEHOLDER": "Enter the bio"
+            "PLACEHOLDER": "Biografie eingeben"
           },
           "COMPANY_NAME": {
             "PLACEHOLDER": "Firmenname eingeben"
           }
         },
-        "UPDATE_BUTTON": "Update contact",
-        "SUCCESS_MESSAGE": "Contact updated successfully",
-        "ERROR_MESSAGE": "Unable to update contact. Please try again later."
+        "UPDATE_BUTTON": "Kontakt aktualisieren",
+        "SUCCESS_MESSAGE": "Kontakt erfolgreich aktualisiert",
+        "ERROR_MESSAGE": "Kontakt konnte nicht aktualisiert werden. Bitte versuche es später erneut."
       },
       "SOCIAL_MEDIA": {
-        "TITLE": "Edit social links",
+        "TITLE": "Social-Media Links bearbeiten",
         "FORM": {
           "FACEBOOK": {
-            "PLACEHOLDER": "Add Facebook"
+            "PLACEHOLDER": "Facebook hinzufügen"
           },
           "GITHUB": {
-            "PLACEHOLDER": "Add Github"
+            "PLACEHOLDER": "Github hinzufügen"
           },
           "INSTAGRAM": {
-            "PLACEHOLDER": "Add Instagram"
+            "PLACEHOLDER": "Instagram hinzufügen"
           },
           "LINKEDIN": {
-            "PLACEHOLDER": "Add LinkedIn"
+            "PLACEHOLDER": "LinkedIn hinzufügen"
           },
           "TWITTER": {
-            "PLACEHOLDER": "Add Twitter"
+            "PLACEHOLDER": "Twitter hinzufügen"
           }
         }
       }
     },
     "DETAILS": {
-      "CREATED_AT": "Created {date}",
-      "LAST_ACTIVITY": "Last active {date}",
-      "DELETE_CONTACT_DESCRIPTION": "Permanently delete this contact. This action is irreversible",
+      "CREATED_AT": "Erstellt am {date}",
+      "LAST_ACTIVITY": "Zuletzt aktiv {date}",
+      "DELETE_CONTACT_DESCRIPTION": "Diesen Kontakt dauerhaft löschen. Diese Aktion kann nicht rückgängig gemacht werden",
       "DELETE_CONTACT": "Kontakt löschen",
       "DELETE_DIALOG": {
         "TITLE": "Löschung bestätigen",
-        "DESCRIPTION": "Are you sure you want to delete this {contactName} contact?",
+        "DESCRIPTION": "Sind Sie sicher, dass Sie den Kontakt {contactName} löschen möchten?",
         "CONFIRM": "Ja, löschen",
         "API": {
           "SUCCESS_MESSAGE": "Kontakt erfolgreich gelöscht",
@@ -475,29 +475,29 @@
       },
       "AVATAR": {
         "UPLOAD": {
-          "ERROR_MESSAGE": "Could not upload avatar. Please try again later.",
-          "SUCCESS_MESSAGE": "Avatar uploaded successfully"
+          "ERROR_MESSAGE": "Avatar konnte nicht hochgeladen werden. Bitte versuche es später erneut.",
+          "SUCCESS_MESSAGE": "Avatar erfolgreich hochgeladen"
         },
         "DELETE": {
           "SUCCESS_MESSAGE": "Avatar erfolgreich gelöscht",
-          "ERROR_MESSAGE": "Could not delete avatar. Please try again later."
+          "ERROR_MESSAGE": "Avatar konnte nicht gelöscht werden. Bitte versuche es später erneut."
         }
       }
     },
     "SIDEBAR": {
       "TABS": {
         "ATTRIBUTES": "Attribute",
-        "HISTORY": "History",
+        "HISTORY": "Verlauf",
         "NOTES": "Notizen",
-        "MERGE": "Merge"
+        "MERGE": "Zusammenführen"
       },
       "HISTORY": {
         "EMPTY_STATE": "Es sind keine vorherigen Gespräche mit diesem Kontakt verbunden"
       },
       "ATTRIBUTES": {
-        "SEARCH_PLACEHOLDER": "Search for attributes",
-        "UNUSED_ATTRIBUTES": "{count} Used attribute | {count} Unused attributes",
-        "EMPTY_STATE": "There are no contact custom attributes available in this account. You can create a custom attribute in settings.",
+        "SEARCH_PLACEHOLDER": "Nach Attributen suchen",
+        "UNUSED_ATTRIBUTES": "{count} verwendete Attribute | {count} ungenutzte Attribute",
+        "EMPTY_STATE": "Es gibt keine benutzerdefinierten Attribute für Kontakte in diesem Konto. Sie können ein eigenes Attribut in den Einstellungen erstellen.",
         "YES": "Ja",
         "NO": "Nein",
         "TRIGGER": {
@@ -505,11 +505,11 @@
           "INPUT": "Wert eintragen"
         },
         "VALIDATIONS": {
-          "INVALID_NUMBER": "Invalid number",
+          "INVALID_NUMBER": "Ungültige Nummer",
           "REQUIRED": "Gültiger Wert ist erforderlich",
-          "INVALID_INPUT": "Invalid input",
+          "INVALID_INPUT": "Ungültige Eingabe",
           "INVALID_URL": "Ungültige URL",
-          "INVALID_DATE": "Invalid date"
+          "INVALID_DATE": "Ungültiges Datum"
         },
         "NO_ATTRIBUTES": "Keine Attribute gefunden",
         "API": {
@@ -521,16 +521,16 @@
       },
       "MERGE": {
         "TITLE": "Kontakte zusammenführen",
-        "DESCRIPTION": "Combine two profiles into one, including all attributes and conversations. In case of conflict, the primary contact’s attributes will take precedence.",
+        "DESCRIPTION": "Profile zusammenführen, um zwei Profile zu einem zu kombinieren, einschließlich aller Attribute und Gespräche. Im Falle eines Konflikts haben die Attribute des primären Kontakts Vorrang.",
         "PRIMARY": "Hauptkontakt",
-        "PRIMARY_HELP_LABEL": "To be saved",
-        "PRIMARY_REQUIRED_ERROR": "Please select a contact to merge with before proceeding",
-        "PARENT": "To be merged",
+        "PRIMARY_HELP_LABEL": "Zu speichern",
+        "PRIMARY_REQUIRED_ERROR": "Bitte wähle einen Kontakt zum Zusammenführen aus, bevor du fortfährst",
+        "PARENT": "Zusammenzuführen",
         "PARENT_HELP_LABEL": "Zu löschen",
-        "EMPTY_STATE": "No contacts found",
-        "PLACEHOLDER": "Search for primary contact",
+        "EMPTY_STATE": "Keine Kontakte gefunden",
+        "PLACEHOLDER": "Nach primärem Kontakt suchen",
         "SEARCH_PLACEHOLDER": "Nach Kontakt suchen",
-        "SEARCH_ERROR_MESSAGE": "Could not search for contacts. Please try again later.",
+        "SEARCH_ERROR_MESSAGE": "Kontakte konnten nicht gesucht werden. Bitte versuchen Sie es später erneut.",
         "SUCCESS_MESSAGE": "Kontakt erfolgreich zusammengeführt",
         "ERROR_MESSAGE": "Kontakte konnten nicht zusammengeführt werden, bitte erneut versuchen!",
         "IS_SEARCHING": "Suchen...",
@@ -543,62 +543,62 @@
         "PLACEHOLDER": "Notiz hinzufügen",
         "WROTE": "schrieb",
         "YOU": "Sie",
-        "SAVE": "Save note",
-        "EMPTY_STATE": "There are no notes associated to this contact. You can add a note by typing in the box above."
+        "SAVE": "Notiz speichern",
+        "EMPTY_STATE": "Es gibt keine Notizen zu diesem Kontakt. Sie können eine Notiz hinzufügen, indem Sie diese in das obige Feld eingeben."
       }
     },
     "EMPTY_STATE": {
-      "TITLE": "No contacts found in this account",
-      "SUBTITLE": "Start adding new contacts by clicking on the button below",
-      "BUTTON_LABEL": "Add contact",
+      "TITLE": "Keine Kontakte in diesem Konto gefunden",
+      "SUBTITLE": "Füge neue Kontakte hinzu, indem du auf den Button unten klickst",
+      "BUTTON_LABEL": "Kontakt hinzufügen",
       "SEARCH_EMPTY_STATE_TITLE": "Keine Kontakte entsprechen Ihrer Suche 🔍",
-      "LIST_EMPTY_STATE_TITLE": "No contacts available in this view 📋"
+      "LIST_EMPTY_STATE_TITLE": "Keine Kontakte verfügbar in dieser Ansicht 📋"
     }
   },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
-      "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
+      "ERROR_MESSAGE": "Wir konnten die Suche nicht abschließen. Bitte versuch es erneut."
     },
     "FORM": {
       "GO_TO_CONVERSATION": "Aussicht",
-      "SUCCESS_MESSAGE": "The message was sent successfully!",
-      "ERROR_MESSAGE": "An error occurred while creating the conversation. Please try again later.",
-      "NO_INBOX_ALERT": "There are no available inboxes to start a conversation with this contact.",
+      "SUCCESS_MESSAGE": "Die Nachricht wurde erfolgreich versendet!",
+      "ERROR_MESSAGE": "Beim Erstellen der Unterhaltung ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut.",
+      "NO_INBOX_ALERT": "Es sind keine Posteingänge vorhanden, um eine Unterhaltung mit diesem Kontakt zu starten.",
       "CONTACT_SELECTOR": {
         "LABEL": "An:",
-        "TAG_INPUT_PLACEHOLDER": "Search for a contact with name, email or phone number",
-        "CONTACT_CREATING": "Creating contact..."
+        "TAG_INPUT_PLACEHOLDER": "Suche nach Kontakten mit Name, E-Mail oder Telefonnummer",
+        "CONTACT_CREATING": "Neuen Kontakt erstellen..."
       },
       "INBOX_SELECTOR": {
         "LABEL": "Via:",
-        "BUTTON": "Show inboxes"
+        "BUTTON": "Posteingänge anzeigen"
       },
       "EMAIL_OPTIONS": {
         "SUBJECT_LABEL": "Betreff :",
-        "SUBJECT_PLACEHOLDER": "Enter your email subject here",
+        "SUBJECT_PLACEHOLDER": "E-Mail Betreff hier eingeben",
         "CC_LABEL": "Cc:",
-        "CC_PLACEHOLDER": "Search for a contact with their email address",
+        "CC_PLACEHOLDER": "Suche nach einem Kontakt mit seiner E-Mail-Adresse",
         "BCC_LABEL": "Bcc:",
-        "BCC_PLACEHOLDER": "Search for a contact with their email address",
+        "BCC_PLACEHOLDER": "Suche nach einem Kontakt mit seiner E-Mail-Adresse",
         "BCC_BUTTON": "Bcc"
       },
       "MESSAGE_EDITOR": {
         "PLACEHOLDER": "Schreiben Sie Ihre Nachricht hier..."
       },
       "WHATSAPP_OPTIONS": {
-        "LABEL": "Select template",
-        "SEARCH_PLACEHOLDER": "Search templates",
-        "EMPTY_STATE": "No templates found",
+        "LABEL": "Vorlage auswählen",
+        "SEARCH_PLACEHOLDER": "Vorlagen suchen",
+        "EMPTY_STATE": "Keine Vorlagen gefunden",
         "TEMPLATE_PARSER": {
-          "TEMPLATE_NAME": "WhatsApp template: {templateName}",
+          "TEMPLATE_NAME": "WhatsApp Template: {templateName}",
           "VARIABLES": "Variablen",
           "BACK": "Zurück",
           "SEND_MESSAGE": "Nachricht senden"
         }
       },
       "ACTION_BUTTONS": {
-        "DISCARD": "Discard",
-        "SEND": "Send ({keyCode})"
+        "DISCARD": "Verwerfen",
+        "SEND": "Senden ({keyCode})"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index c45a03c71..b3b2d9fbd 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -38,23 +38,23 @@
     "REMOVE_SELECTION": "Auswahl entfernen",
     "DOWNLOAD": "Herunterladen",
     "UNKNOWN_FILE_TYPE": "Unbekannte Datei",
-    "SAVE_CONTACT": "Save Contact",
-    "NO_CONTENT": "No content to display",
+    "SAVE_CONTACT": "Kontakt speichern",
+    "NO_CONTENT": "Kein Inhalt zum Anzeigen",
     "SHARED_ATTACHMENT": {
-      "CONTACT": "{sender} has shared a contact",
-      "LOCATION": "{sender} has shared a location",
-      "FILE": "{sender} has shared a file",
+      "CONTACT": "{sender} hat einen Kontakt geteilt",
+      "LOCATION": "{sender} hat einen Standort geteilt",
+      "FILE": "{sender} hat eine Datei geteilt",
       "MEETING": "{sender} hat ein Meeting begonnen"
     },
     "UPLOADING_ATTACHMENTS": "Anhänge werden hochgeladen...",
     "REPLIED_TO_STORY": "Auf deine Geschichte geantwortet",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported. You can view this message on the Facebook / Instagram app.",
+    "UNSUPPORTED_MESSAGE": "Diese Nachricht wird nicht unterstützt. Sie können diese Nachricht in der Facebook/Instagram-App sehen.",
     "UNSUPPORTED_MESSAGE_FACEBOOK": "Diese Nachricht wird nicht unterstützt. Sie können diese Nachricht in der Facebook-Messenger-App sehen.",
     "UNSUPPORTED_MESSAGE_INSTAGRAM": "Diese Nachricht wird nicht unterstützt. Sie können diese Nachricht in der Instagram-App sehen.",
     "SUCCESS_DELETE_MESSAGE": "Nachricht erfolgreich gelöscht",
     "FAIL_DELETE_MESSSAGE": "Nachricht konnte nicht gelöscht werden! Versuchen Sie es erneut",
     "NO_RESPONSE": "Keine Antwort",
-    "RESPONSE": "Response",
+    "RESPONSE": "Antwort",
     "RATING_TITLE": "Bewertung",
     "FEEDBACK_TITLE": "Feedback",
     "REPLY_MESSAGE_NOT_FOUND": "Nachricht nicht verfügbar",
@@ -135,7 +135,7 @@
           "FAILED": "Agent konnte nicht zugewiesen werden. Bitte versuche es erneut."
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned label #{labelName} to conversation id {conversationId}",
+          "SUCCESFUL": "Label #{labelName} der Konversations-ID {conversationId} zugewiesen",
           "FAILED": "Label konnte nicht zugewiesen werden. Bitte versuche es erneut."
         },
         "TEAM_ASSIGNMENT": {
@@ -324,7 +324,7 @@
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Betreff",
-    "EXPAND": "Expand email"
+    "EXPAND": "E-Mail erweitern"
   },
   "CONVERSATION_PARTICIPANTS": {
     "SIDEBAR_MENU_TITLE": "Zugewiesen",
@@ -351,14 +351,14 @@
     "NO_TRANSLATIONS_AVAILABLE": "Für diesen Inhalt sind keine Übersetzungen verfügbar"
   },
   "TYPING": {
-    "ONE": "{user} is typing",
-    "TWO": "{user} and {secondUser} are typing",
-    "MULTIPLE": "{user} and {count} others are typing"
+    "ONE": "{user} tippt",
+    "TWO": "{user} und {secondUser} tippen",
+    "MULTIPLE": "{user} und {count} andere tippen"
   },
   "COPILOT": {
-    "TRY_THESE_PROMPTS": "Try these prompts"
+    "TRY_THESE_PROMPTS": "Probiere diese Prompts"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": "Unable to download attachment. Please try again"
+    "ERROR_DOWNLOADING": "Anhang konnte nicht heruntergeladen werden. Bitte versuche es erneut"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 5a7288aca..3b0021ccb 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -2,7 +2,7 @@
   "INBOX_MGMT": {
     "HEADER": "Posteingänge",
     "DESCRIPTION": "A channel is the mode of communication your customer chooses to interact with you. An inbox is where you manage interactions for a specific channel. It can include communications from various sources such as email, live chat, and social media.",
-    "LEARN_MORE": "Learn more about inboxes",
+    "LEARN_MORE": "Mehr über Posteingänge erfahren",
     "RECONNECTION_REQUIRED": "Ihr Posteingang ist nicht verbunden. Sie erhalten keine neuen Nachrichten, bis Sie ihn erneut autorisieren.",
     "CLICK_TO_RECONNECT": "Klicken Sie hier, um die Verbindung wiederherzustellen.",
     "LIST": {
@@ -367,9 +367,9 @@
         "ERROR_MESSAGE": "Beim Verbinden mit Microsoft ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
       },
       "GOOGLE": {
-        "TITLE": "Google Email",
-        "DESCRIPTION": "Click on the Sign in with Google button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "SIGN_IN": "Sign in with Google",
+        "TITLE": "Google E-Mail",
+        "DESCRIPTION": "Klicken Sie auf die Schaltfläche Einloggen mit Google, um loszulegen. Sie werden zur E-Mail-Anmeldeseite weitergeleitet. Sobald Sie die angeforderten Berechtigungen angenommen haben, werden Sie zum Erstellungsschritt für den Posteingang weitergeleitet.",
+        "SIGN_IN": "Mit Google anmelden",
         "EMAIL_PLACEHOLDER": "E-Mail-Adresse eingeben",
         "ERROR_MESSAGE": "There was an error connecting to Google, please try again"
       }
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index a0d75f833..c54875f51 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Sie",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 557e13add..419674b69 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index b0ba160d6..b7ebb8209 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Tú",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 6769451f3..d42052350 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "شما",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index 2959943ca..172c97d6e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Sinä",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 2e44fd22d..7749322cd 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Vous",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 227f436ac..ef117d324 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index 63061f021..8b03386b4 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/hr/integrations.json b/app/javascript/dashboard/i18n/locale/hr/integrations.json
index 8d990e32c..4591cac8a 100644
--- a/app/javascript/dashboard/i18n/locale/hr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hr/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Vi",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index e4e1dad09..426528387 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Ön",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/hy/integrations.json b/app/javascript/dashboard/i18n/locale/hy/integrations.json
index 32cbfd150..65eb7fcb0 100644
--- a/app/javascript/dashboard/i18n/locale/hy/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hy/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 02ee1dfce..fc7a21274 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Anda",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/is/integrations.json b/app/javascript/dashboard/i18n/locale/is/integrations.json
index 9fb4c8b0b..1967a8210 100644
--- a/app/javascript/dashboard/i18n/locale/is/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/is/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index 9fb347f9f..733ee31e7 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index 100aeb45d..6d4b6a532 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captainが考え中",
       "YOU": "あなた",
       "USE": "これを使用",
-      "RESET": "リセット"
+      "RESET": "リセット",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "アップグレードしてCaptain AIを利用する",
diff --git a/app/javascript/dashboard/i18n/locale/ka/integrations.json b/app/javascript/dashboard/i18n/locale/ka/integrations.json
index 32cbfd150..65eb7fcb0 100644
--- a/app/javascript/dashboard/i18n/locale/ka/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ka/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index a9cb63e00..51047b7b5 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "나",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/lt/integrations.json b/app/javascript/dashboard/i18n/locale/lt/integrations.json
index 3561deb39..2f9f09cd7 100644
--- a/app/javascript/dashboard/i18n/locale/lt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lt/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Jūs",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index 66007b66f..c94144d3e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -302,8 +302,8 @@
         "ERROR": "Atsaistot jautājumu radās kļūda. Lūdzu, mēģiniet vēlreiz"
       },
       "DELETE": {
-        "TITLE": "Are you sure you want to delete the integration?",
-        "MESSAGE": "Are you sure you want to delete the integration?",
+        "TITLE": "Vai tiešām vēlaties dzēst integrāciju?",
+        "MESSAGE": "Vai tiešām vēlaties dzēst integrāciju?",
         "CONFIRM": "Jā, dzēst",
         "CANCEL": "Atcelt"
       }
@@ -316,7 +316,8 @@
       "LOADER": "Kapteinis domā",
       "YOU": "Jūs",
       "USE": "Izmantot šo",
-      "RESET": "Atiestatīt"
+      "RESET": "Atiestatīt",
+      "SELECT_ASSISTANT": "Izvēlēties Asistentu"
     },
     "PAYWALL": {
       "TITLE": "Modernizējiet abonementu, lai izmantotu Captain AI",
@@ -439,19 +440,19 @@
       "DOCUMENTABLE": {
         "CONVERSATION": "Saruna #{id}"
       },
-      "SELECTED": "{count} selected",
-      "BULK_APPROVE_BUTTON": "Approve",
+      "SELECTED": "Atlasīti {count}",
+      "BULK_APPROVE_BUTTON": "Apstiprināt",
       "BULK_DELETE_BUTTON": "Dzēst",
       "BULK_APPROVE": {
-        "SUCCESS_MESSAGE": "FAQs approved successfully",
-        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+        "SUCCESS_MESSAGE": "Bieži uzdotie jautājumi ir veiksmīgi apstiprināti",
+        "ERROR_MESSAGE": "Apstiprinot bieži uzdotos jautājumus radās kļūda. Lūdzu, mēģiniet vēlreiz."
       },
       "BULK_DELETE": {
-        "TITLE": "Delete FAQs?",
-        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
-        "CONFIRM": "Yes, delete all",
-        "SUCCESS_MESSAGE": "FAQs deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+        "TITLE": "Vai dzēst bieži uzdotos jautājumus?",
+        "DESCRIPTION": "Vai tiešām vēlaties dzēst atlasītos bieži uzdotos jautājumus? Šo darbību nevar atsaukt.",
+        "CONFIRM": "Jā, dzēst visu",
+        "SUCCESS_MESSAGE": "Bieži uzdotie jautājumi ir veiksmīgi izdzēsti",
+        "ERROR_MESSAGE": "Dzēšot bieži uzdotos jautājumus radās kļūda. Lūdzu, mēģiniet vēlreiz."
       },
       "DELETE": {
         "TITLE": "Vai tiešām vēlaties izdzēst šos bieži uzdotos jautājumus?",
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 01ba915d6..7a21aaa0e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -36,20 +36,20 @@
         }
       },
       "INTERFACE_SECTION": {
-        "TITLE": "Interface",
-        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "TITLE": "Interfeiss",
+        "NOTE": "Pielāgot sava Chatwoot informācijas paneļa izskatu un darbību.",
         "FONT_SIZE": {
-          "TITLE": "Font size",
-          "NOTE": "Adjust the text size across the dashboard based on your preference.",
-          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
-          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "TITLE": "Fonta lielums",
+          "NOTE": "Pielāgot teksta lielumu informācijas panelī, atbilstoši savām vēlmēm.",
+          "UPDATE_SUCCESS": "Fonta iestatījumi ir veiksmīgi atjaunināti",
+          "UPDATE_ERROR": "Atjauninot fonta iestatījumus radās kļūda. Lūdzu, mēģiniet vēlreiz",
           "OPTIONS": {
-            "SMALLER": "Smaller",
-            "SMALL": "Small",
+            "SMALLER": "Mazāks",
+            "SMALL": "Mazs",
             "DEFAULT": "Noklusējums",
-            "LARGE": "Large",
-            "LARGER": "Larger",
-            "EXTRA_LARGE": "Extra Large"
+            "LARGE": "Liels",
+            "LARGER": "Lielāks",
+            "EXTRA_LARGE": "Īpaši Liels"
           }
         }
       },
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 4cf79620a..5e9a9c459 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ms/integrations.json b/app/javascript/dashboard/i18n/locale/ms/integrations.json
index eb35e257b..ce7632ef4 100644
--- a/app/javascript/dashboard/i18n/locale/ms/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ms/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index b8f145688..ad30a4fa0 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index 835a5602c..765ed2621 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Jij",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index e3ae4be24..feff15bd3 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Du",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 2f1d33425..78127fd9d 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 6ddbdf3cd..e30aa7c80 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Você",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
index 58d05defe..0f73cfd16 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/cannedMgmt.json
@@ -1,14 +1,14 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Atalhos",
+    "HEADER": "Respostas Prontas",
     "LEARN_MORE": "Saiba mais sobre respostas prontas",
     "DESCRIPTION": "Respostas prontas são modelos de resposta pré-escritas que te ajudam a responder rapidamente a uma conversa. Os agentes podem digitar o caractere ' /' seguido pelo atalho para inserir uma resposta pronta durante uma conversa. ",
     "HEADER_BTN_TXT": "Adicionar resposta pronta",
     "LOADING": "Buscando respostas prontas...",
     "SEARCH_404": "Não há itens correspondentes a esta consulta.",
     "LIST": {
-      "404": "Não há atalhos disponíveis nesta conta.",
-      "TITLE": "Gerenciar Atalhos",
+      "404": "Não há respostas prontas disponíveis nesta conta.",
+      "TITLE": "Gerenciar Respostas Prontas",
       "DESC": "Respostas Prontas são modelos de resposta predefinidas que podem ser usados para enviar respostas rapidamente durante conversas.",
       "TABLE_HEADER": {
         "SHORT_CODE": "Atalho",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 69bc3e94e..026a9eeca 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Capitão está pensando",
       "YOU": "Você",
       "USE": "Use isto",
-      "RESET": "Reiniciar"
+      "RESET": "Reiniciar",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Atualize para usar o Capitão IA",
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index 9410961e9..298ff175c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index ae4cddd10..28505ea5e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Капитан думает",
       "YOU": "Вы",
       "USE": "Использовать это",
-      "RESET": "Сброс"
+      "RESET": "Сброс",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Обновите тарифный план, чтобы использовать Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sh/integrations.json b/app/javascript/dashboard/i18n/locale/sh/integrations.json
index 32cbfd150..65eb7fcb0 100644
--- a/app/javascript/dashboard/i18n/locale/sh/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sh/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index 624606c6b..dda0e13cc 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Vy",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sl/integrations.json b/app/javascript/dashboard/i18n/locale/sl/integrations.json
index 5a680aab1..6ffe6839b 100644
--- a/app/javascript/dashboard/i18n/locale/sl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sl/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Vi",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sq/integrations.json b/app/javascript/dashboard/i18n/locale/sq/integrations.json
index 94a456f5b..7704c3145 100644
--- a/app/javascript/dashboard/i18n/locale/sq/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sq/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Ju",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 022f5de87..75d8cdcfc 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 7ec55ff84..d8ee779ae 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Du",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 0d7045e8c..5a87e2f52 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index 9df1c45ce..34f0d24a9 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/tl/integrations.json b/app/javascript/dashboard/i18n/locale/tl/integrations.json
index 8177fdab5..3df5c3bd1 100644
--- a/app/javascript/dashboard/i18n/locale/tl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tl/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index b1e94ec9b..1663f8070 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Sen",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index 5c33e2666..7b51e97a5 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "Ви",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index aa8f9ce78..d4130005b 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
index 32cbfd150..65eb7fcb0 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 2bd680e58..e8232c573 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
index 4fa086b36..01a418d04 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
@@ -66,8 +66,8 @@
     },
     "ERRORS": {
       "VALUE_REQUIRED": "必须填写值",
-      "ATTRIBUTE_KEY_REQUIRED": "Attribute key is required",
-      "FILTER_OPERATOR_REQUIRED": "Filter operator is required",
+      "ATTRIBUTE_KEY_REQUIRED": "属性键是必需的",
+      "FILTER_OPERATOR_REQUIRED": "需要过滤器操作符",
       "VALUE_MUST_BE_BETWEEN_1_AND_998": "值必须介于 1 到 998 之间。"
     },
     "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
index 8830b8e27..bbdaeabee 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentBots.json
@@ -21,7 +21,7 @@
       "SUBMIT": "验证并保存"
     },
     "BOT_CONFIGURATION": {
-      "TITLE": "选择一个代理机器人",
+      "TITLE": "选择一个客服机器人",
       "DESC": "将代理机器人分配到您的收件箱。他们可以处理初始对话，并在必要时将其转移给真人客服。",
       "SUBMIT": "更新",
       "DISCONNECT": "断开机器人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
index 4f63669cc..b8a4a0c49 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/agentMgmt.json
@@ -113,7 +113,7 @@
         "PLACEHOLDER": {
           "AGENT": "搜索客服代表",
           "TEAM": "查找团队",
-          "INPUT": "查找代理"
+          "INPUT": "查找客服代表"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index 88d9639c0..24eb60b22 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -118,8 +118,8 @@
       "LABEL_UPLOAD_FAILED": "上传失败"
     },
     "ERRORS": {
-      "ATTRIBUTE_KEY_REQUIRED": "Attribute key is required",
-      "FILTER_OPERATOR_REQUIRED": "Filter operator is required",
+      "ATTRIBUTE_KEY_REQUIRED": "属性键是必需的",
+      "FILTER_OPERATOR_REQUIRED": "需要过滤器操作符",
       "VALUE_REQUIRED": "必须填写值",
       "VALUE_MUST_BE_BETWEEN_1_AND_998": "值必须介于 1 到 998 之间。",
       "ACTION_PARAMETERS_REQUIRED": "需要操作参数",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
index 4e0912119..2d90a2c71 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/campaign.json
@@ -1,149 +1,149 @@
 {
   "CAMPAIGN": {
     "LIVE_CHAT": {
-      "HEADER_TITLE": "Live chat campaigns",
-      "NEW_CAMPAIGN": "Create campaign",
+      "HEADER_TITLE": "实时聊天活动",
+      "NEW_CAMPAIGN": "创建活动",
       "CARD": {
         "STATUS": {
           "ENABLED": "已启用",
           "DISABLED": "已禁用"
         },
         "CAMPAIGN_DETAILS": {
-          "SENT_BY": "Sent by",
+          "SENT_BY": "发送者",
           "BOT": "机器人",
           "FROM": "发自",
-          "URL": "URL:"
+          "URL": "网址："
         }
       },
       "EMPTY_STATE": {
-        "TITLE": "No live chat campaigns are available",
-        "SUBTITLE": "Connect with your customers using proactive messages.  Click 'Create campaign' to get started."
+        "TITLE": "暂无实时聊天活动",
+        "SUBTITLE": "通过主动消息与您的客户连接。点击 '创建活动' 开始。"
       },
       "CREATE": {
-        "TITLE": "Create a live chat campaign",
+        "TITLE": "创建实时聊天活动",
         "CANCEL_BUTTON_TEXT": "取消",
         "CREATE_BUTTON_TEXT": "创建",
         "FORM": {
           "TITLE": {
             "LABEL": "标题",
-            "PLACEHOLDER": "Please enter the title of campaign",
-            "ERROR": "Title is required"
+            "PLACEHOLDER": "请输入活动标题",
+            "ERROR": "标题是必填项"
           },
           "MESSAGE": {
             "LABEL": "消息",
-            "PLACEHOLDER": "Please enter the message of campaign",
-            "ERROR": "Message is required"
+            "PLACEHOLDER": "请输入活动消息",
+            "ERROR": "消息是必填项"
           },
           "INBOX": {
-            "LABEL": "Select Inbox",
-            "PLACEHOLDER": "Select Inbox",
-            "ERROR": "Inbox is required"
+            "LABEL": "选择收件箱",
+            "PLACEHOLDER": "选择收件箱",
+            "ERROR": "收件箱是必填项"
           },
           "SENT_BY": {
-            "LABEL": "Sent by",
-            "PLACEHOLDER": "Please select sender",
-            "ERROR": "Sender is required"
+            "LABEL": "发送者",
+            "PLACEHOLDER": "请选择发送者",
+            "ERROR": "发送者是必填项"
           },
           "END_POINT": {
-            "LABEL": "URL",
-            "PLACEHOLDER": "Please enter the URL",
-            "ERROR": "请输入一个有效的 URL"
+            "LABEL": "网址",
+            "PLACEHOLDER": "请输入网址",
+            "ERROR": "请输入有效的网址"
           },
           "TIME_ON_PAGE": {
-            "LABEL": "Time on page(Seconds)",
-            "PLACEHOLDER": "Please enter the time",
-            "ERROR": "Time on page is required"
+            "LABEL": "页面停留时间（秒）",
+            "PLACEHOLDER": "请输入时间",
+            "ERROR": "页面停留时间是必填项"
           },
           "OTHER_PREFERENCES": {
-            "TITLE": "Other preferences",
-            "ENABLED": "Enable campaign",
-            "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours"
+            "TITLE": "其他设置",
+            "ENABLED": "启用活动",
+            "TRIGGER_ONLY_BUSINESS_HOURS": "仅在工作时间触发"
           },
           "BUTTONS": {
             "CREATE": "创建",
             "CANCEL": "取消"
           },
           "API": {
-            "SUCCESS_MESSAGE": "Live chat campaign created successfully",
-            "ERROR_MESSAGE": "There was an error. Please try again."
+            "SUCCESS_MESSAGE": "实时聊天活动创建成功",
+            "ERROR_MESSAGE": "发生错误，请重试。"
           }
         }
       },
       "EDIT": {
-        "TITLE": "Edit live chat campaign",
+        "TITLE": "编辑实时聊天活动",
         "FORM": {
           "API": {
-            "SUCCESS_MESSAGE": "Live chat campaign updated successfully",
-            "ERROR_MESSAGE": "There was an error. Please try again."
+            "SUCCESS_MESSAGE": "实时聊天活动更新成功",
+            "ERROR_MESSAGE": "发生错误，请重试。"
           }
         }
       }
     },
     "SMS": {
-      "HEADER_TITLE": "SMS campaigns",
-      "NEW_CAMPAIGN": "Create campaign",
+      "HEADER_TITLE": "短信活动",
+      "NEW_CAMPAIGN": "创建活动",
       "EMPTY_STATE": {
-        "TITLE": "No SMS campaigns are available",
-        "SUBTITLE": "Launch an SMS campaign to reach your customers directly. Send offers or make announcements with ease. Click 'Create campaign' to get started."
+        "TITLE": "暂无短信活动",
+        "SUBTITLE": "启动短信活动直接与客户沟通。轻松发送优惠或公告。点击 '创建活动' 开始。"
       },
       "CARD": {
         "STATUS": {
-          "COMPLETED": "Completed",
-          "SCHEDULED": "Scheduled"
+          "COMPLETED": "已完成",
+          "SCHEDULED": "已计划"
         },
         "CAMPAIGN_DETAILS": {
-          "SENT_FROM": "Sent from",
-          "ON": "on"
+          "SENT_FROM": "发自",
+          "ON": "于"
         }
       },
       "CREATE": {
-        "TITLE": "Create SMS campaign",
+        "TITLE": "创建短信活动",
         "CANCEL_BUTTON_TEXT": "取消",
         "CREATE_BUTTON_TEXT": "创建",
         "FORM": {
           "TITLE": {
             "LABEL": "标题",
-            "PLACEHOLDER": "Please enter the title of campaign",
-            "ERROR": "Title is required"
+            "PLACEHOLDER": "请输入活动标题",
+            "ERROR": "标题是必填项"
           },
           "MESSAGE": {
             "LABEL": "消息",
-            "PLACEHOLDER": "Please enter the message of campaign",
-            "ERROR": "Message is required"
+            "PLACEHOLDER": "请输入活动消息",
+            "ERROR": "消息是必填项"
           },
           "INBOX": {
-            "LABEL": "Select Inbox",
-            "PLACEHOLDER": "Select Inbox",
-            "ERROR": "Inbox is required"
+            "LABEL": "选择收件箱",
+            "PLACEHOLDER": "选择收件箱",
+            "ERROR": "收件箱是必填项"
           },
           "AUDIENCE": {
-            "LABEL": "Audience",
-            "PLACEHOLDER": "Select the customer labels",
-            "ERROR": "Audience is required"
+            "LABEL": "受众",
+            "PLACEHOLDER": "选择客户标签",
+            "ERROR": "受众是必填项"
           },
           "SCHEDULED_AT": {
-            "LABEL": "Scheduled time",
-            "PLACEHOLDER": "Please select the time",
-            "ERROR": "Scheduled time is required"
+            "LABEL": "计划时间",
+            "PLACEHOLDER": "请选择时间",
+            "ERROR": "计划时间是必填项"
           },
           "BUTTONS": {
             "CREATE": "创建",
             "CANCEL": "取消"
           },
           "API": {
-            "SUCCESS_MESSAGE": "SMS campaign created successfully",
-            "ERROR_MESSAGE": "There was an error. Please try again."
+            "SUCCESS_MESSAGE": "短信活动创建成功",
+            "ERROR_MESSAGE": "发生错误，请重试。"
           }
         }
       }
     },
     "CONFIRM_DELETE": {
-      "TITLE": "Are you sure to delete?",
-      "DESCRIPTION": "The delete action is permanent and cannot be reversed.",
+      "TITLE": "确定删除吗？",
+      "DESCRIPTION": "删除操作是永久性的，无法恢复。",
       "CONFIRM": "删除",
       "API": {
-        "SUCCESS_MESSAGE": "Campaign deleted successfully",
-        "ERROR_MESSAGE": "There was an error. Please try again."
+        "SUCCESS_MESSAGE": "活动删除成功",
+        "ERROR_MESSAGE": "发生错误，请重试。"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
index 542f318d7..e38c19639 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/cannedMgmt.json
@@ -1,8 +1,8 @@
 {
   "CANNED_MGMT": {
     "HEADER": "预设回复",
-    "LEARN_MORE": "Learn more about canned responses",
-    "DESCRIPTION": "Canned Responses are pre-written reply templates that help you quickly respond to a conversation. Agents can type the '/' character followed by the shortcode to insert a canned response during a conversation. ",
+    "LEARN_MORE": "了解更多关于预设回复的内容",
+    "DESCRIPTION": "预置回复是预先写好的回复模板，可以帮助您在对话中快速响应。客服人员可以在对话中输入“/”字符，然后输入简码来插入预置回复。 ",
     "HEADER_BTN_TXT": "新增预定义回复",
     "LOADING": "正在检索预定义回复...",
     "SEARCH_404": "没有任何项目符合此查询.",
@@ -69,7 +69,7 @@
       "CONFIRM": {
         "TITLE": "确认删除",
         "MESSAGE": "您确定要删除吗？ ",
-        "YES": "是的，删除",
+        "YES": "是的，删除 ",
         "NO": "不，保留 "
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index 7ff43601c..11077856b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -6,7 +6,7 @@
     "LIST": {
       "404": "没有有效的对话在这个群组里面"
     },
-    "FAILED_TO_SEND": "Failed to send",
+    "FAILED_TO_SEND": "发送失败",
     "TAB_HEADING": "会话",
     "MENTION_HEADING": "提及",
     "UNATTENDED_HEADING": "未处理",
@@ -95,13 +95,13 @@
         "CONTENT": "位置"
       },
       "ig_reel": {
-        "CONTENT": "Instagram Reel"
+        "CONTENT": "Instagram 短视频"
       },
       "fallback": {
         "CONTENT": "分享了一个网址"
       },
       "contact": {
-        "CONTENT": "Shared contact"
+        "CONTENT": "共享联系人"
       }
     },
     "CHAT_SORT_BY_FILTER": {
@@ -134,6 +134,6 @@
     "HIDE_QUOTED_TEXT": "隐藏引用文字",
     "SHOW_QUOTED_TEXT": "显示引用文字",
     "MESSAGE_READ": "已读",
-    "SENDING": "Sending"
+    "SENDING": "发送中"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/components.json b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
index f68ee6562..899d511d5 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/components.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/components.json
@@ -1,43 +1,43 @@
 {
   "PAGINATION_FOOTER": {
-    "SHOWING": "Showing {startItem} - {endItem} of {totalItems} items",
-    "CURRENT_PAGE_INFO": "{currentPage} of {totalPages} pages"
+    "SHOWING": "显示第 {startItem} - {endItem} 项，共 {totalItems} 项",
+    "CURRENT_PAGE_INFO": "第 {currentPage} 页，共 {totalPages} 页"
   },
   "COMBOBOX": {
-    "PLACEHOLDER": "Select an option...",
-    "EMPTY_SEARCH_RESULTS": "No items found for the search term `{searchTerm}`",
+    "PLACEHOLDER": "请选择一个选项……",
+    "EMPTY_SEARCH_RESULTS": "未找到与搜索词 `{searchTerm}` 匹配的项",
     "EMPTY_STATE": "未找到结果。",
-    "SEARCH_PLACEHOLDER": "Search...",
-    "MORE": "+{count} more"
+    "SEARCH_PLACEHOLDER": "搜索……",
+    "MORE": "+{count} 更多"
   },
   "DROPDOWN_MENU": {
-    "SEARCH_PLACEHOLDER": "Search...",
+    "SEARCH_PLACEHOLDER": "搜索……",
     "EMPTY_STATE": "未找到结果。",
-    "SEARCHING": "搜索中..."
+    "SEARCHING": "搜索中……"
   },
   "DIALOG": {
     "BUTTONS": {
       "CANCEL": "取消",
-      "CONFIRM": "Confirm"
+      "CONFIRM": "确认"
     }
   },
   "PHONE_INPUT": {
     "SEARCH_PLACEHOLDER": "搜索国家/地区",
-    "ERROR": "Phone number should be empty or in E.164 format",
+    "ERROR": "电话号码应为空或E.164格式",
     "DIAL_CODE_ERROR": "请从列表中选择拨号代码"
   },
   "THUMBNAIL": {
     "AUTHOR": {
-      "NOT_AVAILABLE": "Author is not available"
+      "NOT_AVAILABLE": "作者不可用"
     }
   },
   "BREADCRUMB": {
-    "ARIA_LABEL": "Breadcrumb"
+    "ARIA_LABEL": "面包屑导航"
   },
   "SWITCH": {
-    "TOGGLE": "Toggle switch"
+    "TOGGLE": "切换开关"
   },
   "LABEL": {
-    "TAG_BUTTON": "tag"
+    "TAG_BUTTON": "标签"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 405a28b10..c8d471a00 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -266,7 +266,7 @@
       "ATTRIBUTE_WARNING": "<strong>{primaryContactName}</strong> 的联系信息将拷贝到 <strong>{parentContactName}</strong>。"
     },
     "SEARCH": {
-      "ERROR_MESSAGE": "Something went wrong. Please try again later."
+      "ERROR_MESSAGE": "出了点问题。请稍后再试。"
     },
     "FORM": {
       "SUBMIT": " 合并联系人",
@@ -284,45 +284,45 @@
   "CONTACTS_LAYOUT": {
     "HEADER": {
       "TITLE": "联系人",
-      "SEARCH_TITLE": "Search contacts",
-      "SEARCH_PLACEHOLDER": "Search...",
+      "SEARCH_TITLE": "搜索联系人",
+      "SEARCH_PLACEHOLDER": "搜索……",
       "MESSAGE_BUTTON": "消息",
       "SEND_MESSAGE": "发送消息",
-      "BLOCK_CONTACT": "Block contact",
-      "UNBLOCK_CONTACT": "Unblock contact",
+      "BLOCK_CONTACT": "屏蔽联系人",
+      "UNBLOCK_CONTACT": "解除屏蔽联系人",
       "BREADCRUMB": {
         "CONTACTS": "联系人"
       },
       "ACTIONS": {
         "CONTACT_CREATION": {
-          "ADD_CONTACT": "Add contact",
-          "EXPORT_CONTACT": "Export contacts",
-          "IMPORT_CONTACT": "Import contacts",
-          "SAVE_CONTACT": "Save contact",
+          "ADD_CONTACT": "添加联系人",
+          "EXPORT_CONTACT": "导出联系人",
+          "IMPORT_CONTACT": "导入联系人",
+          "SAVE_CONTACT": "保存联系人",
           "EMAIL_ADDRESS_DUPLICATE": "此电子邮件地址正在用于另一个联系人。",
           "PHONE_NUMBER_DUPLICATE": "此电话号码正在用于另一个联系人。",
           "SUCCESS_MESSAGE": "联系人保存成功",
-          "ERROR_MESSAGE": "Unable to save contact. Please try again later."
+          "ERROR_MESSAGE": "无法保存联系人，请稍后再试。"
         },
-        "BLOCK_SUCCESS_MESSAGE": "This contact is blocked successfully",
-        "BLOCK_ERROR_MESSAGE": "Unable to block contact. Please try again later.",
-        "UNBLOCK_SUCCESS_MESSAGE": "This contact is unblocked successfully",
-        "UNBLOCK_ERROR_MESSAGE": "Unable to unblock contact. Please try again later.",
+        "BLOCK_SUCCESS_MESSAGE": "此联系人已成功屏蔽",
+        "BLOCK_ERROR_MESSAGE": "无法屏蔽联系人，请稍后再试。",
+        "UNBLOCK_SUCCESS_MESSAGE": "此联系人已成功解除屏蔽",
+        "UNBLOCK_ERROR_MESSAGE": "无法解除屏蔽联系人，请稍后再试。",
         "IMPORT_CONTACT": {
-          "TITLE": "Import contacts",
+          "TITLE": "导入联系人",
           "DESCRIPTION": "通过 CSV 文件导入联系人",
           "DOWNLOAD_LABEL": "下载示例 CSV.",
           "LABEL": "CSV 文件:",
-          "CHOOSE_FILE": "Choose file",
-          "CHANGE": "改變",
+          "CHOOSE_FILE": "选择文件",
+          "CHANGE": "更改",
           "CANCEL": "取消",
           "IMPORT": "导入",
           "SUCCESS_MESSAGE": "导入完成时将通过电子邮件通知您。",
           "ERROR_MESSAGE": "出现错误，请重试"
         },
         "EXPORT_CONTACT": {
-          "TITLE": "Export contacts",
-          "DESCRIPTION": "Quickly export a csv file with comprehensive details of your contacts",
+          "TITLE": "导出联系人",
+          "DESCRIPTION": "快速导出包含联系人详细信息的 CSV 文件",
           "CONFIRM": "导出",
           "SUCCESS_MESSAGE": "导出正在进行。当导出文件准备好下载时，您将收到电子邮件通知。",
           "ERROR_MESSAGE": "出现错误，请重试"
@@ -331,7 +331,7 @@
           "LABEL": "排序方式",
           "OPTIONS": {
             "NAME": "姓名：",
-            "EMAIL": "Email",
+            "EMAIL": "电子邮件",
             "PHONE_NUMBER": "电话号码",
             "COMPANY": "公司",
             "COUNTRY": "国家",
@@ -341,10 +341,10 @@
           }
         },
         "ORDER": {
-          "LABEL": "Ordering",
+          "LABEL": "排序顺序",
           "OPTIONS": {
-            "ASCENDING": "Ascending",
-            "DESCENDING": "Descending"
+            "ASCENDING": "升序",
+            "DESCENDING": "降序"
           }
         },
         "FILTERS": {
@@ -352,28 +352,28 @@
             "TITLE": "您想要保存此过滤器吗？",
             "CONFIRM": "保存过滤器",
             "LABEL": "姓名：",
-            "PLACEHOLDER": "Enter the name of the filter",
-            "ERROR": "Enter a valid name",
-            "SUCCESS_MESSAGE": "Filter saved successfully",
-            "ERROR_MESSAGE": "Unable to save filter. Please try again later."
+            "PLACEHOLDER": "输入过滤器的名称",
+            "ERROR": "请输入有效的名称",
+            "SUCCESS_MESSAGE": "过滤器保存成功",
+            "ERROR_MESSAGE": "无法保存过滤器，请稍后再试。"
           },
           "DELETE_SEGMENT": {
             "TITLE": "确认删除",
-            "DESCRIPTION": "Are you sure you want to delete this filter?",
+            "DESCRIPTION": "您确定要删除此过滤器吗？",
             "CONFIRM": "是，删除",
             "CANCEL": "否，取消",
-            "SUCCESS_MESSAGE": "Filter deleted successfully",
-            "ERROR_MESSAGE": "Unable to delete filter. Please try again later."
+            "SUCCESS_MESSAGE": "过滤器删除成功",
+            "ERROR_MESSAGE": "无法删除过滤器，请稍后再试。"
           }
         }
       }
     },
     "PAGINATION_FOOTER": {
-      "SHOWING": "Showing {startItem} - {endItem} of {totalItems} contacts"
+      "SHOWING": "显示 {startItem} - {endItem} 个联系人，共 {totalItems} 个"
     },
     "FILTER": {
       "NAME": "姓名：",
-      "EMAIL": "Email",
+      "EMAIL": "电子邮件",
       "PHONE_NUMBER": "电话号码",
       "IDENTIFIER": "标识符",
       "COUNTRY": "国家",
@@ -381,92 +381,92 @@
       "CREATED_AT": "创建于",
       "LAST_ACTIVITY": "上次操作",
       "REFERER_LINK": "引用链接",
-      "BLOCKED": "Blocked",
-      "BLOCKED_TRUE": "真的",
-      "BLOCKED_FALSE": "错误",
+      "BLOCKED": "已屏蔽",
+      "BLOCKED_TRUE": "是",
+      "BLOCKED_FALSE": "否",
       "BUTTONS": {
         "CLEAR_FILTERS": "清除过滤器",
-        "UPDATE_SEGMENT": "Update segment",
+        "UPDATE_SEGMENT": "更新分段",
         "APPLY_FILTERS": "应用过滤器",
         "ADD_FILTER": "添加过滤器"
       },
-      "TITLE": "Filter contacts",
+      "TITLE": "过滤联系人",
       "EDIT_SEGMENT": "编辑分段",
       "SEGMENT": {
-        "LABEL": "Segment name",
-        "INPUT_PLACEHOLDER": "Enter the name of the segment"
+        "LABEL": "分段名称",
+        "INPUT_PLACEHOLDER": "输入分段的名称"
       },
       "ACTIVE_FILTERS": {
-        "MORE_FILTERS": "+ {count} more filters",
+        "MORE_FILTERS": "+ {count} 更多过滤器",
         "CLEAR_FILTERS": "清除过滤器"
       }
     },
     "CARD": {
-      "OF": "of",
+      "OF": "的",
       "VIEW_DETAILS": "查看详细信息",
       "EDIT_DETAILS_FORM": {
         "TITLE": "编辑联系人详情",
         "FORM": {
           "FIRST_NAME": {
-            "PLACEHOLDER": "Enter the first name"
+            "PLACEHOLDER": "输入名字"
           },
           "LAST_NAME": {
-            "PLACEHOLDER": "Enter the last name"
+            "PLACEHOLDER": "输入姓氏"
           },
           "EMAIL_ADDRESS": {
-            "PLACEHOLDER": "Enter the email address",
+            "PLACEHOLDER": "输入电子邮件地址",
             "DUPLICATE": "此电子邮件地址正在用于另一个联系人。"
           },
           "PHONE_NUMBER": {
-            "PLACEHOLDER": "Enter the phone number",
+            "PLACEHOLDER": "输入电话号码",
             "DUPLICATE": "此电话号码正在用于另一个联系人。"
           },
           "CITY": {
             "PLACEHOLDER": "输入城市名称"
           },
           "COUNTRY": {
-            "PLACEHOLDER": "Select country"
+            "PLACEHOLDER": "选择国家"
           },
           "BIO": {
-            "PLACEHOLDER": "Enter the bio"
+            "PLACEHOLDER": "输入简历"
           },
           "COMPANY_NAME": {
             "PLACEHOLDER": "输入公司名称"
           }
         },
-        "UPDATE_BUTTON": "Update contact",
-        "SUCCESS_MESSAGE": "Contact updated successfully",
-        "ERROR_MESSAGE": "Unable to update contact. Please try again later."
+        "UPDATE_BUTTON": "更新联系人",
+        "SUCCESS_MESSAGE": "联系人更新成功",
+        "ERROR_MESSAGE": "无法更新联系人，请稍后再试。"
       },
       "SOCIAL_MEDIA": {
-        "TITLE": "Edit social links",
+        "TITLE": "编辑社交链接",
         "FORM": {
           "FACEBOOK": {
-            "PLACEHOLDER": "Add Facebook"
+            "PLACEHOLDER": "添加 Facebook"
           },
           "GITHUB": {
-            "PLACEHOLDER": "Add Github"
+            "PLACEHOLDER": "添加 Github"
           },
           "INSTAGRAM": {
-            "PLACEHOLDER": "Add Instagram"
+            "PLACEHOLDER": "添加 Instagram"
           },
           "LINKEDIN": {
-            "PLACEHOLDER": "Add LinkedIn"
+            "PLACEHOLDER": "添加 LinkedIn"
           },
           "TWITTER": {
-            "PLACEHOLDER": "Add Twitter"
+            "PLACEHOLDER": "添加 Twitter"
           }
         }
       }
     },
     "DETAILS": {
-      "CREATED_AT": "Created {date}",
-      "LAST_ACTIVITY": "Last active {date}",
-      "DELETE_CONTACT_DESCRIPTION": "Permanently delete this contact. This action is irreversible",
+      "CREATED_AT": "创建于 {date}",
+      "LAST_ACTIVITY": "上次活动于 {date}",
+      "DELETE_CONTACT_DESCRIPTION": "永久删除此联系人。此操作不可逆",
       "DELETE_CONTACT": "删除联系人",
       "DELETE_DIALOG": {
         "TITLE": "确认删除",
-        "DESCRIPTION": "Are you sure you want to delete this {contactName} contact?",
+        "DESCRIPTION": "您确定要删除此 {contactName} 联系人吗？",
         "CONFIRM": "是，删除",
         "API": {
           "SUCCESS_MESSAGE": "联系人删除成功",
@@ -475,29 +475,29 @@
       },
       "AVATAR": {
         "UPLOAD": {
-          "ERROR_MESSAGE": "Could not upload avatar. Please try again later.",
-          "SUCCESS_MESSAGE": "Avatar uploaded successfully"
+          "ERROR_MESSAGE": "无法上传头像，请稍后再试。",
+          "SUCCESS_MESSAGE": "头像上传成功"
         },
         "DELETE": {
-          "SUCCESS_MESSAGE": "Avatar deleted successfully",
-          "ERROR_MESSAGE": "Could not delete avatar. Please try again later."
+          "SUCCESS_MESSAGE": "头像删除成功",
+          "ERROR_MESSAGE": "无法删除头像，请稍后再试。"
         }
       }
     },
     "SIDEBAR": {
       "TABS": {
-        "ATTRIBUTES": "Attributes",
-        "HISTORY": "History",
+        "ATTRIBUTES": "属性",
+        "HISTORY": "历史记录",
         "NOTES": "备注",
-        "MERGE": "Merge"
+        "MERGE": "合并"
       },
       "HISTORY": {
-        "EMPTY_STATE": "There are no previous conversations associated to this contact"
+        "EMPTY_STATE": "此联系人没有关联到以前的对话"
       },
       "ATTRIBUTES": {
-        "SEARCH_PLACEHOLDER": "Search for attributes",
-        "UNUSED_ATTRIBUTES": "{count} Used attribute | {count} Unused attributes",
-        "EMPTY_STATE": "There are no contact custom attributes available in this account. You can create a custom attribute in settings.",
+        "SEARCH_PLACEHOLDER": "搜索属性",
+        "UNUSED_ATTRIBUTES": "{count} 个已用属性 | {count} 个未用属性",
+        "EMPTY_STATE": "此账户中没有可用的联系人自定义属性。您可以在设置中创建自定义属性。",
         "YES": "是",
         "NO": "否",
         "TRIGGER": {
@@ -505,11 +505,11 @@
           "INPUT": "填写内容"
         },
         "VALIDATIONS": {
-          "INVALID_NUMBER": "Invalid number",
+          "INVALID_NUMBER": "无效的数字",
           "REQUIRED": "需要有效的值",
-          "INVALID_INPUT": "Invalid input",
+          "INVALID_INPUT": "无效输入",
           "INVALID_URL": "无效的 URL",
-          "INVALID_DATE": "Invalid date"
+          "INVALID_DATE": "无效日期"
         },
         "NO_ATTRIBUTES": "未找到属性",
         "API": {
@@ -521,16 +521,16 @@
       },
       "MERGE": {
         "TITLE": "合并联系人",
-        "DESCRIPTION": "Combine two profiles into one, including all attributes and conversations. In case of conflict, the primary contact’s attributes will take precedence.",
+        "DESCRIPTION": "将两个个人资料合并为一个，包括所有属性和对话。如果发生冲突，将以主联系人的属性为优先。",
         "PRIMARY": "主联系人",
-        "PRIMARY_HELP_LABEL": "To be saved",
-        "PRIMARY_REQUIRED_ERROR": "Please select a contact to merge with before proceeding",
-        "PARENT": "To be merged",
+        "PRIMARY_HELP_LABEL": "将被保留",
+        "PRIMARY_REQUIRED_ERROR": "请选择一个联系人进行合并",
+        "PARENT": "需要合并的联系人",
         "PARENT_HELP_LABEL": "将被删除",
-        "EMPTY_STATE": "No contacts found",
-        "PLACEHOLDER": "Search for primary contact",
+        "EMPTY_STATE": "未找到联系人",
+        "PLACEHOLDER": "搜索主联系人",
         "SEARCH_PLACEHOLDER": "搜索联系人",
-        "SEARCH_ERROR_MESSAGE": "Could not search for contacts. Please try again later.",
+        "SEARCH_ERROR_MESSAGE": "无法搜索联系人，请稍后再试。",
         "SUCCESS_MESSAGE": "已成功合并联系人",
         "ERROR_MESSAGE": "无法合并联系人，请重试！",
         "IS_SEARCHING": "搜索中...",
@@ -541,64 +541,64 @@
       },
       "NOTES": {
         "PLACEHOLDER": "添加备注",
-        "WROTE": "wrote",
+        "WROTE": "写道",
         "YOU": "您",
-        "SAVE": "Save note",
-        "EMPTY_STATE": "There are no notes associated to this contact. You can add a note by typing in the box above."
+        "SAVE": "保存备注",
+        "EMPTY_STATE": "此联系人没有关联的备注。您可以在上方输入框中添加备注。"
       }
     },
     "EMPTY_STATE": {
-      "TITLE": "No contacts found in this account",
-      "SUBTITLE": "Start adding new contacts by clicking on the button below",
-      "BUTTON_LABEL": "Add contact",
+      "TITLE": "此账户中没有找到联系人",
+      "SUBTITLE": "点击下方按钮开始添加新联系人",
+      "BUTTON_LABEL": "添加联系人",
       "SEARCH_EMPTY_STATE_TITLE": "没有搜索到联系人🔍",
-      "LIST_EMPTY_STATE_TITLE": "No contacts available in this view 📋"
+      "LIST_EMPTY_STATE_TITLE": "此视图中没有可用的联系人📋"
     }
   },
   "COMPOSE_NEW_CONVERSATION": {
     "CONTACT_SEARCH": {
-      "ERROR_MESSAGE": "We couldn’t complete the search. Please try again."
+      "ERROR_MESSAGE": "我们无法完成搜索。请稍后再试。"
     },
     "FORM": {
       "GO_TO_CONVERSATION": "查看",
-      "SUCCESS_MESSAGE": "The message was sent successfully!",
-      "ERROR_MESSAGE": "An error occurred while creating the conversation. Please try again later.",
-      "NO_INBOX_ALERT": "There are no available inboxes to start a conversation with this contact.",
+      "SUCCESS_MESSAGE": "消息发送成功！",
+      "ERROR_MESSAGE": "创建对话时发生错误。请稍后再试。",
+      "NO_INBOX_ALERT": "没有可用的收件箱来开始与此联系人的对话。",
       "CONTACT_SELECTOR": {
         "LABEL": "发送至:",
-        "TAG_INPUT_PLACEHOLDER": "Search for a contact with name, email or phone number",
-        "CONTACT_CREATING": "Creating contact..."
+        "TAG_INPUT_PLACEHOLDER": "通过姓名、电子邮件或电话号码搜索联系人",
+        "CONTACT_CREATING": "正在创建联系人..."
       },
       "INBOX_SELECTOR": {
-        "LABEL": "Via:",
-        "BUTTON": "Show inboxes"
+        "LABEL": "通过:",
+        "BUTTON": "显示收件箱"
       },
       "EMAIL_OPTIONS": {
         "SUBJECT_LABEL": "主题 :",
-        "SUBJECT_PLACEHOLDER": "Enter your email subject here",
+        "SUBJECT_PLACEHOLDER": "在此处输入电子邮件主题",
         "CC_LABEL": "抄送:",
-        "CC_PLACEHOLDER": "Search for a contact with their email address",
+        "CC_PLACEHOLDER": "通过电子邮件地址搜索联系人",
         "BCC_LABEL": "密送:",
-        "BCC_PLACEHOLDER": "Search for a contact with their email address",
+        "BCC_PLACEHOLDER": "通过电子邮件地址搜索联系人",
         "BCC_BUTTON": "密送"
       },
       "MESSAGE_EDITOR": {
         "PLACEHOLDER": "在此处输入您的消息..."
       },
       "WHATSAPP_OPTIONS": {
-        "LABEL": "Select template",
-        "SEARCH_PLACEHOLDER": "Search templates",
-        "EMPTY_STATE": "No templates found",
+        "LABEL": "选择模板",
+        "SEARCH_PLACEHOLDER": "搜索模板",
+        "EMPTY_STATE": "未找到模板",
         "TEMPLATE_PARSER": {
-          "TEMPLATE_NAME": "WhatsApp template: {templateName}",
+          "TEMPLATE_NAME": "WhatsApp 模板: {templateName}",
           "VARIABLES": "参数",
           "BACK": "返回",
           "SEND_MESSAGE": "发送消息"
         }
       },
       "ACTION_BUTTONS": {
-        "DISCARD": "Discard",
-        "SEND": "Send ({keyCode})"
+        "DISCARD": "丢弃",
+        "SEND": "发送 ({keyCode})"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
index 114a03cdf..239546d58 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
@@ -1,20 +1,20 @@
 {
   "CONTACTS_FILTER": {
-    "TITLE": "Filter Contacts",
-    "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-    "EDIT_CUSTOM_SEGMENT": "Edit Segment",
-    "CUSTOM_VIEWS_SUBTITLE": "Add or remove filters and update your segment.",
+    "TITLE": "过滤联系人",
+    "SUBTITLE": "添加过滤器并点击“提交”以过滤联系人。",
+    "EDIT_CUSTOM_SEGMENT": "编辑分段",
+    "CUSTOM_VIEWS_SUBTITLE": "添加或删除过滤器并更新您的分段。",
     "ADD_NEW_FILTER": "添加过滤器",
-    "CLEAR_ALL_FILTERS": "Clear All Filters",
+    "CLEAR_ALL_FILTERS": "清除所有过滤器",
     "FILTER_DELETE_ERROR": "您至少需要一个过滤器来保存",
     "SUBMIT_BUTTON_LABEL": "提交",
-    "UPDATE_BUTTON_LABEL": "Update Segment",
+    "UPDATE_BUTTON_LABEL": "更新分段",
     "CANCEL_BUTTON_LABEL": "取消",
     "CLEAR_BUTTON_LABEL": "清除过滤器",
     "EMPTY_VALUE_ERROR": "必须填写值",
-    "SEGMENT_LABEL": "Segment Name",
-    "SEGMENT_QUERY_LABEL": "Segment Query",
-    "TOOLTIP_LABEL": "Filter contacts",
+    "SEGMENT_LABEL": "分段名称",
+    "SEGMENT_QUERY_LABEL": "分段查询",
+    "TOOLTIP_LABEL": "过滤联系人",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "和",
       "OR": "或"
@@ -27,7 +27,7 @@
       "is_present": "存在",
       "is_not_present": "不存在",
       "is_greater_than": "大于",
-      "is_lesser_than": "Is lesser than",
+      "is_lesser_than": "小于",
       "days_before": "是 x 天前"
     },
     "ERRORS": {
@@ -35,9 +35,9 @@
     },
     "ATTRIBUTES": {
       "NAME": "姓名：",
-      "EMAIL": "Email",
+      "EMAIL": "电子邮件",
       "PHONE_NUMBER": "电话号码",
-      "IDENTIFIER": "Identifier",
+      "IDENTIFIER": "标识符",
       "CITY": "城市",
       "COUNTRY": "国家",
       "CUSTOM_ATTRIBUTE_LIST": "列表",
@@ -47,8 +47,8 @@
       "CUSTOM_ATTRIBUTE_CHECKBOX": "复选框",
       "CREATED_AT": "创建于",
       "LAST_ACTIVITY": "最后一次活动",
-      "REFERER_LINK": "Referrer link",
-      "BLOCKED": "Blocked"
+      "REFERER_LINK": "引用链接",
+      "BLOCKED": "已阻止"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "标准过滤器",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 261a971dc..33c886034 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -38,23 +38,23 @@
     "REMOVE_SELECTION": "移除选择",
     "DOWNLOAD": "下载",
     "UNKNOWN_FILE_TYPE": "未知文件",
-    "SAVE_CONTACT": "Save Contact",
-    "NO_CONTENT": "No content to display",
+    "SAVE_CONTACT": "保存联系人",
+    "NO_CONTENT": "没有要显示的内容",
     "SHARED_ATTACHMENT": {
-      "CONTACT": "{sender} has shared a contact",
-      "LOCATION": "{sender} has shared a location",
-      "FILE": "{sender} has shared a file",
+      "CONTACT": "{sender} 分享了一个联系人",
+      "LOCATION": "{sender} 分享了一个地址",
+      "FILE": "{sender} 分享了一个文件",
       "MEETING": "{sender} 已开始会议"
     },
     "UPLOADING_ATTACHMENTS": "正在上传附件...",
     "REPLIED_TO_STORY": "回复您的故事",
-    "UNSUPPORTED_MESSAGE": "This message is unsupported. You can view this message on the Facebook / Instagram app.",
+    "UNSUPPORTED_MESSAGE": "不支持此消息。您可以在 Facebook Messenger 应用上查看此消息。",
     "UNSUPPORTED_MESSAGE_FACEBOOK": "不支持此消息。您可以在 Facebook Messenger 应用上查看此消息。",
     "UNSUPPORTED_MESSAGE_INSTAGRAM": "不支持此消息。您可以在 Instagram 应用上查看此消息。",
     "SUCCESS_DELETE_MESSAGE": "已成功删除消息",
     "FAIL_DELETE_MESSSAGE": "无法删除消息，请重试！",
     "NO_RESPONSE": "无响应",
-    "RESPONSE": "Response",
+    "RESPONSE": "回复",
     "RATING_TITLE": "评分",
     "FEEDBACK_TITLE": "Feedback",
     "REPLY_MESSAGE_NOT_FOUND": "消息不可用",
@@ -77,8 +77,8 @@
         "FRT": "第一响应时间 {status}",
         "NRT": "净响应时间 {status}",
         "RT": "响应时间 {status}",
-        "MISSED": "missed",
-        "DUE": "due"
+        "MISSED": "遗漏",
+        "DUE": "过期"
       }
     },
     "RESOLVE_DROPDOWN": {
@@ -100,7 +100,7 @@
       "TITLE": "优先级",
       "OPTIONS": {
         "NONE": "啥都没有",
-        "URGENT": "Urgent",
+        "URGENT": "紧急的",
         "HIGH": "高",
         "MEDIUM": "中",
         "LOW": "低"
@@ -109,7 +109,7 @@
         "SELECT_PLACEHOLDER": "啥都没有",
         "INPUT_PLACEHOLDER": "选择优先级",
         "NO_RESULTS": "没有检索到相关信息",
-        "SUCCESSFUL": "Changed priority of conversation id {conversationId} to {priority}",
+        "SUCCESSFUL": "已将对话 Id {conversationId} 的优先级更改为 {priority}",
         "FAILED": "无法更改优先级。请重试。"
       }
     },
@@ -117,7 +117,7 @@
       "PENDING": "标记为待处理",
       "RESOLVED": "标记为已解决",
       "MARK_AS_UNREAD": "标记为未读",
-      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_READ": "标记为已读",
       "REOPEN": "重新打开会话",
       "SNOOZE": {
         "TITLE": "推迟",
@@ -135,7 +135,7 @@
           "FAILED": "无法分配客服，请再试。"
         },
         "LABEL_ASSIGNMENT": {
-          "SUCCESFUL": "Assigned label #{labelName} to conversation id {conversationId}",
+          "SUCCESFUL": "已为对话 Id {conversationId} 分配标签 #{labelName}",
           "FAILED": "无法分配标签。请再试。"
         },
         "TEAM_ASSIGNMENT": {
@@ -254,9 +254,9 @@
   "ONBOARDING": {
     "TITLE": "您好 👋, 欢迎来到 {installationName}!",
     "DESCRIPTION": "感谢您注册。我们希望您能够充分使用 {installationName}。 这里有几件您可以在 {installationName} 做的事情，让体验变得愉快。",
-    "GREETING_MORNING": "👋 Good morning, {name}. Welcome to {installationName}.",
-    "GREETING_AFTERNOON": "👋 Good afternoon, {name}. Welcome to {installationName}.",
-    "GREETING_EVENING": "👋 Good evening, {name}. Welcome to {installationName}.",
+    "GREETING_MORNING": "👋 早上好，{name}。欢迎来到 {installationName}。",
+    "GREETING_AFTERNOON": "👋 下午好，{name}。欢迎来到 {installationName}。",
+    "GREETING_EVENING": "👋 晚上好，{name}。欢迎来到 {installationName}。",
     "READ_LATEST_UPDATES": "阅读我们的最新升级日志",
     "ALL_CONVERSATION": {
       "TITLE": "您的所有对话都在一个地方",
@@ -274,9 +274,9 @@
       "NEW_LINK": "点击此处创建标签"
     },
     "CANNED_RESPONSES": {
-      "TITLE": "Create canned responses",
-      "DESCRIPTION": "Pre-written quick reply templates help you quickly respond to a conversation. Agents can type the '/' character followed by the shortcode to insert a response.",
-      "NEW_LINK": "Click here to create a canned response"
+      "TITLE": "创建预设回复",
+      "DESCRIPTION": "预定义的快捷回复模板可以帮助您快速响应对话。客服人员只需输入“/”符号，后跟快捷代码，即可插入回复。",
+      "NEW_LINK": "点击这里创建预设回复"
     }
   },
   "CONVERSATION_SIDEBAR": {
@@ -324,7 +324,7 @@
     "BCC": "密送",
     "CC": "抄送",
     "SUBJECT": "主题",
-    "EXPAND": "Expand email"
+    "EXPAND": "展开邮箱"
   },
   "CONVERSATION_PARTICIPANTS": {
     "SIDEBAR_MENU_TITLE": "参与者",
@@ -351,14 +351,14 @@
     "NO_TRANSLATIONS_AVAILABLE": "此内容暂无翻译"
   },
   "TYPING": {
-    "ONE": "{user} is typing",
-    "TWO": "{user} and {secondUser} are typing",
-    "MULTIPLE": "{user} and {count} others are typing"
+    "ONE": "{user} 正在输入",
+    "TWO": "{user} 和 {secondUser} 正在输入",
+    "MULTIPLE": "{user} 等 {count} 人正在输入"
   },
   "COPILOT": {
-    "TRY_THESE_PROMPTS": "Try these prompts"
+    "TRY_THESE_PROMPTS": "尝试这些提示信息"
   },
   "GALLERY_VIEW": {
-    "ERROR_DOWNLOADING": "Unable to download attachment. Please try again"
+    "ERROR_DOWNLOADING": "无法上传附件。请重试"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/csatMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/csatMgmt.json
index 1bcd3a5ca..fe26d276d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/csatMgmt.json
@@ -3,11 +3,11 @@
     "TITLE": "评价您的对话",
     "PLACEHOLDER": "请告诉我们更多...",
     "RATINGS": {
-      "POOR": "😞 Poor",
-      "FAIR": "😑 Fair",
-      "AVERAGE": "😐 Average",
-      "GOOD": "😀 Good",
-      "EXCELLENT": "😍 Excellent"
+      "POOR": "😞 差",
+      "FAIR": "😑 一般",
+      "AVERAGE": "😐 中等",
+      "GOOD": "😀 好",
+      "EXCELLENT": "😍 非常好"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/customRole.json b/app/javascript/dashboard/i18n/locale/zh_CN/customRole.json
index d516cd261..44747474d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/customRole.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/customRole.json
@@ -1,56 +1,56 @@
 {
   "CUSTOM_ROLE": {
-    "HEADER": "Custom Roles",
-    "LEARN_MORE": "Learn more about custom roles",
-    "DESCRIPTION": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
-    "HEADER_BTN_TXT": "Add custom role",
-    "LOADING": "Fetching custom roles...",
-    "SEARCH_404": "没有任何项目符合此查询.",
+    "HEADER": "自定义角色",
+    "LEARN_MORE": "了解更多关于自定义角色的信息",
+    "DESCRIPTION": "自定义角色是由账户所有者或管理员创建的角色。这些角色可以分配给客服人员，以定义他们在账户中的访问权限和权限。自定义角色可以根据组织的需求创建特定的权限和访问级别。",
+    "HEADER_BTN_TXT": "添加自定义角色",
+    "LOADING": "正在获取自定义角色……",
+    "SEARCH_404": "没有任何项目符合此查询。",
     "PAYWALL": {
-      "TITLE": "Upgrade to create custom roles",
-      "AVAILABLE_ON": "The custom role feature is only available in the Business and Enterprise plans.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "升级以创建自定义角色",
+      "AVAILABLE_ON": "自定义角色功能仅在商务版和企业版计划中可用。",
+      "UPGRADE_PROMPT": "升级您的计划以获取团队管理、自动化、自定义属性等高级功能。",
+      "UPGRADE_NOW": "立即升级",
+      "CANCEL_ANYTIME": "您可以随时更改或取消您的计划"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "The custom role feature is only available in the paid plans.",
-      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "AVAILABLE_ON": "自定义角色功能仅在付费计划中可用。",
+      "UPGRADE_PROMPT": "升级到付费计划以访问审计日志、客服容量等高级功能。",
+      "ASK_ADMIN": "请联系您的管理员进行升级。"
     },
     "LIST": {
-      "404": "There are no custom roles available in this account.",
-      "TITLE": "Manage custom roles",
-      "DESC": "Custom roles are roles that are created by the account owner or admin. These roles can be assigned to agents to define their access and permissions within the account. Custom roles can be created with specific permissions and access levels to suit the requirements of the organization.",
+      "404": "此账户中没有可用的自定义角色。",
+      "TITLE": "管理自定义角色",
+      "DESC": "自定义角色是由账户所有者或管理员创建的角色。这些角色可以分配给客服人员，以定义他们在账户中的访问权限和权限。自定义角色可以根据组织的需求创建特定的权限和访问级别。",
       "TABLE_HEADER": {
-        "NAME": "姓名：",
-        "DESCRIPTION": "描述信息",
-        "PERMISSIONS": "Permissions",
+        "NAME": "姓名",
+        "DESCRIPTION": "描述",
+        "PERMISSIONS": "权限",
         "ACTIONS": "操作"
       }
     },
     "PERMISSIONS": {
-      "CONVERSATION_MANAGE": "Manage all conversations",
-      "CONVERSATION_UNASSIGNED_MANAGE": "Manage unassigned conversations and those assigned to them",
-      "CONVERSATION_PARTICIPATING_MANAGE": "Manage participating conversations and those assigned to them",
-      "CONTACT_MANAGE": "Manage contacts",
-      "REPORT_MANAGE": "Manage reports",
-      "KNOWLEDGE_BASE_MANAGE": "Manage knowledge base"
+      "CONVERSATION_MANAGE": "管理所有对话",
+      "CONVERSATION_UNASSIGNED_MANAGE": "管理未分配的对话及分配给他们的对话",
+      "CONVERSATION_PARTICIPATING_MANAGE": "管理参与的对话及分配给他们的对话",
+      "CONTACT_MANAGE": "管理联系人",
+      "REPORT_MANAGE": "管理报告",
+      "KNOWLEDGE_BASE_MANAGE": "管理知识库"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "姓名：",
-        "PLACEHOLDER": "Please enter a name.",
-        "ERROR": "名称是必填项."
+        "LABEL": "姓名",
+        "PLACEHOLDER": "请输入名称。",
+        "ERROR": "名称是必填项。"
       },
       "DESCRIPTION": {
-        "LABEL": "描述信息",
-        "PLACEHOLDER": "Please enter a description.",
-        "ERROR": "描述是必需的."
+        "LABEL": "描述",
+        "PLACEHOLDER": "请输入描述。",
+        "ERROR": "描述是必需的。"
       },
       "PERMISSIONS": {
-        "LABEL": "Permissions",
-        "ERROR": "Permissions are required."
+        "LABEL": "权限",
+        "ERROR": "权限是必需的。"
       },
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
@@ -58,33 +58,33 @@
       }
     },
     "ADD": {
-      "TITLE": "Add custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "TITLE": "添加自定义角色",
+      "DESC": "自定义角色允许您创建具有特定权限和访问级别的角色，以满足组织的需求。",
       "SUBMIT": "提交",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role added successfully."
+        "SUCCESS_MESSAGE": "自定义角色添加成功。"
       }
     },
     "EDIT": {
       "BUTTON_TEXT": "编辑",
-      "TITLE": "Edit custom role",
-      "DESC": " Custom roles allows you to create roles with specific permissions and access levels to suit the requirements of the organization.",
+      "TITLE": "编辑自定义角色",
+      "DESC": "自定义角色允许您创建具有特定权限和访问级别的角色，以满足组织的需求。",
       "SUBMIT": "更新",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role updated successfully."
+        "SUCCESS_MESSAGE": "自定义角色更新成功。"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "删除",
       "API": {
-        "SUCCESS_MESSAGE": "Custom role deleted successfully.",
+        "SUCCESS_MESSAGE": "自定义角色删除成功。",
         "ERROR_MESSAGE": "无法与 Woot 服务器建立连接。请重试。"
       },
       "CONFIRM": {
         "TITLE": "确认删除",
-        "MESSAGE": "您确定要删除吗？ ",
+        "MESSAGE": "您确定要删除吗？",
         "YES": "是的，删除",
-        "NO": "不，保留 "
+        "NO": "不，保留"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json b/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json
index c3ff69568..5372771b1 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/datePicker.json
@@ -1,19 +1,19 @@
 {
   "DATE_PICKER": {
-    "APPLY_BUTTON": "Apply",
-    "CLEAR_BUTTON": "Clear",
+    "APPLY_BUTTON": "应用",
+    "CLEAR_BUTTON": "清除",
     "DATE_RANGE_INPUT": {
-      "START": "Start Date",
-      "END": "End Date"
+      "START": "开始日期",
+      "END": "结束时间"
     },
     "DATE_RANGE_OPTIONS": {
-      "TITLE": "DATE RANGE",
+      "TITLE": "日期范围",
       "LAST_7_DAYS": "最近7天",
       "LAST_30_DAYS": "最近30天",
-      "LAST_3_MONTHS": "Last 3 months",
-      "LAST_6_MONTHS": "Last 6 months",
-      "LAST_YEAR": "Last year",
-      "CUSTOM_RANGE": "Custom date range"
+      "LAST_3_MONTHS": "最近3个月",
+      "LAST_6_MONTHS": "最近6个月",
+      "LAST_YEAR": "最近一年",
+      "CUSTOM_RANGE": "自定义日期范围"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/general.json b/app/javascript/dashboard/i18n/locale/zh_CN/general.json
index 3f39e289f..bd655a5ba 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/general.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/general.json
@@ -1,6 +1,6 @@
 {
   "GENERAL": {
-    "SHOWING_RESULTS": "Showing {firstIndex}-{lastIndex} of {totalCount} items",
+    "SHOWING_RESULTS": "显示第 {firstIndex} - {lastIndex} 项，共 {totalCount} 项",
     "PHONE_INPUT": {
       "PLACEHOLDER": "搜索",
       "EMPTY_STATE": "没有检索到相关信息"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index f864b0c2d..f54703f1a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -88,9 +88,9 @@
       "assigned_conversation_new_message": "新消息",
       "participating_conversation_new_message": "新消息",
       "conversation_mention": "提及",
-      "sla_missed_first_response": "SLA Missed",
-      "sla_missed_next_response": "SLA Missed",
-      "sla_missed_resolution": "SLA Missed"
+      "sla_missed_first_response": "未满足SLA要求",
+      "sla_missed_next_response": "未满足SLA要求",
+      "sla_missed_resolution": "未满足SLA要求"
     }
   },
   "NETWORK": {
@@ -134,10 +134,10 @@
       "GO_TO_SETTINGS_TEAMS": "前往团队设置",
       "GO_TO_SETTINGS_INBOXES": "前往收件箱设置",
       "GO_TO_SETTINGS_LABELS": "前往标签设置",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "前往预设回复设置",
       "GO_TO_SETTINGS_APPLICATIONS": "转到应用程序设置",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
+      "GO_TO_SETTINGS_ACCOUNT": "前往帐户设置",
+      "GO_TO_SETTINGS_PROFILE": "前往个人资料设置",
       "GO_TO_NOTIFICATIONS": "转到通知",
       "ADD_LABELS_TO_CONVERSATION": "为对话添加标签",
       "ASSIGN_AN_AGENT": "分配一位客服代表",
@@ -149,15 +149,15 @@
       "REMOVE_LABEL_FROM_CONVERSATION": "从对话移除标签",
       "REOPEN_CONVERSATION": "重新打开会话",
       "RESOLVE_CONVERSATION": "解决会话",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow",
-      "UNTIL_NEXT_MONTH": "Until next month",
-      "AN_HOUR_FROM_NOW": "Until an hour from now",
-      "UNTIL_CUSTOM_TIME": "Custom...",
-      "CHANGE_APPEARANCE": "Change Appearance",
+      "SEND_TRANSCRIPT": "发送电子邮件副本",
+      "SNOOZE_CONVERSATION": "暂停对话",
+      "UNTIL_NEXT_REPLY": "直到下次回复",
+      "UNTIL_NEXT_WEEK": "直到下周",
+      "UNTIL_TOMORROW": "直到明天",
+      "UNTIL_NEXT_MONTH": "直到下个月",
+      "AN_HOUR_FROM_NOW": "从现在起一小时",
+      "UNTIL_CUSTOM_TIME": "自定义……",
+      "CHANGE_APPEARANCE": "更改外观",
       "LIGHT_MODE": "浅色",
       "DARK_MODE": "深色",
       "SYSTEM_MODE": "系统",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
index 746635773..272997c4e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/helpCenter.json
@@ -2,8 +2,8 @@
   "HELP_CENTER": {
     "TITLE": "帮助中心",
     "NEW_PAGE": {
-      "DESCRIPTION": "Create self-service help center portals for your customers. Help them find answers quickly, without waiting. Streamline inquiries, boost agent efficiency, and elevate customer support.",
-      "CREATE_PORTAL_BUTTON": "Create Portal"
+      "DESCRIPTION": "为您的客户创建自助服务帮助中心门户。帮助他们快速找到答案，无需等待。简化查询，提高代理效率，提升客户支持。",
+      "CREATE_PORTAL_BUTTON": "创建门户"
     },
     "HEADER": {
       "FILTER": "过滤条件",
@@ -23,10 +23,10 @@
         "ARCHIVED": "已存档的文章"
       },
       "LOCALE_SELECT": {
-        "TITLE": "Select locale",
-        "PLACEHOLDER": "Select locale",
-        "NO_RESULT": "No locale found",
-        "SEARCH_PLACEHOLDER": "Search locale"
+        "TITLE": "选择语言环境",
+        "PLACEHOLDER": "选择语言环境",
+        "NO_RESULT": "未找到语言环境",
+        "SEARCH_PLACEHOLDER": "搜索语言环境"
       }
     },
     "EDIT_HEADER": {
@@ -44,12 +44,12 @@
       "IMAGE_UPLOAD": {
         "TITLE": "上传头像",
         "UPLOADING": "上传中...",
-        "SUCCESS": "Image uploaded successfully",
-        "ERROR": "Error while uploading image",
-        "UN_AUTHORIZED_ERROR": "You are not authorized to upload images",
-        "ERROR_FILE_SIZE": "Image size should be less than {size}MB",
-        "ERROR_FILE_FORMAT": "Image format should be jpg, jpeg or png",
-        "ERROR_FILE_DIMENSIONS": "Image dimensions should be less than 2000 x 2000"
+        "SUCCESS": "图片上传成功",
+        "ERROR": "上传图片时出错",
+        "UN_AUTHORIZED_ERROR": "您无权上传图片",
+        "ERROR_FILE_SIZE": "图片大小应小于 {size}MB",
+        "ERROR_FILE_FORMAT": "图片格式应为 jpg、jpeg 或 png",
+        "ERROR_FILE_DIMENSIONS": "图片尺寸应小于 2000 x 2000"
       }
     },
     "ARTICLE_SETTINGS": {
@@ -75,7 +75,7 @@
         },
         "META_DESCRIPTION": {
           "LABEL": "Meta描述",
-          "PLACEHOLDER": "Add your meta description for better SEO results..."
+          "PLACEHOLDER": "添加您的Meta描述以获得更好的SEO效果……"
         },
         "META_TAGS": {
           "LABEL": "Meta标签",
@@ -88,15 +88,15 @@
       }
     },
     "ARTICLE_SEARCH_RESULT": {
-      "UNCATEGORIZED": "Uncategorized",
-      "SEARCH_RESULTS": "Search results for {query}",
-      "EMPTY_TEXT": "Search for articles to insert into replies.",
+      "UNCATEGORIZED": "未分类",
+      "SEARCH_RESULTS": "搜索 {query} 的结果",
+      "EMPTY_TEXT": "搜索文章以插入回复。",
       "SEARCH_LOADER": "搜索中...",
-      "INSERT_ARTICLE": "Insert",
-      "NO_RESULT": "No articles found",
-      "COPY_LINK": "Copy article link to clipboard",
-      "OPEN_LINK": "Open article in new tab",
-      "PREVIEW_LINK": "Preview article"
+      "INSERT_ARTICLE": "插入",
+      "NO_RESULT": "未找到文章",
+      "COPY_LINK": "复制文章链接到剪贴板",
+      "OPEN_LINK": "在新标签页中打开文章",
+      "PREVIEW_LINK": "预览文章"
     },
     "PORTAL": {
       "HEADER": "门户网站",
@@ -106,7 +106,7 @@
       "CHOOSE_LOCALE_LABEL": "选择一个语言环境",
       "LOADING_MESSAGE": "正在加载门户...",
       "ARTICLES_LABEL": "文章",
-      "NO_PORTALS_MESSAGE": "There are no available portals",
+      "NO_PORTALS_MESSAGE": "没有可用的门户",
       "ADD_NEW_LOCALE": "添加一个新的语言环境",
       "POPOVER": {
         "TITLE": "门户网站",
@@ -119,196 +119,196 @@
         "LIST_ITEM": {
           "HEADER": {
             "COUNT_LABEL": "文章",
-            "ADD": "Add locale",
-            "VISIT": "Visit site",
+            "ADD": "添加语言环境",
+            "VISIT": "访问网站",
             "SETTINGS": "设置",
             "DELETE": "删除"
           },
           "PORTAL_CONFIG": {
-            "TITLE": "Portal Configurations",
+            "TITLE": "门户配置",
             "ITEMS": {
               "NAME": "姓名：",
-              "DOMAIN": "Custom domain",
+              "DOMAIN": "自定义域名",
               "SLUG": "Slug",
-              "TITLE": "Portal title",
-              "THEME": "Theme color",
-              "SUB_TEXT": "Portal sub text"
+              "TITLE": "门户标题",
+              "THEME": "主题颜色",
+              "SUB_TEXT": "门户副文本"
             }
           },
           "AVAILABLE_LOCALES": {
-            "TITLE": "Available locales",
+            "TITLE": "可用的语言环境",
             "TABLE": {
-              "NAME": "Locale name",
-              "CODE": "Locale code",
-              "ARTICLE_COUNT": "No. of articles",
-              "CATEGORIES": "No. of categories",
-              "SWAP": "Swap",
+              "NAME": "语言环境名称",
+              "CODE": "语言环境代码",
+              "ARTICLE_COUNT": "文章数量",
+              "CATEGORIES": "类别数量",
+              "SWAP": "交换",
               "DELETE": "删除",
-              "DEFAULT_LOCALE": "Default"
+              "DEFAULT_LOCALE": "默认"
             }
           }
         },
         "DELETE_PORTAL": {
-          "TITLE": "Delete portal",
-          "MESSAGE": "Are you sure you want to delete this portal",
-          "YES": "Yes, delete portal",
-          "NO": "No, keep portal",
+          "TITLE": "删除门户",
+          "MESSAGE": "您确定要删除此门户吗？",
+          "YES": "是，删除门户",
+          "NO": "否，保留门户",
           "API": {
-            "DELETE_SUCCESS": "Portal deleted successfully",
-            "DELETE_ERROR": "Error while deleting portal"
+            "DELETE_SUCCESS": "门户删除成功",
+            "DELETE_ERROR": "删除门户时出错"
           }
         }
       },
       "EDIT": {
-        "HEADER_TEXT": "Edit portal",
+        "HEADER_TEXT": "编辑门户",
         "TABS": {
           "BASIC_SETTINGS": {
-            "TITLE": "Basic information"
+            "TITLE": "基本信息"
           },
           "CUSTOMIZATION_SETTINGS": {
-            "TITLE": "Portal customization"
+            "TITLE": "门户定制"
           },
           "CATEGORY_SETTINGS": {
-            "TITLE": "Categories"
+            "TITLE": "类别"
           },
           "LOCALE_SETTINGS": {
-            "TITLE": "Locales"
+            "TITLE": "语言环境"
           }
         },
         "CATEGORIES": {
-          "TITLE": "Categories in",
-          "NEW_CATEGORY": "New category",
+          "TITLE": "类别",
+          "NEW_CATEGORY": "新建类别",
           "TABLE": {
             "NAME": "姓名：",
             "DESCRIPTION": "描述信息",
             "LOCALE": "语言环境",
-            "ARTICLE_COUNT": "No. of articles",
+            "ARTICLE_COUNT": "文章数量",
             "ACTION_BUTTON": {
-              "EDIT": "Edit category",
-              "DELETE": "Delete category"
+              "EDIT": "编辑类别",
+              "DELETE": "删除类别"
             },
             "EMPTY_TEXT": "未找到类别"
           }
         },
         "EDIT_BASIC_INFO": {
-          "BUTTON_TEXT": "Update basic settings"
+          "BUTTON_TEXT": "更新基本设置"
         }
       },
       "ADD": {
         "CREATE_FLOW": {
           "BASIC": {
-            "TITLE": "Help center information",
-            "BODY": "Basic information about portal"
+            "TITLE": "帮助中心信息",
+            "BODY": "关于门户的基本信息"
           },
           "CUSTOMIZATION": {
-            "TITLE": "Help center customization",
-            "BODY": "Customize portal"
+            "TITLE": "帮助中心定制",
+            "BODY": "定制门户"
           },
           "FINISH": {
-            "TITLE": "Voila! 🎉",
-            "BODY": "You're all set!"
+            "TITLE": "完成！🎉",
+            "BODY": "您已全部设置完成！"
           }
         },
         "CREATE_FLOW_PAGE": {
           "BACK_BUTTON": "后退",
           "BASIC_SETTINGS_PAGE": {
-            "HEADER": "Create Portal",
-            "TITLE": "Help center information",
-            "CREATE_BASIC_SETTING_BUTTON": "Create portal basic settings"
+            "HEADER": "创建门户",
+            "TITLE": "帮助中心信息",
+            "CREATE_BASIC_SETTING_BUTTON": "创建门户基本设置"
           },
           "CUSTOMIZATION_PAGE": {
-            "HEADER": "Portal customisation",
-            "TITLE": "Help center customization",
-            "UPDATE_PORTAL_BUTTON": "Update portal settings"
+            "HEADER": "门户定制",
+            "TITLE": "帮助中心定制",
+            "UPDATE_PORTAL_BUTTON": "更新门户设置"
           },
           "FINISH_PAGE": {
-            "TITLE": "Voila!🎉 You're all set up!",
-            "MESSAGE": "You can now see this created portal on your all portals page.",
-            "FINISH": "Go to all portals page"
+            "TITLE": "完成！🎉 您已全部设置完成！",
+            "MESSAGE": "您现在可以在所有门户页面中看到此创建的门户。",
+            "FINISH": "转到所有门户页面"
           }
         },
         "LOGO": {
           "LABEL": "Logo",
-          "UPLOAD_BUTTON": "Upload logo",
-          "HELP_TEXT": "This logo will be displayed on the portal header.",
-          "IMAGE_UPLOAD_SUCCESS": "Logo uploaded successfully",
-          "IMAGE_UPLOAD_ERROR": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Error while deleting logo"
+          "UPLOAD_BUTTON": "上传Logo",
+          "HELP_TEXT": "此Logo将显示在门户标题中。",
+          "IMAGE_UPLOAD_SUCCESS": "Logo上传成功",
+          "IMAGE_UPLOAD_ERROR": "Logo删除成功",
+          "IMAGE_DELETE_ERROR": "删除Logo时出错"
         },
         "NAME": {
           "LABEL": "姓名：",
-          "PLACEHOLDER": "Portal name",
-          "HELP_TEXT": "The name will be used in the public facing portal internally.",
+          "PLACEHOLDER": "门户名称",
+          "HELP_TEXT": "该名称将用于面向公众的门户内部。",
           "ERROR": "名字必填"
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Portal slug for urls",
-          "ERROR": "Slug is required"
+          "PLACEHOLDER": "门户的URL Slug",
+          "ERROR": "Slug是必填项"
         },
         "DOMAIN": {
-          "LABEL": "Custom Domain",
-          "PLACEHOLDER": "Portal custom domain",
-          "HELP_TEXT": "Add only If you want to use a custom domain for your portals. Eg: {exampleURL}",
-          "ERROR": "Enter a valid domain URL"
+          "LABEL": "自定义域名",
+          "PLACEHOLDER": "门户自定义域名",
+          "HELP_TEXT": "仅在您希望为门户使用自定义域名时添加。例如：{exampleURL}",
+          "ERROR": "请输入有效的域名URL"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Home Page Link",
-          "PLACEHOLDER": "Portal home page link",
-          "HELP_TEXT": "The link used to return from the portal to the home page. Eg: {exampleURL}",
-          "ERROR": "Enter a valid home page URL"
+          "LABEL": "主页链接",
+          "PLACEHOLDER": "门户主页链接",
+          "HELP_TEXT": "用于从门户返回到主页的链接。例如：{exampleURL}",
+          "ERROR": "请输入有效的主页URL"
         },
         "THEME_COLOR": {
-          "LABEL": "Portal theme color",
-          "HELP_TEXT": "This color will show as the theme color for the portal."
+          "LABEL": "门户主题颜色",
+          "HELP_TEXT": "此颜色将作为门户的主题颜色显示。"
         },
         "PAGE_TITLE": {
-          "LABEL": "Page Title",
-          "PLACEHOLDER": "Portal page title",
-          "HELP_TEXT": "The page title will be used in the public facing portal.",
-          "ERROR": "Page title is required"
+          "LABEL": "页面标题",
+          "PLACEHOLDER": "门户页面标题",
+          "HELP_TEXT": "页面标题将用于面向公众的门户。",
+          "ERROR": "页面标题是必填项"
         },
         "HEADER_TEXT": {
-          "LABEL": "Header Text",
-          "PLACEHOLDER": "Portal header text",
-          "HELP_TEXT": "The Portal header text will be used in the public facing portal.",
-          "ERROR": "Portal header text is required"
+          "LABEL": "标题文本",
+          "PLACEHOLDER": "门户标题文本",
+          "HELP_TEXT": "门户标题文本将用于面向公众的门户。",
+          "ERROR": "门户标题文本是必填项"
         },
         "API": {
-          "SUCCESS_MESSAGE_FOR_BASIC": "Portal created successfully.",
-          "ERROR_MESSAGE_FOR_BASIC": "Couldn't create the portal. Try again.",
-          "SUCCESS_MESSAGE_FOR_UPDATE": "Portal updated successfully.",
-          "ERROR_MESSAGE_FOR_UPDATE": "Couldn't update the portal. Try again."
+          "SUCCESS_MESSAGE_FOR_BASIC": "门户创建成功。",
+          "ERROR_MESSAGE_FOR_BASIC": "无法创建门户，请重试。",
+          "SUCCESS_MESSAGE_FOR_UPDATE": "门户更新成功。",
+          "ERROR_MESSAGE_FOR_UPDATE": "无法更新门户，请重试。"
         }
       },
       "ADD_LOCALE": {
         "TITLE": "添加一个新的语言环境",
-        "SUB_TITLE": "This adds a new locale to your available translation list.",
+        "SUB_TITLE": "这将向您的可用翻译列表中添加一个新的语言环境。",
         "PORTAL": "门户网站",
         "LOCALE": {
           "LABEL": "语言环境",
           "PLACEHOLDER": "选择一个语言环境",
-          "ERROR": "Locale is required"
+          "ERROR": "语言环境是必填项"
         },
         "BUTTONS": {
-          "CREATE": "Create locale",
+          "CREATE": "创建语言环境",
           "CANCEL": "取消"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Locale added successfully",
-          "ERROR_MESSAGE": "Unable to add locale. Try again."
+          "SUCCESS_MESSAGE": "语言环境添加成功",
+          "ERROR_MESSAGE": "无法添加语言环境，请重试。"
         }
       },
       "CHANGE_DEFAULT_LOCALE": {
         "API": {
-          "SUCCESS_MESSAGE": "Default locale updated successfully",
-          "ERROR_MESSAGE": "Unable to update default locale. Try again."
+          "SUCCESS_MESSAGE": "默认语言环境更新成功",
+          "ERROR_MESSAGE": "无法更新默认语言环境，请重试。"
         }
       },
       "DELETE_LOCALE": {
         "API": {
-          "SUCCESS_MESSAGE": "Locale removed from portal successfully",
-          "ERROR_MESSAGE": "Unable to remove locale from portal. Try again."
+          "SUCCESS_MESSAGE": "语言环境从门户中移除成功",
+          "ERROR_MESSAGE": "无法从门户中移除语言环境，请重试。"
         }
       }
     },
@@ -319,57 +319,57 @@
       "HEADERS": {
         "TITLE": "标题",
         "CATEGORY": "类别",
-        "READ_COUNT": "Views",
+        "READ_COUNT": "浏览量",
         "STATUS": "状态",
-        "LAST_EDITED": "Last edited"
+        "LAST_EDITED": "最后编辑"
       },
       "COLUMNS": {
-        "BY": "by",
-        "AUTHOR_NOT_AVAILABLE": "Author is not available"
+        "BY": "由",
+        "AUTHOR_NOT_AVAILABLE": "作者不可用"
       }
     },
     "EDIT_ARTICLE": {
-      "LOADING": "Loading article...",
+      "LOADING": "正在加载文章...",
       "TITLE_PLACEHOLDER": "文章标题在此处显示",
       "CONTENT_PLACEHOLDER": "在此处写下您的文章",
       "API": {
-        "ERROR": "Error while saving article"
+        "ERROR": "保存文章时出错"
       }
     },
     "PUBLISH_ARTICLE": {
       "API": {
-        "ERROR": "Error while publishing article",
-        "SUCCESS": "Article published successfully"
+        "ERROR": "发布文章时出错",
+        "SUCCESS": "文章发布成功"
       }
     },
     "ARCHIVE_ARTICLE": {
       "API": {
-        "ERROR": "Error while archiving article",
-        "SUCCESS": "Article archived successfully"
+        "ERROR": "归档文章时出错",
+        "SUCCESS": "文章归档成功"
       }
     },
     "DRAFT_ARTICLE": {
       "API": {
-        "ERROR": "Error while drafting article",
-        "SUCCESS": "Article drafted successfully"
+        "ERROR": "草稿文章时出错",
+        "SUCCESS": "文章草稿成功"
       }
     },
     "DELETE_ARTICLE": {
       "MODAL": {
         "CONFIRM": {
           "TITLE": "确认删除",
-          "MESSAGE": "Are you sure to delete the article?",
+          "MESSAGE": "您确定要删除这篇文章吗？",
           "YES": "是，删除",
           "NO": "否，保留它"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Article deleted successfully",
-        "ERROR_MESSAGE": "Error while deleting article"
+        "SUCCESS_MESSAGE": "文章删除成功",
+        "ERROR_MESSAGE": "删除文章时出错"
       }
     },
     "CREATE_ARTICLE": {
-      "ERROR_MESSAGE": "Please add the article heading and content then only you can update the settings"
+      "ERROR_MESSAGE": "请添加文章标题和内容，然后才能更新设置"
     },
     "SIDEBAR": {
       "SEARCH": {
@@ -381,18 +381,18 @@
         "TITLE": "创建一个类别",
         "SUB_TITLE": "类别将用于公共门户来对文章进行归类。",
         "PORTAL": "门户网站",
-        "LOCALE": "Locale",
+        "LOCALE": "语言环境",
         "NAME": {
           "LABEL": "姓名：",
           "PLACEHOLDER": "类别名称",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "类别名称和图标将用于面向公众的门户以对文章进行分类。",
           "ERROR": "名字必填"
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Category slug for urls",
+          "PLACEHOLDER": "类别的URL Slug",
           "HELP_TEXT": "app.chatwoot.com/hc/my-portal/en-US/categories/my-slug",
-          "ERROR": "Slug is required"
+          "ERROR": "Slug是必填项"
         },
         "DESCRIPTION": {
           "LABEL": "描述信息",
@@ -404,26 +404,26 @@
           "CANCEL": "取消"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Category created successfully",
-          "ERROR_MESSAGE": "Unable to create category"
+          "SUCCESS_MESSAGE": "类别创建成功",
+          "ERROR_MESSAGE": "无法创建类别"
         }
       },
       "EDIT": {
-        "TITLE": "Edit a category",
-        "SUB_TITLE": "Editing a category will update the category in the public facing portal.",
+        "TITLE": "编辑类别",
+        "SUB_TITLE": "编辑类别将更新面向公众的门户中的类别。",
         "PORTAL": "门户网站",
         "LOCALE": "语言环境",
         "NAME": {
           "LABEL": "姓名：",
           "PLACEHOLDER": "类别名称",
-          "HELP_TEXT": "The category name and icon will be used in the public facing portal to categorize articles.",
+          "HELP_TEXT": "类别名称和图标将用于面向公众的门户以对文章进行分类。",
           "ERROR": "名字必填"
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Category slug for urls",
+          "PLACEHOLDER": "类别的URL Slug",
           "HELP_TEXT": "app.chatwoot.com/hc/my-portal/en-US/categories/my-slug",
-          "ERROR": "Slug is required"
+          "ERROR": "Slug是必填项"
         },
         "DESCRIPTION": {
           "LABEL": "描述信息",
@@ -431,168 +431,168 @@
           "ERROR": "描述是必需的"
         },
         "BUTTONS": {
-          "CREATE": "Update category",
+          "CREATE": "更新类别",
           "CANCEL": "取消"
         },
         "API": {
-          "SUCCESS_MESSAGE": "Category updated successfully",
-          "ERROR_MESSAGE": "Unable to update category"
+          "SUCCESS_MESSAGE": "类别更新成功",
+          "ERROR_MESSAGE": "无法更新类别"
         }
       },
       "DELETE": {
         "API": {
-          "SUCCESS_MESSAGE": "Category deleted successfully",
-          "ERROR_MESSAGE": "Unable to delete category"
+          "SUCCESS_MESSAGE": "类别删除成功",
+          "ERROR_MESSAGE": "无法删除类别"
         }
       }
     },
     "ARTICLE_SEARCH": {
-      "TITLE": "Search articles",
-      "PLACEHOLDER": "Search articles",
-      "NO_RESULT": "No articles found",
+      "TITLE": "搜索文章",
+      "PLACEHOLDER": "搜索文章",
+      "NO_RESULT": "未找到文章",
       "SEARCHING": "搜索中...",
       "SEARCH_BUTTON": "搜索",
-      "INSERT_ARTICLE": "Insert link",
-      "IFRAME_ERROR": "URL is empty or invalid. Unable to display content.",
-      "OPEN_ARTICLE_SEARCH": "Insert article from Help Center",
-      "SUCCESS_ARTICLE_INSERTED": "Article inserted successfully",
-      "PREVIEW_LINK": "Preview article",
+      "INSERT_ARTICLE": "插入链接",
+      "IFRAME_ERROR": "URL为空或无效，无法显示内容。",
+      "OPEN_ARTICLE_SEARCH": "从帮助中心插入文章",
+      "SUCCESS_ARTICLE_INSERTED": "文章插入成功",
+      "PREVIEW_LINK": "预览文章",
       "CANCEL": "关闭",
       "BACK": "后退",
-      "BACK_RESULTS": "Back to results"
+      "BACK_RESULTS": "返回结果"
     },
     "UPGRADE_PAGE": {
       "TITLE": "帮助中心",
-      "DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Upgrade your subscription to enable this feature.",
-      "SELF_HOSTED_DESCRIPTION": "Create user-friendly self-service portals. Help your users to access the articles and get support 24/7. Please contact your administrator to enable this feature.",
+      "DESCRIPTION": "创建用户友好的自助服务门户。帮助您的用户访问文章并获得24/7支持。升级您的订阅以启用此功能。",
+      "SELF_HOSTED_DESCRIPTION": "创建用户友好的自助服务门户。帮助您的用户访问文章并获得24/7支持。请联系您的管理员以启用此功能。",
       "BUTTON": {
         "LEARN_MORE": "了解更多",
-        "UPGRADE": "Upgrade"
+        "UPGRADE": "升级"
       },
       "FEATURES": {
         "PORTALS": {
-          "TITLE": "Multiple portals",
-          "DESCRIPTION": "Create multiple help center portals for different products using the same account."
+          "TITLE": "多门户支持",
+          "DESCRIPTION": "使用同一账户为不同产品创建多个帮助中心门户。"
         },
         "LOCALES": {
-          "TITLE": "Full support for locales",
-          "DESCRIPTION": "Localize the portal in your language. We support all locales and allow translations for every article."
+          "TITLE": "全面支持多语言环境",
+          "DESCRIPTION": "将门户本地化为您的语言。我们支持所有语言环境，并允许为每篇文章提供翻译。"
         },
         "SEO": {
-          "TITLE": "SEO-friendly design",
-          "DESCRIPTION": "Customize your meta tags to improve your visibility on search engines with our SEO-friendly pages."
+          "TITLE": "SEO友好设计",
+          "DESCRIPTION": "自定义您的Meta标签，通过我们的SEO友好页面提高在搜索引擎中的可见性。"
         },
         "API": {
-          "TITLE": "Full API support",
-          "DESCRIPTION": "Use the portal as a headless CMS with third party front-end frameworks using our APIs."
+          "TITLE": "全面API支持",
+          "DESCRIPTION": "使用我们的API将门户作为无头CMS与第三方前端框架集成。"
         }
       }
     },
-    "LOADING": "Loading...",
+    "LOADING": "加载中...",
     "ARTICLES_PAGE": {
       "ARTICLE_CARD": {
         "CARD": {
-          "VIEWS": "{count} view | {count} views",
+          "VIEWS": "{count} 次浏览 | {count} 次浏览",
           "DROPDOWN_MENU": {
             "PUBLISH": "发布",
             "DRAFT": "草稿",
-            "ARCHIVE": "Archive",
+            "ARCHIVE": "归档",
             "DELETE": "删除"
           },
           "STATUS": {
             "DRAFT": "草稿",
             "PUBLISHED": "已发布",
-            "ARCHIVED": "已存档"
+            "ARCHIVED": "已归档"
           },
           "CATEGORY": {
-            "UNCATEGORISED": "Uncategorised"
+            "UNCATEGORISED": "未分类"
           }
         }
       },
       "ARTICLES_HEADER": {
         "TABS": {
-          "ALL": "All articles",
-          "MINE": "我的",
+          "ALL": "所有文章",
+          "MINE": "我的文章",
           "DRAFT": "草稿",
           "PUBLISHED": "已发布",
-          "ARCHIVED": "已存档"
+          "ARCHIVED": "已归档"
         },
         "CATEGORY": {
-          "ALL": "All categories"
+          "ALL": "所有类别"
         },
         "LOCALE": {
-          "ALL": "All locales"
+          "ALL": "所有语言环境"
         },
-        "NEW_ARTICLE": "New article"
+        "NEW_ARTICLE": "新建文章"
       },
       "EMPTY_STATE": {
         "ALL": {
-          "TITLE": "Write an article",
-          "SUBTITLE": "Write a rich article, let’s get started!",
-          "BUTTON_LABEL": "New article"
+          "TITLE": "撰写一篇文章",
+          "SUBTITLE": "撰写一篇丰富的文章，让我们开始吧！",
+          "BUTTON_LABEL": "新建文章"
         },
         "MINE": {
-          "TITLE": "You haven't written any articles here",
-          "SUBTITLE": "All articles written by you show up here for quick access."
+          "TITLE": "您尚未在此撰写任何文章",
+          "SUBTITLE": "您撰写的所有文章将显示在此处以便快速访问。"
         },
         "DRAFT": {
-          "TITLE": "There are no articles in drafts",
-          "SUBTITLE": "Draft articles will appear here"
+          "TITLE": "草稿中没有文章",
+          "SUBTITLE": "草稿文章将显示在此处"
         },
         "PUBLISHED": {
-          "TITLE": "There are no published articles",
-          "SUBTITLE": "Published articles will appear here"
+          "TITLE": "没有已发布的文章",
+          "SUBTITLE": "已发布的文章将显示在此处"
         },
         "ARCHIVED": {
-          "TITLE": "There are no articles in the archive",
-          "SUBTITLE": "Archived articles don't show up on the portal, you can use it to mark deprecated or outdated pages"
+          "TITLE": "归档中没有文章",
+          "SUBTITLE": "归档文章不会显示在门户上，您可以用它标记已弃用或过时的页面"
         },
         "CATEGORY": {
-          "TITLE": "There are no articles in this category",
-          "SUBTITLE": "Articles in this category will appear here"
+          "TITLE": "此类别中没有文章",
+          "SUBTITLE": "此类别中的文章将显示在此处"
         }
       }
     },
     "CATEGORY_PAGE": {
       "CATEGORY_HEADER": {
-        "NEW_CATEGORY": "New category",
-        "EDIT_CATEGORY": "Edit category",
-        "CATEGORIES_COUNT": "{n} category | {n} categories",
+        "NEW_CATEGORY": "新建类别",
+        "EDIT_CATEGORY": "编辑类别",
+        "CATEGORIES_COUNT": "{n} 个类别 | {n} 个类别",
         "BREADCRUMB": {
-          "CATEGORY_LOCALE": "Categories ({localeCode})",
-          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} articles) | {categoryName} ({categoryCount} article)"
+          "CATEGORY_LOCALE": "类别 ({localeCode})",
+          "ACTIVE_CATEGORY": "{categoryName} ({categoryCount} 篇文章) | {categoryName} ({categoryCount} 篇文章)"
         }
       },
       "CATEGORY_EMPTY_STATE": {
         "TITLE": "未找到类别",
-        "SUBTITLE": "Categories will appear here. You can add a category by clicking the 'New Category' button."
+        "SUBTITLE": "类别将显示在此处。您可以点击“新建类别”按钮添加类别。"
       },
       "CATEGORY_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles"
+        "ARTICLES_COUNT": "{count} 篇文章 | {count} 篇文章"
       },
       "CATEGORY_DIALOG": {
         "CREATE": {
           "API": {
-            "SUCCESS_MESSAGE": "Category created successfully",
-            "ERROR_MESSAGE": "Unable to create category"
+            "SUCCESS_MESSAGE": "类别创建成功",
+            "ERROR_MESSAGE": "无法创建类别"
           }
         },
         "EDIT": {
           "API": {
-            "SUCCESS_MESSAGE": "Category updated successfully",
-            "ERROR_MESSAGE": "Unable to update category"
+            "SUCCESS_MESSAGE": "类别更新成功",
+            "ERROR_MESSAGE": "无法更新类别"
           }
         },
         "DELETE": {
           "API": {
-            "SUCCESS_MESSAGE": "Category deleted successfully",
-            "ERROR_MESSAGE": "Unable to delete category"
+            "SUCCESS_MESSAGE": "类别删除成功",
+            "ERROR_MESSAGE": "无法删除类别"
           }
         },
         "HEADER": {
           "CREATE": "创建类别",
-          "EDIT": "Edit category",
-          "DESCRIPTION": "Editing a category will update the category in the public facing portal.",
+          "EDIT": "编辑类别",
+          "DESCRIPTION": "编辑类别将更新面向公众的门户中的类别。",
           "PORTAL": "门户网站",
           "LOCALE": "语言环境"
         },
@@ -604,8 +604,8 @@
           },
           "SLUG": {
             "LABEL": "Slug",
-            "PLACEHOLDER": "Category slug for urls",
-            "ERROR": "Slug is required",
+            "PLACEHOLDER": "类别的URL Slug",
+            "ERROR": "Slug是必填项",
             "HELP_TEXT": "app.chatwoot.com/hc/{portalSlug}/{localeCode}/categories/{categorySlug}"
           },
           "DESCRIPTION": {
@@ -622,26 +622,26 @@
       }
     },
     "LOCALES_PAGE": {
-      "LOCALES_COUNT": "No locales available | {n} locale | {n} locales",
-      "NEW_LOCALE_BUTTON_TEXT": "New locale",
+      "LOCALES_COUNT": "没有可用的语言环境 | {n} 个语言环境 | {n} 个语言环境",
+      "NEW_LOCALE_BUTTON_TEXT": "新建语言环境",
       "LOCALE_CARD": {
-        "ARTICLES_COUNT": "{count} article | {count} articles",
-        "CATEGORIES_COUNT": "{count} category | {count} categories",
+        "ARTICLES_COUNT": "{count} 篇文章 | {count} 篇文章",
+        "CATEGORIES_COUNT": "{count} 个类别 | {count} 个类别",
         "DEFAULT": "默认",
         "DROPDOWN_MENU": {
-          "MAKE_DEFAULT": "Make default",
+          "MAKE_DEFAULT": "设为默认",
           "DELETE": "删除"
         }
       },
       "ADD_LOCALE_DIALOG": {
         "TITLE": "添加一个新的语言环境",
-        "DESCRIPTION": "Select the language in which this article will be written. This will be added to your list of translations, and you can add more later.",
+        "DESCRIPTION": "选择此文章将使用的语言。这将添加到您的翻译列表中，您可以稍后添加更多。",
         "COMBOBOX": {
-          "PLACEHOLDER": "Select locale..."
+          "PLACEHOLDER": "选择语言环境..."
         },
         "API": {
-          "SUCCESS_MESSAGE": "Locale added successfully",
-          "ERROR_MESSAGE": "Unable to add locale. Try again."
+          "SUCCESS_MESSAGE": "语言环境添加成功",
+          "ERROR_MESSAGE": "无法添加语言环境，请重试。"
         }
       }
     },
@@ -654,137 +654,137 @@
         "PREVIEW": "预览",
         "PUBLISH": "发布",
         "DRAFT": "草稿",
-        "ARCHIVE": "Archive",
-        "BACK_TO_ARTICLES": "Back to articles"
+        "ARCHIVE": "归档",
+        "BACK_TO_ARTICLES": "返回文章"
       },
       "EDIT_ARTICLE": {
-        "MORE_PROPERTIES": "More properties",
+        "MORE_PROPERTIES": "更多属性",
         "UNCATEGORIZED": "未分类",
-        "EDITOR_PLACEHOLDER": "Write something..."
+        "EDITOR_PLACEHOLDER": "写点什么..."
       },
       "ARTICLE_PROPERTIES": {
-        "ARTICLE_PROPERTIES": "Article properties",
+        "ARTICLE_PROPERTIES": "文章属性",
         "META_DESCRIPTION": "Meta描述",
-        "META_DESCRIPTION_PLACEHOLDER": "Add meta description",
-        "META_TITLE": "Meta 标题",
-        "META_TITLE_PLACEHOLDER": "Add meta title",
+        "META_DESCRIPTION_PLACEHOLDER": "添加Meta描述",
+        "META_TITLE": "Meta标题",
+        "META_TITLE_PLACEHOLDER": "添加Meta标题",
         "META_TAGS": "Meta标签",
-        "META_TAGS_PLACEHOLDER": "Add meta tags"
+        "META_TAGS_PLACEHOLDER": "添加Meta标签"
       },
       "API": {
-        "ERROR": "Error while saving article"
+        "ERROR": "保存文章时出错"
       }
     },
     "PORTAL_SWITCHER": {
-      "NEW_PORTAL": "New portal",
+      "NEW_PORTAL": "新建门户",
       "PORTALS": "门户网站",
-      "CREATE_PORTAL": "Create and manage multiple portals",
+      "CREATE_PORTAL": "创建和管理多个门户",
       "ARTICLES": "文章",
-      "DOMAIN": "domain",
-      "PORTAL_NAME": "Portal name"
+      "DOMAIN": "域名",
+      "PORTAL_NAME": "门户名称"
     },
     "CREATE_PORTAL_DIALOG": {
-      "TITLE": "Create new portal",
-      "DESCRIPTION": "Give your portal a name and create a user-friendly URL slug. You can modify both later in the settings.",
+      "TITLE": "创建新门户",
+      "DESCRIPTION": "为您的门户命名并创建一个用户友好的URL Slug。您稍后可以在设置中修改它们。",
       "CONFIRM_BUTTON_LABEL": "创建",
       "NAME": {
         "LABEL": "姓名：",
-        "PLACEHOLDER": "User Guide | Chatwoot",
-        "MESSAGE": "Choose an name for your portal.",
+        "PLACEHOLDER": "用户指南 | Chatwoot",
+        "MESSAGE": "为您的门户选择一个名称。",
         "ERROR": "名字必填"
       },
       "SLUG": {
         "LABEL": "Slug",
-        "PLACEHOLDER": "user-guide",
-        "ERROR": "Slug is required"
+        "PLACEHOLDER": "用户指南",
+        "ERROR": "Slug是必填项"
       }
     },
     "PORTAL_SETTINGS": {
       "FORM": {
         "AVATAR": {
-          "LABEL": "Logo",
+          "LABEL": "头像",
           "IMAGE_UPLOAD_ERROR": "无法上传图片！请再试一次",
-          "IMAGE_UPLOAD_SUCCESS": "Image added successfully. Please click on save changes to save the logo",
-          "IMAGE_DELETE_SUCCESS": "Logo deleted successfully",
-          "IMAGE_DELETE_ERROR": "Unable to delete logo",
-          "IMAGE_UPLOAD_SIZE_ERROR": "Image size should be less than {size}MB"
+          "IMAGE_UPLOAD_SUCCESS": "图片上传成功，请点击保存更改以保存Logo",
+          "IMAGE_DELETE_SUCCESS": "Logo删除成功",
+          "IMAGE_DELETE_ERROR": "无法删除Logo",
+          "IMAGE_UPLOAD_SIZE_ERROR": "图片大小应小于 {size}MB"
         },
         "NAME": {
           "LABEL": "姓名：",
-          "PLACEHOLDER": "Portal name",
+          "PLACEHOLDER": "门户名称",
           "ERROR": "名字必填"
         },
         "HEADER_TEXT": {
-          "LABEL": "Header text",
-          "PLACEHOLDER": "Portal header text"
+          "LABEL": "标题文本",
+          "PLACEHOLDER": "门户标题文本"
         },
         "PAGE_TITLE": {
-          "LABEL": "Page title",
-          "PLACEHOLDER": "Portal page title"
+          "LABEL": "页面标题",
+          "PLACEHOLDER": "门户页面标题"
         },
         "HOME_PAGE_LINK": {
-          "LABEL": "Home page link",
-          "PLACEHOLDER": "Portal home page link",
-          "ERROR": "Invalid URL. The Home page link must start with 'http://' or 'https://'."
+          "LABEL": "主页链接",
+          "PLACEHOLDER": "门户主页链接",
+          "ERROR": "无效的URL。主页链接必须以 'http://' 或 'https://' 开头。"
         },
         "SLUG": {
           "LABEL": "Slug",
-          "PLACEHOLDER": "Portal slug"
+          "PLACEHOLDER": "门户Slug"
         },
         "LIVE_CHAT_WIDGET": {
-          "LABEL": "Live chat widget",
-          "PLACEHOLDER": "Select live chat widget",
-          "HELP_TEXT": "Select a live chat widget that will appear on your help center"
+          "LABEL": "在线聊天小部件",
+          "PLACEHOLDER": "选择在线聊天小部件",
+          "HELP_TEXT": "选择将显示在您的帮助中心上的在线聊天小部件"
         },
         "BRAND_COLOR": {
-          "LABEL": "Brand color"
+          "LABEL": "品牌颜色"
         },
-        "SAVE_CHANGES": "Save changes"
+        "SAVE_CHANGES": "保存更改"
       },
       "CONFIGURATION_FORM": {
         "CUSTOM_DOMAIN": {
-          "HEADER": "Custom domain",
-          "LABEL": "Custom domain:",
-          "DESCRIPTION": "You can host your portal on a custom domain. For instance, if your website is yourdomain.com and you want your portal available at docs.yourdomain.com, simply enter that in this field.",
-          "PLACEHOLDER": "Portal custom domain",
-          "EDIT_BUTTON": "Edit custom domain",
-          "ADD_BUTTON": "Add custom domain",
+          "HEADER": "自定义域名",
+          "LABEL": "自定义域名：",
+          "DESCRIPTION": "您可以在自定义域名上托管您的门户。例如，如果您的网站是 yourdomain.com，并且您希望您的门户在 docs.yourdomain.com 上可用，只需在此字段中输入即可。",
+          "PLACEHOLDER": "门户自定义域名",
+          "EDIT_BUTTON": "编辑自定义域名",
+          "ADD_BUTTON": "添加自定义域名",
           "DIALOG": {
-            "ADD_HEADER": "Add custom domain",
-            "EDIT_HEADER": "Edit custom domain",
-            "ADD_CONFIRM_BUTTON_LABEL": "Add domain",
-            "EDIT_CONFIRM_BUTTON_LABEL": "Update domain",
-            "LABEL": "Custom domain",
-            "PLACEHOLDER": "Portal custom domain",
-            "ERROR": "Custom domain is required"
+            "ADD_HEADER": "添加自定义域名",
+            "EDIT_HEADER": "编辑自定义域名",
+            "ADD_CONFIRM_BUTTON_LABEL": "添加域名",
+            "EDIT_CONFIRM_BUTTON_LABEL": "更新域名",
+            "LABEL": "自定义域名",
+            "PLACEHOLDER": "门户自定义域名",
+            "ERROR": "自定义域名是必填项"
           },
           "DNS_CONFIGURATION_DIALOG": {
-            "HEADER": "DNS configuration",
-            "DESCRIPTION": "Log in to the account you have with your DNS provider, and add a CNAME record for subdomain pointing to chatwoot.help",
-            "HELP_TEXT": "Once this is done, you can reach out to our support to request for the auto-generated SSL certificate.",
-            "CONFIRM_BUTTON_LABEL": "Got it!"
+            "HEADER": "DNS配置",
+            "DESCRIPTION": "登录您的DNS提供商账户，并添加一个指向 chatwoot.help 的子域名的CNAME记录。",
+            "HELP_TEXT": "完成后，您可以联系我们的支持团队以请求自动生成的SSL证书。",
+            "CONFIRM_BUTTON_LABEL": "明白了！"
           }
         },
         "DELETE_PORTAL": {
-          "BUTTON": "Delete {portalName}",
-          "HEADER": "Delete portal",
-          "DESCRIPTION": "Permanently delete this portal. This action is irreversible",
+          "BUTTON": "删除 {portalName}",
+          "HEADER": "删除门户",
+          "DESCRIPTION": "永久删除此门户。此操作不可逆",
           "DIALOG": {
-            "HEADER": "Sure you want to delete {portalName}?",
-            "DESCRIPTION": "This is a permanent action that cannot be reversed.",
+            "HEADER": "确定要删除 {portalName} 吗？",
+            "DESCRIPTION": "这是一个永久操作，无法撤销。",
             "CONFIRM_BUTTON_LABEL": "删除"
           }
         },
-        "EDIT_CONFIGURATION": "Edit configuration"
+        "EDIT_CONFIGURATION": "编辑配置"
       },
       "API": {
         "CREATE_PORTAL": {
-          "SUCCESS_MESSAGE": "Portal created successfully",
-          "ERROR_MESSAGE": "Unable to create portal"
+          "SUCCESS_MESSAGE": "门户创建成功",
+          "ERROR_MESSAGE": "无法创建门户"
         },
         "UPDATE_PORTAL": {
-          "SUCCESS_MESSAGE": "Portal updated successfully",
-          "ERROR_MESSAGE": "Unable to update portal"
+          "SUCCESS_MESSAGE": "门户更新成功",
+          "ERROR_MESSAGE": "无法更新门户"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json b/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
index 1b8409bc8..49aa3c8fd 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inbox.json
@@ -1,77 +1,77 @@
 {
   "INBOX": {
     "LIST": {
-      "TITLE": "My Inbox",
-      "DISPLAY_DROPDOWN": "Display",
-      "LOADING": "Fetching notifications",
-      "404": "There are no active notifications in this group.",
-      "NO_NOTIFICATIONS": "No notifications",
-      "NOTE": "Notifications from all subscribed inboxes",
-      "NO_MESSAGES_AVAILABLE": "Oops! Not able to fetch messages",
+      "TITLE": "我的收件箱",
+      "DISPLAY_DROPDOWN": "显示",
+      "LOADING": "正在获取通知",
+      "404": "此组中没有活跃的通知。",
+      "NO_NOTIFICATIONS": "没有通知",
+      "NOTE": "来自所有订阅收件箱的通知",
+      "NO_MESSAGES_AVAILABLE": "哎呀！无法获取消息",
       "SNOOZED_UNTIL": "推迟到",
       "SNOOZED_UNTIL_TOMORROW": "推迟到明天",
       "SNOOZED_UNTIL_NEXT_WEEK": "推迟到下周"
     },
     "ACTION_HEADER": {
-      "SNOOZE": "Snooze notification",
-      "DELETE": "Delete notification",
-      "BACK": "后退"
+      "SNOOZE": "推迟通知",
+      "DELETE": "删除通知",
+      "BACK": "返回"
     },
     "TYPES": {
-      "CONVERSATION_MENTION": "You have been mentioned in a conversation",
-      "CONVERSATION_CREATION": "New conversation created",
-      "CONVERSATION_ASSIGNMENT": "A conversation has been assigned to you",
-      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "New message in an assigned conversation",
-      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "New message in a conversation you are participating in",
-      "SLA_MISSED_FIRST_RESPONSE": "SLA target first response missed for conversation",
-      "SLA_MISSED_NEXT_RESPONSE": "SLA target next response missed for conversation",
-      "SLA_MISSED_RESOLUTION": "SLA target resolution missed for conversation"
+      "CONVERSATION_MENTION": "您被提及在对话中",
+      "CONVERSATION_CREATION": "新对话已创建",
+      "CONVERSATION_ASSIGNMENT": "对话已分配给您",
+      "ASSIGNED_CONVERSATION_NEW_MESSAGE": "分配的对话中有新消息",
+      "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "您参与的对话中有新消息",
+      "SLA_MISSED_FIRST_RESPONSE": "对话的首次响应SLA目标未达成",
+      "SLA_MISSED_NEXT_RESPONSE": "对话的下次响应SLA目标未达成",
+      "SLA_MISSED_RESOLUTION": "对话的解决SLA目标未达成"
     },
     "TYPES_NEXT": {
-      "CONVERSATION_MENTION": "Mentioned",
-      "CONVERSATION_ASSIGNMENT": "Assigned to you",
-      "CONVERSATION_CREATION": "New Conversation",
-      "SLA_MISSED_FIRST_RESPONSE": "SLA breach",
-      "SLA_MISSED_NEXT_RESPONSE": "SLA breach",
-      "SLA_MISSED_RESOLUTION": "SLA breach",
+      "CONVERSATION_MENTION": "被提及",
+      "CONVERSATION_ASSIGNMENT": "分配给您",
+      "CONVERSATION_CREATION": "新对话",
+      "SLA_MISSED_FIRST_RESPONSE": "SLA违约",
+      "SLA_MISSED_NEXT_RESPONSE": "SLA违约",
+      "SLA_MISSED_RESOLUTION": "SLA违约",
       "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "新消息",
       "ASSIGNED_CONVERSATION_NEW_MESSAGE": "新消息",
-      "SNOOZED_UNTIL": "Snoozed for {time}",
-      "SNOOZED_ENDS": "Snooze ended"
+      "SNOOZED_UNTIL": "推迟至{time}",
+      "SNOOZED_ENDS": "推迟结束"
     },
     "NO_CONTENT": "没有可用的内容",
     "MENU_ITEM": {
-      "MARK_AS_READ": "Mark as read",
+      "MARK_AS_READ": "标记为已读",
       "MARK_AS_UNREAD": "标记为未读",
       "SNOOZE": "推迟",
       "DELETE": "删除",
       "MARK_ALL_READ": "全部标记为已读",
-      "DELETE_ALL": "Delete all",
-      "DELETE_ALL_READ": "Delete all read"
+      "DELETE_ALL": "删除全部",
+      "DELETE_ALL_READ": "删除所有已读"
     },
     "DISPLAY_MENU": {
-      "SORT": "Sort",
-      "DISPLAY": "Display :",
+      "SORT": "排序",
+      "DISPLAY": "显示：",
       "SORT_OPTIONS": {
-        "NEWEST": "Newest",
-        "OLDEST": "Oldest",
+        "NEWEST": "最新",
+        "OLDEST": "最旧",
         "PRIORITY": "优先级"
       },
       "DISPLAY_OPTIONS": {
         "SNOOZED": "已关闭",
         "READ": "已读",
         "LABELS": "标签",
-        "CONVERSATION_ID": "Conversation ID"
+        "CONVERSATION_ID": "对话ID"
       }
     },
     "ALERTS": {
-      "MARK_AS_READ": "Notification marked as read",
-      "MARK_AS_UNREAD": "Notification marked as unread",
-      "SNOOZE": "Notification snoozed",
-      "DELETE": "Notification deleted",
-      "MARK_ALL_READ": "All notifications marked as read",
-      "DELETE_ALL": "All notifications deleted",
-      "DELETE_ALL_READ": "All read notifications deleted"
+      "MARK_AS_READ": "通知标记为已读",
+      "MARK_AS_UNREAD": "通知标记为未读",
+      "SNOOZE": "通知已推迟",
+      "DELETE": "通知已删除",
+      "MARK_ALL_READ": "所有通知标记为已读",
+      "DELETE_ALL": "所有通知已删除",
+      "DELETE_ALL_READ": "所有已读通知已删除"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 5d666a9fc..41fe5a4d7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -1,10 +1,10 @@
 {
   "INBOX_MGMT": {
     "HEADER": "收件箱",
-    "DESCRIPTION": "A channel is the mode of communication your customer chooses to interact with you. An inbox is where you manage interactions for a specific channel. It can include communications from various sources such as email, live chat, and social media.",
-    "LEARN_MORE": "Learn more about inboxes",
-    "RECONNECTION_REQUIRED": "Your inbox is disconnected. You won't receive new messages until you reauthorize it.",
-    "CLICK_TO_RECONNECT": "Click here to reconnect.",
+    "DESCRIPTION": "频道是客户选择与您互动的方式。收件箱则是您用来管理特定频道互动的地方，它可以整合来自不同来源的通信，比如电子邮件、即时聊天和社交媒体等。",
+    "LEARN_MORE": "了解更多关于收件箱的信息",
+    "RECONNECTION_REQUIRED": "您的收件箱已断开连接。在您重新授权之前，您不会收到新消息。",
+    "CLICK_TO_RECONNECT": "点击此处重新连接。",
     "LIST": {
       "404": "此账户没有收件箱。"
     },
@@ -22,14 +22,14 @@
         "BODY": "将客服添加到创建的收件箱。"
       },
       "FINISH": {
-        "TITLE": "Voilà!",
+        "TITLE": "搞定！",
         "BODY": "你已设定状态为离开"
       }
     },
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "收件箱名称",
-        "PLACEHOLDER": "输入您的收件箱名称 (e.g: Acme Inc)",
+        "PLACEHOLDER": "输入您的收件箱名称 (例如: Acme Inc)",
         "ERROR": "请输入一个有效的收件箱名称"
       },
       "WEBSITE_NAME": {
@@ -42,7 +42,7 @@
         "CHOOSE_PLACEHOLDER": "从列表中选择一个页面",
         "INBOX_NAME": "收件箱名称",
         "ADD_NAME": "为收件箱添加名称",
-        "PICK_NAME": "Pick a Name for your Inbox",
+        "PICK_NAME": "为收件箱选择一个名称",
         "PICK_A_VALUE": "选择一个数值"
       },
       "TWITTER": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "Webhook 网址",
-          "PLACEHOLDER": "Please enter your Webhook URL",
+          "PLACEHOLDER": "请输入您的 Webhook URL",
           "ERROR": "请输入一个有效的 URL"
         },
         "CHANNEL_DOMAIN": {
@@ -160,26 +160,26 @@
         "DESC": "开始通过短信支持您的客户",
         "PROVIDERS": {
           "LABEL": "API提供商",
-          "TWILIO": "思源",
-          "BANDWIDTH": "带宽"
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
         },
         "API": {
           "ERROR_MESSAGE": "我们无法保存短信通道"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "帐号 ID",
+            "LABEL": "账号 ID",
             "PLACEHOLDER": "请输入您的 Bandwidth 应用ID",
             "ERROR": "此字段是必填项"
           },
           "API_KEY": {
             "LABEL": "API 密钥",
-            "PLACEHOLDER": "Please enter your Bandwidth API Key",
+            "PLACEHOLDER": "请输入您的Bandwidth API Key",
             "ERROR": "此字段是必填项"
           },
           "API_SECRET": {
             "LABEL": "API秘钥",
-            "PLACEHOLDER": "Please enter your Bandwidth API Secret",
+            "PLACEHOLDER": "请输入您的Bandwidth API Secret",
             "ERROR": "此字段是必填项"
           },
           "APPLICATION_ID": {
@@ -212,7 +212,7 @@
         "DESC": "开始通过WhatsApp支持您的客户",
         "PROVIDERS": {
           "LABEL": "API提供商",
-          "TWILIO": "思源",
+          "TWILIO": "Twilio",
           "WHATSAPP_CLOUD": "WhatsApp 云服务",
           "360_DIALOG": "360Dialog"
         },
@@ -238,7 +238,7 @@
         },
         "WEBHOOK_VERIFY_TOKEN": {
           "LABEL": "Webhook 验证令牌",
-          "PLACEHOLDER": "Enter a verify token which you want to configure for Facebook webhooks.",
+          "PLACEHOLDER": "请输入您要配置为Facebook Webhook的验证令牌。",
           "ERROR": "请输入一个有效的值"
         },
         "API_KEY": {
@@ -268,7 +268,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "Webhook 网址",
-          "SUBTITLE": "Configure the URL where you want to receive callbacks on events.",
+          "SUBTITLE": "配置您希望接收事件回调的URL。",
           "PLACEHOLDER": "Webhook 网址"
         },
         "SUBMIT_BUTTON": "创建 API 频道",
@@ -278,7 +278,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "电子邮件频道",
-        "DESC": "Integrate your email inbox.",
+        "DESC": "集成您的电子邮件收件箱。",
         "CHANNEL_NAME": {
           "LABEL": "频道类型",
           "PLACEHOLDER": "请输入频道名称",
@@ -339,47 +339,47 @@
       },
       "AUTH": {
         "TITLE": "选择一个通道",
-        "DESC": "Chatwoot supports live-chat widgets, Facebook Messenger, Twitter profiles, WhatsApp, Emails, etc., as channels. If you want to build a custom channel, you can create it using the API channel. To get started, choose one of the channels below."
+        "DESC": "Chatwoot支持实时聊天小部件、Facebook Messenger、Twitter个人资料、WhatsApp、电子邮件等作为通道。如果您想构建自定义通道，可以使用API通道创建。要开始，请从下面的通道中选择一个。"
       },
       "AGENTS": {
         "TITLE": "客服代理们",
-        "DESC": "在这里您可以添加代理来管理您新创建的收件箱。只有这些选定的代理才能访问您的收件箱。 不属于此收件箱的代理人在登录时将无法看到或回复此收件箱中的消息。 <br> <b>PS：</b> 作为管理员，如果您需要访问所有收件箱， 您应该将自己添加到您创建的所有收件箱中。",
-        "VALIDATION_ERROR": "Add at least one agent to your new Inbox",
+        "DESC": "在这里您可以添加代理来管理您新创建的收件箱。只有这些选定的代理才能访问您的收件箱。不属于此收件箱的代理人在登录时将无法看到或回复此收件箱中的消息。<br><b>PS：</b>作为管理员，如果您需要访问所有收件箱，您应该将自己添加到您创建的所有收件箱中。",
+        "VALIDATION_ERROR": "请至少为您的收件箱添加一个代理",
         "PICK_AGENTS": "为收件箱选择代理"
       },
       "DETAILS": {
         "TITLE": "收件箱详细信息",
-        "DESC": "从下面的下拉菜单中选择您想要连接到聊天室的 Facebook 页面。 您也可以给您的收件箱提供一个自定义名称以便更好地识别身份。"
+        "DESC": "从下面的下拉菜单中选择您想要连接到聊天室的 Facebook 页面。您也可以给您的收件箱提供一个自定义名称以便更好地识别身份。"
       },
       "FINISH": {
-        "TITLE": "已被注明！",
-        "DESC": "您已成功地将您的Facebook页面与Chatwoot集成。下次客户消息您的页面时，对话将自动出现在收件箱中。<br>我们还为您提供了一个小部件脚本，您可以轻松地添加到您的网站。 在您的网站上登录后， 客户可以在没有任何外部工具帮助的情况下从您的网站向您发送消息，对话将会在这里出现在Chatwoot 上。<br>酷，好吧？好吧，我们肯定试着是 :)"
+        "TITLE": "搞定！",
+        "DESC": "您已成功地将您的Facebook页面与Chatwoot集成。下次客户消息您的页面时，对话将自动出现在收件箱中。<br>我们还为您提供了一个小部件脚本，您可以轻松地添加到您的网站。在您的网站上登录后，客户可以在没有任何外部工具帮助的情况下从您的网站向您发送消息，对话将会在这里出现在Chatwoot上。<br>酷，对吧？我们肯定试着是 :)"
       },
       "EMAIL_PROVIDER": {
         "TITLE": "选择您的电子邮件提供商",
-        "DESCRIPTION": "Select an email provider from the list below. If you don't see your email provider in the list, you can select the other provider option and provide the IMAP and SMTP Credentials."
+        "DESCRIPTION": "从下面的列表中选择一个电子邮件提供商。如果您的电子邮件提供商不在列表中，您可以选择其他提供商选项并提供IMAP和SMTP凭据。"
       },
       "MICROSOFT": {
         "TITLE": "Microsoft Email",
-        "DESCRIPTION": "Click on the Sign in with Microsoft button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
+        "DESCRIPTION": "点击“使用Microsoft登录”按钮以开始。您将被重定向到电子邮件登录页面。一旦您接受了请求的权限，您将被重定向回收件箱创建步骤。",
         "EMAIL_PLACEHOLDER": "输入电子邮件地址",
-        "SIGN_IN": "Sign in with Microsoft",
-        "ERROR_MESSAGE": "There was an error connecting to Microsoft, please try again"
+        "SIGN_IN": "使用Microsoft登录",
+        "ERROR_MESSAGE": "连接Microsoft时出现错误，请重试"
       },
       "GOOGLE": {
-        "TITLE": "Google Email",
-        "DESCRIPTION": "Click on the Sign in with Google button to get started. You will redirected to the email sign in page. Once you accept the requested permissions, you would be redirected back to the inbox creation step.",
-        "SIGN_IN": "Sign in with Google",
+        "TITLE": "Google 邮箱",
+        "DESCRIPTION": "点击“使用Google登录”按钮以开始。您将被重定向到电子邮件登录页面。一旦您接受了请求的权限，您将被重定向回收件箱创建步骤。",
+        "SIGN_IN": "使用Google登录",
         "EMAIL_PLACEHOLDER": "输入电子邮件地址",
-        "ERROR_MESSAGE": "There was an error connecting to Google, please try again"
+        "ERROR_MESSAGE": "连接Google时出现错误，请重试"
       }
     },
     "DETAILS": {
       "LOADING_FB": "在 Facebook 上认证你... ..",
-      "ERROR_FB_LOADING": "Error loading Facebook SDK. Please disable any ad-blockers and try again from a different browser.",
+      "ERROR_FB_LOADING": "加载Facebook SDK时出错。请禁用任何广告拦截器并尝试使用不同的浏览器。",
       "ERROR_FB_AUTH": "出错了，请刷新页面...",
-      "ERROR_FB_UNAUTHORIZED": "您无权执行此操作。 ",
-      "ERROR_FB_UNAUTHORIZED_HELP": "请确保您拥有对 Facebook 页面的完全控制权。您可以在<a href=\" https://www.facebook.com/help/187316341316631\">这里</a>阅读更多关于 Facebook 角色的信息。",
+      "ERROR_FB_UNAUTHORIZED": "您无权执行此操作。",
+      "ERROR_FB_UNAUTHORIZED_HELP": "请确保您拥有对Facebook页面的完全控制权。您可以在<a href=\"https://www.facebook.com/help/187316341316631\">这里</a>阅读更多关于Facebook角色的信息。",
       "CREATING_CHANNEL": "创建您的收件箱...",
       "TITLE": "配置收件箱详情",
       "DESC": ""
@@ -393,7 +393,7 @@
       "MESSAGE": "您现在可以通过您的新频道与您的客户联系。快乐支持",
       "BUTTON_TEXT": "带我到这里",
       "MORE_SETTINGS": "更多设置",
-      "WEBSITE_SUCCESS": "您已成功完成创建网站频道。复制下面显示的代码并将其粘贴在您的网站上。 下次客户使用实时聊天时，对话将自动出现在您的收件箱中。"
+      "WEBSITE_SUCCESS": "您已成功完成创建网站频道。复制下面显示的代码并将其粘贴在您的网站上。下次客户使用实时聊天时，对话将自动出现在您的收件箱中。"
     },
     "REAUTH": "重新授权",
     "VIEW": "查看",
@@ -413,20 +413,20 @@
       },
       "SENDER_NAME_SECTION": {
         "TITLE": "发件人姓名",
-        "SUB_TEXT": "Select the name shown to your customer when they receive emails from your agents.",
-        "FOR_EG": "For eg:",
+        "SUB_TEXT": "选择您的客户在收到您的代理的电子邮件时显示的名称。",
+        "FOR_EG": "例如：",
         "FRIENDLY": {
           "TITLE": "友好的",
           "FROM": "发自",
-          "SUBTITLE": "Add the name of the agent who sent the reply in the sender name to make it friendly."
+          "SUBTITLE": "在发件人姓名中添加回复的代理名称，使其更加友好。"
         },
         "PROFESSIONAL": {
           "TITLE": "专业的",
-          "SUBTITLE": "Use only the configured business name as the sender name in the email header."
+          "SUBTITLE": "仅在电子邮件标题中使用配置的业务名称作为发件人姓名。"
         },
         "BUSINESS_NAME": {
-          "BUTTON_TEXT": "+ Configure your business name",
-          "PLACEHOLDER": "Enter your business name",
+          "BUTTON_TEXT": "+ 配置您的业务名称",
+          "PLACEHOLDER": "输入您的业务名称",
           "SAVE_BUTTON_TEXT": "保存"
         }
       },
@@ -451,24 +451,24 @@
       "AVATAR_DELETE_BUTTON_TEXT": "删除头像",
       "CONFIRM": {
         "TITLE": "确认删除",
-        "MESSAGE": "您确定要删除吗？ ",
+        "MESSAGE": "您确定要删除吗？",
         "PLACE_HOLDER": "请输入 {inboxName} 以确认",
-        "YES": "是，删除 ",
-        "NO": "不，保留 "
+        "YES": "是，删除",
+        "NO": "不，保留"
       },
       "API": {
         "SUCCESS_MESSAGE": "收件箱删除成功",
         "ERROR_MESSAGE": "无法删除收件箱。请稍后再试。",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "收件箱头像删除成功",
+        "AVATAR_ERROR_MESSAGE": "无法删除收件箱头像。请稍后再试。"
       }
     },
     "TABS": {
       "SETTINGS": "设置",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
-      "CAMPAIGN": "Campagnes",
-      "PRE_CHAT_FORM": "Pre Chat Form",
+      "COLLABORATORS": "协作者",
+      "CONFIGURATION": "配置",
+      "CAMPAIGN": "活动",
+      "PRE_CHAT_FORM": "预聊天表单",
       "BUSINESS_HOURS": "工作时间",
       "WIDGET_BUILDER": "小部件生成器",
       "BOT_CONFIGURATION": "机器人配置"
@@ -476,26 +476,26 @@
     "SETTINGS": "设置",
     "FEATURES": {
       "LABEL": "特性",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
-      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget",
-      "USE_INBOX_AVATAR_FOR_BOT": "Use inbox name and avatar for the bot"
+      "DISPLAY_FILE_PICKER": "在小部件上显示文件选择器",
+      "DISPLAY_EMOJI_PICKER": "在小部件上显示表情选择器",
+      "ALLOW_END_CONVERSATION": "允许用户从小部件结束对话",
+      "USE_INBOX_AVATAR_FOR_BOT": "使用收件箱名称和头像作为机器人"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger 脚本",
       "MESSENGER_SUB_HEAD": "将此按钮放置在窗体标签中",
       "INBOX_AGENTS": "客服代理们",
       "INBOX_AGENTS_SUB_TEXT": "添加或删除此收件箱中的客服",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT": "对话分配",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "更新对话分配设置",
       "UPDATE": "更新",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX": "启用电子邮件收集框",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "在新对话中启用或禁用电子邮件收集框",
       "AUTO_ASSIGNMENT": "启用自动分配",
-      "ENABLE_CSAT": "Enable CSAT",
-      "SENDER_NAME_SECTION": "Enable Agent Name in Email",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "SENDER_NAME_SECTION_TEXT": "Enable/Disable showing Agent's name in email, if disabled it will show business name",
+      "ENABLE_CSAT": "启用CSAT",
+      "SENDER_NAME_SECTION": "在电子邮件中启用代理名称",
+      "ENABLE_CSAT_SUB_TEXT": "在解决对话后启用/禁用CSAT（客户满意度）调查",
+      "SENDER_NAME_SECTION_TEXT": "启用/禁用在电子邮件中显示代理名称，如果禁用，将显示业务名称",
       "ENABLE_CONTINUITY_VIA_EMAIL": "通过电子邮件启用对话连续性",
       "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "如果有联系人的电子邮件地址，对话将会继续在电子邮件中进行。",
       "LOCK_TO_SINGLE_CONVERSATION": "锁定到单一对话",
@@ -505,24 +505,24 @@
       "AUTO_ASSIGNMENT_SUB_TEXT": "启用或禁用添加到此收件箱的代理人自动分配新的会话。",
       "HMAC_VERIFICATION": "用户身份验证",
       "HMAC_DESCRIPTION": "使用这个密钥，您可以生成一个秘密令牌，用于验证您用户的身份",
-      "HMAC_LINK_TO_DOCS": "You can read more here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, requests that cannot be verified will be rejected.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "HMAC_LINK_TO_DOCS": "您可以在这里阅读更多信息。",
+      "HMAC_MANDATORY_VERIFICATION": "强制执行用户身份验证",
+      "HMAC_MANDATORY_DESCRIPTION": "如果启用，无法验证的请求将被拒绝。",
+      "INBOX_IDENTIFIER": "收件箱标识符",
+      "INBOX_IDENTIFIER_SUB_TEXT": "使用此处显示的`inbox_identifier`令牌来验证您的API客户端。",
+      "FORWARD_EMAIL_TITLE": "转发到电子邮件",
       "FORWARD_EMAIL_SUB_TEXT": "开始将您的电子邮件转发到以下电子邮件地址。",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved.",
-      "WHATSAPP_SECTION_SUBHEADER": "This API Key is used for the integration with the WhatsApp APIs.",
-      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "Enter the new API key to be used for the integration with the WhatsApp APIs.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "允许在对话解决后发送消息",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "允许最终用户在对话解决后发送消息。",
+      "WHATSAPP_SECTION_SUBHEADER": "此API密钥用于与WhatsApp API集成。",
+      "WHATSAPP_SECTION_UPDATE_SUBHEADER": "输入新的API密钥以用于与WhatsApp API集成。",
       "WHATSAPP_SECTION_TITLE": "API 密钥",
-      "WHATSAPP_SECTION_UPDATE_TITLE": "Update API Key",
-      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "Enter the new API Key here",
+      "WHATSAPP_SECTION_UPDATE_TITLE": "更新API密钥",
+      "WHATSAPP_SECTION_UPDATE_PLACEHOLDER": "在此处输入新的API密钥",
       "WHATSAPP_SECTION_UPDATE_BUTTON": "更新",
       "WHATSAPP_WEBHOOK_TITLE": "Webhook 验证令牌",
-      "WHATSAPP_WEBHOOK_SUBHEADER": "This token is used to verify the authenticity of the webhook endpoint.",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
+      "WHATSAPP_WEBHOOK_SUBHEADER": "此令牌用于验证webhook端点的真实性。",
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "更新预聊天表单设置"
     },
     "HELP_CENTER": {
       "LABEL": "帮助中心",
@@ -533,18 +533,18 @@
     },
     "AUTO_ASSIGNMENT": {
       "MAX_ASSIGNMENT_LIMIT": "自动分配限制",
-      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "请输入一个大于0 的值",
+      "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "请输入一个大于0的值",
       "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "限制从此收件箱自动分配给代理的对话的最大数量"
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "重新授权",
-      "SUBTITLE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务",
+      "SUBTITLE": "您的Facebook连接已过期，请重新连接您的Facebook页面以继续服务",
       "MESSAGE_SUCCESS": "重新连接成功",
       "MESSAGE_ERROR": "出现错误，请重试"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
-      "SET_FIELDS": "Pre chat form fields",
+      "DESCRIPTION": "预聊天表单使您能够在用户开始与您对话之前捕获用户信息。",
+      "SET_FIELDS": "预聊天表单字段",
       "SET_FIELDS_HEADER": {
         "FIELDS": "字段",
         "LABEL": "标签",
@@ -554,31 +554,31 @@
         "REQUIRED": "必填项"
       },
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "启用预聊天表单",
         "OPTIONS": {
           "ENABLED": "是",
           "DISABLED": "否"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre chat message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "预聊天消息",
+        "PLACEHOLDER": "此消息将与表单一起显示给用户"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "访客在开始聊天前应提供他们的姓名和电子邮件地址"
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
-      "WEEKLY_TITLE": "Set your weekly hours",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours visitors can be warned with a message and a pre-chat form.",
+      "TITLE": "设置您的可用性",
+      "SUBTITLE": "在您的实时聊天小部件上设置您的可用性",
+      "WEEKLY_TITLE": "设置您的每周工作时间",
+      "TIMEZONE_LABEL": "选择时区",
+      "UPDATE": "更新工作时间设置",
+      "TOGGLE_AVAILABILITY": "为此收件箱启用业务可用性",
+      "UNAVAILABLE_MESSAGE_LABEL": "对访客的不可用消息",
+      "TOGGLE_HELP": "启用业务可用性将在实时聊天小部件上显示可用时间，即使所有代理都离线。在可用时间之外，访客将收到一条消息和预聊天表单的警告。",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
+        "ENABLE": "为此天启用可用性",
         "UNAVAILABLE": "不可用",
         "HOURS": "小时",
         "VALIDATION_ERROR": "起始时间应在结束时间之前。",
@@ -588,14 +588,14 @@
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "设置您的 IMAP 详情",
-      "NOTE_TEXT": "要启用 SMTP，请配置 IMAP。",
-      "UPDATE": "更新 IMAP 设置",
-      "TOGGLE_AVAILABILITY": "为此收件箱启用 IMAP 配置",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to receive email",
+      "SUBTITLE": "设置您的IMAP详情",
+      "NOTE_TEXT": "要启用SMTP，请配置IMAP。",
+      "UPDATE": "更新IMAP设置",
+      "TOGGLE_AVAILABILITY": "为此收件箱启用IMAP配置",
+      "TOGGLE_HELP": "启用IMAP将帮助用户接收电子邮件",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP 设置更新成功",
-        "ERROR_MESSAGE": "无法更新 IMAP 设置"
+        "SUCCESS_MESSAGE": "IMAP设置更新成功",
+        "ERROR_MESSAGE": "无法更新IMAP设置"
       },
       "ADDRESS": {
         "LABEL": "地址",
@@ -613,25 +613,25 @@
         "LABEL": "密码",
         "PLACE_HOLDER": "密码"
       },
-      "ENABLE_SSL": "启用 SSL"
+      "ENABLE_SSL": "启用SSL"
     },
     "MICROSOFT": {
       "TITLE": "Microsoft",
-      "SUBTITLE": "重新授权您的 Microsoft 帐户"
+      "SUBTITLE": "重新授权您的Microsoft帐户"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "设置您的SMTP详情",
+      "UPDATE": "更新SMTP设置",
+      "TOGGLE_AVAILABILITY": "为此收件箱启用SMTP配置",
+      "TOGGLE_HELP": "启用SMTP将帮助用户发送电子邮件",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "SMTP设置更新成功",
+        "ERROR_MESSAGE": "无法更新SMTP设置"
       },
       "ADDRESS": {
         "LABEL": "地址",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "PLACE_HOLDER": "地址 (例如：smtp.gmail.com)"
       },
       "PORT": {
         "LABEL": "端口",
@@ -646,77 +646,77 @@
         "PLACE_HOLDER": "密码"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
+        "LABEL": "域名",
+        "PLACE_HOLDER": "域名"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "加密",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
-      "AUTH_MECHANISM": "Authentication"
+      "OPEN_SSL_VERIFY_MODE": "Open SSL 验证模式",
+      "AUTH_MECHANISM": "认证机制"
     },
-    "NOTE": "Note: ",
+    "NOTE": "注意：",
     "WIDGET_BUILDER": {
       "WIDGET_OPTIONS": {
         "AVATAR": {
-          "LABEL": "Website Avatar",
+          "LABEL": "网站头像",
           "DELETE": {
             "API": {
-              "SUCCESS_MESSAGE": "Avatar deleted successfully",
+              "SUCCESS_MESSAGE": "头像删除成功",
               "ERROR_MESSAGE": "出现错误，请重试"
             }
           }
         },
         "WEBSITE_NAME": {
           "LABEL": "网站名称",
-          "PLACE_HOLDER": "输入您的网站名称 (e.g: Acme Inc)",
-          "ERROR": "Please enter a valid website name"
+          "PLACE_HOLDER": "输入您的网站名称 (例如：Acme Inc)",
+          "ERROR": "请输入有效的网站名称"
         },
         "WELCOME_HEADING": {
           "LABEL": "欢迎标题：",
-          "PLACE_HOLDER": "Hi there!"
+          "PLACE_HOLDER": "你好！"
         },
         "WELCOME_TAGLINE": {
           "LABEL": "欢迎标签行",
           "PLACE_HOLDER": "如有疑问，请联系我们"
         },
         "REPLY_TIME": {
-          "LABEL": "Reply Time",
-          "IN_A_FEW_MINUTES": "几分钟前",
-          "IN_A_FEW_HOURS": "几个小时前",
-          "IN_A_DAY": "一天内"
+          "LABEL": "回复时间",
+          "IN_A_FEW_MINUTES": "通常在几分钟内回复您",
+          "IN_A_FEW_HOURS": "通常在几小时内回复您",
+          "IN_A_DAY": "通常在一天之内回复您"
         },
         "WIDGET_COLOR_LABEL": "窗口小部件颜色",
-        "WIDGET_BUBBLE_POSITION_LABEL": "Widget Bubble Position",
-        "WIDGET_BUBBLE_TYPE_LABEL": "Widget Bubble Type",
+        "WIDGET_BUBBLE_POSITION_LABEL": "小部件气泡位置",
+        "WIDGET_BUBBLE_TYPE_LABEL": "小部件气泡类型",
         "WIDGET_BUBBLE_LAUNCHER_TITLE": {
           "DEFAULT": "联系我们",
-          "LABEL": "Widget Bubble Launcher Title",
+          "LABEL": "小部件气泡启动器标题",
           "PLACE_HOLDER": "联系我们"
         },
         "UPDATE": {
-          "BUTTON_TEXT": "Update Widget Settings",
+          "BUTTON_TEXT": "更新小部件设置",
           "API": {
-            "SUCCESS_MESSAGE": "Widget settings updated successfully",
-            "ERROR_MESSAGE": "Unable to update widget settings"
+            "SUCCESS_MESSAGE": "小部件设置更新成功",
+            "ERROR_MESSAGE": "无法更新小部件设置"
           }
         },
         "WIDGET_VIEW_OPTION": {
           "PREVIEW": "预览",
-          "SCRIPT": "Script"
+          "SCRIPT": "脚本"
         },
         "WIDGET_BUBBLE_POSITION": {
-          "LEFT": "Left",
-          "RIGHT": "Right"
+          "LEFT": "左侧",
+          "RIGHT": "右侧"
         },
         "WIDGET_BUBBLE_TYPE": {
-          "STANDARD": "Standard",
-          "EXPANDED_BUBBLE": "Expanded Bubble"
+          "STANDARD": "标准",
+          "EXPANDED_BUBBLE": "扩展气泡"
         }
       },
       "WIDGET_SCREEN": {
-        "DEFAULT": "Default",
-        "CHAT": "Chat"
+        "DEFAULT": "默认",
+        "CHAT": "聊天"
       },
       "REPLY_TIME": {
         "IN_A_FEW_MINUTES": "通常在几分钟内回复您",
@@ -729,7 +729,7 @@
       },
       "BODY": {
         "TEAM_AVAILABILITY": {
-          "ONLINE": "We are Online",
+          "ONLINE": "我们在线",
           "OFFLINE": "当前已离线"
         },
         "USER_MESSAGE": "嗨",
@@ -747,10 +747,10 @@
       "MESSENGER": "Messenger",
       "WEB_WIDGET": "网站",
       "TWITTER_PROFILE": "推特",
-      "TWILIO_SMS": "Twilio SMS",
+      "TWILIO_SMS": "Twilio 短信",
       "WHATSAPP": "WhatsApp",
-      "SMS": "SMS",
-      "EMAIL": "Email",
+      "SMS": "短信",
+      "EMAIL": "电子邮件",
       "TELEGRAM": "Telegram",
       "LINE": "Line",
       "API": "API 频道"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
index c9b44e42f..5669d48b4 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrationApps.json
@@ -1,35 +1,35 @@
 {
   "INTEGRATION_APPS": {
     "FETCHING": "正在获取集成",
-    "NO_HOOK_CONFIGURED": "There are no {integrationId} integrations configured in this account.",
-    "HEADER": "Applications",
+    "NO_HOOK_CONFIGURED": "此账户中未配置任何 {integrationId} 集成。",
+    "HEADER": "应用程序",
     "STATUS": {
       "ENABLED": "已启用",
       "DISABLED": "已禁用"
     },
     "CONFIGURE": "配置",
-    "ADD_BUTTON": "Add a new hook",
+    "ADD_BUTTON": "添加一个新钩子",
     "DELETE": {
       "TITLE": {
-        "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "INBOX": "确认删除",
+        "ACCOUNT": "断开连接"
       },
       "MESSAGE": {
-        "INBOX": "Are you sure to delete?",
-        "ACCOUNT": "Are you sure to disconnect?"
+        "INBOX": "确定删除吗？",
+        "ACCOUNT": "您确定要断开连接吗？"
       },
       "CONFIRM_BUTTON_TEXT": {
         "INBOX": "是，删除",
-        "ACCOUNT": "Yes, Disconnect"
+        "ACCOUNT": "是，断开连接"
       },
       "CANCEL_BUTTON_TEXT": "取消",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "钩子成功删除",
         "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
+      "FETCHING": "正在获取集成",
       "INBOX": "收件箱",
       "DELETE": {
         "BUTTON_TEXT": "删除"
@@ -38,14 +38,14 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "选择收件箱",
+          "PLACEHOLDER": "选择收件箱"
         },
         "SUBMIT": "创建",
         "CANCEL": "取消"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "成功添加集成钩子",
         "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
       }
     },
@@ -53,7 +53,7 @@
       "BUTTON_TEXT": "连接"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "断开连接"
     },
     "SIDEBAR_DESCRIPTION": {
       "DIALOGFLOW": "Dialogflow 是一个自然语言理解平台，可以轻松设计会话用户界面并将其集成到移动应用程序、Web 应用程序、设备、机器人、交互式语音应答系统等中。 <br /> <br /> Dialogflow 与 {installationName} 集成允许您使用收件箱配置 Dialogflow 机器人，让机器人最初处理查询并在需要时将其移交给代理。 Dialogflow 可用于确定潜在客户资格，通过提供常见问题等来减少客服人员的工作量。<br /> <br />要添加 Dialogflow，您需要在 Google 项目控制台中创建一个服务帐户并共享凭据。请参阅 Dialogflow 文档以获取更多信息。"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index eb5eb1b43..4e720155e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -1,29 +1,29 @@
 {
   "INTEGRATION_SETTINGS": {
-    "HEADER": "集成方式",
-    "DESCRIPTION": "Chatwoot integrates with multiple tools and services to improve your team's efficiency. Explore the list below to configure your favorite apps.",
-    "LEARN_MORE": "Learn more about integrations",
-    "LOADING": "Fetching integrations",
+    "HEADER": "集成设置",
+    "DESCRIPTION": "Chatwoot 集成了多种工具和服务，以提高团队效率。浏览以下列表以配置您喜欢的应用程序。",
+    "LEARN_MORE": "了解更多关于集成的信息",
+    "LOADING": "正在获取集成",
     "CAPTAIN": {
-      "DISABLED": "Captain is not enabled on your account.",
-      "CLICK_HERE_TO_CONFIGURE": "Click here to configure",
-      "LOADING_CONSOLE": "Loading Captain Console...",
-      "FAILED_TO_LOAD_CONSOLE": "Failed to load Captain Console. Please refresh and try again."
+      "DISABLED": "您的账户未启用 Captain。",
+      "CLICK_HERE_TO_CONFIGURE": "点击此处配置",
+      "LOADING_CONSOLE": "正在加载 Captain 控制台……",
+      "FAILED_TO_LOAD_CONSOLE": "加载 Captain 控制台失败。请刷新页面并重试。"
     },
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "订阅事件",
-      "LEARN_MORE": "Learn more about webhooks",
+      "LEARN_MORE": "了解更多关于 Webhooks 的信息",
       "FORM": {
         "CANCEL": "取消",
-        "DESC": "Webhook 事件为您提供了有关Chatwoot 帐户中发生的事情的实时信息。请输入一个有效的URL来配置回调。",
+        "DESC": "Webhook 事件为您提供了有关 Chatwoot 账户中发生的事情的实时信息。请输入一个有效的 URL 来配置回调。",
         "SUBSCRIPTIONS": {
           "LABEL": "事件",
           "EVENTS": {
             "CONVERSATION_CREATED": "对话创建",
             "CONVERSATION_STATUS_CHANGED": "对话状态已更改",
             "CONVERSATION_UPDATED": "对话已更新",
-            "MESSAGE_CREATED": "信息已创建",
-            "MESSAGE_UPDATED": "信息已更新",
+            "MESSAGE_CREATED": "消息已创建",
+            "MESSAGE_UPDATED": "消息已更新",
             "WEBWIDGET_TRIGGERED": "用户打开实时聊天小部件",
             "CONTACT_CREATED": "联系人已创建",
             "CONTACT_UPDATED": "联系人已更新"
@@ -31,22 +31,22 @@
         },
         "END_POINT": {
           "LABEL": "Webhook 网址",
-          "PLACEHOLDER": "Example: {webhookExampleURL}",
+          "PLACEHOLDER": "例如：{webhookExampleURL}",
           "ERROR": "请输入一个有效的 URL"
         },
-        "EDIT_SUBMIT": "更新 webhook",
-        "ADD_SUBMIT": "创建 webhook"
+        "EDIT_SUBMIT": "更新 Webhook",
+        "ADD_SUBMIT": "创建 Webhook"
       },
       "TITLE": "回调接口地址",
       "CONFIGURE": "配置",
-      "HEADER": "Webhook设置",
-      "HEADER_BTN_TXT": "添加新的 webhook",
-      "LOADING": "正在获取已添加的 webhooks",
+      "HEADER": "Webhook 设置",
+      "HEADER_BTN_TXT": "添加新的 Webhook",
+      "LOADING": "正在获取已添加的 Webhooks",
       "SEARCH_404": "没有任何项目符合此查询",
-      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks 是 HTTP 回调，可以为每个账户定义的。 他们是由诸如在Chatwoot 中创建消息等事件所触发的。您可以为此帐户创建多个web钩子。 <br /><br /> 创建一个 <b>webhook</b>, 点击 <b>添加新的 webhook</b> 按钮。 您也可以通过点击删除按钮删除任何现有的网络钩子。</p>",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks 是 HTTP 回调，可以为每个账户定义。它们由诸如在 Chatwoot 中创建消息等事件触发。您可以为此账户创建多个 Webhooks。<br /><br /> 要创建一个 <b>Webhook</b>，点击 <b>添加新的 Webhook</b> 按钮。您也可以通过点击删除按钮删除任何现有的 Webhook。</p>",
       "LIST": {
-        "404": "此帐户没有配置Webhooks。",
-        "TITLE": "管理 webhooks",
+        "404": "此账户没有配置 Webhooks。",
+        "TITLE": "管理 Webhooks",
         "TABLE_HEADER": {
           "WEBHOOK_ENDPOINT": "Webhook 端点",
           "ACTIONS": "操作"
@@ -54,7 +54,7 @@
       },
       "EDIT": {
         "BUTTON_TEXT": "编辑",
-        "TITLE": "编辑 webhook",
+        "TITLE": "编辑 Webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook 配置更新成功",
           "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
@@ -62,7 +62,7 @@
       },
       "ADD": {
         "CANCEL": "取消操作",
-        "TITLE": "添加新的 webhook",
+        "TITLE": "添加新的 Webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook 配置添加成功",
           "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
@@ -76,8 +76,8 @@
         },
         "CONFIRM": {
           "TITLE": "确认删除",
-          "MESSAGE": "Are you sure to delete the webhook? ({webhookURL})",
-          "YES": "是，删除 ",
+          "MESSAGE": "您确定要删除该 Webhook 吗？({webhookURL})",
+          "YES": "是，删除",
           "NO": "否，保留它"
         }
       }
@@ -85,85 +85,85 @@
     "SLACK": {
       "DELETE": "删除",
       "DELETE_CONFIRMATION": {
-        "TITLE": "Delete the integration",
-        "MESSAGE": "Are you sure you want to delete the integration? Doing so will result in the loss of access to conversations on your Slack workspace."
+        "TITLE": "删除集成",
+        "MESSAGE": "您确定要删除该集成吗？这样做将导致您无法在 Slack 工作区中访问对话。"
       },
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "With this integration, all of your incoming conversations will be synced to the ***{selectedChannelName}*** channel in your Slack workspace. You can manage all your customer conversations right within the channel and never miss a message.\n\nHere are the main features of the integration:\n\n**Respond to conversations from within Slack:** To respond to a conversation in the ***{selectedChannelName}*** Slack channel, simply type out your message and send it as a thread. This will create a response back to the customer through Chatwoot. It's that simple!\n\n **Create private notes:** If you want to create private notes instead of replies, start your message with ***`note:`***. This ensures that your message is kept private and won't be visible to the customer.\n\n**Associate an agent profile:** If the person who replied on Slack has an agent profile in Chatwoot under the same email, the replies will be associated with that agent profile automatically. This means you can easily track who said what and when. On the other hand, when the replier doesn't have an associated agent profile, the replies will appear from the bot profile to the customer.",
-        "SELECTED": "selected"
+        "TITLE": "使用 Slack 集成？",
+        "BODY": "通过此集成，所有传入的对话将同步到您的 Slack 工作区中的 ***{selectedChannelName}*** 频道。您可以直接在频道中管理所有客户对话，再也不会错过任何消息。\n\n以下是该集成的主要功能：\n\n**从 Slack 回复对话：** 要在 ***{selectedChannelName}*** Slack 频道中回复对话，只需输入您的消息并将其作为线程发送。这将通过 Chatwoot 创建对客户的回复。就是这么简单！\n\n**创建私密笔记：** 如果您想创建私密笔记而不是回复，请在消息开头加上 ***`note:`***。这将确保您的消息保持私密，不会对客户可见。\n\n**关联客服资料：** 如果在 Slack 上回复的人拥有与 Chatwoot 中相同电子邮件的客服资料，回复将自动与该客服资料关联。这意味着您可以轻松跟踪谁在何时说了什么。另一方面，如果回复者没有关联的客服资料，回复将显示为机器人资料。",
+        "SELECTED": "已选择"
       },
       "SELECT_CHANNEL": {
-        "OPTION_LABEL": "Select a channel",
+        "OPTION_LABEL": "选择一个频道",
         "UPDATE": "更新",
-        "BUTTON_TEXT": "Connect channel",
-        "DESCRIPTION": "Your Slack workspace is now linked with Chatwoot. However, the integration is currently inactive. To activate the integration and connect a channel to Chatwoot, please click the button below.\n\n**Note:** If you are attempting to connect a private channel, add the Chatwoot app to the Slack channel before proceeding with this step.",
-        "ATTENTION_REQUIRED": "Attention required",
-        "EXPIRED": "Your Slack integration has expired. To continue receiving messages on Slack, please delete the integration and connect your workspace again."
+        "BUTTON_TEXT": "连接频道",
+        "DESCRIPTION": "您的 Slack 工作区现已与 Chatwoot 连接。但是，集成当前处于非活动状态。要激活集成并将频道连接到 Chatwoot，请点击下面的按钮。\n\n**注意：** 如果您尝试连接私有频道，请在进行此步骤之前将 Chatwoot 应用添加到 Slack 频道。",
+        "ATTENTION_REQUIRED": "需要关注",
+        "EXPIRED": "您的 Slack 集成已过期。要继续在 Slack 上接收消息，请删除该集成并重新连接您的工作区。"
       },
-      "UPDATE_ERROR": "There was an error updating the integration, please try again",
-      "UPDATE_SUCCESS": "The channel is connected successfully",
-      "FAILED_TO_FETCH_CHANNELS": "There was an error fetching the channels from Slack, please try again"
+      "UPDATE_ERROR": "更新集成时出错，请重试",
+      "UPDATE_SUCCESS": "频道连接成功",
+      "FAILED_TO_FETCH_CHANNELS": "获取 Slack 频道时出错，请重试"
     },
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the room",
-      "START_VIDEO_CALL_HELP_TEXT": "Start a new video call with the customer",
-      "JOIN_ERROR": "There was an error joining the call, please try again",
-      "CREATE_ERROR": "There was an error creating a meeting link, please try again"
+      "CLICK_HERE_TO_JOIN": "点击此处加入",
+      "LEAVE_THE_ROOM": "离开房间",
+      "START_VIDEO_CALL_HELP_TEXT": "与客户开始新的视频通话",
+      "JOIN_ERROR": "加入通话时出错，请重试",
+      "CREATE_ERROR": "创建会议链接时出错，请重试"
     },
     "OPEN_AI": {
       "AI_ASSIST": "AI 助手",
-      "WITH_AI": " {option} with AI ",
+      "WITH_AI": " 使用 AI {option} ",
       "OPTIONS": {
-        "REPLY_SUGGESTION": "Reply Suggestion",
-        "SUMMARIZE": "Summarize",
-        "REPHRASE": "Improve Writing",
-        "FIX_SPELLING_GRAMMAR": "Fix Spelling and Grammar",
-        "SHORTEN": "Shorten",
-        "EXPAND": "Expand",
-        "MAKE_FRIENDLY": "Change message tone to friendly",
-        "MAKE_FORMAL": "Use formal tone",
-        "SIMPLIFY": "Simplify"
+        "REPLY_SUGGESTION": "回复建议",
+        "SUMMARIZE": "总结",
+        "REPHRASE": "改进写作",
+        "FIX_SPELLING_GRAMMAR": "修正拼写和语法",
+        "SHORTEN": "缩短",
+        "EXPAND": "扩展",
+        "MAKE_FRIENDLY": "将消息语气改为友好",
+        "MAKE_FORMAL": "使用正式语气",
+        "SIMPLIFY": "简化"
       },
       "ASSISTANCE_MODAL": {
-        "DRAFT_TITLE": "Draft content",
-        "GENERATED_TITLE": "Generated content",
-        "AI_WRITING": "AI is writing",
+        "DRAFT_TITLE": "草稿内容",
+        "GENERATED_TITLE": "生成内容",
+        "AI_WRITING": "AI 正在写作",
         "BUTTONS": {
-          "APPLY": "Use this suggestion",
+          "APPLY": "使用此建议",
           "CANCEL": "取消"
         }
       },
       "CTA_MODAL": {
-        "TITLE": "Integrate with OpenAI",
-        "DESC": "Bring advanced AI features to your dashboard with OpenAI's GPT models. To begin, enter the API key from your OpenAI account.",
-        "KEY_PLACEHOLDER": "Enter your OpenAI API key",
+        "TITLE": "集成 OpenAI",
+        "DESC": "通过 OpenAI 的 GPT 模型为您的仪表板带来高级 AI 功能。要开始，请输入您 OpenAI 账户的 API 密钥。",
+        "KEY_PLACEHOLDER": "输入您的 OpenAI API 密钥",
         "BUTTONS": {
-          "NEED_HELP": "Need help?",
+          "NEED_HELP": "需要帮助？",
           "DISMISS": "取消",
-          "FINISH": "Finish Setup"
+          "FINISH": "完成设置"
         },
-        "DISMISS_MESSAGE": "You can setup OpenAI integration later Whenever you want.",
-        "SUCCESS_MESSAGE": "OpenAI integration setup successfully"
+        "DISMISS_MESSAGE": "您可以稍后随时设置 OpenAI 集成。",
+        "SUCCESS_MESSAGE": "OpenAI 集成设置成功"
       },
-      "TITLE": "Improve With AI",
-      "SUMMARY_TITLE": "Summary with AI",
-      "REPLY_TITLE": "Reply suggestion with AI",
-      "SUBTITLE": "An improved reply will be generated using AI, based on your current draft.",
+      "TITLE": "通过 AI 改进",
+      "SUMMARY_TITLE": "通过 AI 总结",
+      "REPLY_TITLE": "通过 AI 回复建议",
+      "SUBTITLE": "将根据您的当前草稿生成改进的回复。",
       "TONE": {
-        "TITLE": "Tone",
+        "TITLE": "语气",
         "OPTIONS": {
-          "PROFESSIONAL": "Professional",
-          "FRIENDLY": "Friendly"
+          "PROFESSIONAL": "专业",
+          "FRIENDLY": "友好"
         }
       },
       "BUTTONS": {
-        "GENERATE": "Generate",
-        "GENERATING": "Generating...",
+        "GENERATE": "生成",
+        "GENERATING": "生成中...",
         "CANCEL": "取消"
       },
-      "GENERATE_ERROR": "There was an error processing the content, please try again"
+      "GENERATE_ERROR": "处理内容时出错，请重试"
     },
     "DELETE": {
       "BUTTON_TEXT": "删除",
@@ -175,136 +175,136 @@
       "BUTTON_TEXT": "连接"
     },
     "DASHBOARD_APPS": {
-      "TITLE": "Dashboard Apps",
-      "HEADER_BTN_TXT": "Add a new dashboard app",
-      "SIDEBAR_TXT": "<p><b>Dashboard Apps</b></p><p>Dashboard Apps allow organizations to embed an application inside the Chatwoot dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that inside the dashboard to provide user information, their orders, or their previous payment history.</p><p>When you embed your application using the dashboard in Chatwoot, your application will get the context of the conversation and contact as a window event. Implement a listener for the message event on your page to receive the context.</p><p>To add a new dashboard app, click on the button 'Add a new dashboard app'.</p>",
-      "DESCRIPTION": "Dashboard Apps allow organizations to embed an application inside the dashboard to provide the context for customer support agents. This feature allows you to create an application independently and embed that to provide user information, their orders, or their previous payment history.",
-      "LEARN_MORE": "Learn more about Dashboard Apps",
+      "TITLE": "仪表板应用",
+      "HEADER_BTN_TXT": "添加新的仪表板应用",
+      "SIDEBAR_TXT": "<p><b>仪表板应用</b></p><p>仪表板应用允许组织将应用程序嵌入 Chatwoot 仪表板中，以便为客服人员提供上下文信息。此功能允许您独立创建应用程序并将其嵌入仪表板中，以提供用户信息、他们的订单或以前的付款历史记录。</p><p>当您使用 Chatwoot 仪表板嵌入应用程序时，您的应用程序将作为窗口事件获取对话和联系人的上下文信息。在您的页面上实现消息事件的监听器以接收上下文信息。</p><p>要添加新的仪表板应用，请点击“添加新的仪表板应用”按钮。</p>",
+      "DESCRIPTION": "仪表板应用允许组织将应用程序嵌入仪表板中，以便为客服人员提供上下文信息。此功能允许您独立创建应用程序并将其嵌入仪表板中，以提供用户信息、他们的订单或以前的付款历史记录。",
+      "LEARN_MORE": "了解更多关于仪表板应用的信息",
       "LIST": {
-        "404": "There are no dashboard apps configured on this account yet",
-        "LOADING": "Fetching dashboard apps...",
+        "404": "此账户尚未配置任何仪表板应用",
+        "LOADING": "正在获取仪表板应用...",
         "TABLE_HEADER": {
-          "NAME": "姓名：",
-          "ENDPOINT": "Endpoint"
+          "NAME": "姓名",
+          "ENDPOINT": "端点"
         },
-        "EDIT_TOOLTIP": "Edit app",
-        "DELETE_TOOLTIP": "Delete app"
+        "EDIT_TOOLTIP": "编辑应用",
+        "DELETE_TOOLTIP": "删除应用"
       },
       "FORM": {
-        "TITLE_LABEL": "姓名：",
-        "TITLE_PLACEHOLDER": "Enter a name for your dashboard app",
-        "TITLE_ERROR": "A name for the dashboard app is required",
-        "URL_LABEL": "Endpoint",
-        "URL_PLACEHOLDER": "Enter the endpoint URL where your app is hosted",
-        "URL_ERROR": "A valid URL is required"
+        "TITLE_LABEL": "姓名",
+        "TITLE_PLACEHOLDER": "输入您的仪表板应用的名称",
+        "TITLE_ERROR": "仪表板应用的名称是必需的",
+        "URL_LABEL": "端点",
+        "URL_PLACEHOLDER": "输入您的应用托管的端点 URL",
+        "URL_ERROR": "需要有效的 URL"
       },
       "CREATE": {
-        "HEADER": "Add a new dashboard app",
+        "HEADER": "添加新的仪表板应用",
         "FORM_SUBMIT": "提交",
         "FORM_CANCEL": "取消",
-        "API_SUCCESS": "Dashboard app configured successfully",
-        "API_ERROR": "We couldn't create an app. Please try again later"
+        "API_SUCCESS": "仪表板应用配置成功",
+        "API_ERROR": "无法创建应用，请稍后重试"
       },
       "UPDATE": {
-        "HEADER": "Edit dashboard app",
+        "HEADER": "编辑仪表板应用",
         "FORM_SUBMIT": "更新",
         "FORM_CANCEL": "取消",
-        "API_SUCCESS": "Dashboard app updated successfully",
-        "API_ERROR": "We couldn't update the app. Please try again later"
+        "API_SUCCESS": "仪表板应用更新成功",
+        "API_ERROR": "无法更新应用，请稍后重试"
       },
       "DELETE": {
-        "CONFIRM_YES": "Yes, delete it",
-        "CONFIRM_NO": "No, keep it",
-        "TITLE": "Confirm deletion",
-        "MESSAGE": "Are you sure to delete the app - {appName}?",
-        "API_SUCCESS": "Dashboard app deleted successfully",
-        "API_ERROR": "We couldn't delete the app. Please try again later"
+        "CONFIRM_YES": "是，删除它",
+        "CONFIRM_NO": "否，保留它",
+        "TITLE": "确认删除",
+        "MESSAGE": "您确定要删除该应用 - {appName} 吗？",
+        "API_SUCCESS": "仪表板应用删除成功",
+        "API_ERROR": "无法删除应用，请稍后重试"
       }
     },
     "LINEAR": {
-      "ADD_OR_LINK_BUTTON": "Create/Link Linear Issue",
-      "LOADING": "Fetching linear issues...",
-      "LOADING_ERROR": "There was an error fetching the linear issues, please try again",
+      "ADD_OR_LINK_BUTTON": "创建/链接 Linear 问题",
+      "LOADING": "正在获取 Linear 问题...",
+      "LOADING_ERROR": "获取 Linear 问题时出错，请重试",
       "CREATE": "创建",
       "LINK": {
-        "SEARCH": "Search issues",
-        "SELECT": "Select issue",
+        "SEARCH": "搜索问题",
+        "SELECT": "选择问题",
         "TITLE": "链接",
-        "EMPTY_LIST": "No linear issues found",
-        "LOADING": "Loading",
-        "ERROR": "There was an error fetching the linear issues, please try again",
-        "LINK_SUCCESS": "Issue linked successfully",
-        "LINK_ERROR": "There was an error linking the issue, please try again",
-        "LINK_TITLE": "Conversation (#{conversationId}) with {name}"
+        "EMPTY_LIST": "未找到 Linear 问题",
+        "LOADING": "加载中",
+        "ERROR": "获取 Linear 问题时出错，请重试",
+        "LINK_SUCCESS": "问题链接成功",
+        "LINK_ERROR": "链接问题时出错，请重试",
+        "LINK_TITLE": "对话 (#{conversationId}) 与 {name}"
       },
       "ADD_OR_LINK": {
-        "TITLE": "Create/link linear issue",
-        "DESCRIPTION": "Create Linear issues from conversations, or link existing ones for seamless tracking.",
+        "TITLE": "创建/链接 Linear 问题",
+        "DESCRIPTION": "从对话中创建 Linear 问题，或链接现有问题以进行无缝跟踪。",
         "FORM": {
           "TITLE": {
             "LABEL": "标题",
-            "PLACEHOLDER": "Enter title",
-            "REQUIRED_ERROR": "Title is required"
+            "PLACEHOLDER": "输入标题",
+            "REQUIRED_ERROR": "标题是必填项"
           },
           "DESCRIPTION": {
-            "LABEL": "描述信息",
-            "PLACEHOLDER": "Enter description"
+            "LABEL": "描述",
+            "PLACEHOLDER": "输入描述"
           },
           "TEAM": {
-            "LABEL": "Team",
+            "LABEL": "团队",
             "PLACEHOLDER": "选择团队",
-            "SEARCH": "Search team",
-            "REQUIRED_ERROR": "Team is required"
+            "SEARCH": "搜索团队",
+            "REQUIRED_ERROR": "团队是必填项"
           },
           "ASSIGNEE": {
-            "LABEL": "Assignee",
-            "PLACEHOLDER": "Select assignee",
-            "SEARCH": "Search assignee"
+            "LABEL": "负责人",
+            "PLACEHOLDER": "选择负责人",
+            "SEARCH": "搜索负责人"
           },
           "PRIORITY": {
             "LABEL": "优先级",
             "PLACEHOLDER": "选择优先级",
-            "SEARCH": "Search priority"
+            "SEARCH": "搜索优先级"
           },
           "LABEL": {
             "LABEL": "标签",
-            "PLACEHOLDER": "Select label",
-            "SEARCH": "Search label"
+            "PLACEHOLDER": "选择标签",
+            "SEARCH": "搜索标签"
           },
           "STATUS": {
             "LABEL": "状态",
-            "PLACEHOLDER": "Select status",
-            "SEARCH": "Search status"
+            "PLACEHOLDER": "选择状态",
+            "SEARCH": "搜索状态"
           },
           "PROJECT": {
-            "LABEL": "Project",
-            "PLACEHOLDER": "Select project",
-            "SEARCH": "Search project"
+            "LABEL": "项目",
+            "PLACEHOLDER": "选择项目",
+            "SEARCH": "搜索项目"
           }
         },
         "CREATE": "创建",
         "CANCEL": "取消",
-        "CREATE_SUCCESS": "Issue created successfully",
-        "CREATE_ERROR": "There was an error creating the issue, please try again",
-        "LOADING_TEAM_ERROR": "There was an error fetching the teams, please try again",
-        "LOADING_TEAM_ENTITIES_ERROR": "There was an error fetching the team entities, please try again"
+        "CREATE_SUCCESS": "问题创建成功",
+        "CREATE_ERROR": "创建问题时出错，请重试",
+        "LOADING_TEAM_ERROR": "获取团队时出错，请重试",
+        "LOADING_TEAM_ENTITIES_ERROR": "获取团队实体时出错，请重试"
       },
       "ISSUE": {
         "STATUS": "状态",
         "PRIORITY": "优先级",
-        "ASSIGNEE": "Assignee",
+        "ASSIGNEE": "负责人",
         "LABELS": "标签",
-        "CREATED_AT": "Created at {createdAt}"
+        "CREATED_AT": "创建于 {createdAt}"
       },
       "UNLINK": {
-        "TITLE": "Unlink",
-        "SUCCESS": "Issue unlinked successfully",
-        "ERROR": "There was an error unlinking the issue, please try again"
+        "TITLE": "取消链接",
+        "SUCCESS": "问题取消链接成功",
+        "ERROR": "取消链接问题时出错，请重试"
       },
       "DELETE": {
-        "TITLE": "Are you sure you want to delete the integration?",
-        "MESSAGE": "Are you sure you want to delete the integration?",
-        "CONFIRM": "是的，删除",
+        "TITLE": "您确定要删除该集成吗？",
+        "MESSAGE": "您确定要删除该集成吗？",
+        "CONFIRM": "是，删除",
         "CANCEL": "取消"
       }
     }
@@ -313,26 +313,27 @@
     "NAME": "Captain",
     "COPILOT": {
       "SEND_MESSAGE": "发送消息...",
-      "LOADER": "Captain is thinking",
+      "LOADER": "Captain 正在思考",
       "YOU": "您",
-      "USE": "Use this",
-      "RESET": "Reset"
+      "USE": "使用此",
+      "RESET": "重置",
+      "SELECT_ASSISTANT": "选择助手"
     },
     "PAYWALL": {
-      "TITLE": "Upgrade to use Captain AI",
-      "AVAILABLE_ON": "Captain is not available on the free plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "升级以使用 Captain AI",
+      "AVAILABLE_ON": "Captain 在免费计划中不可用。",
+      "UPGRADE_PROMPT": "升级您的计划以获取我们的助手、副驾驶等功能。",
+      "UPGRADE_NOW": "立即升级",
+      "CANCEL_ANYTIME": "您可以随时更改或取消您的计划"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "Captain AI feature is only available in a paid plan.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to our assistants, copilot and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "AVAILABLE_ON": "Captain AI 功能仅在付费计划中可用。",
+      "UPGRADE_PROMPT": "升级您的计划以获取我们的助手、副驾驶等功能。",
+      "ASK_ADMIN": "请联系您的管理员进行升级。"
     },
     "BANNER": {
-      "RESPONSES": "You've used over 80% of your response limit. To continue using Captain AI, please upgrade.",
-      "DOCUMENTS": "Document limit reached. Upgrade to continue using Captain AI."
+      "RESPONSES": "您已使用超过 80% 的回复限制。要继续使用 Captain AI，请升级。",
+      "DOCUMENTS": "文档限制已满。升级以继续使用 Captain AI。"
     },
     "FORM": {
       "CANCEL": "取消",
@@ -340,205 +341,205 @@
       "EDIT": "更新"
     },
     "ASSISTANTS": {
-      "HEADER": "Assistants",
-      "ADD_NEW": "Create a new assistant",
+      "HEADER": "助手",
+      "ADD_NEW": "创建新的助手",
       "DELETE": {
-        "TITLE": "Are you sure to delete the assistant?",
-        "DESCRIPTION": "This action is permanent. Deleting this assistant will remove it from all connected inboxes and permanently erase all generated knowledge.",
-        "CONFIRM": "是的，删除",
-        "SUCCESS_MESSAGE": "The assistant has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the assistant, please try again."
+        "TITLE": "您确定要删除该文档吗？",
+        "DESCRIPTION": "此操作是永久性的。删除此文档将永久删除所有生成的知识。",
+        "CONFIRM": "是，删除",
+        "SUCCESS_MESSAGE": "文档已成功删除",
+        "ERROR_MESSAGE": "删除文档时出错，请重试。"
       },
-      "FORM_DESCRIPTION": "Fill out the details below to name your assistant, describe its purpose, and specify the product it will support.",
+      "FORM_DESCRIPTION": "填写以下详细信息以命名您的助手，描述其用途，并指定它将支持的产品。",
       "CREATE": {
-        "TITLE": "Create an assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the assistant, please try again."
+        "TITLE": "创建助手",
+        "SUCCESS_MESSAGE": "助手已成功创建",
+        "ERROR_MESSAGE": "创建助手时出错，请重试。"
       },
       "FORM": {
         "NAME": {
-          "LABEL": "Assistant Name",
-          "PLACEHOLDER": "Enter a name for the assistant",
-          "ERROR": "Please provide a name for the assistant"
+          "LABEL": "助手名称",
+          "PLACEHOLDER": "为助手输入一个名称",
+          "ERROR": "请提供助手的名称"
         },
         "DESCRIPTION": {
-          "LABEL": "Assistant Description",
-          "PLACEHOLDER": "Describe how and where this assistant will be used",
-          "ERROR": "A description is required"
+          "LABEL": "助手描述",
+          "PLACEHOLDER": "描述助手的用途和使用场景",
+          "ERROR": "描述是必需的"
         },
         "PRODUCT_NAME": {
-          "LABEL": "Product Name",
-          "PLACEHOLDER": "Enter the name of the product this assistant is designed for",
-          "ERROR": "The product name is required"
+          "LABEL": "产品名称",
+          "PLACEHOLDER": "输入此助手设计用于的产品名称",
+          "ERROR": "产品名称是必需的"
         },
         "FEATURES": {
           "TITLE": "特性",
-          "ALLOW_CONVERSATION_FAQS": "Generate FAQs from resolved conversations",
-          "ALLOW_MEMORIES": "Capture key details as memories from customer interactions."
+          "ALLOW_CONVERSATION_FAQS": "从已解决的对话中生成常见问题",
+          "ALLOW_MEMORIES": "从客户互动中捕获关键细节作为记忆"
         }
       },
       "EDIT": {
-        "TITLE": "Update the assistant",
-        "SUCCESS_MESSAGE": "The assistant has been successfully updated",
-        "ERROR_MESSAGE": "There was an error updating the assistant, please try again."
+        "TITLE": "更新助手",
+        "SUCCESS_MESSAGE": "助手已成功更新",
+        "ERROR_MESSAGE": "更新助手时出错，请重试"
       },
       "OPTIONS": {
-        "EDIT_ASSISTANT": "Edit Assistant",
-        "DELETE_ASSISTANT": "Delete Assistant",
-        "VIEW_CONNECTED_INBOXES": "View connected inboxes"
+        "EDIT_ASSISTANT": "编辑助手",
+        "DELETE_ASSISTANT": "删除助手",
+        "VIEW_CONNECTED_INBOXES": "查看连接的收件箱"
       },
       "EMPTY_STATE": {
-        "TITLE": "No assistants available",
-        "SUBTITLE": "Create an assistant to provide quick and accurate responses to your users. It can learn from your help articles and past conversations."
+        "TITLE": "没有可用的文档",
+        "SUBTITLE": "文档用于为您的助手生成常见问题。您可以导入文档以为您的助手提供上下文。"
       }
     },
     "DOCUMENTS": {
-      "HEADER": "Documents",
-      "ADD_NEW": "Create a new document",
+      "HEADER": "文档",
+      "ADD_NEW": "创建新文档",
       "RELATED_RESPONSES": {
-        "TITLE": "Related FAQs",
-        "DESCRIPTION": "These FAQs are generated directly from the document."
+        "TITLE": "相关常见问题",
+        "DESCRIPTION": "这些常见问题直接从文档生成。"
       },
-      "FORM_DESCRIPTION": "Enter the URL of the document to add it as a knowledge source and choose the assistant to associate it with.",
+      "FORM_DESCRIPTION": "输入文档的 URL 以将其添加为知识源，并选择要关联的助手。",
       "CREATE": {
-        "TITLE": "Add a document",
-        "SUCCESS_MESSAGE": "The document has been successfully created",
-        "ERROR_MESSAGE": "There was an error creating the document, please try again."
+        "TITLE": "添加文档",
+        "SUCCESS_MESSAGE": "文档已成功创建",
+        "ERROR_MESSAGE": "创建文档时出错，请重试"
       },
       "FORM": {
         "URL": {
-          "LABEL": "URL",
-          "PLACEHOLDER": "Enter the URL of the document",
-          "ERROR": "Please provide a valid URL for the document"
+          "LABEL": "网址",
+          "PLACEHOLDER": "输入文档的 URL",
+          "ERROR": "请提供有效的文档 URL"
         },
         "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select the assistant",
-          "ERROR": "The assistant field is required"
+          "LABEL": "助手",
+          "PLACEHOLDER": "选择助手",
+          "ERROR": "助手字段是必需的"
         }
       },
       "DELETE": {
-        "TITLE": "Are you sure to delete the document?",
-        "DESCRIPTION": "This action is permanent. Deleting this document will permanently erase all generated knowledge.",
-        "CONFIRM": "是的，删除",
-        "SUCCESS_MESSAGE": "The document has been successfully deleted",
-        "ERROR_MESSAGE": "There was an error deleting the document, please try again."
+        "TITLE": "您确定要删除该文档吗？",
+        "DESCRIPTION": "此操作是永久性的。删除此文档将永久删除所有生成的知识。",
+        "CONFIRM": "是，删除",
+        "SUCCESS_MESSAGE": "文档已成功删除",
+        "ERROR_MESSAGE": "删除文档时出错，请重试"
       },
       "OPTIONS": {
-        "VIEW_RELATED_RESPONSES": "View Related Responses",
-        "DELETE_DOCUMENT": "Delete Document"
+        "VIEW_RELATED_RESPONSES": "查看相关常见问题",
+        "DELETE_DOCUMENT": "删除文档"
       },
       "EMPTY_STATE": {
-        "TITLE": "No documents available",
-        "SUBTITLE": "Documents are used by your assistant to generate FAQs. You can import documents to provide context for your assistant."
+        "TITLE": "没有可用的文档",
+        "SUBTITLE": "文档用于为您的助手生成常见问题。您可以导入文档以为您的助手提供上下文。"
       }
     },
     "RESPONSES": {
-      "HEADER": "FAQs",
-      "ADD_NEW": "Create new FAQ",
+      "HEADER": "常见问题",
+      "ADD_NEW": "创建新常见问题",
       "DOCUMENTABLE": {
-        "CONVERSATION": "Conversation #{id}"
+        "CONVERSATION": "对话 #{id}"
       },
-      "SELECTED": "{count} selected",
-      "BULK_APPROVE_BUTTON": "Approve",
+      "SELECTED": "{count} 已选择",
+      "BULK_APPROVE_BUTTON": "批准",
       "BULK_DELETE_BUTTON": "删除",
       "BULK_APPROVE": {
-        "SUCCESS_MESSAGE": "FAQs approved successfully",
-        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+        "SUCCESS_MESSAGE": "常见问题已成功批准",
+        "ERROR_MESSAGE": "批准常见问题时出错，请重试"
       },
       "BULK_DELETE": {
-        "TITLE": "Delete FAQs?",
-        "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
-        "CONFIRM": "Yes, delete all",
-        "SUCCESS_MESSAGE": "FAQs deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQs, please try again."
+        "TITLE": "删除常见问题？",
+        "DESCRIPTION": "您确定要删除选中的常见问题吗？此操作无法撤销。",
+        "CONFIRM": "是，全部删除",
+        "SUCCESS_MESSAGE": "常见问题已成功删除",
+        "ERROR_MESSAGE": "删除常见问题时出错，请重试"
       },
       "DELETE": {
-        "TITLE": "Are you sure to delete the FAQ?",
+        "TITLE": "您确定要删除该常见问题吗？",
         "DESCRIPTION": "",
-        "CONFIRM": "是的，删除",
-        "SUCCESS_MESSAGE": "FAQ deleted successfully",
-        "ERROR_MESSAGE": "There was an error deleting the FAQ, please try again."
+        "CONFIRM": "是，删除",
+        "SUCCESS_MESSAGE": "常见问题已成功删除",
+        "ERROR_MESSAGE": "删除常见问题时出错，请重试"
       },
       "FILTER": {
-        "ASSISTANT": "Assistant: {selected}",
-        "STATUS": "Status: {selected}",
-        "ALL_ASSISTANTS": "所有的"
+        "ASSISTANT": "助手：{selected}",
+        "STATUS": "状态：{selected}",
+        "ALL_ASSISTANTS": "所有"
       },
       "STATUS": {
         "TITLE": "状态",
-        "PENDING": "等待中",
-        "APPROVED": "Approved",
-        "ALL": "所有的"
+        "PENDING": "待处理",
+        "APPROVED": "已批准",
+        "ALL": "所有"
       },
-      "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
+      "FORM_DESCRIPTION": "将问题及其对应的答案添加到知识库，并选择应关联的助手。",
       "CREATE": {
-        "TITLE": "Add an FAQ",
-        "SUCCESS_MESSAGE": "The response has been added successfully.",
-        "ERROR_MESSAGE": "An error occurred while adding the response. Please try again."
+        "TITLE": "添加常见问题",
+        "SUCCESS_MESSAGE": "响应已成功添加",
+        "ERROR_MESSAGE": "添加响应时出错，请重试"
       },
       "FORM": {
         "QUESTION": {
-          "LABEL": "Question",
-          "PLACEHOLDER": "Enter the question here",
-          "ERROR": "Please provide a valid question."
+          "LABEL": "问题",
+          "PLACEHOLDER": "在此输入问题",
+          "ERROR": "请提供有效的问题"
         },
         "ANSWER": {
-          "LABEL": "Answer",
-          "PLACEHOLDER": "Enter the answer here",
-          "ERROR": "Please provide a valid answer."
+          "LABEL": "答案",
+          "PLACEHOLDER": "在此输入答案",
+          "ERROR": "请提供有效的答案"
         },
         "ASSISTANT": {
-          "LABEL": "Assistant",
-          "PLACEHOLDER": "Select an assistant",
-          "ERROR": "Please select an assistant."
+          "LABEL": "助手",
+          "PLACEHOLDER": "选择助手",
+          "ERROR": "请选择助手"
         }
       },
       "EDIT": {
-        "TITLE": "Update the FAQ",
-        "SUCCESS_MESSAGE": "The FAQ has been successfully updated",
-        "ERROR_MESSAGE": "There was an error updating the FAQ, please try again",
-        "APPROVE_SUCCESS_MESSAGE": "The FAQ was marked as approved"
+        "TITLE": "更新常见问题",
+        "SUCCESS_MESSAGE": "常见问题已成功更新",
+        "ERROR_MESSAGE": "更新常见问题时出错，请重试",
+        "APPROVE_SUCCESS_MESSAGE": "常见问题已标记为已批准"
       },
       "OPTIONS": {
-        "APPROVE": "Mark as approved",
-        "EDIT_RESPONSE": "Edit FAQ",
-        "DELETE_RESPONSE": "Delete FAQ"
+        "APPROVE": "标记为已批准",
+        "EDIT_RESPONSE": "编辑常见问题",
+        "DELETE_RESPONSE": "删除常见问题"
       },
       "EMPTY_STATE": {
-        "TITLE": "No FAQs Found",
-        "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually."
+        "TITLE": "未找到常见问题",
+        "SUBTITLE": "常见问题帮助您的助手为客户提供快速准确的答案。它们可以从您的内容自动生成，也可以手动添加。"
       }
     },
     "INBOXES": {
-      "HEADER": "Connected Inboxes",
-      "ADD_NEW": "Connect a new inbox",
+      "HEADER": "连接的收件箱",
+      "ADD_NEW": "连接新收件箱",
       "OPTIONS": {
-        "DISCONNECT": "Disconnect"
+        "DISCONNECT": "断开连接"
       },
       "DELETE": {
-        "TITLE": "Are you sure to disconnect the inbox?",
+        "TITLE": "您确定要断开收件箱的连接吗？",
         "DESCRIPTION": "",
-        "CONFIRM": "是的，删除",
-        "SUCCESS_MESSAGE": "The inbox was successfully disconnected.",
-        "ERROR_MESSAGE": "There was an error disconnecting the inbox, please try again."
+        "CONFIRM": "是，删除",
+        "SUCCESS_MESSAGE": "收件箱已成功断开连接",
+        "ERROR_MESSAGE": "断开收件箱连接时出错，请重试"
       },
-      "FORM_DESCRIPTION": "Choose an inbox to connect with the assistant.",
+      "FORM_DESCRIPTION": "选择要与助手连接的收件箱。",
       "CREATE": {
-        "TITLE": "Connect an Inbox",
-        "SUCCESS_MESSAGE": "The inbox was successfully connected.",
-        "ERROR_MESSAGE": "An error occurred while connecting the inbox. Please try again."
+        "TITLE": "连接收件箱",
+        "SUCCESS_MESSAGE": "收件箱已成功连接",
+        "ERROR_MESSAGE": "连接收件箱时出错，请重试"
       },
       "FORM": {
         "INBOX": {
           "LABEL": "收件箱",
-          "PLACEHOLDER": "Choose the inbox to deploy the assistant.",
-          "ERROR": "An inbox selection is required."
+          "PLACEHOLDER": "选择收件箱以部署助手",
+          "ERROR": "需要选择收件箱"
         }
       },
       "EMPTY_STATE": {
-        "TITLE": "No Connected Inboxes",
-        "SUBTITLE": "Connecting an inbox allows the assistant to handle initial questions from your customers before transferring them to you."
+        "TITLE": "没有连接的收件箱",
+        "SUBTITLE": "连接收件箱允许助手在处理客户初始问题后将对话转交给您。"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
index 8ce62df81..5732d4a11 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/labelsMgmt.json
@@ -3,15 +3,15 @@
     "HEADER": "标签",
     "HEADER_BTN_TXT": "添加标签",
     "LOADING": "正在获取标签",
-    "DESCRIPTION": "Labels help you categorize and prioritize conversations and leads. You can assign a label to a conversation or contact using the side panel.",
-    "LEARN_MORE": "Learn more about labels",
+    "DESCRIPTION": "标签帮助您对对话和潜在客户进行分类和优先排序。您可以使用侧边栏将标签分配给对话或联系人。",
+    "LEARN_MORE": "了解更多关于标签的信息",
     "SEARCH_404": "没有任何项目符合此查询",
     "LIST": {
       "404": "此帐户中没有可用的标签。",
       "TITLE": "管理标签",
       "DESC": "标记可以让您将对话集中起来。",
       "TABLE_HEADER": {
-        "NAME": "姓名：",
+        "NAME": "名称",
         "DESCRIPTION": "描述信息",
         "COLOR": "颜色"
       }
@@ -20,9 +20,9 @@
       "NAME": {
         "LABEL": "标签名称",
         "PLACEHOLDER": "标签名称",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "REQUIRED_ERROR": "标签名称为必填项",
+        "MINIMUM_LENGTH_ERROR": "至少需要2个字符",
+        "VALID_ERROR": "仅允许使用字母、数字、连字符和下划线"
       },
       "DESCRIPTION": {
         "LABEL": "描述信息",
@@ -41,17 +41,17 @@
     },
     "SUGGESTIONS": {
       "TOOLTIP": {
-        "SINGLE_SUGGESTION": "Add label to conversation",
-        "MULTIPLE_SUGGESTION": "Select this label",
-        "DESELECT": "Deselect label",
-        "DISMISS": "Dismiss suggestion"
+        "SINGLE_SUGGESTION": "将标签添加到对话",
+        "MULTIPLE_SUGGESTION": "选择此标签",
+        "DESELECT": "取消选择标签",
+        "DISMISS": "忽略建议"
       },
       "POWERED_BY": "Chatwoot AI",
       "DISMISS": "取消",
-      "ADD_SELECTED_LABELS": "Add selected labels",
-      "ADD_SELECTED_LABEL": "Add selected label",
-      "ADD_ALL_LABELS": "Add all labels",
-      "SUGGESTED_LABELS": "Suggested labels"
+      "ADD_SELECTED_LABELS": "添加选定的标签",
+      "ADD_SELECTED_LABEL": "添加选定的标签",
+      "ADD_ALL_LABELS": "添加所有标签",
+      "SUGGESTED_LABELS": "建议的标签"
     },
     "ADD": {
       "TITLE": "添加标签",
@@ -76,9 +76,9 @@
       },
       "CONFIRM": {
         "TITLE": "确认删除",
-        "MESSAGE": "您确定要删除吗？ ",
-        "YES": "是，删除 ",
-        "NO": "不，保留 "
+        "MESSAGE": "您确定要删除吗？",
+        "YES": "是，删除",
+        "NO": "不，保留"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/macros.json b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
index 86cc62a70..8b1663fd9 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/macros.json
@@ -1,8 +1,8 @@
 {
   "MACROS": {
     "HEADER": "宏",
-    "DESCRIPTION": "A macro is a set of saved actions that help customer service agents easily complete tasks. The agents can define a set of actions like tagging a conversation with a label, sending an email transcript, updating a custom attribute, etc., and they can run these actions in a single click.",
-    "LEARN_MORE": "Learn more about macros",
+    "DESCRIPTION": "宏是一组预设操作，帮助客服人员快速完成任务。客服人员可以定义诸如标记对话、发送邮件记录、更新自定义属性等操作，并一键执行。",
+    "LEARN_MORE": "了解更多关于宏的信息",
     "HEADER_BTN_TXT": "添加一个新宏文件",
     "HEADER_BTN_TXT_SAVE": "保存宏文件",
     "LOADING": "获取宏中",
@@ -76,8 +76,8 @@
       "EXECUTED_SUCCESSFULLY": "宏成功执行"
     },
     "ERRORS": {
-      "ATTRIBUTE_KEY_REQUIRED": "Attribute key is required",
-      "FILTER_OPERATOR_REQUIRED": "Filter operator is required",
+      "ATTRIBUTE_KEY_REQUIRED": "属性键是必需的",
+      "FILTER_OPERATOR_REQUIRED": "需要过滤器操作符",
       "VALUE_REQUIRED": "必须填写值",
       "VALUE_MUST_BE_BETWEEN_1_AND_998": "值必须介于 1 到 998 之间。",
       "ACTION_PARAMETERS_REQUIRED": "需要操作参数",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index ce8287676..8c7f59a79 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -4,8 +4,8 @@
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
     "DOWNLOAD_AGENT_REPORTS": "下载客服报表",
-    "DATA_FETCHING_FAILED": "Failed to fetch data, please try again later.",
-    "SUMMARY_FETCHING_FAILED": "Failed to fetch summary, please try again later.",
+    "DATA_FETCHING_FAILED": "数据获取失败，请稍后再试。",
+    "SUMMARY_FETCHING_FAILED": "摘要获取失败，请稍后再试。",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "会话",
@@ -23,13 +23,13 @@
         "NAME": "首次响应时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "First Response Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "首次响应时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "Resolution Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "解决时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -40,95 +40,95 @@
         "DESC": "(总计)"
       },
       "BOT_HANDOFF_COUNT": {
-        "NAME": "Handoff Count",
+        "NAME": "转交次数",
         "DESC": "(总计)"
       },
       "REPLY_TIME": {
-        "NAME": "Customer waiting time",
-        "TOOLTIP_TEXT": "Waiting time is {metricValue} (based on {conversationCount} replies)",
+        "NAME": "客户等待时间",
+        "TOOLTIP_TEXT": "等待时间为 {metricValue}（基于 {conversationCount} 条回复）",
         "DESC": ""
       }
     },
     "DATE_RANGE_OPTIONS": {
       "LAST_7_DAYS": "最近7天",
       "LAST_30_DAYS": "最近30天",
-      "LAST_3_MONTHS": "Last 3 months",
-      "LAST_6_MONTHS": "Last 6 months",
-      "LAST_YEAR": "Last year",
-      "CUSTOM_DATE_RANGE": "Custom date range"
+      "LAST_3_MONTHS": "最近3个月",
+      "LAST_6_MONTHS": "最近6个月",
+      "LAST_YEAR": "最近一年",
+      "CUSTOM_DATE_RANGE": "自定义日期范围"
     },
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "应用",
+      "PLACEHOLDER": "选择日期范围"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
-    "DURATION_FILTER_LABEL": "Duration",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "分组依据",
+    "DURATION_FILTER_LABEL": "持续时间",
     "GROUPING_OPTIONS": {
-      "DAY": "Day",
-      "WEEK": "Week",
-      "MONTH": "Month",
-      "YEAR": "Month"
+      "DAY": "日",
+      "WEEK": "周",
+      "MONTH": "月",
+      "YEAR": "年"
     },
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "日"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "日"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "周"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "日"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "周"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "月"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "日"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "周"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "月"
       }
     ],
     "BUSINESS_HOURS": "工作时间",
     "FILTER_ACTIONS": {
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_FILTER": "清除筛选条件",
       "EMPTY_LIST": "没有检索到相关信息"
     },
     "PAGINATION": {
-      "RESULTS": "Showing {start} to {end} of {total} results"
+      "RESULTS": "显示 {start} 到 {end} 条，共 {total} 条结果"
     }
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
-    "DESCRIPTION": "Easily track agent performance with key metrics such as conversations, response times, resolution times, and resolved cases. Click an agent’s name to learn more.",
+    "HEADER": "客服概览",
+    "DESCRIPTION": "通过关键指标（如会话、响应时间、解决时间和已解决案例）轻松跟踪客服表现。点击客服姓名以了解更多信息。",
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
     "DOWNLOAD_AGENT_REPORTS": "下载客服报表",
-    "FILTER_DROPDOWN_LABEL": "选择代理",
+    "FILTER_DROPDOWN_LABEL": "选择客服",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "会话",
@@ -146,13 +146,13 @@
         "NAME": "首次响应时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "First Response Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "首次响应时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "Resolution Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "解决时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -170,32 +170,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "最近3个月"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "最近6个月"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "最近一年"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "自定义日期范围"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "应用",
+      "PLACEHOLDER": "选择日期范围"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "标签概览",
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "下载标签报表",
+    "FILTER_DROPDOWN_LABEL": "选择标签",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "会话",
@@ -213,13 +213,13 @@
         "NAME": "首次响应时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "First Response Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "首次响应时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "Resolution Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "解决时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -237,33 +237,33 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "最近3个月"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "最近6个月"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "最近一年"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "自定义日期范围"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "应用",
+      "PLACEHOLDER": "选择日期范围"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
-    "DESCRIPTION": "Quickly view your inbox performance with key metrics like conversations, response times, resolution times, and resolved cases—all in one place. Click an inbox name for more details.",
+    "HEADER": "收件箱概览",
+    "DESCRIPTION": "在一个地方快速查看您的收件箱表现，包括会话、响应时间、解决时间和已解决案例等关键指标。点击收件箱名称以了解更多详细信息。",
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "DOWNLOAD_INBOX_REPORTS": "下载收件箱报表",
+    "FILTER_DROPDOWN_LABEL": "选择收件箱",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "会话",
@@ -281,13 +281,13 @@
         "NAME": "首次响应时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "First Response Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "首次响应时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "Resolution Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "解决时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -305,33 +305,33 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "最近3个月"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "最近6个月"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "最近一年"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "自定义日期范围"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "应用",
+      "PLACEHOLDER": "选择日期范围"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
-    "DESCRIPTION": "Get a snapshot of your team’s performance with essential metrics, including conversations, response times, resolution times, and resolved cases. Click a team name for more details.",
+    "HEADER": "团队概览",
+    "DESCRIPTION": "通过关键指标（如会话、响应时间、解决时间和已解决案例）快速了解团队表现。点击团队名称以了解更多详细信息。",
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "下载团队报表",
+    "FILTER_DROPDOWN_LABEL": "选择团队",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "会话",
@@ -349,13 +349,13 @@
         "NAME": "首次响应时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "First Response Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "首次响应时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
         "DESC": "( 平均)",
         "INFO_TEXT": "用于计算的对话总数：",
-        "TOOLTIP_TEXT": "Resolution Time is {metricValue} (based on {conversationCount} conversations)"
+        "TOOLTIP_TEXT": "解决时间为 {metricValue}（基于 {conversationCount} 个对话）"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -373,183 +373,183 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "最近3个月"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "最近6个月"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "最近一年"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "自定义日期范围"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "应用",
+      "PLACEHOLDER": "选择日期范围"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
-    "DOWNLOAD": "Download CSAT Reports",
-    "DOWNLOAD_FAILED": "Failed to download CSAT Reports",
+    "HEADER": "CSAT 报告",
+    "NO_RECORDS": "没有可用的 CSAT 调查回复。",
+    "DOWNLOAD": "下载 CSAT 报告",
+    "DOWNLOAD_FAILED": "下载 CSAT 报告失败",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "选择客服"
       }
     },
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
+        "CONTACT_NAME": "联系人",
+        "AGENT_NAME": "分配的客服",
         "RATING": "评分",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "FEEDBACK_TEXT": "反馈评论"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "总回复数",
+        "TOOLTIP": "收集到的回复总数"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "满意度得分",
+        "TOOLTIP": "正面回复数 / 总回复数 * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "回复率",
+        "TOOLTIP": "总回复数 / 发送的 CSAT 调查消息总数 * 100"
       }
     }
   },
   "BOT_REPORTS": {
-    "HEADER": "Bot Reports",
+    "HEADER": "机器人报告",
     "METRIC": {
       "TOTAL_CONVERSATIONS": {
-        "LABEL": "No. of Conversations",
-        "TOOLTIP": "Total number of conversations handled by the bot"
+        "LABEL": "会话数量",
+        "TOOLTIP": "机器人处理的会话总数"
       },
       "TOTAL_RESPONSES": {
-        "LABEL": "Total Responses",
-        "TOOLTIP": "Total number of responses sent by the bot"
+        "LABEL": "总回复数",
+        "TOOLTIP": "机器人发送的回复总数"
       },
       "RESOLUTION_RATE": {
-        "LABEL": "Resolution Rate",
-        "TOOLTIP": "Total number of conversations resolved by the bot / Total number of conversations handled by the bot * 100"
+        "LABEL": "解决率",
+        "TOOLTIP": "机器人解决的会话数 / 机器人处理的会话总数 * 100"
       },
       "HANDOFF_RATE": {
-        "LABEL": "Handoff Rate",
-        "TOOLTIP": "Total number of conversations handed off to agents / Total number of conversations handled by the bot * 100"
+        "LABEL": "转交率",
+        "TOOLTIP": "转交给客服的会话数 / 机器人处理的会话总数 * 100"
       }
     }
   },
   "OVERVIEW_REPORTS": {
-    "HEADER": "Overview",
-    "LIVE": "Live",
+    "HEADER": "概览",
+    "LIVE": "实时",
     "ACCOUNT_CONVERSATIONS": {
-      "HEADER": "Open Conversations",
-      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "HEADER": "未解决会话",
+      "LOADING_MESSAGE": "正在加载会话指标...",
       "OPEN": "打开",
-      "UNATTENDED": "Unattended",
-      "UNASSIGNED": "未分配的",
+      "UNATTENDED": "未处理",
+      "UNASSIGNED": "未分配",
       "PENDING": "等待中"
     },
     "CONVERSATION_HEATMAP": {
-      "HEADER": "Conversation Traffic",
-      "NO_CONVERSATIONS": "No conversations",
-      "CONVERSATION": "{count} conversation",
-      "CONVERSATIONS": "{count} conversations",
-      "DOWNLOAD_REPORT": "Download report"
+      "HEADER": "会话流量",
+      "NO_CONVERSATIONS": "没有会话",
+      "CONVERSATION": "{count} 个会话",
+      "CONVERSATIONS": "{count} 个会话",
+      "DOWNLOAD_REPORT": "下载报告"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "Conversations by agents",
-      "LOADING_MESSAGE": "Loading agent metrics...",
-      "NO_AGENTS": "There are no conversations by agents",
+      "HEADER": "按客服划分的会话",
+      "LOADING_MESSAGE": "正在加载客服指标...",
+      "NO_AGENTS": "没有客服的会话",
       "TABLE_HEADER": {
         "AGENT": "客服",
         "OPEN": "打开",
-        "UNATTENDED": "Unattended",
+        "UNATTENDED": "未处理",
         "STATUS": "状态"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Agent status",
-      "ONLINE": "在线的",
-      "BUSY": "忙碌中",
-      "OFFLINE": "离线的"
+      "HEADER": "客服状态",
+      "ONLINE": "在线",
+      "BUSY": "忙碌",
+      "OFFLINE": "离线"
     }
   },
   "DAYS_OF_WEEK": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "周日",
+    "MONDAY": "周一",
+    "TUESDAY": "周二",
+    "WEDNESDAY": "周三",
+    "THURSDAY": "周四",
+    "FRIDAY": "周五",
+    "SATURDAY": "周六"
   },
   "SLA_REPORTS": {
-    "HEADER": "SLA Reports",
-    "NO_RECORDS": "SLA applied conversations are not available.",
-    "LOADING": "Loading SLA data...",
-    "DOWNLOAD_SLA_REPORTS": "Download SLA reports",
-    "DOWNLOAD_FAILED": "Failed to download SLA Reports",
+    "HEADER": "SLA 报告",
+    "NO_RECORDS": "没有可用的 SLA 应用会话。",
+    "LOADING": "正在加载 SLA 数据...",
+    "DOWNLOAD_SLA_REPORTS": "下载 SLA 报告",
+    "DOWNLOAD_FAILED": "下载 SLA 报告失败",
     "DROPDOWN": {
       "ADD_FIlTER": "添加过滤器",
-      "CLEAR_ALL": "Clear all",
-      "CLEAR_FILTER": "Clear filter",
+      "CLEAR_ALL": "清除全部",
+      "CLEAR_FILTER": "清除过滤器",
       "EMPTY_LIST": "没有检索到相关信息",
-      "NO_FILTER": "No filters available",
-      "SEARCH": "Search filter",
+      "NO_FILTER": "没有可用的过滤器",
+      "SEARCH": "搜索过滤器",
       "INPUT_PLACEHOLDER": {
-        "SLA": "SLA name",
+        "SLA": "SLA 名称",
         "AGENTS": "客服名称",
         "INBOXES": "收件箱名称",
         "LABELS": "标签名称",
         "TEAMS": "团队名称"
       },
-      "SLA": "SLA Policy",
+      "SLA": "SLA 策略",
       "INBOXES": "收件箱",
       "AGENTS": "客服",
       "LABELS": "标签",
-      "TEAMS": "Team"
+      "TEAMS": "团队"
     },
-    "WITH": "with",
+    "WITH": "与",
     "METRICS": {
       "HIT_RATE": {
-        "LABEL": "Hit Rate",
-        "TOOLTIP": "Percentage of SLAs created were completed successfully"
+        "LABEL": "命中率",
+        "TOOLTIP": "成功完成的 SLA 百分比"
       },
       "NO_OF_MISSES": {
-        "LABEL": "Number of Misses",
-        "TOOLTIP": "Total SLA misses in a certain period"
+        "LABEL": "未命中次数",
+        "TOOLTIP": "特定时间段内的 SLA 未命中总数"
       },
       "NO_OF_CONVERSATIONS": {
-        "LABEL": "Number of Conversations",
-        "TOOLTIP": "Total number of conversations with SLA"
+        "LABEL": "会话数量",
+        "TOOLTIP": "带有 SLA 的会话总数"
       }
     },
     "TABLE": {
       "HEADER": {
-        "POLICY": "Policy",
+        "POLICY": "策略",
         "CONVERSATION": "会话",
         "AGENT": "客服"
       },
-      "VIEW_DETAILS": "View Details"
+      "VIEW_DETAILS": "查看详情"
     }
   },
   "SUMMARY_REPORTS": {
     "INBOX": "收件箱",
     "AGENT": "客服",
-    "TEAM": "Team",
-    "AVG_RESOLUTION_TIME": "Avg. Resolution Time",
-    "AVG_FIRST_RESPONSE_TIME": "Avg. First Response Time",
-    "AVG_REPLY_TIME": "Avg. Customer Waiting Time",
+    "TEAM": "团队",
+    "AVG_RESOLUTION_TIME": "平均解决时间",
+    "AVG_FIRST_RESPONSE_TIME": "平均首次响应时间",
+    "AVG_REPLY_TIME": "平均客户等待时间",
     "RESOLUTION_COUNT": "已解决的数量",
-    "CONVERSATIONS": "No. of conversations"
+    "CONVERSATIONS": "会话数量"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/search.json b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
index aad6590d2..44de1798c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/search.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/search.json
@@ -1,7 +1,7 @@
 {
   "SEARCH": {
     "TABS": {
-      "ALL": "所有的",
+      "ALL": "全部",
       "CONTACTS": "联系人",
       "CONVERSATIONS": "会话",
       "MESSAGES": "消息"
@@ -11,20 +11,20 @@
       "CONVERSATIONS": "会话",
       "MESSAGES": "消息"
     },
-    "VIEW_MORE": "View more",
-    "LOAD_MORE": "Load more",
+    "VIEW_MORE": "查看更多",
+    "LOAD_MORE": "加载更多",
     "SEARCHING_DATA": "搜索中",
-    "LOADING_DATA": "Loading",
-    "EMPTY_STATE": "No {item} found for query '{query}'",
-    "EMPTY_STATE_FULL": "No results found for query '{query}'",
-    "PLACEHOLDER_KEYBINDING": "/ to focus",
-    "INPUT_PLACEHOLDER": "Type 3 or more characters to search",
-    "EMPTY_STATE_DEFAULT": "Search by conversation id, email, phone number, messages for better search results. ",
+    "LOADING_DATA": "加载中",
+    "EMPTY_STATE": "未找到与查询 '{query}' 相关的 {item}",
+    "EMPTY_STATE_FULL": "未找到与查询 '{query}' 相关的结果",
+    "PLACEHOLDER_KEYBINDING": "/ 聚焦搜索框",
+    "INPUT_PLACEHOLDER": "输入 3 个或更多字符以进行搜索",
+    "EMPTY_STATE_DEFAULT": "通过会话 Id、电子邮件、电话号码、消息等进行搜索以获得更好的搜索结果。 ",
     "BOT_LABEL": "机器人",
-    "READ_MORE": "Read more",
-    "WROTE": "wrote:",
-    "FROM": "发自",
-    "EMAIL": "email",
+    "READ_MORE": "查看更多",
+    "WROTE": "写道：",
+    "FROM": "来自",
+    "EMAIL": "电子邮件",
     "EMAIL_SUBJECT": "主题"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 969e874df..4d9e7dd5a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -10,7 +10,7 @@
     "PASSWORD_UPDATE_SUCCESS": "您的密码已成功更改。",
     "AFTER_EMAIL_CHANGED": "您的个人资料已成功更新，请在您的登录凭据更改后重新登录",
     "FORM": {
-      "PICTURE": "Profile Picture",
+      "PICTURE": "个人资料图片",
       "AVATAR": "头像",
       "ERROR": "请修正表单错误",
       "REMOVE_IMAGE": "删除",
@@ -36,20 +36,20 @@
         }
       },
       "INTERFACE_SECTION": {
-        "TITLE": "Interface",
-        "NOTE": "Customize the look and feel of your Chatwoot dashboard.",
+        "TITLE": "界面",
+        "NOTE": "自定义您的 Chatwoot 仪表板的外观和感觉。",
         "FONT_SIZE": {
-          "TITLE": "Font size",
-          "NOTE": "Adjust the text size across the dashboard based on your preference.",
-          "UPDATE_SUCCESS": "Your font settings have been updated successfully",
-          "UPDATE_ERROR": "There is an error while updating the font settings, please try again",
+          "TITLE": "字体大小",
+          "NOTE": "根据您的偏好调整仪表板中的文本大小。",
+          "UPDATE_SUCCESS": "您的字体设置已成功更新",
+          "UPDATE_ERROR": "更新字体设置时出错，请重试",
           "OPTIONS": {
-            "SMALLER": "Smaller",
-            "SMALL": "Small",
+            "SMALLER": "较小",
+            "SMALL": "小",
             "DEFAULT": "默认",
-            "LARGE": "Large",
-            "LARGER": "Larger",
-            "EXTRA_LARGE": "Extra Large"
+            "LARGE": "大",
+            "LARGER": "较大",
+            "EXTRA_LARGE": "特大"
           }
         }
       },
@@ -61,12 +61,12 @@
         "API_SUCCESS": "签名保存成功",
         "IMAGE_UPLOAD_ERROR": "无法上传图片！请再试一次",
         "IMAGE_UPLOAD_SUCCESS": "图片添加成功。请点击保存签名。",
-        "IMAGE_UPLOAD_SIZE_ERROR": "Image size should be less than {size}MB"
+        "IMAGE_UPLOAD_SIZE_ERROR": "图片大小应该小于{size}MB"
       },
       "MESSAGE_SIGNATURE": {
         "LABEL": "消息签名",
         "ERROR": "消息签名不能为空",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "PLACEHOLDER": "在此插入您的个人消息签名。"
       },
       "PASSWORD_SECTION": {
         "TITLE": "密码",
@@ -79,72 +79,72 @@
         "COPY": "复制"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Alerts",
-        "NOTE": "Enable audio alerts in dashboard for new messages and conversations.",
-        "PLAY": "Play sound",
+        "TITLE": "音频提醒",
+        "NOTE": "在仪表板中为新消息和会话启用音频提醒。",
+        "PLAY": "播放声音",
         "ALERT_TYPES": {
-          "NONE": "啥都没有",
-          "MINE": "Assigned",
-          "ALL": "所有的",
-          "ASSIGNED": "My assigned conversations",
-          "UNASSIGNED": "Unassigned conversations",
-          "NOTME": "Open conversations assigned to others"
+          "NONE": "无",
+          "MINE": "分配给我的",
+          "ALL": "所有",
+          "ASSIGNED": "分配给我的会话",
+          "UNASSIGNED": "未分配的会话",
+          "NOTME": "分配给其他人的开放会话"
         },
         "ALERT_COMBINATIONS": {
-          "NONE": "You haven't selected any options, you won't receive any audio alerts.",
-          "ASSIGNED": "You'll receive alerts for conversations assigned to you.",
-          "UNASSIGNED": "You'll receive alerts for any unassigned conversations.",
-          "NOTME": "You'll receive alerts for conversations assigned to others.",
-          "ASSIGNED+UNASSIGNED": "You'll receive alerts for your assigned conversations and any unattended ones.",
-          "ASSIGNED+NOTME": "You'll receive alerts for conversations assigned to you and to others, but not for unassigned ones.",
-          "NOTME+UNASSIGNED": "You'll receive alerts for unattended conversations and those assigned to others.",
-          "ASSIGNED+NOTME+UNASSIGNED": "You'll receive alerts for all conversations."
+          "NONE": "您尚未选择任何选项，您不会收到任何音频提醒。",
+          "ASSIGNED": "您将收到分配给您的会话的提醒。",
+          "UNASSIGNED": "您将收到任何未分配会话的提醒。",
+          "NOTME": "您将收到分配给其他人的会话的提醒。",
+          "ASSIGNED+UNASSIGNED": "您将收到分配给您的会话和任何未处理会话的提醒。",
+          "ASSIGNED+NOTME": "您将收到分配给您的会话和分配给其他人的会话的提醒，但不会收到未分配会话的提醒。",
+          "NOTME+UNASSIGNED": "您将收到未处理会话和分配给其他人的会话的提醒。",
+          "ASSIGNED+NOTME+UNASSIGNED": "您将收到所有会话的提醒。"
         },
         "ALERT_TYPE": {
-          "TITLE": "Alert events for conversations",
-          "NONE": "啥都没有",
+          "TITLE": "会话提醒事件",
+          "NONE": "无",
           "ASSIGNED": "分配会话",
           "ALL_CONVERSATIONS": "所有会话"
         },
         "DEFAULT_TONE": {
-          "TITLE": "Alert tone:"
+          "TITLE": "提醒音调："
         },
         "CONDITIONS": {
-          "TITLE": "Alert conditions:",
-          "CONDITION_ONE": "Send audio alerts only if the browser window is not active",
-          "CONDITION_TWO": "Send alerts every 30s until all the assigned conversations are read"
+          "TITLE": "提醒条件：",
+          "CONDITION_ONE": "仅在浏览器窗口未激活时发送音频提醒",
+          "CONDITION_TWO": "每30秒发送一次提醒，直到所有分配的会话被阅读"
         },
-        "SOUND_PERMISSION_ERROR": "Autoplay is disabled in your browser. To hear alerts automatically, enable sound permission in your browser settings or interact with the page.",
-        "READ_MORE": "查看更多"
+        "SOUND_PERMISSION_ERROR": "您的浏览器中禁用了自动播放。要自动听到提醒，请在浏览器设置中启用声音权限或与页面进行交互。",
+        "READ_MORE": "阅读更多"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "电子邮件通知",
         "NOTE": "在此更新您的电子邮件通知设置",
         "CONVERSATION_ASSIGNMENT": "当对话分配给我时发送电子邮件通知",
         "CONVERSATION_CREATION": "当对话分配给我时发送电子邮件通知",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "当您在会话中被提及时发送电子邮件通知",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在已分配的会话中创建新消息时发送电子邮件通知",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in a participating conversation",
-        "SLA_MISSED_FIRST_RESPONSE": "Send email notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send email notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send email notifications when a conversation misses resolution SLA"
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "当参与会话中创建新消息时发送电子邮件通知",
+        "SLA_MISSED_FIRST_RESPONSE": "当会话错过首次响应 SLA 时发送电子邮件通知",
+        "SLA_MISSED_NEXT_RESPONSE": "当会话错过下次响应 SLA 时发送电子邮件通知",
+        "SLA_MISSED_RESOLUTION": "当会话错过解决 SLA 时发送电子邮件通知"
       },
       "NOTIFICATIONS": {
-        "TITLE": "Notification preferences",
-        "TYPE_TITLE": "Notification type",
-        "EMAIL": "Email",
-        "PUSH": "Push notification",
+        "TITLE": "通知偏好",
+        "TYPE_TITLE": "通知类型",
+        "EMAIL": "电子邮件",
+        "PUSH": "推送通知",
         "TYPES": {
-          "CONVERSATION_CREATED": "A new conversation is created",
-          "CONVERSATION_ASSIGNED": "A conversation is assigned to you",
-          "CONVERSATION_MENTION": "You are mentioned in a conversation",
-          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "A new message is created in an assigned conversation",
-          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "A new message is created in a participating conversation",
-          "SLA_MISSED_FIRST_RESPONSE": "A conversation misses first response SLA",
-          "SLA_MISSED_NEXT_RESPONSE": "A conversation misses next response SLA",
-          "SLA_MISSED_RESOLUTION": "A conversation misses resolution SLA"
+          "CONVERSATION_CREATED": "新会话已创建",
+          "CONVERSATION_ASSIGNED": "会话已分配给您",
+          "CONVERSATION_MENTION": "您在会话中被提及",
+          "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在分配的会话中创建了新消息",
+          "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "在参与的会话中创建了新消息",
+          "SLA_MISSED_FIRST_RESPONSE": "会话错过了首次响应 SLA",
+          "SLA_MISSED_NEXT_RESPONSE": "会话错过了下次响应 SLA",
+          "SLA_MISSED_RESOLUTION": "会话错过了解决 SLA"
         },
-        "BROWSER_PERMISSION": "Enable push notifications for your browser so you’re able to receive them"
+        "BROWSER_PERMISSION": "为您的浏览器启用推送通知，以便您能够接收它们"
       },
       "API": {
         "UPDATE_SUCCESS": "您的通知设置已成功更新",
@@ -152,17 +152,17 @@
       },
       "PUSH_NOTIFICATIONS_SECTION": {
         "TITLE": "推送通知",
-        "NOTE": "在此更新您的电子邮件通知设置",
+        "NOTE": "在此更新您的推送通知设置",
         "CONVERSATION_ASSIGNMENT": "当对话被分配给我时发送推送通知",
         "CONVERSATION_CREATION": "创建新对话时发送推送通知",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "CONVERSATION_MENTION": "当您在会话中被提及时发送推送通知",
         "ASSIGNED_CONVERSATION_NEW_MESSAGE": "在已分配的会话中创建新消息时发送推送通知",
-        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in a participating conversation",
+        "PARTICIPATING_CONVERSATION_NEW_MESSAGE": "当参与会话中创建新消息时发送推送通知",
         "HAS_ENABLED_PUSH": "您已启用此浏览器的推送。",
         "REQUEST_PUSH": "启用推送通知",
-        "SLA_MISSED_FIRST_RESPONSE": "Send push notifications when a conversation misses first response SLA",
-        "SLA_MISSED_NEXT_RESPONSE": "Send push notifications when a conversation misses next response SLA",
-        "SLA_MISSED_RESOLUTION": "Send push notifications when a conversation misses resolution SLA"
+        "SLA_MISSED_FIRST_RESPONSE": "当会话错过首次响应 SLA 时发送推送通知",
+        "SLA_MISSED_NEXT_RESPONSE": "当会话错过下次响应 SLA 时发送推送通知",
+        "SLA_MISSED_RESOLUTION": "当会话错过解决 SLA 时发送推送通知"
       },
       "PROFILE_IMAGE": {
         "LABEL": "头像"
@@ -184,8 +184,8 @@
           "BUSY": "忙碌中",
           "OFFLINE": "离线"
         },
-        "SET_AVAILABILITY_SUCCESS": "Availability has been set successfully",
-        "SET_AVAILABILITY_ERROR": "Couldn't set availability, please try again"
+        "SET_AVAILABILITY_SUCCESS": "可用性已成功设置",
+        "SET_AVAILABILITY_ERROR": "无法设置可用性，请重试"
       },
       "EMAIL": {
         "LABEL": "您的电子邮件地址",
@@ -210,39 +210,39 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "改變",
-    "CHANGE_ACCOUNTS": "Switch account",
-    "SWITCH_ACCOUNT": "Switch account",
-    "CONTACT_SUPPORT": "Contact support",
+    "CHANGE_AVAILABILITY_STATUS": "更改",
+    "CHANGE_ACCOUNTS": "切换账户",
+    "SWITCH_ACCOUNT": "切换账户",
+    "CONTACT_SUPPORT": "联系支持",
     "SELECTOR_SUBTITLE": "从以下列表中选择一个账户",
-    "PROFILE_SETTINGS": "Profile settings",
-    "KEYBOARD_SHORTCUTS": "Keyboard shortcuts",
-    "APPEARANCE": "Change appearance",
-    "SUPER_ADMIN_CONSOLE": "SuperAdmin console",
-    "DOCS": "Read documentation",
-    "LOGOUT": "Log out"
+    "PROFILE_SETTINGS": "个人资料设置",
+    "KEYBOARD_SHORTCUTS": "键盘快捷键",
+    "APPEARANCE": "更改外观",
+    "SUPER_ADMIN_CONSOLE": "超级管理员控制台",
+    "DOCS": "阅读文档",
+    "LOGOUT": "注销"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "剩余试用期天数",
     "TRAIL_BUTTON": "立即购买",
-    "DELETED_USER": "Deleted User",
-    "EMAIL_VERIFICATION_PENDING": "It seems that you haven't verified your email address yet. Please check your inbox for the verification email.",
-    "RESEND_VERIFICATION_MAIL": "Resend verification email",
-    "EMAIL_VERIFICATION_SENT": "Verification email has been sent. Please check your inbox.",
+    "DELETED_USER": "已删除用户",
+    "EMAIL_VERIFICATION_PENDING": "您似乎尚未验证您的电子邮件地址。请检查您的收件箱以获取验证邮件。",
+    "RESEND_VERIFICATION_MAIL": "重新发送验证邮件",
+    "EMAIL_VERIFICATION_SENT": "验证邮件已发送。请检查您的收件箱。",
     "ACCOUNT_SUSPENDED": {
-      "TITLE": "Account Suspended",
-      "MESSAGE": "Your account is suspended. Please reach out to the support team for more information."
+      "TITLE": "账户已暂停",
+      "MESSAGE": "您的账户已被暂停。请联系支持团队以获取更多信息。"
     }
   },
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "复制",
-      "CODEPEN": "Open in CodePen",
-      "COPY_SUCCESSFUL": "Copied to clipboard"
+      "CODEPEN": "在 CodePen 中打开",
+      "COPY_SUCCESSFUL": "已复制到剪贴板"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "显示更多",
+      "SHOW_LESS": "显示更少"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "下载",
@@ -250,14 +250,14 @@
       "INSTAGRAM_STORY_UNAVAILABLE": "本信息不存在"
     },
     "LOCATION_BUBBLE": {
-      "SEE_ON_MAP": "See on map"
+      "SEE_ON_MAP": "在地图上查看"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "提交"
     },
     "MEDIA": {
-      "IMAGE_UNAVAILABLE": "This image is no longer available.",
-      "LOADING_FAILED": "Loading failed"
+      "IMAGE_UNAVAILABLE": "此图片不再可用。",
+      "LOADING_FAILED": "加载失败"
     }
   },
   "CONFIRM_EMAIL": "正在验证...",
@@ -267,25 +267,25 @@
     }
   },
   "SIDEBAR": {
-    "NO_ITEMS": "No items",
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
-    "SWITCH": "Switch",
-    "INBOX_VIEW": "Inbox View",
+    "NO_ITEMS": "无项目",
+    "CURRENTLY_VIEWING_ACCOUNT": "当前查看：",
+    "SWITCH": "切换",
+    "INBOX_VIEW": "收件箱视图",
     "CONVERSATIONS": "会话",
-    "INBOX": "My Inbox",
+    "INBOX": "我的收件箱",
     "ALL_CONVERSATIONS": "所有会话",
     "MENTIONED_CONVERSATIONS": "提及",
     "PARTICIPATING_CONVERSATIONS": "参与者",
-    "UNATTENDED_CONVERSATIONS": "Unattended",
+    "UNATTENDED_CONVERSATIONS": "未处理",
     "REPORTS": "报告",
     "SETTINGS": "设置",
     "CONTACTS": "联系人",
     "CAPTAIN": "Captain",
-    "CAPTAIN_ASSISTANTS": "Assistants",
-    "CAPTAIN_DOCUMENTS": "Documents",
-    "CAPTAIN_RESPONSES": "FAQs",
+    "CAPTAIN_ASSISTANTS": "助手",
+    "CAPTAIN_DOCUMENTS": "文档",
+    "CAPTAIN_RESPONSES": "常见问题",
     "HOME": "首页",
-    "AGENTS": "客服代理们",
+    "AGENTS": "客服代理",
     "AGENT_BOTS": "机器人",
     "AUDIT_LOGS": "审计日志",
     "INBOXES": "收件箱",
@@ -293,93 +293,93 @@
     "CANNED_RESPONSES": "预设回复",
     "INTEGRATIONS": "集成方式",
     "PROFILE_SETTINGS": "个人资料设置",
-    "ACCOUNT_SETTINGS": "帐户设置",
-    "APPLICATIONS": "Applications",
+    "ACCOUNT_SETTINGS": "账户设置",
+    "APPLICATIONS": "应用程序",
     "LABELS": "标签",
     "CUSTOM_ATTRIBUTES": "自定义属性",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "自动化",
     "MACROS": "宏",
-    "TEAMS": "Teams",
-    "BILLING": "Billing",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
-    "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
+    "TEAMS": "团队",
+    "BILLING": "计费",
+    "CUSTOM_VIEWS_FOLDER": "文件夹",
+    "CUSTOM_VIEWS_SEGMENTS": "分段",
+    "ALL_CONTACTS": "所有联系人",
+    "TAGGED_WITH": "标记为",
+    "NEW_LABEL": "新标签",
+    "NEW_TEAM": "新团队",
+    "NEW_INBOX": "新收件箱",
     "REPORTS_CONVERSATION": "会话",
-    "CSAT": "CSAT",
-    "LIVE_CHAT": "Live Chat",
-    "SMS": "SMS",
-    "CAMPAIGNS": "Campagnes",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "CSAT": "客户满意度",
+    "LIVE_CHAT": "在线聊天",
+    "SMS": "短信",
+    "CAMPAIGNS": "活动",
+    "ONGOING": "进行中",
+    "ONE_OFF": "一次性",
     "REPORTS_SLA": "SLA",
     "REPORTS_BOT": "机器人",
     "REPORTS_AGENT": "客服",
     "REPORTS_LABEL": "标签",
     "REPORTS_INBOX": "收件箱",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "SET_YOUR_AVAILABILITY": "Set your availability",
+    "REPORTS_TEAM": "团队",
+    "SET_AVAILABILITY_TITLE": "将自己设置为",
+    "SET_YOUR_AVAILABILITY": "设置您的可用性",
     "SLA": "SLA",
-    "CUSTOM_ROLES": "Custom Roles",
-    "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview",
-    "REAUTHORIZE": "Your inbox connection has expired, please reconnect\n to continue receiving and sending messages",
+    "CUSTOM_ROLES": "自定义角色",
+    "BETA": "测试版",
+    "REPORTS_OVERVIEW": "概览",
+    "REAUTHORIZE": "您的收件箱连接已过期，请重新连接以继续接收和发送消息",
     "HELP_CENTER": {
       "TITLE": "帮助中心",
-      "ARTICLES": "Articles",
-      "CATEGORIES": "Categories",
-      "LOCALES": "Locales",
+      "ARTICLES": "文章",
+      "CATEGORIES": "类别",
+      "LOCALES": "语言",
       "SETTINGS": "设置"
     },
     "CHANNELS": "频道",
     "SET_AUTO_OFFLINE": {
       "TEXT": "自动标记离线状态",
       "INFO_TEXT": "当您不使用应用程序或仪表板时，让系统自动标记您离线。",
-      "INFO_SHORT": "Automatically mark offline when you aren't using the app."
+      "INFO_SHORT": "当您不使用应用程序时自动标记离线。"
     },
     "DOCS": "阅读文档"
   },
   "BILLING_SETTINGS": {
     "TITLE": "计费方式",
-    "DESCRIPTION": "Manage your subscription here, upgrade your plan and get more for your team.",
+    "DESCRIPTION": "在此管理您的订阅，升级您的计划并为您的团队获取更多功能。",
     "CURRENT_PLAN": {
       "TITLE": "当前计划",
-      "PLAN_NOTE": "You are currently subscribed to the **{plan}** plan with **{quantity}** licenses",
-      "SEAT_COUNT": "Number of seats",
-      "RENEWS_ON": "Renews on"
+      "PLAN_NOTE": "您当前订阅的是 **{plan}** 计划，拥有 **{quantity}** 个许可证",
+      "SEAT_COUNT": "座位数",
+      "RENEWS_ON": "续订于"
     },
-    "VIEW_PRICING": "View Pricing",
+    "VIEW_PRICING": "查看价格",
     "MANAGE_SUBSCRIPTION": {
       "TITLE": "管理您的订阅",
-      "DESCRIPTION": "View your previous invoices, edit your billing details, or cancel your subscription.",
-      "BUTTON_TXT": "Go to the billing portal"
+      "DESCRIPTION": "查看您之前的发票，编辑您的账单详细信息或取消您的订阅。",
+      "BUTTON_TXT": "前往账单门户"
     },
     "CAPTAIN": {
       "TITLE": "Captain",
-      "DESCRIPTION": "Manage usage and credits for Captain AI.",
-      "BUTTON_TXT": "Buy more credits",
-      "DOCUMENTS": "Documents",
-      "RESPONSES": "Responses",
-      "UPGRADE": "Captain is not available on the free plan, upgrade now to get access to assistants, copilot and more."
+      "DESCRIPTION": "管理 Captain AI 的使用和积分。",
+      "BUTTON_TXT": "购买更多积分",
+      "DOCUMENTS": "文档",
+      "RESPONSES": "常见问题",
+      "UPGRADE": "Captain 在免费计划中不可用，立即升级以获取助手、副驾驶等更多功能。"
     },
     "CHAT_WITH_US": {
-      "TITLE": "Need help?",
-      "DESCRIPTION": "Do you face any issues in billing? We are here to help.",
+      "TITLE": "需要帮助吗？",
+      "DESCRIPTION": "您在计费方面遇到任何问题吗？我们在此为您提供帮助。",
       "BUTTON_TXT": "联系我们"
     },
-    "NO_BILLING_USER": "Your billing account is being configured. Please refresh the page and try again."
+    "NO_BILLING_USER": "您的计费账户正在配置中。请刷新页面并重试。"
   },
   "CREATE_ACCOUNT": {
-    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
-    "NEW_ACCOUNT": "New Account",
-    "SELECTOR_SUBTITLE": "Create a new account",
+    "NO_ACCOUNT_WARNING": "哦，糟糕！我们找不到任何 Chatwoot 账户。请创建一个新账户以继续。",
+    "NEW_ACCOUNT": "新账户",
+    "SELECTOR_SUBTITLE": "创建一个新账户",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "账户创建成功",
+      "EXIST_MESSAGE": "账户已存在",
       "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
     },
     "FORM": {
@@ -391,22 +391,22 @@
     }
   },
   "KEYBOARD_SHORTCUTS": {
-    "TOGGLE_MODAL": "View all shortcuts",
+    "TOGGLE_MODAL": "查看所有快捷键",
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
-      "RESOLVE_AND_NEXT": "Resolve and move to next",
-      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
-      "RESOLVE_CONVERSATION": "Resolve Conversation",
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "TOGGLE_SIDEBAR": "Toggle Sidebar",
-      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
-      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "打开对话",
+      "RESOLVE_AND_NEXT": "解决并移动到下一个",
+      "NAVIGATE_DROPDOWN": "导航下拉项",
+      "RESOLVE_CONVERSATION": "解决对话",
+      "GO_TO_CONVERSATION_DASHBOARD": "前往对话仪表板",
+      "ADD_ATTACHMENT": "添加附件",
+      "GO_TO_CONTACTS_DASHBOARD": "前往联系人仪表板",
+      "TOGGLE_SIDEBAR": "切换侧边栏",
+      "GO_TO_REPORTS_SIDEBAR": "前往报告侧边栏",
+      "MOVE_TO_NEXT_TAB": "移动到对话列表中的下一个标签",
+      "GO_TO_SETTINGS": "前往设置",
+      "SWITCH_TO_PRIVATE_NOTE": "切换到私人笔记",
+      "SWITCH_TO_REPLY": "切换到回复",
+      "TOGGLE_SNOOZE_DROPDOWN": "切换暂停下拉菜单"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
index 61fee2db9..061100076 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
@@ -20,7 +20,7 @@
     },
     "EMAIL": {
       "LABEL": "工作邮箱",
-      "PLACEHOLDER": "Enter your work email address. E.g., bruce{'@'}wayne{'.'}enterprises",
+      "PLACEHOLDER": "请输入您的工作邮箱地址。例如：bruce{'@'}wayne{'.'}enterprises",
       "ERROR": "请输入一个有效的电子邮件."
     },
     "PASSWORD": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
index 3135b08ee..9f9f6e303 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/sla.json
@@ -3,35 +3,35 @@
     "HEADER": "服务协议",
     "ADD_ACTION": "添加服务协议",
     "ADD_ACTION_LONG": "创建一个新的服务协议",
-    "DESCRIPTION": "Service Level Agreements (SLAs) are contracts that define clear expectations between your team and customers. They establish standards for response and resolution times, creating a framework for accountability and ensures a consistent, high-quality experience.",
-    "LEARN_MORE": "Learn more about SLA",
-    "LOADING": "Fetching SLAs",
+    "DESCRIPTION": "服务级别协议（SLA）是定义团队与客户之间明确期望的合同。它们为响应和解决时间设定了标准，创建了一个责任框架，并确保了一致的高质量体验。",
+    "LEARN_MORE": "了解更多关于SLA的信息",
+    "LOADING": "正在获取SLA",
     "PAYWALL": {
-      "TITLE": "Upgrade to create SLAs",
-      "AVAILABLE_ON": "The SLA feature is only available in the Business and Enterprise plans.",
-      "UPGRADE_PROMPT": "Upgrade your plan to get access to advanced features like team management, automations, custom attributes, and more.",
-      "UPGRADE_NOW": "Upgrade now",
-      "CANCEL_ANYTIME": "You can change or cancel your plan anytime"
+      "TITLE": "升级以创建SLA",
+      "AVAILABLE_ON": "SLA功能仅在商业和企业计划中可用。",
+      "UPGRADE_PROMPT": "升级您的计划以获取高级功能，如团队管理、自动化、自定义属性等。",
+      "UPGRADE_NOW": "立即升级",
+      "CANCEL_ANYTIME": "您可以随时更改或取消您的计划"
     },
     "ENTERPRISE_PAYWALL": {
-      "AVAILABLE_ON": "The SLA feature is only available in the paid plans.",
-      "UPGRADE_PROMPT": "Upgrade to a paid plan to access advanced features like audit logs, agent capacity, and more.",
-      "ASK_ADMIN": "Please reach out to your administrator for the upgrade."
+      "AVAILABLE_ON": "SLA功能仅在付费计划中可用。",
+      "UPGRADE_PROMPT": "升级到付费计划以访问高级功能，如审计日志、代理容量等。",
+      "ASK_ADMIN": "请联系您的管理员进行升级。"
     },
     "LIST": {
-      "404": "There are no SLAs available in this account.",
+      "404": "此账户中没有可用的SLA。",
       "EMPTY": {
-        "TITLE_1": "Enterprise P0",
-        "DESC_1": "Issues raised by enterprise customers, that require immediate attention.",
-        "TITLE_2": "Enterprise P1",
-        "DESC_2": "Issues raised by enterprise customers, that needs to be acknowledged quickly."
+        "TITLE_1": "企业P0",
+        "DESC_1": "由企业客户提出的需要立即关注的问题。",
+        "TITLE_2": "企业P1",
+        "DESC_2": "由企业客户提出的需要快速确认的问题。"
       },
-      "BUSINESS_HOURS_ON": "Business hours on",
-      "BUSINESS_HOURS_OFF": "Business hours off",
+      "BUSINESS_HOURS_ON": "工作时间开启",
+      "BUSINESS_HOURS_OFF": "工作时间关闭",
       "RESPONSE_TYPES": {
-        "FRT": "First response time threshold",
-        "NRT": "Next response time threshold",
-        "RT": "Resolution time threshold",
+        "FRT": "首次响应时间阈值",
+        "NRT": "下次响应时间阈值",
+        "RT": "解决时间阈值",
         "SHORT_HAND": {
           "FRT": "FRT",
           "NRT": "NRT",
@@ -45,18 +45,18 @@
         "PLACEHOLDER": "请在这里输入协议标题",
         "REQUIRED_ERROR": "请填写服务协议标题",
         "MINIMUM_LENGTH_ERROR": "最少2个字符",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "VALID_ERROR": "仅允许使用字母、数字、连字符和下划线"
       },
       "DESCRIPTION": {
         "LABEL": "描述信息",
-        "PLACEHOLDER": "SLA for premium customers"
+        "PLACEHOLDER": "为高级客户提供的SLA"
       },
       "FIRST_RESPONSE_TIME": {
         "LABEL": "首次响应时间",
         "PLACEHOLDER": "5"
       },
       "NEXT_RESPONSE_TIME": {
-        "LABEL": "Next Response Time",
+        "LABEL": "下次响应时间",
         "PLACEHOLDER": "5"
       },
       "RESOLUTION_TIME": {
@@ -65,10 +65,10 @@
       },
       "BUSINESS_HOURS": {
         "LABEL": "工作时间",
-        "PLACEHOLDER": "Only during business hours"
+        "PLACEHOLDER": "仅在工作时间内"
       },
       "THRESHOLD_TIME": {
-        "INVALID_FORMAT_ERROR": "Threshold should be a number and greater than zero"
+        "INVALID_FORMAT_ERROR": "阈值应为数字且大于零"
       },
       "EDIT": "编辑",
       "CREATE": "创建",
@@ -76,33 +76,33 @@
       "CANCEL": "取消"
     },
     "ADD": {
-      "TITLE": "Add SLA",
-      "DESC": "Friendly promises for great service!",
+      "TITLE": "添加SLA",
+      "DESC": "友好承诺，提供优质服务！",
       "API": {
-        "SUCCESS_MESSAGE": "SLA added successfully",
+        "SUCCESS_MESSAGE": "SLA添加成功",
         "ERROR_MESSAGE": "出现错误，请重试"
       }
     },
     "DELETE": {
-      "TITLE": "Delete SLA",
+      "TITLE": "删除SLA",
       "API": {
-        "SUCCESS_MESSAGE": "SLA deleted successfully",
+        "SUCCESS_MESSAGE": "SLA删除成功",
         "ERROR_MESSAGE": "出现错误，请重试"
       },
       "CONFIRM": {
         "TITLE": "确认删除",
-        "MESSAGE": "Are you sure you want to delete ",
+        "MESSAGE": "您确定要删除 ",
         "YES": "是的，删除 ",
         "NO": "不，保留 "
       }
     },
     "EVENTS": {
-      "TITLE": "SLA Misses",
+      "TITLE": "SLA未达标",
       "FRT": "首次响应时间",
-      "NRT": "Next response time",
-      "RT": "Resolution time",
-      "SHOW_MORE": "{count} more",
-      "HIDE": "Hide {count} rows"
+      "NRT": "下次响应时间",
+      "RT": "解决时间",
+      "SHOW_MORE": "还有{count}个",
+      "HIDE": "隐藏{count}行"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
index 0c916ea0d..44e2a3d37 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
@@ -70,20 +70,20 @@
       "ADD_AGENTS": "正在向收件箱添加客服...",
       "SELECT": "选择",
       "SELECT_ALL": "选择全部客服",
-      "SELECTED_COUNT": "{selected} out of {total} agents selected."
+      "SELECTED_COUNT": "已选择 {selected}/{total} 位客服人员。"
     },
     "ADD": {
       "TITLE": "添加客服至您的团队 - {teamName}",
       "DESC": "添加客服到您新创建的团队。这让您能够作为一个团队在对话中进行合作，在同一对话中获得新事件的通知。",
       "SELECT": "选择",
       "SELECT_ALL": "选择全部客服",
-      "SELECTED_COUNT": "{selected} out of {total} agents selected.",
+      "SELECTED_COUNT": "已选择 {selected}/{total} 位客服人员。",
       "BUTTON_TEXT": "添加客服代理",
       "AGENT_VALIDATION_ERROR": "至少选择一个客服。"
     },
     "FINISH": {
       "TITLE": "您的团队已准备好了！",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "MESSAGE": "您现在可以以团队形式协作处理对话了。祝您工作顺利！ ",
       "BUTTON_TEXT": "完成"
     },
     "DELETE": {
@@ -93,9 +93,9 @@
         "ERROR_MESSAGE": "无法删除团队，请重试！"
       },
       "CONFIRM": {
-        "TITLE": "Are you sure you want to delete the team?",
+        "TITLE": "您确定要删除该团队吗？",
         "PLACE_HOLDER": "请输入 {teamName} 以确认",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "MESSAGE": "删除团队后，相关对话的团队分配将被取消。",
         "YES": "删除 ",
         "NO": "取消"
       }
@@ -103,19 +103,19 @@
     "SETTINGS": "设置",
     "FORM": {
       "UPDATE": "更新团队",
-      "CREATE": "Create team",
+      "CREATE": "创建新团队",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "团队名称",
+        "PLACEHOLDER": "示例：销售，客户支持"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "团队描述",
+        "PLACEHOLDER": "关于此团队的简短描述。"
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "允许为这个团队自动分配。"
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "创建新团队"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 5d1e632ba..9e3010118 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -316,7 +316,8 @@
       "LOADER": "Captain is thinking",
       "YOU": "You",
       "USE": "Use this",
-      "RESET": "Reset"
+      "RESET": "Reset",
+      "SELECT_ASSISTANT": "Select Assistant"
     },
     "PAYWALL": {
       "TITLE": "Upgrade to use Captain AI",
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 4c672e8a3..76a84facd 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -29,10 +29,10 @@ zh_CN:
       invalid: 无效的事件
     signup:
       disposable_email: 我们不允许可用的电子邮件
-      blocked_domain: This domain is not allowed. If you believe this is a mistake, please contact support.
+      blocked_domain: 该域名不被允许。如果您认为这是一个错误，请联系支持团队。
       invalid_email: 您输入了一个无效的电子邮件
       email_already_exists: '您已经注册了 %{email} 的帐户'
-      invalid_params: 'Invalid, please check the signup paramters and try again'
+      invalid_params: '无效，请检查注册参数并重试'
       failed: 注册失败
     data_import:
       data_type:
@@ -63,50 +63,50 @@ zh_CN:
       validations:
         name: 不应该以符号开头或结尾，它不应该有 < > / \ @ 字符。
     custom_filters:
-      number_of_records: 已达到上限。每个帐户允许用户自定义过滤器的最大数目为50个。
-      invalid_attribute: Invalid attribute key - [%{key}]. The key should be one of [%{allowed_keys}] or a custom attribute defined in the account.
-      invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
-      invalid_query_operator: Query operator must be either "AND" or "OR".
-      invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+      number_of_records: 已达到上限。每个账户允许用户自定义过滤器的最大数目为50个。
+      invalid_attribute: 无效的属性键 - [%{key}]。键应为 [%{allowed_keys}] 之一或帐户中定义的自定义属性。
+      invalid_operator: 无效的操作符。%{attribute_name} 允许的操作符为 [%{allowed_keys}]。
+      invalid_query_operator: 查询操作符必须为 "AND" 或 "OR"。
+      invalid_value: 无效的值。为 %{attribute_name} 提供的值无效
   reports:
-    period: Reporting period %{since} to %{until}
+    period: 报告周期 %{since} 至 %{until}
     utc_warning: 生成的报表在 UTC 时区
     agent_csv:
       agent_name: 客服名称
-      conversations_count: Assigned conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      conversations_count: 分配的对话数量
+      avg_first_response_time: 平均首次响应时间
+      avg_resolution_time: 平均解决时间
       resolution_count: 已解决的数量
-      avg_customer_waiting_time: Avg customer waiting time
+      avg_customer_waiting_time: 平均客户等待时间
     inbox_csv:
       inbox_name: 收件箱名称
       inbox_type: 收件箱类型
-      conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      conversations_count: 对话数量
+      avg_first_response_time: 平均首次响应时间
+      avg_resolution_time: 平均解决时间
     label_csv:
       label_title: 标签
-      conversations_count: No. of conversations
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      conversations_count: 对话数量
+      avg_first_response_time: 平均首次响应时间
+      avg_resolution_time: 平均解决时间
     team_csv:
       team_name: 团队名称
       conversations_count: 对话数量
-      avg_first_response_time: Avg first response time
-      avg_resolution_time: Avg resolution time
+      avg_first_response_time: 平均首次响应时间
+      avg_resolution_time: 平均解决时间
       resolution_count: 已解决的数量
-      avg_customer_waiting_time: Avg customer waiting time
+      avg_customer_waiting_time: 平均客户等待时间
     conversation_traffic_csv:
       timezone: 时区
     sla_csv:
-      conversation_id: Conversation ID
-      sla_policy_breached: SLA Policy
-      assignee: Assignee
-      team: Team
+      conversation_id: 对话ID
+      sla_policy_breached: SLA 政策
+      assignee: 负责人
+      team: 团队
       inbox: 收件箱
       labels: 标签
-      conversation_link: Link to the Conversation
-      breached_events: Breached Events
+      conversation_link: 对话链接
+      breached_events: 违反的事件
     default_group_by: 天
     csat:
       headers:
@@ -120,15 +120,15 @@ zh_CN:
         recorded_at: 录制日期
   notifications:
     notification_title:
-      conversation_creation: 'A conversation (#%{display_id}) has been created in %{inbox_name}'
-      conversation_assignment: 'A conversation (#%{display_id}) has been assigned to you'
-      assigned_conversation_new_message: 'A new message is created in conversation (#%{display_id})'
-      conversation_mention: 'You have been mentioned in conversation (#%{display_id})'
-      sla_missed_first_response: 'SLA target first response missed for conversation (#%{display_id})'
-      sla_missed_next_response: 'SLA target next response missed for conversation (#%{display_id})'
-      sla_missed_resolution: 'SLA target resolution missed for conversation (#%{display_id})'
-    attachment: 'Attachment'
-    no_content: 'No content'
+      conversation_creation: '在 %{inbox_name} 中创建了一个对话 (#%{display_id})'
+      conversation_assignment: '对话 (#%{display_id}) 已分配给您'
+      assigned_conversation_new_message: '在对话 (#%{display_id}) 中创建了一条新消息'
+      conversation_mention: '您在对话 (#%{display_id}) 中被提及'
+      sla_missed_first_response: '对话 (#%{display_id}) 的首次响应 SLA 目标未达成'
+      sla_missed_next_response: '对话 (#%{display_id}) 的下次响应 SLA 目标未达成'
+      sla_missed_resolution: '对话 (#%{display_id}) 的解决 SLA 目标未达成'
+    attachment: '附件'
+    no_content: '无内容'
   conversations:
     messages:
       instagram_story_content: '%{story_sender} 会话中提到了你: '
@@ -142,7 +142,7 @@ zh_CN:
         contact_resolved: '对话被 %{contact_name} 重新打开'
         open: '对话被 %{user_name} 重新打开'
         pending: '对话被标记由 %{user_name} 待处理'
-        snoozed: 'Conversation was snoozed by %{user_name}'
+        snoozed: '对话被 %{user_name} 暂停'
         auto_resolved: '对话被系统标记为已解决, 原因是 %{duration} 天不活跃'
         system_auto_open: 由于收到新的消息，系统重新打开了对话。
       priority:
@@ -156,16 +156,16 @@ zh_CN:
       team:
         assigned: '由 %{team_name} 分配给 %{user_name}'
         assigned_with_assignee: '由 %{assignee_name} 分配给 %{team_name} 团队的 %{user_name}'
-        removed: 'Unassigned from %{team_name} by %{user_name}'
+        removed: '由 %{user_name} 从 %{team_name} 中取消分配'
       labels:
         added: '%{user_name} 添加 %{labels}'
         removed: '%{user_name} 移除 %{labels}'
       sla:
-        added: '%{user_name} added SLA policy %{sla_name}'
-        removed: '%{user_name} removed SLA policy %{sla_name}'
+        added: '%{user_name} 添加了 SLA 策略 %{sla_name}'
+        removed: '%{user_name} 移除了 SLA 策略 %{sla_name}'
       muted: '%{user_name} 已将会话静音'
       unmuted: '%{user_name} 已将会话取消静音'
-      auto_resolution_message: 'Resolving the conversation as it has been inactive for a while. Please start a new conversation if you need further assistance.'
+      auto_resolution_message: '由于对话长时间未活跃，已将其标记为已解决。如果您需要进一步帮助，请开始新的对话。'
     templates:
       greeting_message_body: '%{account_name} 通常在几小时内回复。'
       ways_to_reach_you_message_body: '给团队一个联系您的方法。'
@@ -191,33 +191,33 @@ zh_CN:
       delete: '%{contact_name} 在线, 请重试'
   integration_apps:
     dashboard_apps:
-      name: 'Dashboard Apps'
-      description: 'Dashboard Apps allow you to create and embed applications that display user information, orders, or payment history, providing more context to your customer support agents.'
+      name: '仪表板应用'
+      description: '仪表板应用允许您创建和嵌入显示用户信息、订单或支付历史的应用程序，为您的客户支持代理提供更多上下文。'
     dyte:
       name: 'Dyte'
-      description: 'Dyte is a product that integrates audio and video functionalities into your application. With this integration, your agents can start video/voice calls with your customers directly from Chatwoot.'
+      description: 'Dyte 是一个将音频和视频功能集成到您的应用程序中的产品。通过此集成，您的代理可以直接从 Chatwoot 开始与客户的视频/语音通话。'
       meeting_name: '%{agent_name} 已开始会议'
     slack:
       name: 'Slack'
-      description: "Integrate Chatwoot with Slack to keep your team in sync. This integration allows you to receive notifications for new conversations and respond to them directly within Slack's interface."
+      description: "将 Chatwoot 与 Slack 集成，以保持团队的同步。此集成允许您接收新对话的通知并直接在 Slack 界面中响应它们。"
     webhooks:
       name: ''
-      description: 'Webhook events provide real-time updates about activities in your Chatwoot account. You can subscribe to your preferred events, and Chatwoot will send you HTTP callbacks with the updates.'
+      description: 'Webhook 事件提供有关 Chatwoot 帐户中活动的实时更新。您可以订阅您喜欢的事件，Chatwoot 将向您发送带有更新的 HTTP 回调。'
     dialogflow:
       name: 'Dialogflow'
-      description: 'Build chatbots with Dialogflow and easily integrate them into your inbox. These bots can handle initial queries before transferring them to a customer service agent.'
+      description: '使用 Dialogflow 构建聊天机器人，并轻松将其集成到您的收件箱中。这些机器人可以在将查询转移给客户服务代理之前处理初始查询。'
     google_translate:
       name: 'Google 翻译'
-      description: "Integrate Google Translate to help agents easily translate customer messages. This integration automatically detects the language and converts it to the agent's or admin's preferred language."
+      description: "集成 Google 翻译以帮助代理轻松翻译客户消息。此集成会自动检测语言并将其转换为代理或管理员的首选语言。"
     openai:
       name: 'OpenAI'
-      description: 'Leverage the power of large language models from OpenAI with the features such as reply suggestions, summarization, message rephrasing, spell-checking, and label classification.'
+      description: '利用 OpenAI 的大型语言模型功能，例如回复建议、摘要、消息改写、拼写检查和标签分类。'
     linear:
       name: 'Linear'
-      description: 'Create issues in Linear directly from your conversation window. Alternatively, link existing Linear issues for a more streamlined and efficient issue tracking process.'
+      description: '直接从对话窗口在 Linear 中创建问题。或者，链接现有的 Linear 问题以简化问题跟踪过程。'
   captain:
-    copilot_error: 'Please connect an assistant to this inbox to use Copilot'
-    copilot_limit: 'You are out of Copilot credits. You can buy more credits from the billing section.'
+    copilot_error: '请为该收件箱连接一个助手以使用 Copilot'
+    copilot_limit: '您的 Copilot 积分已用完。您可以从计费部分购买更多积分。'
   public_portal:
     search:
       search_placeholder: 搜索文章的标题或正文...
@@ -256,7 +256,7 @@ zh_CN:
   slack_unfurl:
     fields:
       name: 姓名：
-      email: Email
+      email: 电子邮件
       phone_number: 手机号码
       company_name: 公司
       inbox_name: 收件箱
@@ -264,10 +264,10 @@ zh_CN:
     button: 重新打开会话
   time_units:
     days:
-      other: '%{count} days'
+      other: '%{count} 天'
     hours:
-      other: '%{count} hours'
+      other: '%{count} 小时'
     minutes:
-      other: '%{count} minutes'
+      other: '%{count} 分钟'
     seconds:
-      other: '%{count} seconds'
+      other: '%{count} 秒'

From 6040e50265676149163196f194ebb5afd456586c Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 3 Mar 2025 03:08:22 -0800
Subject: [PATCH 21/27] chore: Ability to filter conversations with priority
 (#10967)

- Ability to filter conversation with priority

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/helpers/{ => filters}/filter_helper.rb    | 16 +++-
 .../components-next/filter/contactProvider.js | 51 +++++++------
 .../filter/helper/filterHelper.js             | 73 ++++++++++++++----
 .../components-next/filter/provider.js        | 75 ++++++++++++-------
 app/models/custom_attribute_definition.rb     | 14 ++++
 app/services/filter_service.rb                | 21 +++---
 config/locales/en.yml                         |  2 +
 ...m_attribute_definitions_controller_spec.rb | 24 ++++++
 .../conversations/filter_service_spec.rb      | 57 ++++++++++++++
 9 files changed, 258 insertions(+), 75 deletions(-)
 rename app/helpers/{ => filters}/filter_helper.rb (90%)

diff --git a/app/helpers/filter_helper.rb b/app/helpers/filters/filter_helper.rb
similarity index 90%
rename from app/helpers/filter_helper.rb
rename to app/helpers/filters/filter_helper.rb
index 9b5cac684..fe03dae28 100644
--- a/app/helpers/filter_helper.rb
+++ b/app/helpers/filters/filter_helper.rb
@@ -1,4 +1,4 @@
-module FilterHelper
+module Filters::FilterHelper
   def build_condition_query(model_filters, query_hash, current_index)
     current_filter = model_filters[query_hash['attribute_key']]
 
@@ -89,4 +89,18 @@ module FilterHelper
     operator = condition['query_operator'].upcase
     raise CustomExceptions::CustomFilter::InvalidQueryOperator.new({}) unless %w[AND OR].include?(operator)
   end
+
+  def conversation_status_values(values)
+    return Conversation.statuses.values if values.include?('all')
+
+    values.map { |x| Conversation.statuses[x.to_sym] }
+  end
+
+  def conversation_priority_values(values)
+    values.map { |x| Conversation.priorities[x.to_sym] }
+  end
+
+  def message_type_values(values)
+    values.map { |x| Message.message_types[x.to_sym] }
+  end
 end
diff --git a/app/javascript/dashboard/components-next/filter/contactProvider.js b/app/javascript/dashboard/components-next/filter/contactProvider.js
index 4aceac359..4b2709e62 100644
--- a/app/javascript/dashboard/components-next/filter/contactProvider.js
+++ b/app/javascript/dashboard/components-next/filter/contactProvider.js
@@ -2,7 +2,10 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useOperators } from './operators';
 import { useMapGetter } from 'dashboard/composables/store.js';
-import { buildAttributesFilterTypes } from './helper/filterHelper.js';
+import {
+  buildAttributesFilterTypes,
+  CONTACT_ATTRIBUTES,
+} from './helper/filterHelper.js';
 import countries from 'shared/constants/countries.js';
 
 /**
@@ -59,7 +62,11 @@ export function useContactFilterContext() {
    * @type {import('vue').ComputedRef<FilterType[]>}
    */
   const customFilterTypes = computed(() =>
-    buildAttributesFilterTypes(contactAttributes.value, getOperatorTypes)
+    buildAttributesFilterTypes(
+      contactAttributes.value,
+      getOperatorTypes,
+      'contact'
+    )
   );
 
   /**
@@ -67,8 +74,8 @@ export function useContactFilterContext() {
    */
   const filterTypes = computed(() => [
     {
-      attributeKey: 'name',
-      value: 'name',
+      attributeKey: CONTACT_ATTRIBUTES.NAME,
+      value: CONTACT_ATTRIBUTES.NAME,
       attributeName: t('CONTACTS_LAYOUT.FILTER.NAME'),
       label: t('CONTACTS_LAYOUT.FILTER.NAME'),
       inputType: 'plainText',
@@ -77,8 +84,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'email',
-      value: 'email',
+      attributeKey: CONTACT_ATTRIBUTES.EMAIL,
+      value: CONTACT_ATTRIBUTES.EMAIL,
       attributeName: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
       label: t('CONTACTS_LAYOUT.FILTER.EMAIL'),
       inputType: 'plainText',
@@ -87,8 +94,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'phone_number',
-      value: 'phone_number',
+      attributeKey: CONTACT_ATTRIBUTES.PHONE_NUMBER,
+      value: CONTACT_ATTRIBUTES.PHONE_NUMBER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
       label: t('CONTACTS_LAYOUT.FILTER.PHONE_NUMBER'),
       inputType: 'plainText',
@@ -97,8 +104,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'identifier',
-      value: 'identifier',
+      attributeKey: CONTACT_ATTRIBUTES.IDENTIFIER,
+      value: CONTACT_ATTRIBUTES.IDENTIFIER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
       label: t('CONTACTS_LAYOUT.FILTER.IDENTIFIER'),
       inputType: 'plainText',
@@ -107,8 +114,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'country_code',
-      value: 'country_code',
+      attributeKey: CONTACT_ATTRIBUTES.COUNTRY_CODE,
+      value: CONTACT_ATTRIBUTES.COUNTRY_CODE,
       attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       inputType: 'searchSelect',
@@ -118,8 +125,8 @@ export function useContactFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'city',
-      value: 'city',
+      attributeKey: CONTACT_ATTRIBUTES.CITY,
+      value: CONTACT_ATTRIBUTES.CITY,
       attributeName: t('CONTACTS_LAYOUT.FILTER.CITY'),
       label: t('CONTACTS_LAYOUT.FILTER.CITY'),
       inputType: 'plainText',
@@ -128,8 +135,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'created_at',
-      value: 'created_at',
+      attributeKey: CONTACT_ATTRIBUTES.CREATED_AT,
+      value: CONTACT_ATTRIBUTES.CREATED_AT,
       attributeName: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
       label: t('CONTACTS_LAYOUT.FILTER.CREATED_AT'),
       inputType: 'date',
@@ -138,8 +145,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'last_activity_at',
-      value: 'last_activity_at',
+      attributeKey: CONTACT_ATTRIBUTES.LAST_ACTIVITY_AT,
+      value: CONTACT_ATTRIBUTES.LAST_ACTIVITY_AT,
       attributeName: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
       label: t('CONTACTS_LAYOUT.FILTER.LAST_ACTIVITY'),
       inputType: 'date',
@@ -148,8 +155,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'referer',
-      value: 'referer',
+      attributeKey: CONTACT_ATTRIBUTES.REFERER,
+      value: CONTACT_ATTRIBUTES.REFERER,
       attributeName: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
       label: t('CONTACTS_LAYOUT.FILTER.REFERER_LINK'),
       inputType: 'plainText',
@@ -158,8 +165,8 @@ export function useContactFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'blocked',
-      value: 'blocked',
+      attributeKey: CONTACT_ATTRIBUTES.BLOCKED,
+      value: CONTACT_ATTRIBUTES.BLOCKED,
       attributeName: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
       label: t('CONTACTS_LAYOUT.FILTER.BLOCKED'),
       inputType: 'searchSelect',
diff --git a/app/javascript/dashboard/components-next/filter/helper/filterHelper.js b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
index 2160365f6..cb5acfe40 100644
--- a/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
+++ b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
@@ -1,3 +1,35 @@
+/**
+ * Standard attributes of the conversation model
+ */
+export const CONVERSATION_ATTRIBUTES = {
+  STATUS: 'status',
+  PRIORITY: 'priority',
+  ASSIGNEE_ID: 'assignee_id',
+  INBOX_ID: 'inbox_id',
+  TEAM_ID: 'team_id',
+  DISPLAY_ID: 'display_id',
+  CAMPAIGN_ID: 'campaign_id',
+  LABELS: 'labels',
+  BROWSER_LANGUAGE: 'browser_language',
+  COUNTRY_CODE: 'country_code',
+  REFERER: 'referer',
+  CREATED_AT: 'created_at',
+  LAST_ACTIVITY_AT: 'last_activity_at',
+};
+
+export const CONTACT_ATTRIBUTES = {
+  NAME: 'name',
+  EMAIL: 'email',
+  PHONE_NUMBER: 'phone_number',
+  IDENTIFIER: 'identifier',
+  COUNTRY_CODE: 'country_code',
+  CITY: 'city',
+  CREATED_AT: 'created_at',
+  LAST_ACTIVITY_AT: 'last_activity_at',
+  REFERER: 'referer',
+  BLOCKED: 'blocked',
+};
+
 /**
  * Determines the input type for a custom attribute based on its key
  * @param {string} key - The attribute display type key
@@ -20,24 +52,37 @@ export const getCustomAttributeInputType = key => {
 
 /**
  * Builds filter types for custom attributes
+ * This also removes any conflicting attributes
  * @param {Array} attributes - The attributes array
  * @param {Function} getOperatorTypes - Function to get operator types
  * @returns {Array} Array of filter types
  */
-export const buildAttributesFilterTypes = (attributes, getOperatorTypes) => {
-  return attributes.map(attr => ({
-    attributeKey: attr.attributeKey,
-    value: attr.attributeKey,
-    attributeName: attr.attributeDisplayName,
-    label: attr.attributeDisplayName,
-    inputType: getCustomAttributeInputType(attr.attributeDisplayType),
-    filterOperators: getOperatorTypes(attr.attributeDisplayType),
-    options:
-      attr.attributeDisplayType === 'list'
-        ? attr.attributeValues.map(item => ({ id: item, name: item }))
-        : [],
-    attributeModel: 'customAttributes',
-  }));
+export const buildAttributesFilterTypes = (
+  attributes,
+  getOperatorTypes,
+  filterModel = 'conversation'
+) => {
+  const standardAttributes = Object.values(
+    filterModel === 'conversation'
+      ? CONVERSATION_ATTRIBUTES
+      : CONTACT_ATTRIBUTES
+  );
+
+  return attributes
+    .filter(attr => !standardAttributes.includes(attr.attributeKey))
+    .map(attr => ({
+      attributeKey: attr.attributeKey,
+      value: attr.attributeKey,
+      attributeName: attr.attributeDisplayName,
+      label: attr.attributeDisplayName,
+      inputType: getCustomAttributeInputType(attr.attributeDisplayType),
+      filterOperators: getOperatorTypes(attr.attributeDisplayType),
+      options:
+        attr.attributeDisplayType === 'list'
+          ? attr.attributeValues.map(item => ({ id: item, name: item }))
+          : [],
+      attributeModel: 'customAttributes',
+    }));
 };
 
 /**
diff --git a/app/javascript/dashboard/components-next/filter/provider.js b/app/javascript/dashboard/components-next/filter/provider.js
index bb775a663..f6d078d76 100644
--- a/app/javascript/dashboard/components-next/filter/provider.js
+++ b/app/javascript/dashboard/components-next/filter/provider.js
@@ -3,7 +3,10 @@ import { useI18n } from 'vue-i18n';
 import { useOperators } from './operators';
 import { useMapGetter } from 'dashboard/composables/store.js';
 import { useChannelIcon } from 'next/icon/provider';
-import { buildAttributesFilterTypes } from './helper/filterHelper';
+import {
+  buildAttributesFilterTypes,
+  CONVERSATION_ATTRIBUTES,
+} from './helper/filterHelper';
 import countries from 'shared/constants/countries.js';
 import languages from 'dashboard/components/widgets/conversation/advancedFilterItems/languages.js';
 
@@ -70,7 +73,11 @@ export function useConversationFilterContext() {
    * @type {import('vue').ComputedRef<FilterType[]>}
    */
   const customFilterTypes = computed(() =>
-    buildAttributesFilterTypes(conversationAttributes.value, getOperatorTypes)
+    buildAttributesFilterTypes(
+      conversationAttributes.value,
+      getOperatorTypes,
+      'conversation'
+    )
   );
 
   /**
@@ -78,8 +85,8 @@ export function useConversationFilterContext() {
    */
   const filterTypes = computed(() => [
     {
-      attributeKey: 'status',
-      value: 'status',
+      attributeKey: CONVERSATION_ATTRIBUTES.STATUS,
+      value: CONVERSATION_ATTRIBUTES.STATUS,
       attributeName: t('FILTER.ATTRIBUTES.STATUS'),
       label: t('FILTER.ATTRIBUTES.STATUS'),
       inputType: 'multiSelect',
@@ -94,8 +101,24 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'assignee_id',
-      value: 'assignee_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.PRIORITY,
+      value: CONVERSATION_ATTRIBUTES.PRIORITY,
+      attributeName: t('FILTER.ATTRIBUTES.PRIORITY'),
+      label: t('FILTER.ATTRIBUTES.PRIORITY'),
+      inputType: 'multiSelect',
+      options: ['low', 'medium', 'high', 'urgent'].map(id => {
+        return {
+          id,
+          name: t(`CONVERSATION.PRIORITY.OPTIONS.${id.toUpperCase()}`),
+        };
+      }),
+      dataType: 'text',
+      filterOperators: equalityOperators.value,
+      attributeModel: 'standard',
+    },
+    {
+      attributeKey: CONVERSATION_ATTRIBUTES.ASSIGNEE_ID,
+      value: CONVERSATION_ATTRIBUTES.ASSIGNEE_ID,
       attributeName: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
       label: t('FILTER.ATTRIBUTES.ASSIGNEE_NAME'),
       inputType: 'searchSelect',
@@ -110,8 +133,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'inbox_id',
-      value: 'inbox_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.INBOX_ID,
+      value: CONVERSATION_ATTRIBUTES.INBOX_ID,
       attributeName: t('FILTER.ATTRIBUTES.INBOX_NAME'),
       label: t('FILTER.ATTRIBUTES.INBOX_NAME'),
       inputType: 'searchSelect',
@@ -126,8 +149,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'team_id',
-      value: 'team_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.TEAM_ID,
+      value: CONVERSATION_ATTRIBUTES.TEAM_ID,
       attributeName: t('FILTER.ATTRIBUTES.TEAM_NAME'),
       label: t('FILTER.ATTRIBUTES.TEAM_NAME'),
       inputType: 'searchSelect',
@@ -137,8 +160,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'display_id',
-      value: 'display_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.DISPLAY_ID,
+      value: CONVERSATION_ATTRIBUTES.DISPLAY_ID,
       attributeName: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
       label: t('FILTER.ATTRIBUTES.CONVERSATION_IDENTIFIER'),
       inputType: 'plainText',
@@ -147,8 +170,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'campaign_id',
-      value: 'campaign_id',
+      attributeKey: CONVERSATION_ATTRIBUTES.CAMPAIGN_ID,
+      value: CONVERSATION_ATTRIBUTES.CAMPAIGN_ID,
       attributeName: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
       label: t('FILTER.ATTRIBUTES.CAMPAIGN_NAME'),
       inputType: 'searchSelect',
@@ -161,8 +184,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'labels',
-      value: 'labels',
+      attributeKey: CONVERSATION_ATTRIBUTES.LABELS,
+      value: CONVERSATION_ATTRIBUTES.LABELS,
       attributeName: t('FILTER.ATTRIBUTES.LABELS'),
       label: t('FILTER.ATTRIBUTES.LABELS'),
       inputType: 'multiSelect',
@@ -185,8 +208,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'browser_language',
-      value: 'browser_language',
+      attributeKey: CONVERSATION_ATTRIBUTES.BROWSER_LANGUAGE,
+      value: CONVERSATION_ATTRIBUTES.BROWSER_LANGUAGE,
       attributeName: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
       label: t('FILTER.ATTRIBUTES.BROWSER_LANGUAGE'),
       inputType: 'searchSelect',
@@ -196,8 +219,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'country_code',
-      value: 'country_code',
+      attributeKey: CONVERSATION_ATTRIBUTES.COUNTRY_CODE,
+      value: CONVERSATION_ATTRIBUTES.COUNTRY_CODE,
       attributeName: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       label: t('FILTER.ATTRIBUTES.COUNTRY_NAME'),
       inputType: 'searchSelect',
@@ -207,8 +230,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'referer',
-      value: 'referer',
+      attributeKey: CONVERSATION_ATTRIBUTES.REFERER,
+      value: CONVERSATION_ATTRIBUTES.REFERER,
       attributeName: t('FILTER.ATTRIBUTES.REFERER_LINK'),
       label: t('FILTER.ATTRIBUTES.REFERER_LINK'),
       inputType: 'plainText',
@@ -217,8 +240,8 @@ export function useConversationFilterContext() {
       attributeModel: 'additional',
     },
     {
-      attributeKey: 'created_at',
-      value: 'created_at',
+      attributeKey: CONVERSATION_ATTRIBUTES.CREATED_AT,
+      value: CONVERSATION_ATTRIBUTES.CREATED_AT,
       attributeName: t('FILTER.ATTRIBUTES.CREATED_AT'),
       label: t('FILTER.ATTRIBUTES.CREATED_AT'),
       inputType: 'date',
@@ -227,8 +250,8 @@ export function useConversationFilterContext() {
       attributeModel: 'standard',
     },
     {
-      attributeKey: 'last_activity_at',
-      value: 'last_activity_at',
+      attributeKey: CONVERSATION_ATTRIBUTES.LAST_ACTIVITY_AT,
+      value: CONVERSATION_ATTRIBUTES.LAST_ACTIVITY_AT,
       attributeName: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
       label: t('FILTER.ATTRIBUTES.LAST_ACTIVITY'),
       inputType: 'date',
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 7d7b36e42..09d415401 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -22,6 +22,12 @@
 #  index_custom_attribute_definitions_on_account_id  (account_id)
 #
 class CustomAttributeDefinition < ApplicationRecord
+  STANDARD_ATTRIBUTES = {
+    :conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
+                        last_activity_at],
+    :contact => %w[name email phone_number identifier country_code city created_at last_activity_at referer blocked]
+  }.freeze
+
   scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }
   validates :attribute_display_name, presence: true
 
@@ -31,6 +37,7 @@ class CustomAttributeDefinition < ApplicationRecord
 
   validates :attribute_display_type, presence: true
   validates :attribute_model, presence: true
+  validate :attribute_must_not_conflict, on: :create
 
   enum attribute_model: { conversation_attribute: 0, contact_attribute: 1 }
   enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
@@ -48,4 +55,11 @@ class CustomAttributeDefinition < ApplicationRecord
   def update_widget_pre_chat_custom_fields
     ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_later(account, self)
   end
+
+  def attribute_must_not_conflict
+    model_keys = attribute_model.to_sym == :conversation_attribute ? :conversation : :contact
+    return unless attribute_key.in?(STANDARD_ATTRIBUTES[model_keys])
+
+    errors.add(:attribute_key, I18n.t('errors.custom_attribute_definition.key_conflict'))
+  end
 end
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index 23cc0e188..e4cef7941 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -1,7 +1,7 @@
 require 'json'
 
 class FilterService
-  include FilterHelper
+  include Filters::FilterHelper
   include CustomExceptions::CustomFilter
 
   ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
@@ -43,18 +43,15 @@ class FilterService
   end
 
   def filter_values(query_hash)
-    case query_hash['attribute_key']
-    when 'status'
-      return Conversation.statuses.values if query_hash['values'].include?('all')
+    attribute_key = query_hash['attribute_key']
+    values = query_hash['values']
 
-      query_hash['values'].map { |x| Conversation.statuses[x.to_sym] }
-    when 'message_type'
-      query_hash['values'].map { |x| Message.message_types[x.to_sym] }
-    when 'content'
-      downcase_array_values(query_hash['values'])
-    else
-      case_insensitive_values(query_hash)
-    end
+    return conversation_status_values(values) if attribute_key == 'status'
+    return conversation_priority_values(values) if attribute_key == 'priority'
+    return message_type_values(values) if attribute_key == 'message_type'
+    return downcase_array_values(values) if attribute_key == 'content'
+
+    case_insensitive_values(query_hash)
   end
 
   def downcase_array_values(values)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16d13ab71..4183c873d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -82,6 +82,8 @@ en:
       invalid_operator: Invalid operator. The allowed operators for %{attribute_name} are [%{allowed_keys}].
       invalid_query_operator: Query operator must be either "AND" or "OR".
       invalid_value: Invalid value. The values provided for %{attribute_name} are invalid
+    custom_attribute_definition:
+      key_conflict: The provided key is not allowed as it might conflict with default attributes.
   reports:
     period: Reporting period %{since} to %{until}
     utc_warning: The report generated is in UTC timezone
diff --git a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
index d434381cd..c5be392b6 100644
--- a/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/custom_attribute_definitions_controller_spec.rb
@@ -89,6 +89,30 @@ RSpec.describe 'Custom Attribute Definitions API', type: :request do
         json_response = response.parsed_body
         expect(json_response['attribute_key']).to eq 'developer_id'
       end
+
+      context 'when creating with a conflicting attribute_key' do
+        let(:standard_key) { CustomAttributeDefinition::STANDARD_ATTRIBUTES[:conversation].first }
+        let(:conflicting_payload) do
+          {
+            custom_attribute_definition: {
+              attribute_display_name: 'Conflicting Key',
+              attribute_key: standard_key,
+              attribute_model: 'conversation_attribute',
+              attribute_display_type: 'text'
+            }
+          }
+        end
+
+        it 'returns error for conflicting key' do
+          post "/api/v1/accounts/#{account.id}/custom_attribute_definitions",
+               headers: user.create_new_auth_token,
+               params: conflicting_payload
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          json_response = response.parsed_body
+          expect(json_response['message']).to include('The provided key is not allowed as it might conflict with default attributes.')
+        end
+      end
     end
   end
 
diff --git a/spec/services/conversations/filter_service_spec.rb b/spec/services/conversations/filter_service_spec.rb
index 45e5be143..53878c780 100644
--- a/spec/services/conversations/filter_service_spec.rb
+++ b/spec/services/conversations/filter_service_spec.rb
@@ -77,6 +77,63 @@ describe Conversations::FilterService do
         expect(result[:count][:all_count]).to be conversations.count
       end
 
+      it 'filter conversations by priority' do
+        conversation = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'equal_to',
+            values: ['high'],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to eq 1
+        expect(result[:conversations][0][:id]).to eq conversation.id
+      end
+
+      it 'filter conversations by multiple priority values' do
+        high_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        urgent_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :urgent)
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :low)
+
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'equal_to',
+            values: %w[high urgent],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+        expect(result[:conversations].length).to eq 2
+        expect(result[:conversations].pluck(:id)).to include(high_priority.id, urgent_priority.id)
+      end
+
+      it 'filter conversations with not_equal_to priority operator' do
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :high)
+        create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :urgent)
+        low_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :low)
+        medium_priority = create(:conversation, account: account, inbox: inbox, assignee: user_1, priority: :medium)
+
+        params[:payload] = [
+          {
+            attribute_key: 'priority',
+            filter_operator: 'not_equal_to',
+            values: %w[high urgent],
+            query_operator: nil,
+            custom_attribute_type: ''
+          }.with_indifferent_access
+        ]
+        result = filter_service.new(params, user_1).perform
+
+        # Only include conversations with medium and low priority, excluding high and urgent
+        expect(result[:conversations].length).to eq 2
+        expect(result[:conversations].pluck(:id)).to include(low_priority.id, medium_priority.id)
+      end
+
       it 'filter conversations by additional_attributes and status with pagination' do
         params[:payload] = payload
         params[:page] = 2

From 12d7be62d380cb752ef3c9d9d95dbfcacd881c7a Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Mon, 3 Mar 2025 17:45:57 +0530
Subject: [PATCH 22/27] chore: fix nightly linux installer github action
 (#11009)

- chore: fix nightly linux installer github action
---
 .github/workflows/nightly_installer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly_installer.yml b/.github/workflows/nightly_installer.yml
index d11fe6401..a01ba1093 100644
--- a/.github/workflows/nightly_installer.yml
+++ b/.github/workflows/nightly_installer.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   nightly:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
 
     - name: get installer

From ed562832a69ee676092b8b3d7a09f548b6365039 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <iamwishnu@gmail.com>
Date: Tue, 4 Mar 2025 16:51:40 +0530
Subject: [PATCH 23/27] feat: add ui element for secrets in superadmin (#11000)

- add secret type for installation_config in the super admin console
- hide tokens by default on the UI

Before
----
<img width="891" alt="image"
src="https://github.com/user-attachments/assets/1c51b3bb-47f9-49bf-bb0d-75b84d8d2eeb"
/>


After
----
<img width="958" alt="image"
src="https://github.com/user-attachments/assets/b7eca1ff-1cc0-4259-9977-6109eb38ad64"
/>

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../administrate/components/_buttons.scss     | 10 ++--
 .../super_admin/app_configs/show.html.erb     | 59 +++++++++++++++++--
 config/installation_config.yml                | 14 +++++
 3 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/administrate/components/_buttons.scss b/app/assets/stylesheets/administrate/components/_buttons.scss
index 7b2f62045..a0c3699ba 100644
--- a/app/assets/stylesheets/administrate/components/_buttons.scss
+++ b/app/assets/stylesheets/administrate/components/_buttons.scss
@@ -1,8 +1,8 @@
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-.button {
+button:not(.reset-base),
+input[type='button']:not(.reset-base),
+input[type='reset']:not(.reset-base),
+input[type='submit']:not(.reset-base),
+.button:not(.reset-base) {
   appearance: none;
   background-color: $color-woot;
   border: 0;
diff --git a/app/views/super_admin/app_configs/show.html.erb b/app/views/super_admin/app_configs/show.html.erb
index 1754808e5..6f95a6418 100644
--- a/app/views/super_admin/app_configs/show.html.erb
+++ b/app/views/super_admin/app_configs/show.html.erb
@@ -1,11 +1,19 @@
 <% content_for(:title) do %>
   Configure Settings - <%= @config.titleize %>
 <% end %>
+
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title" id="page-title">
     <%= content_for(:title) %>
   </h1>
 </header>
+
+<style>
+.eye-icon.eye-hide path {
+  d: path('M3 3l18 18M10.5 10.677a2 2 0 002.823 2.823M7.362 7.561C5.68 8.74 4.279 10.42 3 12c1.889 2.991 5.282 6 9 6 1.55 0 3.043-.523 4.395-1.35M12 6c4.008 0 6.701 3.009 9 6a15.66 15.66 0 01-1.078 1.5');
+}
+</style>
+
 <section class="main-content__body">
   <%= form_with url: super_admin_app_config_url(config: @config) , method: :post do |form| %>
     <% @allowed_configs.each do |key| %>
@@ -15,18 +23,36 @@
         </div>
         <div class="-mt-2 field-unit__field ">
           <% if @installation_configs[key]&.dig('type') == 'boolean' %>
-            <%= form.select "app_config[#{key}]", 
-              [["True", true], ["False", false]], 
+            <%= form.select "app_config[#{key}]",
+              [["True", true], ["False", false]],
               { selected: ActiveModel::Type::Boolean.new.cast(@app_config[key]) },
-              class: "mt-2 border border-slate-100 p-1 rounded-md" 
+              class: "mt-2 border border-slate-100 p-1 rounded-md"
             %>
           <% elsif @installation_configs[key]&.dig('type') == 'code' %>
-            <%= form.text_area "app_config[#{key}]", 
-                value: @app_config[key], 
+            <%= form.text_area "app_config[#{key}]",
+                value: @app_config[key],
                 rows: 12,
                 wrap: 'off',
                 class: "mt-2 border font-mono text-xs border-slate-100 p-1 rounded-md overflow-scroll"
             %>
+          <% elsif @installation_configs[key]&.dig('type') == 'secret' %>
+            <div class="relative">
+              <%= form.password_field "app_config[#{key}]",
+                  id: "app_config_#{key}",
+                  value: @app_config[key],
+                  class: "mt-2 border border-slate-100 p-1.5 pr-8 rounded-md w-full"
+              %>
+              <button
+                type="button"
+                class="absolute reset-base !bg-white top-1/2 !outline-0 !text-n-slate-11 -translate-y-1/2 right-2 p-1 hover:!bg-n-slate-5 rounded-sm toggle-password"
+                data-target="app_config_<%= key %>"
+              >
+                <svg class="eye-icon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+                  <path d="M12 5C5.63636 5 2 12 2 12C2 12 5.63636 19 12 19C18.3636 19 22 12 22 12C22 12 18.3636 5 12 5Z"/>
+                  <path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z"/>
+                </svg>
+              </button>
+            </div>
           <% else %>
             <%= form.text_field "app_config[#{key}]", value: @app_config[key] %>
           <% end %>
@@ -43,3 +69,26 @@
     </div>
   <% end %>
 </section>
+
+<% content_for :javascript do %>
+  <script>
+  document.addEventListener('DOMContentLoaded', () => {
+    document.querySelectorAll('.toggle-password').forEach(button => {
+      button.addEventListener('click', () => {
+        const targetId = button.dataset.target;
+        const input = document.getElementById(targetId);
+        const type = input.type === 'password' ? 'text' : 'password';
+        input.type = type;
+
+        // Toggle icon
+        const svg = button.querySelector('.eye-icon');
+        if (type === 'password') {
+          svg.classList.remove('eye-hide')
+        } else {
+          svg.classList.add('eye-hide')
+        }
+      });
+    });
+  });
+  </script>
+<% end %>
diff --git a/config/installation_config.yml b/config/installation_config.yml
index 70c07ce60..d5924ebe0 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -103,13 +103,16 @@
   display_title: 'Facebook Verify Token'
   description: 'The verify token used for Facebook Messenger Webhook'
   locked: false
+  type: secret
 - name: FB_APP_SECRET
   display_title: 'Facebook App Secret'
   locked: false
+  type: secret
 - name: IG_VERIFY_TOKEN
   display_title: 'Instagram Verify Token'
   description: 'The verify token used for Instagram Webhook'
   locked: false
+  type: secret
 - name: FACEBOOK_API_VERSION
   display_title: 'Facebook API Version'
   description: 'Configure this if you want to use a different Facebook API version. Make sure its prefixed with `v`'
@@ -131,6 +134,7 @@
 - name: AZURE_APP_SECRET
   display_title: 'Azure App Secret'
   locked: false
+  type: secret
 # End of Microsoft Email Channel Config
 
 # MARK: Captain Config
@@ -138,6 +142,7 @@
   display_title: 'OpenAI API Key'
   description: 'The API key used to authenticate requests to OpenAI services for Captain AI.'
   locked: false
+  type: secret
 - name: CAPTAIN_OPEN_AI_MODEL
   display_title: 'OpenAI Model'
   description: 'The OpenAI model configured for use in Captain AI. Default: gpt-4o-mini'
@@ -146,6 +151,7 @@
   display_title: 'FireCrawl API Key (optional)'
   description: 'The FireCrawl API key for the Captain AI service'
   locked: false
+  type: secret
 - name: CAPTAIN_CLOUD_PLAN_LIMITS
   display_title: 'Captain Cloud Plan Limits'
   description: 'The limits for the Captain AI service for different plans'
@@ -160,11 +166,13 @@
   display_title: 'Inbox Token'
   description: 'The Chatwoot Inbox Token for Contact Support in Cloud'
   locked: false
+  type: secret
 - name: CHATWOOT_INBOX_HMAC_KEY
   value:
   display_title: 'Inbox HMAC Key'
   description: 'The Chatwoot Inbox HMAC Key for Contact Support in Cloud'
   locked: false
+  type: secret
 - name: CHATWOOT_CLOUD_PLANS
   display_title: 'Cloud Plans'
   value:
@@ -180,10 +188,12 @@
   value:
   display_title: 'Analytics Token'
   description: 'The June.so analytics token for Chatwoot cloud'
+  type: secret
 - name: CLEARBIT_API_KEY
   value:
   display_title: 'Clearbit API Key'
   description: 'This API key is used for onboarding the users, to pre-fill account data.'
+  type: secret
 - name: DASHBOARD_SCRIPTS
   value:
   display_title: 'Dashboard Scripts'
@@ -206,12 +216,14 @@
 - name: CHATWOOT_SUPPORT_WEBSITE_TOKEN
   value:
   description: 'The Chatwoot website token, used to identify the Chatwoot inbox and display the "Contact Support" option on the billing page'
+  type: secret
 - name: CHATWOOT_SUPPORT_SCRIPT_URL
   value:
   description: 'The Chatwoot script base URL, to display the "Contact Support" option on the billing page'
 - name: CHATWOOT_SUPPORT_IDENTIFIER_HASH
   value:
   description: 'The Chatwoot identifier hash, to validate the contact in the live chat window.'
+  type: secret
 - name: ACCOUNT_SECURITY_NOTIFICATION_WEBHOOK_URL
   display_title: Webhook URL to post security analysis
   value:
@@ -245,6 +257,7 @@
   display_title: 'Firebase Credentials'
   value:
   locked: false
+  type: secret
   description: 'Contents on your firebase credentials json file'
 ## ------ End of Configs added for FCM v1 notifications ------ ##
 
@@ -259,4 +272,5 @@
   value:
   locked: false
   description: 'Linear client secret'
+  type: secret
 ## ------ End of Configs added for Linear ------ ##

From c1f6d9f76f7b03eb865c52d57f96a4528afe0282 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 5 Mar 2025 16:32:54 -0800
Subject: [PATCH 24/27] feat: Add the ability to filter items in Super Admin
 panel (#11020)

---
 Gemfile.lock                                  |  2 +-
 .../administrate/custom_styles.scss           |  1 -
 app/dashboards/account_dashboard.rb           |  6 +-
 app/dashboards/user_dashboard.rb              |  7 ++-
 .../super_admin/application/_filters.html.erb | 63 +++++++++++++++++++
 .../super_admin/application/_search.html.erb  | 24 +++++++
 .../super_admin/application/index.html.erb    | 47 ++++++++------
 7 files changed, 127 insertions(+), 23 deletions(-)
 create mode 100644 app/views/super_admin/application/_filters.html.erb
 create mode 100644 app/views/super_admin/application/_search.html.erb

diff --git a/Gemfile.lock b/Gemfile.lock
index e9a573816..8591a0c34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -799,7 +799,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    uri (0.13.0)
+    uri (1.0.3)
     uri_template (0.7.0)
     valid_email2 (5.2.6)
       activemodel (>= 3.2)
diff --git a/app/assets/stylesheets/administrate/custom_styles.scss b/app/assets/stylesheets/administrate/custom_styles.scss
index 5e6d803d8..00f1a058c 100644
--- a/app/assets/stylesheets/administrate/custom_styles.scss
+++ b/app/assets/stylesheets/administrate/custom_styles.scss
@@ -10,7 +10,6 @@
 
   .icon-container {
     margin-right: 2px;
-
   }
 
   .value-container {
diff --git a/app/dashboards/account_dashboard.rb b/app/dashboards/account_dashboard.rb
index b566551f4..f7b04a167 100644
--- a/app/dashboards/account_dashboard.rb
+++ b/app/dashboards/account_dashboard.rb
@@ -78,7 +78,11 @@ class AccountDashboard < Administrate::BaseDashboard
   #   COLLECTION_FILTERS = {
   #     open: ->(resources) { resources.where(open: true) }
   #   }.freeze
-  COLLECTION_FILTERS = {}.freeze
+  COLLECTION_FILTERS = {
+    active: ->(resources) { resources.where(status: :active) },
+    suspended: ->(resources) { resources.where(status: :suspended) },
+    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
+  }.freeze
 
   # Overwrite this method to customize how accounts are displayed
   # across all pages of the admin dashboard.
diff --git a/app/dashboards/user_dashboard.rb b/app/dashboards/user_dashboard.rb
index 6b2129eed..8abdefd1a 100644
--- a/app/dashboards/user_dashboard.rb
+++ b/app/dashboards/user_dashboard.rb
@@ -94,7 +94,12 @@ class UserDashboard < Administrate::BaseDashboard
   #   COLLECTION_FILTERS = {
   #     open: ->(resources) { resources.where(open: true) }
   #   }.freeze
-  COLLECTION_FILTERS = {}.freeze
+  COLLECTION_FILTERS = {
+    super_admin: ->(resources) { resources.where(type: 'SuperAdmin') },
+    confirmed: ->(resources) { resources.where.not(confirmed_at: nil) },
+    unconfirmed: ->(resources) { resources.where(confirmed_at: nil) },
+    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
+  }.freeze
 
   # Overwrite this method to customize how users are displayed
   # across all pages of the admin dashboard.
diff --git a/app/views/super_admin/application/_filters.html.erb b/app/views/super_admin/application/_filters.html.erb
new file mode 100644
index 000000000..f2e339ebe
--- /dev/null
+++ b/app/views/super_admin/application/_filters.html.erb
@@ -0,0 +1,63 @@
+<%#
+# Filters
+
+This partial is used on the `index` page to display available filters
+for a collection of resources.
+
+## Local variables:
+
+- `page`:
+  An instance of [Administrate::Page::Collection][1].
+  Contains helper methods to help display a table,
+  and knows which attributes should be displayed in the resource's table.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Page/Collection
+%>
+
+<% 
+  # Get the dashboard class name from the resource name
+  resource_name = page.resource_name.classify
+  dashboard_class_name = "#{resource_name}Dashboard"
+  dashboard_class = dashboard_class_name.constantize
+  
+  # Get the current filter if any
+  current_filter = nil
+  if params[:search] && params[:search].include?(':')
+    current_filter = params[:search].split(':').first
+  end
+%>
+
+<% if dashboard_class.const_defined?(:COLLECTION_FILTERS) && !dashboard_class::COLLECTION_FILTERS.empty? %>
+  <div class="flex items-center bg-gray-100 border-0 rounded-md shadow-none relative w-[260px]">
+    <div class="flex items-center h-10 px-2 w-full">
+      <div class="flex items-center justify-center flex-shrink-0 mr-2 text-gray-500" title="Filter by">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+          <polygon points="22 3 2 3 10 12.46 10 19 14 21 14 12.46 22 3"></polygon>
+        </svg>
+      </div>
+      <div class="flex-1 h-full min-w-0 relative">
+        <select id="filter-select" class="appearance-none bg-gray-100 border-0 text-gray-700 cursor-pointer text-sm h-full overflow-hidden truncate whitespace-nowrap w-full pr-7 pl-0 py-2 focus:outline-none bg-[url('data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2712%27 height=%2712%27 viewBox=%270 0 12 12%27%3E%3Cpath fill=%27%23293f54%27 d=%27M6 9L1 4h10z%27/%3E%3C/svg%3E')] bg-[right_0.25rem_center] bg-no-repeat bg-[length:0.75rem]" onchange="applyFilter(this.value)">
+          <option value="">All records</option>
+          <% dashboard_class::COLLECTION_FILTERS.each do |filter_name, _| %>
+            <option value="<%= filter_name %>" <%= 'selected' if filter_name.to_s == current_filter %>>
+              <%= filter_name.to_s.titleize %>
+            </option>
+          <% end %>
+        </select>
+        <% if current_filter %>
+          <a href="?" class="flex items-center justify-center rounded-full text-gray-500 text-xl font-bold h-[18px] w-[18px] leading-none absolute right-5 top-1/2 -translate-y-1/2 no-underline z-2 hover:text-gray-900" title="Clear filter">×</a>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    function applyFilter(filterName) {
+      if (filterName) {
+        window.location.href = "?search=" + encodeURIComponent(filterName) + "%3A";
+      } else {
+        window.location.href = "?";
+      }
+    }
+  </script>
+<% end %> 
\ No newline at end of file
diff --git a/app/views/super_admin/application/_search.html.erb b/app/views/super_admin/application/_search.html.erb
new file mode 100644
index 000000000..a38c5a9c5
--- /dev/null
+++ b/app/views/super_admin/application/_search.html.erb
@@ -0,0 +1,24 @@
+<form class="search" role="search">
+  <label class="search__label" for="search">
+    <svg class="search__eyeglass-icon" role="img">
+      <title>
+        <%= t("administrate.search.label", resource: resource_name) %>
+      </title>
+      <use xlink:href="#icon-eyeglass" />
+    </svg>
+  </label>
+
+  <input class="search__input"
+         id="search"
+         type="search"
+         name="search"
+         placeholder="<%= t("administrate.search.label", resource: resource_name) %>"
+         value="<%= search_term %>">
+
+  <%= link_to clear_search_params, class: "search__clear-link" do %>
+    <svg class="search__clear-icon" role="img">
+      <title><%= t("administrate.search.clear") %></title>
+      <use xlink:href="#icon-cancel" />
+    </svg>
+  <% end %>
+</form> 
\ No newline at end of file
diff --git a/app/views/super_admin/application/index.html.erb b/app/views/super_admin/application/index.html.erb
index f73b3033c..89d40d697 100644
--- a/app/views/super_admin/application/index.html.erb
+++ b/app/views/super_admin/application/index.html.erb
@@ -28,27 +28,36 @@ It renders the `_table` partial to display details about the resources.
 <% end %>
 
 <header class="main-content__header" role="banner">
-  <h1 class="main-content__page-title" id="page-title">
-    <%= content_for(:title) %>
-  </h1>
+  <div class="flex items-center justify-between w-full">
+    <h1 class="main-content__page-title m-0 mr-6" id="page-title">
+      <%= content_for(:title) %>
+    </h1>
 
-  <% if show_search_bar %>
-    <%= render(
-      "search",
-      search_term: search_term,
-      resource_name: display_resource_name(page.resource_name)
-    ) %>
-  <% end %>
+    <div class="flex items-center">
+      <% if show_search_bar %>
+        <div class="flex items-center">
+          <%= render("filters", page: page) %>
+          <div class="ml-3">
+            <%= render(
+              "search",
+              search_term: search_term,
+              resource_name: display_resource_name(page.resource_name)
+            ) %>
+          </div>
+        </div>
+      <% end %>
 
-  <div>
-    <%= link_to(
-      t(
-        "administrate.actions.new_resource",
-        name: page.resource_name.titleize.downcase
-      ),
-      [:new, namespace, page.resource_path.to_sym],
-      class: "button",
-    ) if accessible_action?(new_resource, :new) %>
+      <div class="whitespace-nowrap ml-4">
+        <%= link_to(
+          t(
+            "administrate.actions.new_resource",
+            name: page.resource_name.titleize.downcase
+          ),
+          [:new, namespace, page.resource_path.to_sym],
+          class: "button",
+        ) if accessible_action?(new_resource, :new) %>
+      </div>
+    </div>
   </div>
 </header>
 

From d017156f32e9a02a43f06d014df24d1025713606 Mon Sep 17 00:00:00 2001
From: Pranav <pranav@chatwoot.com>
Date: Wed, 5 Mar 2025 17:10:24 -0800
Subject: [PATCH 25/27] fix: Disable syncing IMAP if the account is suspended
 (#11031)

This PR disables the IMAP syncing if the account is suspended.
---
 Gemfile.lock                                  |  2 +-
 .../inboxes/fetch_imap_email_inboxes_job.rb   | 11 +++++--
 .../fetch_imap_email_inboxes_job_spec.rb      | 33 ++++++++++++++++---
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8591a0c34..857319fc4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -561,7 +561,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.11)
+    rack (2.2.12)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
diff --git a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
index b360940e3..56e8c2235 100644
--- a/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
+++ b/app/jobs/inboxes/fetch_imap_email_inboxes_job.rb
@@ -2,8 +2,15 @@ class Inboxes::FetchImapEmailInboxesJob < ApplicationJob
   queue_as :scheduled_jobs
 
   def perform
-    Inbox.where(channel_type: 'Channel::Email').all.find_each(batch_size: 100) do |inbox|
-      ::Inboxes::FetchImapEmailsJob.perform_later(inbox.channel) if inbox.channel.imap_enabled
+    email_inboxes = Inbox.where(channel_type: 'Channel::Email')
+    email_inboxes.find_each(batch_size: 100) do |inbox|
+      ::Inboxes::FetchImapEmailsJob.perform_later(inbox.channel) if should_fetch_emails?(inbox)
     end
   end
+
+  private
+
+  def should_fetch_emails?(inbox)
+    inbox.channel.imap_enabled && !inbox.account.suspended?
+  end
 end
diff --git a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
index ae4f540d4..18685a649 100644
--- a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
@@ -2,11 +2,19 @@ require 'rails_helper'
 
 RSpec.describe Inboxes::FetchImapEmailInboxesJob do
   let(:account) { create(:account) }
+  let(:suspended_account) { create(:account, status: 'suspended') }
+
   let(:imap_email_channel) do
-    create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_login: 'imap@gmail.com',
-                           imap_password: 'password', account: account)
+    create(:channel_email, imap_enabled: true, account: account)
+  end
+
+  let(:imap_email_channel_suspended) do
+    create(:channel_email, imap_enabled: true, account: suspended_account)
+  end
+
+  let(:disabled_imap_channel) do
+    create(:channel_email, imap_enabled: false, account: account)
   end
-  let(:email_inbox) { create(:inbox, channel: imap_email_channel, account: account) }
 
   it 'enqueues the job' do
     expect { described_class.perform_later }.to have_enqueued_job(described_class)
@@ -14,9 +22,26 @@ RSpec.describe Inboxes::FetchImapEmailInboxesJob do
   end
 
   context 'when called' do
-    it 'fetch all the email channels' do
+    it 'fetches emails only for active accounts with imap enabled' do
+      # Should call perform_later only once for the active, imap-enabled inbox
       expect(Inboxes::FetchImapEmailsJob).to receive(:perform_later).with(imap_email_channel).once
 
+      # Should not call for suspended account or disabled IMAP channels
+      expect(Inboxes::FetchImapEmailsJob).not_to receive(:perform_later).with(imap_email_channel_suspended)
+      expect(Inboxes::FetchImapEmailsJob).not_to receive(:perform_later).with(disabled_imap_channel)
+
+      described_class.perform_now
+    end
+
+    it 'skips suspended accounts' do
+      expect(Inboxes::FetchImapEmailsJob).not_to receive(:perform_later).with(imap_email_channel_suspended)
+
+      described_class.perform_now
+    end
+
+    it 'skips disabled imap channels' do
+      expect(Inboxes::FetchImapEmailsJob).not_to receive(:perform_later).with(disabled_imap_channel)
+
       described_class.perform_now
     end
   end

From 7e1458fd32f8c24e4da84097f6510b120e22907b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 6 Mar 2025 10:53:02 +0530
Subject: [PATCH 26/27] fix: Issue when saving hotkeys (#11026)

# Pull Request Template

## Description

This PR fixes an issue when saving send message button hotkeys, where a
TypeError occurs: `this.updateUISettings is not a function`.

This issue arises after merging this PR
https://github.com/chatwoot/chatwoot/pull/10974

Fixes
https://chatwoot-p3.sentry.io/issues/6339976939/events/ca9946f92cb74428a72f1f74976a56a3/

## Type of change

- [x] Bug fix (non-breaking change which fixes an issue)

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
 .../dashboard/routes/dashboard/settings/profile/Index.vue      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 85204627a..45a060e05 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -39,13 +39,14 @@ export default {
   },
   mixins: [globalConfigMixin],
   setup() {
-    const { isEditorHotKeyEnabled } = useUISettings();
+    const { isEditorHotKeyEnabled, updateUISettings } = useUISettings();
     const { currentFontSize, updateFontSize } = useFontSize();
 
     return {
       currentFontSize,
       updateFontSize,
       isEditorHotKeyEnabled,
+      updateUISettings,
     };
   },
   data() {

From 8d85a02ca9a7a4f81fb58e987758103219642801 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 6 Mar 2025 20:09:47 +0530
Subject: [PATCH 27/27] feat: handle Channel errors (#11015)

This PR adds missing error handlers for the following channels and cases

1. WhatsApp - Generic Handlers for both Cloud and 360Dialog (Deprecated)
2. Instagram - Handler for a case where there is an HTTP error instead
of an `:error` in the 200 response
3. Facebook - Errors from the two sentry issues
([Net::OpenTimeout](https://chatwoot-p3.sentry.io/issues/6164805227) &
[JSON::ParserError](https://chatwoot-p3.sentry.io/issues/5903200786))
4. SMS: Generic handlers for Bandwidth SMS

#### Checklist

- [x] Bandwidth SMS
- [x] Whatsapp Cloud + 360 Dialog
- [x] Twilio SMS
- [x] Line
- [x] Telegram
- [x] Instagram
- [x] Facebook
- [x] GMail
- [x] 365 Mail
- [x] SMTP Mail

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../components-next/message/MessageError.vue  |   2 +-
 .../components-next/message/MessageMeta.vue   |   1 +
 app/models/channel/sms.rb                     |  21 +++-
 .../facebook/send_on_facebook_service.rb      |  21 +++-
 .../instagram/send_on_instagram_service.rb    |  28 +++--
 .../whatsapp/providers/base_service.rb        |  27 ++++
 .../providers/whatsapp_360_dialog_service.rb  |  12 +-
 .../providers/whatsapp_cloud_service.rb       |  12 +-
 .../facebook/send_on_facebook_service_spec.rb |  49 ++++++++
 .../send_on_instagram_service_spec.rb         | 108 +++++++++++-----
 .../providers/whatsapp_cloud_service_spec.rb  |  52 ++++++++
 .../whatsapp/send_on_whatsapp_service_spec.rb | 115 +++++++++---------
 12 files changed, 324 insertions(+), 124 deletions(-)

diff --git a/app/javascript/dashboard/components-next/message/MessageError.vue b/app/javascript/dashboard/components-next/message/MessageError.vue
index e113ada71..d3a03e746 100644
--- a/app/javascript/dashboard/components-next/message/MessageError.vue
+++ b/app/javascript/dashboard/components-next/message/MessageError.vue
@@ -26,7 +26,7 @@ const { t } = useI18n();
         />
       </div>
       <div
-        class="absolute bg-n-alpha-3 px-4 py-3 border rounded-xl border-n-strong text-n-slate-12 bottom-6 w-52 text-xs backdrop-blur-[100px] shadow-[0px_0px_24px_0px_rgba(0,0,0,0.12)] opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all"
+        class="absolute bg-n-alpha-3 px-4 py-3 border rounded-xl border-n-strong text-n-slate-12 bottom-6 w-52 text-xs backdrop-blur-[100px] shadow-[0px_0px_24px_0px_rgba(0,0,0,0.12)] opacity-0 invisible group-hover:opacity-100 group-hover:visible transition-all break-all"
         :class="{
           'ltr:left-0 rtl:right-0': orientation === ORIENTATION.LEFT,
           'ltr:right-0 rtl:left-0': orientation === ORIENTATION.RIGHT,
diff --git a/app/javascript/dashboard/components-next/message/MessageMeta.vue b/app/javascript/dashboard/components-next/message/MessageMeta.vue
index 3b276221b..41a0a3d15 100644
--- a/app/javascript/dashboard/components-next/message/MessageMeta.vue
+++ b/app/javascript/dashboard/components-next/message/MessageMeta.vue
@@ -102,6 +102,7 @@ const statusToShow = computed(() => {
   if (isRead.value) return MESSAGE_STATUS.READ;
   if (isDelivered.value) return MESSAGE_STATUS.DELIVERED;
   if (isSent.value) return MESSAGE_STATUS.SENT;
+  if (status.value === MESSAGE_STATUS.FAILED) return MESSAGE_STATUS.FAILED;
 
   return MESSAGE_STATUS.PROGRESS;
 });
diff --git a/app/models/channel/sms.rb b/app/models/channel/sms.rb
index e6f993e59..ab04f55f0 100644
--- a/app/models/channel/sms.rb
+++ b/app/models/channel/sms.rb
@@ -37,7 +37,7 @@ class Channel::Sms < ApplicationRecord
     body = message_body(contact_number, message.content)
     body['media'] = message.attachments.map(&:download_url) if message.attachments.present?
 
-    send_to_bandwidth(body)
+    send_to_bandwidth(body, message)
   end
 
   def send_text_message(contact_number, message_content)
@@ -56,7 +56,7 @@ class Channel::Sms < ApplicationRecord
     }
   end
 
-  def send_to_bandwidth(body)
+  def send_to_bandwidth(body, message = nil)
     response = HTTParty.post(
       "#{api_base_path}/users/#{provider_config['account_id']}/messages",
       basic_auth: bandwidth_auth,
@@ -64,7 +64,22 @@ class Channel::Sms < ApplicationRecord
       body: body.to_json
     )
 
-    response.success? ? response.parsed_response['id'] : nil
+    if response.success?
+      response.parsed_response['id']
+    else
+      handle_error(response, message)
+      nil
+    end
+  end
+
+  def handle_error(response, message)
+    Rails.logger.error("[#{account_id}] Error sending SMS: #{response.parsed_response['description']}")
+    return if message.blank?
+
+    # https://dev.bandwidth.com/apis/messaging-apis/messaging/#tag/Messages/operation/createMessage
+    message.external_error = response.parsed_response['description']
+    message.status = :failed
+    message.save!
   end
 
   def bandwidth_auth
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 514ba3e1f..5dde19c5a 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -20,15 +20,30 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   end
 
   def send_message_to_facebook(delivery_params)
-    result = Facebook::Messenger::Bot.deliver(delivery_params, page_id: channel.page_id)
-    parsed_result = JSON.parse(result)
+    parsed_result = deliver_message(delivery_params)
+    return if parsed_result.nil?
+
     if parsed_result['error'].present?
       message.update!(status: :failed, external_error: external_error(parsed_result))
-      Rails.logger.info "Facebook::SendOnFacebookService: Error sending message to Facebook : Page - #{channel.page_id} : #{result}"
+      Rails.logger.info "Facebook::SendOnFacebookService: Error sending message to Facebook : Page - #{channel.page_id} : #{parsed_result}"
     end
+
     message.update!(source_id: parsed_result['message_id']) if parsed_result['message_id'].present?
   end
 
+  def deliver_message(delivery_params)
+    result = Facebook::Messenger::Bot.deliver(delivery_params, page_id: channel.page_id)
+    JSON.parse(result)
+  rescue JSON::ParserError
+    message.update!(status: :failed, external_error: 'Facebook was unable to process this request')
+    Rails.logger.error "Facebook::SendOnFacebookService: Error parsing JSON response from Facebook : Page - #{channel.page_id} : #{result}"
+    nil
+  rescue Net::OpenTimeout
+    message.update!(status: :failed, external_error: 'Request timed out, please try again later')
+    Rails.logger.error "Facebook::SendOnFacebookService: Timeout error sending message to Facebook : Page - #{channel.page_id}"
+    nil
+  end
+
   def fb_text_message_params
     {
       recipient: { id: contact.get_source_id(inbox.id) },
diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index a681745d8..23cd04370 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -70,22 +70,28 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
       query: query
     )
 
-    if response[:error].present?
-      Rails.logger.error("Instagram response: #{response['error']} : #{message_content}")
-      message.status = :failed
-      message.external_error = external_error(response)
+    handle_response(response, message_content)
+  end
+
+  def handle_response(response, message_content)
+    parsed_response = response.parsed_response
+    if response.success? && parsed_response['error'].blank?
+      message.update!(source_id: parsed_response['message_id'])
+
+      parsed_response
+    else
+      external_error = external_error(parsed_response)
+      Rails.logger.error("Instagram response: #{external_error} : #{message_content}")
+      message.update!(status: :failed, external_error: external_error)
+
+      nil
     end
-
-    message.source_id = response['message_id'] if response['message_id'].present?
-    message.save!
-
-    response
   end
 
   def external_error(response)
     # https://developers.facebook.com/docs/instagram-api/reference/error-codes/
-    error_message = response[:error][:message]
-    error_code = response[:error][:code]
+    error_message = response.dig('error', 'message')
+    error_code = response.dig('error', 'code')
 
     "#{error_code} - #{error_message}"
   end
diff --git a/app/services/whatsapp/providers/base_service.rb b/app/services/whatsapp/providers/base_service.rb
index 9923017dd..55714ba4d 100644
--- a/app/services/whatsapp/providers/base_service.rb
+++ b/app/services/whatsapp/providers/base_service.rb
@@ -27,6 +27,33 @@ class Whatsapp::Providers::BaseService
     raise 'Overwrite this method in child class'
   end
 
+  def error_message
+    raise 'Overwrite this method in child class'
+  end
+
+  def process_response(response)
+    parsed_response = response.parsed_response
+    if response.success? && parsed_response['error'].blank?
+      parsed_response['messages'].first['id']
+    else
+      handle_error(response)
+      nil
+    end
+  end
+
+  def handle_error(response)
+    Rails.logger.error response.body
+    return if @message.blank?
+
+    # https://developers.facebook.com/docs/whatsapp/cloud-api/support/error-codes/#sample-response
+    error_message = error_message(response)
+    return if error_message.blank?
+
+    @message.external_error = error_message
+    @message.status = :failed
+    @message.save!
+  end
+
   def create_buttons(items)
     buttons = []
     items.each do |item|
diff --git a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
index 668162905..61cdeebf1 100644
--- a/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_360_dialog_service.rb
@@ -1,5 +1,6 @@
 class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseService
   def send_message(phone_number, message)
+    @message = message
     if message.attachments.present?
       send_attachment_message(phone_number, message)
     elsif message.content_type == 'input_select'
@@ -78,6 +79,7 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
     }
     type_content['caption'] = message.content unless %w[audio sticker].include?(type)
     type_content['filename'] = attachment.file.filename if type == 'document'
+
     response = HTTParty.post(
       "#{api_base_path}/messages",
       headers: api_headers,
@@ -91,13 +93,9 @@ class Whatsapp::Providers::Whatsapp360DialogService < Whatsapp::Providers::BaseS
     process_response(response)
   end
 
-  def process_response(response)
-    if response.success?
-      response['messages'].first['id']
-    else
-      Rails.logger.error response.body
-      nil
-    end
+  def error_message(response)
+    # {"meta": {"success": false, "http_code": 400, "developer_message": "errro-message", "360dialog_trace_id": "someid"}}
+    response.parsed_response.dig('meta', 'developer_message')
   end
 
   def template_body_parameters(template_info)
diff --git a/app/services/whatsapp/providers/whatsapp_cloud_service.rb b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
index f1af38e36..ec2275920 100644
--- a/app/services/whatsapp/providers/whatsapp_cloud_service.rb
+++ b/app/services/whatsapp/providers/whatsapp_cloud_service.rb
@@ -1,5 +1,7 @@
 class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseService
   def send_message(phone_number, message)
+    @message = message
+
     if message.attachments.present?
       send_attachment_message(phone_number, message)
     elsif message.content_type == 'input_select'
@@ -111,13 +113,9 @@ class Whatsapp::Providers::WhatsappCloudService < Whatsapp::Providers::BaseServi
     process_response(response)
   end
 
-  def process_response(response)
-    if response.success?
-      response['messages'].first['id']
-    else
-      Rails.logger.error response.body
-      nil
-    end
+  def error_message(response)
+    # https://developers.facebook.com/docs/whatsapp/cloud-api/support/error-codes/#sample-response
+    response.parsed_response&.dig('error', 'message')
   end
 
   def template_body_parameters(template_info)
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 2fcea8b72..cddf527cb 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -117,5 +117,54 @@ describe Facebook::SendOnFacebookService do
         expect(message.reload.status).to eq('failed')
       end
     end
+
+    context 'when deliver_message fails' do
+      let(:message) { create(:message, message_type: 'outgoing', inbox: facebook_inbox, account: account, conversation: conversation) }
+
+      it 'handles JSON parse errors' do
+        allow(bot).to receive(:deliver).and_return('invalid_json')
+        described_class.new(message: message).perform
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.external_error).to eq('Facebook was unable to process this request')
+      end
+
+      it 'handles timeout errors' do
+        allow(bot).to receive(:deliver).and_raise(Net::OpenTimeout)
+        described_class.new(message: message).perform
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.external_error).to eq('Request timed out, please try again later')
+      end
+
+      it 'handles facebook error with code' do
+        error_response = {
+          error: {
+            message: 'Invalid OAuth access token.',
+            type: 'OAuthException',
+            code: 190,
+            fbtrace_id: 'BLBz/WZt8dN'
+          }
+        }.to_json
+        allow(bot).to receive(:deliver).and_return(error_response)
+
+        described_class.new(message: message).perform
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.external_error).to eq('190 - Invalid OAuth access token.')
+      end
+
+      it 'handles successful delivery with message_id' do
+        success_response = {
+          message_id: 'mid.1456970487936:c34767dfe57ee6e339'
+        }.to_json
+        allow(bot).to receive(:deliver).and_return(success_response)
+
+        described_class.new(message: message).perform
+
+        expect(message.reload.source_id).to eq('mid.1456970487936:c34767dfe57ee6e339')
+        expect(message.status).not_to eq('failed')
+      end
+    end
   end
 end
diff --git a/spec/services/instagram/send_on_instagram_service_spec.rb b/spec/services/instagram/send_on_instagram_service_spec.rb
index 8900171f3..3e88b1cdd 100644
--- a/spec/services/instagram/send_on_instagram_service_spec.rb
+++ b/spec/services/instagram/send_on_instagram_service_spec.rb
@@ -4,7 +4,7 @@ describe Instagram::SendOnInstagramService do
   subject(:send_reply_service) { described_class.new(message: message) }
 
   before do
-    stub_request(:post, /graph.facebook.com/)
+    stub_request(:post, /graph\.facebook\.com/)
     create(:message, message_type: :incoming, inbox: instagram_inbox, account: account, conversation: conversation)
   end
 
@@ -15,16 +15,49 @@ describe Instagram::SendOnInstagramService do
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: instagram_inbox) }
   let(:conversation) { create(:conversation, contact: contact, inbox: instagram_inbox, contact_inbox: contact_inbox) }
   let(:response) { double }
+  let(:mock_response) do
+    instance_double(
+      HTTParty::Response,
+      :success? => true,
+      :body => { message_id: 'anyrandommessageid1234567890' }.to_json,
+      :parsed_response => { 'message_id' => 'anyrandommessageid1234567890' }
+    )
+  end
+
+  let(:error_body) do
+    {
+      'error' => {
+        'message' => 'The Instagram account is restricted.',
+        'type' => 'OAuthException',
+        'code' => 400,
+        'fbtrace_id' => 'anyrandomfbtraceid1234567890'
+      }
+    }
+  end
+
+  let(:error_response) do
+    instance_double(
+      HTTParty::Response,
+      :success? => false,
+      :body => error_body.to_json,
+      :parsed_response => error_body
+    )
+  end
+
+  let(:response_with_error) do
+    instance_double(
+      HTTParty::Response,
+      :success? => true,
+      :body => error_body.to_json,
+      :parsed_response => error_body
+    )
+  end
 
   describe '#perform' do
     context 'with reply' do
       before do
         allow(Facebook::Messenger::Configuration::AppSecretProofCalculator).to receive(:call).and_return('app_secret_key', 'access_token')
-        allow(HTTParty).to receive(:post).and_return(
-          {
-            'message_id': 'anyrandommessageid1234567890'
-          }
-        )
+        allow(HTTParty).to receive(:post).and_return(mock_response)
       end
 
       context 'without message_tag HUMAN_AGENT' do
@@ -35,22 +68,8 @@ describe Instagram::SendOnInstagramService do
         it 'if message is sent from chatwoot and is outgoing' do
           message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
 
-          allow(HTTParty).to receive(:post).with(
-            {
-              recipient: { id: contact.get_source_id(instagram_inbox.id) },
-              message: {
-                text: message.content
-              }
-            }
-          ).and_return(
-            {
-              'message_id': 'anyrandommessageid1234567890'
-            }
-          )
-
           response = described_class.new(message: message).perform
-
-          expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
+          expect(response['message_id']).to eq('anyrandommessageid1234567890')
         end
 
         it 'if message is sent from chatwoot and is outgoing with multiple attachments' do
@@ -78,22 +97,13 @@ describe Instagram::SendOnInstagramService do
           message.save!
           response = described_class.new(message: message).perform
 
-          expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
+          expect(response['message_id']).to eq('anyrandommessageid1234567890')
         end
 
         it 'if message sent from chatwoot is failed' do
           message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
 
-          allow(HTTParty).to receive(:post).and_return(
-            {
-              'error': {
-                'message': 'The Instagram account is restricted.',
-                'type': 'OAuthException',
-                'code': 400,
-                'fbtrace_id': 'anyrandomfbtraceid1234567890'
-              }
-            }
-          )
+          allow(HTTParty).to receive(:post).and_return(response_with_error)
           described_class.new(message: message).perform
           expect(HTTParty).to have_received(:post)
           expect(message.reload.status).to eq('failed')
@@ -129,5 +139,39 @@ describe Instagram::SendOnInstagramService do
         end
       end
     end
+
+    context 'when handling errors' do
+      before do
+        allow(Facebook::Messenger::Configuration::AppSecretProofCalculator).to receive(:call).and_return('app_secret_key', 'access_token')
+      end
+
+      it 'handles HTTP errors' do
+        message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+        allow(HTTParty).to receive(:post).and_return(error_response)
+
+        described_class.new(message: message).perform
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.reload.external_error).to eq('400 - The Instagram account is restricted.')
+      end
+
+      it 'handles response errors' do
+        message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+
+        error_response = instance_double(
+          HTTParty::Response,
+          success?: true,
+          body: { 'error' => { 'message' => 'Invalid message format', 'code' => 100 } }.to_json,
+          parsed_response: { 'error' => { 'message' => 'Invalid message format', 'code' => 100 } }
+        )
+
+        allow(HTTParty).to receive(:post).and_return(error_response)
+
+        described_class.new(message: message).perform
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.reload.external_error).to eq('100 - Invalid message format')
+      end
+    end
   end
 end
diff --git a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
index 7c2b79b8d..134d69fee 100644
--- a/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/providers/whatsapp_cloud_service_spec.rb
@@ -263,4 +263,56 @@ describe Whatsapp::Providers::WhatsappCloudService do
       end
     end
   end
+
+  describe '#handle_error' do
+    let(:error_message) { 'Invalid message format' }
+    let(:error_response) do
+      {
+        'error' => {
+          'message' => error_message,
+          'code' => 100
+        }
+      }
+    end
+
+    let(:error_response_object) do
+      instance_double(
+        HTTParty::Response,
+        body: error_response.to_json,
+        parsed_response: error_response
+      )
+    end
+
+    before do
+      allow(Rails.logger).to receive(:error)
+    end
+
+    context 'when there is a message' do
+      it 'logs error and updates message status' do
+        service.instance_variable_set(:@message, message)
+        service.send(:handle_error, error_response_object)
+
+        expect(message.reload.status).to eq('failed')
+        expect(message.reload.external_error).to eq(error_message)
+      end
+    end
+
+    context 'when error message is blank' do
+      let(:error_response_object) do
+        instance_double(
+          HTTParty::Response,
+          body: '{}',
+          parsed_response: {}
+        )
+      end
+
+      it 'logs error but does not update message' do
+        service.instance_variable_set(:@message, message)
+        service.send(:handle_error, error_response_object)
+
+        expect(message.reload.status).not_to eq('failed')
+        expect(message.reload.external_error).to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
index 0df9316f5..88f3f7740 100644
--- a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+++ b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
@@ -12,13 +12,30 @@ describe Whatsapp::SendOnWhatsappService do
   describe '#perform' do
     before do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
+      stub_request(:post, 'https://waba.360dialog.io/v1/messages')
     end
 
     context 'when a valid message' do
-      let(:whatsapp_request) { double }
+      let(:whatsapp_request) { instance_double(HTTParty::Response) }
       let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false) }
       let!(:contact_inbox) { create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '123456789') }
       let!(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: whatsapp_channel.inbox) }
+      let(:api_key) { 'test_key' }
+      let(:headers) { { 'D360-API-KEY' => api_key, 'Content-Type' => 'application/json' } }
+      let(:template_body) do
+        {
+          to: '123456789',
+          template: {
+            name: 'sample_shipping_confirmation',
+            namespace: '23423423_2342423_324234234_2343224',
+            language: { 'policy': 'deterministic', 'code': 'en_US' },
+            components: [{ 'type': 'body', 'parameters': [{ 'type': 'text', 'text': '3' }] }]
+          },
+          type: 'template'
+        }
+      end
+
+      let(:success_response) { { 'messages' => [{ 'id' => '123456789' }] }.to_json }
 
       it 'calls channel.send_message when with in 24 hour limit' do
         # to handle the case of 24 hour window limit.
@@ -26,14 +43,14 @@ describe Whatsapp::SendOnWhatsappService do
                          conversation: conversation)
         message = create(:message, message_type: :outgoing, content: 'test',
                                    conversation: conversation)
-        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
-        allow(whatsapp_request).to receive(:success?).and_return(true)
-        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
-        expect(HTTParty).to receive(:post).with(
-          'https://waba.360dialog.io/v1/messages',
-          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
-          body: { 'to' => '123456789', 'text' => { 'body' => 'test' }, 'type' => 'text' }.to_json
-        )
+
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            headers: headers,
+            body: { 'to' => '123456789', 'text' => { 'body' => 'test' }, 'type' => 'text' }.to_json
+          )
+          .to_return(status: 200, body: success_response, headers: { 'content-type' => 'application/json' })
+
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')
       end
@@ -41,23 +58,13 @@ describe Whatsapp::SendOnWhatsappService do
       it 'calls channel.send_template when after 24 hour limit' do
         message = create(:message, message_type: :outgoing, content: 'Your package has been shipped. It will be delivered in 3 business days.',
                                    conversation: conversation)
-        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
-        allow(whatsapp_request).to receive(:success?).and_return(true)
-        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
-        expect(HTTParty).to receive(:post).with(
-          'https://waba.360dialog.io/v1/messages',
-          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
-          body: {
-            to: '123456789',
-            template: {
-              name: 'sample_shipping_confirmation',
-              namespace: '23423423_2342423_324234234_2343224',
-              language: { 'policy': 'deterministic', 'code': 'en_US' },
-              components: [{ 'type': 'body', 'parameters': [{ 'type': 'text', 'text': '3' }] }]
-            },
-            type: 'template'
-          }.to_json
-        )
+
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            headers: headers,
+            body: template_body.to_json
+          ).to_return(status: 200, body: success_response, headers: { 'content-type' => 'application/json' })
+
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')
       end
@@ -65,23 +72,12 @@ describe Whatsapp::SendOnWhatsappService do
       it 'calls channel.send_template if template_params are present' do
         message = create(:message, additional_attributes: { template_params: template_params },
                                    content: 'Your package will be delivered in 3 business days.', conversation: conversation, message_type: :outgoing)
-        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
-        allow(whatsapp_request).to receive(:success?).and_return(true)
-        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
-        expect(HTTParty).to receive(:post).with(
-          'https://waba.360dialog.io/v1/messages',
-          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
-          body: {
-            to: '123456789',
-            template: {
-              name: 'sample_shipping_confirmation',
-              namespace: '23423423_2342423_324234234_2343224',
-              language: { 'policy': 'deterministic', 'code': 'en_US' },
-              components: [{ 'type': 'body', 'parameters': [{ 'type': 'text', 'text': '3' }] }]
-            },
-            type: 'template'
-          }.to_json
-        )
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            headers: headers,
+            body: template_body.to_json
+          ).to_return(status: 200, body: success_response, headers: { 'content-type' => 'application/json' })
+
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')
       end
@@ -93,23 +89,22 @@ describe Whatsapp::SendOnWhatsappService do
           content: 'عميلنا العزيز الرجاء الرد على هذه الرسالة بكلمة *نعم* للرد على إستفساركم من قبل خدمة العملاء.',
           conversation: conversation
         )
-        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
-        allow(whatsapp_request).to receive(:success?).and_return(true)
-        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
-        expect(HTTParty).to receive(:post).with(
-          'https://waba.360dialog.io/v1/messages',
-          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
-          body: {
-            to: '123456789',
-            template: {
-              name: 'customer_yes_no',
-              namespace: '2342384942_32423423_23423fdsdaf23',
-              language: { 'policy': 'deterministic', 'code': 'ar' },
-              components: [{ 'type': 'body', 'parameters': [] }]
-            },
-            type: 'template'
-          }.to_json
-        )
+
+        stub_request(:post, 'https://waba.360dialog.io/v1/messages')
+          .with(
+            headers: headers,
+            body: {
+              to: '123456789',
+              template: {
+                name: 'customer_yes_no',
+                namespace: '2342384942_32423423_23423fdsdaf23',
+                language: { 'policy': 'deterministic', 'code': 'ar' },
+                components: [{ 'type': 'body', 'parameters': [] }]
+              },
+              type: 'template'
+            }.to_json
+          ).to_return(status: 200, body: success_response, headers: { 'content-type' => 'application/json' })
+
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')
       end