diff --git a/src/apps/chatwoot/i18n/locales/ar-AE.yaml b/src/apps/chatwoot/i18n/locales/ar-AE.yaml
index 8409f970..2275a4df 100644
--- a/src/apps/chatwoot/i18n/locales/ar-AE.yaml
+++ b/src/apps/chatwoot/i18n/locales/ar-AE.yaml
@@ -1,5 +1,11 @@
 # Arabic translations for ChatWoot integration
 locale.name: '🇦🇪 العربية (Arabic)'
+
+# رمز اللغة الأساسي - يجب أن يكون محليًا صالحًا وفق BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# تستخدمه WAHA لعرض الأرقام والعملات والتاريخ/الوقت
+locale.base: 'ar-AE'
+
 app.inbox.contact.name: 'تكامل واتساب (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/bn-BD.yaml b/src/apps/chatwoot/i18n/locales/bn-BD.yaml
index 0de5e09c..bda85d86 100644
--- a/src/apps/chatwoot/i18n/locales/bn-BD.yaml
+++ b/src/apps/chatwoot/i18n/locales/bn-BD.yaml
@@ -1,5 +1,11 @@
 # Bengali translations for ChatWoot integration
 locale.name: '🇧🇩 বাংলা (Bengali)'
+
+# বেস লোকেল কোড - এটি একটি বৈধ BCP 47 লোকেল হতে হবে
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA এটি সংখ্যা, মুদ্রা এবং তারিখ/সময়ের ফরম্যাটিংয়ে ব্যবহার করে।
+locale.base: 'bn-BD'
+
 app.inbox.contact.name: 'হোয়াটসঅ্যাপ ইন্টিগ্রেশন (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/de-DE.yaml b/src/apps/chatwoot/i18n/locales/de-DE.yaml
index f4b9187f..f4712fed 100644
--- a/src/apps/chatwoot/i18n/locales/de-DE.yaml
+++ b/src/apps/chatwoot/i18n/locales/de-DE.yaml
@@ -1,5 +1,11 @@
 # German translations for ChatWoot integration
 locale.name: '🇩🇪 Deutsch (German)'
+
+# Basis-Gebietsschema-Code - muss eine gültige BCP 47 Locale sein
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA nutzt ihn zur Darstellung von Zahlen, Währungen sowie Datum und Uhrzeit
+locale.base: 'de-DE'
+
 app.inbox.contact.name: 'WhatsApp Integration (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/en-US.yaml b/src/apps/chatwoot/i18n/locales/en-US.yaml
index f75bf00b..b598b8fc 100644
--- a/src/apps/chatwoot/i18n/locales/en-US.yaml
+++ b/src/apps/chatwoot/i18n/locales/en-US.yaml
@@ -10,7 +10,6 @@ app.inbox.contact.name: 'WhatsApp Integration (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
 datetime:
-  locales: en-US
   day: 2-digit
   month: 2-digit
   year: numeric
diff --git a/src/apps/chatwoot/i18n/locales/es-ES.yaml b/src/apps/chatwoot/i18n/locales/es-ES.yaml
index 62197797..71ce8243 100644
--- a/src/apps/chatwoot/i18n/locales/es-ES.yaml
+++ b/src/apps/chatwoot/i18n/locales/es-ES.yaml
@@ -1,5 +1,11 @@
 # Spanish translations for ChatWoot integration
 locale.name: '🇪🇸 Español (Spanish)'
+
+# Código de locale base - debe ser un locale BCP 47 válido
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA lo utiliza para formatear números, moneda y fecha/hora
+locale.base: 'es-ES'
+
 app.inbox.contact.name: 'Integración de WhatsApp (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/fa-IR.yaml b/src/apps/chatwoot/i18n/locales/fa-IR.yaml
index 53362aeb..30b327d4 100644
--- a/src/apps/chatwoot/i18n/locales/fa-IR.yaml
+++ b/src/apps/chatwoot/i18n/locales/fa-IR.yaml
@@ -1,5 +1,11 @@
 # Persian translations for ChatWoot integration
 locale.name: '🇮🇷 فارسی (Persian)'
+
+# کد محلی پایه - باید یک محلی معتبر BCP 47 باشد
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA از آن برای نمایش اعداد، ارز و تاریخ/زمان استفاده می‌کند
+locale.base: 'fa-IR'
+
 app.inbox.contact.name: 'ادغام واتساپ (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/fr-FR.yaml b/src/apps/chatwoot/i18n/locales/fr-FR.yaml
index d0d736a1..1f143606 100644
--- a/src/apps/chatwoot/i18n/locales/fr-FR.yaml
+++ b/src/apps/chatwoot/i18n/locales/fr-FR.yaml
@@ -1,5 +1,11 @@
 # French translations for ChatWoot integration
 locale.name: '🇫🇷 Français (French)'
+
+# Code de locale de base - doit être une locale BCP 47 valide
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA l'utilise pour le formatage des nombres, devises et dates/heures
+locale.base: 'fr-FR'
+
 app.inbox.contact.name: 'Intégration WhatsApp (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/he-IL.yaml b/src/apps/chatwoot/i18n/locales/he-IL.yaml
index 8a10e9fe..1a175f6a 100644
--- a/src/apps/chatwoot/i18n/locales/he-IL.yaml
+++ b/src/apps/chatwoot/i18n/locales/he-IL.yaml
@@ -1,5 +1,11 @@
 # Hebrew translations for ChatWoot integration
 locale.name: '🇮🇱 עברית (Hebrew)'
+
+# קוד הלוקאל הבסיסי - חייב להיות לוקאל תקין לפי BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA משתמש בכך להצגת מספרים, מטבע ותאריך/שעה
+locale.base: 'he-IL'
+
 app.inbox.contact.name: 'אינטגרציית וואטסאפ (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/hi-IN.yaml b/src/apps/chatwoot/i18n/locales/hi-IN.yaml
index 043388c6..cf5fc76e 100644
--- a/src/apps/chatwoot/i18n/locales/hi-IN.yaml
+++ b/src/apps/chatwoot/i18n/locales/hi-IN.yaml
@@ -1,5 +1,11 @@
 # Hindi translations for ChatWoot integration
 locale.name: '🇮🇳 हिंदी (Hindi)'
+
+# बेस लोकैल कोड - यह एक मान्य BCP 47 लोकैल होना चाहिए
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA इसे संख्याएँ, मुद्रा और दिनांक/समय प्रदर्शित करने के लिए उपयोग करता है।
+locale.base: 'hi-IN'
+
 app.inbox.contact.name: 'व्हाट्सएप इंटीग्रेशन (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/id-ID.yaml b/src/apps/chatwoot/i18n/locales/id-ID.yaml
index 3c403439..223f956c 100644
--- a/src/apps/chatwoot/i18n/locales/id-ID.yaml
+++ b/src/apps/chatwoot/i18n/locales/id-ID.yaml
@@ -1,5 +1,11 @@
 # Indonesian translations for ChatWoot integration
 locale.name: '🇮🇩 Bahasa Indonesia (Indonesian)'
+
+# Kode locale dasar - harus berupa locale BCP 47 yang valid
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA menggunakannya untuk format angka, mata uang, dan tanggal/waktu
+locale.base: 'id-ID'
+
 app.inbox.contact.name: 'Integrasi WhatsApp (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/pa-PK.yaml b/src/apps/chatwoot/i18n/locales/pa-PK.yaml
index 16ba1234..9dbdccb1 100644
--- a/src/apps/chatwoot/i18n/locales/pa-PK.yaml
+++ b/src/apps/chatwoot/i18n/locales/pa-PK.yaml
@@ -1,5 +1,11 @@
 # Punjabi translations for ChatWoot integration
 locale.name: '🇵🇰 ਪੰਜਾਬੀ (Punjabi)'
+
+# ਅਧਾਰਭੂਤ ਲੋਕੇਲ ਕੋਡ - ਇਹ ਇੱਕ ਵੈਧ BCP 47 ਲੋਕੇਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA ਇਸਨੂੰ ਅੰਕ, ਕਰੰਸੀ ਅਤੇ ਤਾਰੀਖ/ਸਮੇਂ ਦੀ ਨਮਾਇਸ਼ ਲਈ ਵਰਤਦਾ ਹੈ
+locale.base: 'pa-PK'
+
 app.inbox.contact.name: 'ਵਟਸਐਪ ਇੰਟੀਗ੍ਰੇਸ਼ਨ (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/pt-BR.yaml b/src/apps/chatwoot/i18n/locales/pt-BR.yaml
index f7f6b613..3d5923d4 100644
--- a/src/apps/chatwoot/i18n/locales/pt-BR.yaml
+++ b/src/apps/chatwoot/i18n/locales/pt-BR.yaml
@@ -1,9 +1,9 @@
 # Portuguese translations for ChatWoot integration
 locale.name: '🇧🇷🇵🇹 Português (Portuguese)'
 
-# Base locale code - must be a valid BCP 47 locale
+# Código de locale base - deve ser um locale BCP 47 válido
 # https://en.wikipedia.org/wiki/IETF_language_tag
-# WAHA uses it for number, currency and datetime representation
+# A WAHA usa isso para formatar números, moeda e data/hora
 locale.base: 'pt-BR'
 
 app.inbox.contact.name: 'Integração WhatsApp (WAHA)'
diff --git a/src/apps/chatwoot/i18n/locales/ru-RU.yaml b/src/apps/chatwoot/i18n/locales/ru-RU.yaml
index a7181356..16bad7ba 100644
--- a/src/apps/chatwoot/i18n/locales/ru-RU.yaml
+++ b/src/apps/chatwoot/i18n/locales/ru-RU.yaml
@@ -1,5 +1,11 @@
 # Russian translations for ChatWoot integration
 locale.name: '🇷🇺 Русский (Russian)'
+
+# Базовый код локали - должен быть корректной локалью BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA использует его для форматирования чисел, валют и даты/времени
+locale.base: 'ru-RU'
+
 app.inbox.contact.name: 'WhatsApp Интеграция (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/tr-TR.yaml b/src/apps/chatwoot/i18n/locales/tr-TR.yaml
index 2d7fd455..09403e6f 100644
--- a/src/apps/chatwoot/i18n/locales/tr-TR.yaml
+++ b/src/apps/chatwoot/i18n/locales/tr-TR.yaml
@@ -1,5 +1,11 @@
 # Turkish translations for ChatWoot integration
 locale.name: '🇹🇷 Türkçe (Turkish)'
+
+# Temel yerel kodu - geçerli bir BCP 47 yerel kodu olmalı
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA bunu sayı, para birimi ve tarih/saat gösterimi için kullanır
+locale.base: 'tr-TR'
+
 app.inbox.contact.name: 'WhatsApp Entegrasyonu (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/uk-UA.yaml b/src/apps/chatwoot/i18n/locales/uk-UA.yaml
index dbe5a28f..2ad8770a 100644
--- a/src/apps/chatwoot/i18n/locales/uk-UA.yaml
+++ b/src/apps/chatwoot/i18n/locales/uk-UA.yaml
@@ -1,5 +1,11 @@
 # Ukrainian translations for ChatWoot integration
 locale.name: '🇺🇦 Українська (Ukrainian)'
+
+# Базовий код локалі - має бути чинною локаллю BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA використовує його для форматування чисел, валют і дати/часу
+locale.base: 'uk-UA'
+
 app.inbox.contact.name: 'Інтеграція WhatsApp (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/ur-PK.yaml b/src/apps/chatwoot/i18n/locales/ur-PK.yaml
index aec88c4c..a1307c0d 100644
--- a/src/apps/chatwoot/i18n/locales/ur-PK.yaml
+++ b/src/apps/chatwoot/i18n/locales/ur-PK.yaml
@@ -1,5 +1,11 @@
 # Urdu translations for ChatWoot integration
 locale.name: '🇵🇰 اردو (Urdu)'
+
+# بنیادی لوکل کوڈ - یہ ایک معتبر BCP 47 لوکل ہونا چاہیے
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA اسے نمبرز، کرنسی اور تاریخ/وقت کی نمائندگی کے لیے استعمال کرتا ہے۔
+locale.base: 'ur-PK'
+
 app.inbox.contact.name: 'واٹس ایپ انٹیگریشن (WAHA)'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'
 
diff --git a/src/apps/chatwoot/i18n/locales/zh-CN.yaml b/src/apps/chatwoot/i18n/locales/zh-CN.yaml
index 736fb4b6..7125a74a 100644
--- a/src/apps/chatwoot/i18n/locales/zh-CN.yaml
+++ b/src/apps/chatwoot/i18n/locales/zh-CN.yaml
@@ -1,5 +1,11 @@
 # Simplified Chinese translations for ChatWoot integration
 locale.name: '🇨🇳 中文（Simplified Chinese）'
+
+# 基础语言代码 - 必须是有效的 BCP 47 语言区域
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA 使用它来格式化数字、货币和日期时间。
+locale.base: 'zh-CN'
+
 app.inbox.contact.name: 'WhatsApp 集成（WAHA）'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'