From 714bd677dd0dcd2351846869b3e55996d922f47e Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 00:08:12 +0330
Subject: [PATCH 01/21] feat: localize country names across all supported
 languages and update exit navigation flow

---
 .../[slug]/question-detail-client.test.tsx    |    4 +-
 .../[slug]/question-detail-client.tsx         |   65 +-
 .../[slug]/test-intro-client.tsx              |    9 +-
 .../question-exit-navigation-button.tsx       |   18 +-
 .../Componentes/test-questions-flow.tsx       |    9 +-
 src/data/countries.ts                         | 4810 ++++++++++++++++-
 src/hooks/use-habib-web-ready.ts              |   15 +
 src/lib/entry-route-cache.ts                  |   14 +
 src/lib/marriage-field-formatter.ts           |   30 +-
 src/translations/locales/ar.json              |   52 +-
 src/translations/locales/az.json              |   40 +-
 src/translations/locales/bn.json              |   42 +-
 src/translations/locales/da.json              |  160 +-
 src/translations/locales/de.json              |  200 +-
 src/translations/locales/es.json              |  210 +-
 src/translations/locales/fr.json              |  248 +-
 src/translations/locales/gu.json              |  364 +-
 src/translations/locales/ha.json              |  226 +-
 src/translations/locales/he.json              |  384 +-
 src/translations/locales/hi.json              |  368 +-
 src/translations/locales/id.json              |  168 +-
 src/translations/locales/ks.json              |  388 +-
 src/translations/locales/pt.json              |  284 +-
 src/translations/locales/ru.json              |  354 +-
 src/translations/locales/sw.json              |  234 +-
 src/translations/locales/tg.json              |  384 +-
 src/translations/locales/tr.json              |  280 +-
 src/translations/locales/ul.json              |   76 +-
 src/translations/locales/ur.json              |  388 +-
 src/translations/locales/uz.json              |  320 +-
 src/translations/locales/zh.json              |  180 +-
 31 files changed, 7348 insertions(+), 2976 deletions(-)

diff --git a/src/app/questions-list/[slug]/question-detail-client.test.tsx b/src/app/questions-list/[slug]/question-detail-client.test.tsx
index 7594eac..47e758a 100644
--- a/src/app/questions-list/[slug]/question-detail-client.test.tsx
+++ b/src/app/questions-list/[slug]/question-detail-client.test.tsx
@@ -298,8 +298,8 @@ describe("QuestionDetailClient Validation", () => {
 
     expect(screen.getByText("Overview Profile Title")).toBeDefined();
     expect(screen.getByRole("status")).toBeDefined();
-    expect(screen.getByRole("button", { name: "Close" })).toBeDefined();
-    expect(screen.getByRole("button", { name: "Info" })).toBeDefined();
+    expect(screen.getByRole("button", { name: "Back" })).toBeDefined();
+    expect(screen.queryByRole("button", { name: "Info" })).toBeNull();
     expect(screen.getByRole("button", { name: "Continue" })).toBeDisabled();
     expect(document.querySelector(".shimmer-bg")).toBeNull();
   });
diff --git a/src/app/questions-list/[slug]/question-detail-client.tsx b/src/app/questions-list/[slug]/question-detail-client.tsx
index 49bf376..27b2931 100644
--- a/src/app/questions-list/[slug]/question-detail-client.tsx
+++ b/src/app/questions-list/[slug]/question-detail-client.tsx
@@ -520,21 +520,14 @@ export default function QuestionDetailClient({
                 <NavigationButton
                   className="shrink-0"
                   variant="transparent"
-                  icon="close"
-                  iconLabel={closeLabel}
+                  icon="back"
+                  iconLabel={t["Back"] || "Back"}
                   onClick={handleExit}
                 />
                 <h1 className="min-w-0 flex-1 truncate text-center text-[14px] font-semibold text-white">
                   {loadingTitle}
                 </h1>
-                <NavigationButton
-                  className="shrink-0"
-                  variant="transparent"
-                  icon="info"
-                  iconLabel={informationLabel}
-                  helpTitle={loadingTitle}
-                  helpDescription={description}
-                />
+                <div className="size-10 shrink-0" />
               </div>
             </StickyHeader>
 
@@ -572,21 +565,14 @@ export default function QuestionDetailClient({
                 <NavigationButton
                   className="shrink-0"
                   variant="transparent"
-                  icon="close"
-                  iconLabel={closeLabel}
+                  icon="back"
+                  iconLabel={t["Back"] || "Back"}
                   onClick={handleExit}
                 />
                 <h1 className="min-w-0 flex-1 truncate text-center text-[14px] font-semibold text-white">
                   {errorTitle}
                 </h1>
-                <NavigationButton
-                  className="shrink-0"
-                  variant="transparent"
-                  icon="info"
-                  iconLabel={informationLabel}
-                  helpTitle={errorTitle}
-                  helpDescription={description}
-                />
+                <div className="size-10 shrink-0" />
               </div>
             </StickyHeader>
 
@@ -615,21 +601,14 @@ export default function QuestionDetailClient({
               <NavigationButton
                 className="shrink-0"
                 variant="transparent"
-                icon="close"
-                iconLabel={closeLabel}
+                icon="back"
+                iconLabel={t["Back"] || "Back"}
                 onClick={handleExit}
               />
               <h1 className="min-w-0 flex-1 truncate text-center text-[14px] font-semibold text-white">
                 {errorTitle}
               </h1>
-              <NavigationButton
-                className="shrink-0"
-                variant="transparent"
-                icon="info"
-                iconLabel={informationLabel}
-                helpTitle={errorTitle}
-                helpDescription={description}
-              />
+              <div className="size-10 shrink-0" />
             </div>
           </StickyHeader>
 
@@ -801,21 +780,14 @@ export default function QuestionDetailClient({
               <NavigationButton
                 className="shrink-0"
                 variant="transparent"
-                icon="close"
-                iconLabel={closeLabel}
+                icon="back"
+                iconLabel={t["Back"] || "Back"}
                 onClick={handleExit}
               />
               <h1 className="min-w-0 flex-1 text-center text-[14px] font-semibold text-white truncate">
                 {item.title}
               </h1>
-              <NavigationButton
-                className="shrink-0"
-                variant="transparent"
-                icon="info"
-                iconLabel={informationLabel}
-                helpTitle={item.title}
-                helpDescription={description}
-              />
+              <div className="size-10 shrink-0" />
             </div>
           </StickyHeader>
 
@@ -989,22 +961,15 @@ export default function QuestionDetailClient({
               <QuestionExitNavigationButton
                 className="shrink-0"
                 variant="transparent"
-                icon="close"
-                iconLabel={closeLabel}
+                icon="back"
+                iconLabel={t["Back"] || "Back"}
                 exitHref={questionsListHref}
                 onExit={handleExit}
               />
               <h1 className="min-w-0 flex-1 text-center text-[14px] font-semibold text-white truncate">
                 {item.title}
               </h1>
-              <NavigationButton
-                className="shrink-0"
-                variant="transparent"
-                icon="info"
-                iconLabel={informationLabel}
-                helpTitle={item.title}
-                helpDescription={description}
-              />
+              <div className="size-10 shrink-0" />
             </div>
           </StickyHeader>
 
diff --git a/src/app/questions-list/[slug]/test-intro-client.tsx b/src/app/questions-list/[slug]/test-intro-client.tsx
index c006a46..db83711 100644
--- a/src/app/questions-list/[slug]/test-intro-client.tsx
+++ b/src/app/questions-list/[slug]/test-intro-client.tsx
@@ -38,18 +38,13 @@ export default function TestIntroClient({
             <NavigationButton
               className="shrink-0"
               variant="transparent"
-              icon="close"
+              icon="back"
               iconLabel={closeLabel}
             />
             <h1 className="min-w-0 flex-1 text-center font-semibold text-white truncate">
               {title}
             </h1>
-            <NavigationButton
-              className="shrink-0"
-              variant="transparent"
-              icon="info"
-              iconLabel={informationLabel}
-            />
+            <div className="size-10 shrink-0" />
           </div>
         </StickyHeader>
 
diff --git a/src/components/Componentes/question-exit-navigation-button.tsx b/src/components/Componentes/question-exit-navigation-button.tsx
index be99a3b..eaa8750 100644
--- a/src/components/Componentes/question-exit-navigation-button.tsx
+++ b/src/components/Componentes/question-exit-navigation-button.tsx
@@ -30,7 +30,7 @@ export function QuestionExitNavigationButton({
     <NavigationButton
       {...props}
       disabled={props.disabled || isNavigating}
-      onClick={async (event) => {
+      onClick={(event) => {
         props.onClick?.(event);
 
         if (event.defaultPrevented || isNavigating) {
@@ -42,16 +42,16 @@ export function QuestionExitNavigationButton({
 
         try {
           markFirstEntryCompleted();
-          await flushAnswers({ force: true });
+          void flushAnswers({ force: true }).catch(() => {});
         } catch {
           // ignore
-        } finally {
-          if (onExit) {
-            onExit();
-          } else {
-            const target = localizePath(exitHref || "/questions-list", locale);
-            router.replace(target);
-          }
+        }
+
+        if (onExit) {
+          onExit();
+        } else {
+          const target = localizePath(exitHref || "/questions-list", locale);
+          router.replace(target);
         }
       }}
     />
diff --git a/src/components/Componentes/test-questions-flow.tsx b/src/components/Componentes/test-questions-flow.tsx
index fa44048..637c734 100644
--- a/src/components/Componentes/test-questions-flow.tsx
+++ b/src/components/Componentes/test-questions-flow.tsx
@@ -245,19 +245,14 @@ export default function TestQuestionsFlow({
             <NavigationButton
               className="shrink-0"
               variant="transparent"
-              icon="close"
+              icon="back"
               iconLabel={closeLabel}
               onClick={handleRequestClose}
             />
             <h1 className="min-w-0 flex-1 text-center font-semibold text-white truncate group-16">
               {title}
             </h1>
-            <NavigationButton
-              className="shrink-0"
-              variant="transparent"
-              icon="info"
-              iconLabel={informationLabel}
-            />
+            <div className="size-10 shrink-0" />
           </div>
         </StickyHeader>
 
diff --git a/src/data/countries.ts b/src/data/countries.ts
index 29e5617..b57bb62 100644
--- a/src/data/countries.ts
+++ b/src/data/countries.ts
@@ -1,3 +1,7 @@
+/**
+ * Complete localized country lists for all 24 supported languages.
+ */
+
 export const COUNTRIES_EN = [
   "Afghanistan",
   "Albania",
@@ -24,32 +28,4169 @@ export const COUNTRIES_EN = [
   "Botswana",
   "Brazil",
   "Brunei",
-  "Bulgaria",
+  "Bulgaria",
+  "Burkina Faso",
+  "Burundi",
+  "Cabo Verde",
+  "Cambodia",
+  "Cameroon",
+  "Canada",
+  "Central African Republic",
+  "Chad",
+  "Chile",
+  "China",
+  "Colombia",
+  "Comoros",
+  "Congo",
+  "Costa Rica",
+  "Croatia",
+  "Cuba",
+  "Cyprus",
+  "Czechia",
+  "Democratic Republic of the Congo",
+  "Denmark",
+  "Djibouti",
+  "Dominica",
+  "Dominican Republic",
+  "Ecuador",
+  "Egypt",
+  "El Salvador",
+  "Equatorial Guinea",
+  "Eritrea",
+  "Estonia",
+  "Eswatini",
+  "Ethiopia",
+  "Fiji",
+  "Finland",
+  "France",
+  "Gabon",
+  "Gambia",
+  "Georgia",
+  "Germany",
+  "Ghana",
+  "Greece",
+  "Grenada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Holy See",
+  "Honduras",
+  "Hungary",
+  "Iceland",
+  "India",
+  "Indonesia",
+  "Iran",
+  "Iraq",
+  "Ireland",
+  "Italy",
+  "Ivory Coast",
+  "Jamaica",
+  "Japan",
+  "Jordan",
+  "Kazakhstan",
+  "Kenya",
+  "Kiribati",
+  "Kuwait",
+  "Kyrgyzstan",
+  "Laos",
+  "Latvia",
+  "Lebanon",
+  "Lesotho",
+  "Liberia",
+  "Libya",
+  "Liechtenstein",
+  "Lithuania",
+  "Luxembourg",
+  "Madagascar",
+  "Malawi",
+  "Malaysia",
+  "Maldives",
+  "Mali",
+  "Malta",
+  "Marshall Islands",
+  "Mauritania",
+  "Mauritius",
+  "Mexico",
+  "Micronesia",
+  "Moldova",
+  "Monaco",
+  "Mongolia",
+  "Montenegro",
+  "Morocco",
+  "Mozambique",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Netherlands",
+  "New Zealand",
+  "Nicaragua",
+  "Niger",
+  "Nigeria",
+  "North Korea",
+  "North Macedonia",
+  "Norway",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Palestine State",
+  "Panama",
+  "Papua New Guinea",
+  "Paraguay",
+  "Peru",
+  "Philippines",
+  "Poland",
+  "Portugal",
+  "Qatar",
+  "Romania",
+  "Russia",
+  "Rwanda",
+  "Saint Kitts and Nevis",
+  "Saint Lucia",
+  "Saint Vincent and the Grenadines",
+  "Samoa",
+  "San Marino",
+  "Sao Tome and Principe",
+  "Saudi Arabia",
+  "Senegal",
+  "Serbia",
+  "Seychelles",
+  "Sierra Leone",
+  "Singapore",
+  "Slovakia",
+  "Slovenia",
+  "Solomon Islands",
+  "Somalia",
+  "South Africa",
+  "South Korea",
+  "South Sudan",
+  "Spain",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Sweden",
+  "Switzerland",
+  "Syria",
+  "Tajikistan",
+  "Tanzania",
+  "Thailand",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinidad and Tobago",
+  "Tunisia",
+  "Turkey",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukraine",
+  "United Arab Emirates (UAE)",
+  "United Kingdom (UK)",
+  "United States (US)",
+  "Uruguay",
+  "Uzbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yemen",
+  "Zambia",
+  "Zimbabwe",
+];
+
+export const COUNTRIES_FA = [
+  "افغانستان",
+  "آلبانی",
+  "الجزایر",
+  "آندورا",
+  "آنگولا",
+  "آنتیگوا و باربودا",
+  "آرژانتین",
+  "ارمنستان",
+  "استرالیا",
+  "اتریش",
+  "آذربایجان",
+  "باهاما",
+  "بحرین",
+  "بنگلادش",
+  "باربادوس",
+  "بلاروس",
+  "بلژیک",
+  "بلیز",
+  "بنین",
+  "بوتان",
+  "بولیوی",
+  "بوسنی و هرزگوین",
+  "بوتسوانا",
+  "برزیل",
+  "برونئی",
+  "بلغارستان",
+  "بورکینافاسو",
+  "بوروندی",
+  "کیپ ورد",
+  "کامبوج",
+  "کامرون",
+  "کانادا",
+  "جمهوری آفریقای مرکزی",
+  "چاد",
+  "شیلی",
+  "چین",
+  "کلمبیا",
+  "کومور",
+  "کنگو",
+  "کاستاریکا",
+  "کرواسی",
+  "کوبا",
+  "قبرس",
+  "جمهوری چک",
+  "جمهوری دموکراتیک کنگو",
+  "دانمارک",
+  "جیبوتی",
+  "دومینیکا",
+  "جمهوری دومینیکن",
+  "اکوادور",
+  "مصر",
+  "السالوادور",
+  "گینه استوایی",
+  "اریتره",
+  "استونی",
+  "اسواتینی",
+  "اتیوپی",
+  "فیجی",
+  "فنلاند",
+  "فرانسه",
+  "گابن",
+  "گامبیا",
+  "گرجستان",
+  "آلمان",
+  "غنا",
+  "یونان",
+  "گرنادا",
+  "گواتمالا",
+  "گینه",
+  "گینه بیسائو",
+  "گویان",
+  "هایتی",
+  "واتیکان",
+  "هندوراس",
+  "مجارستان",
+  "ایسلند",
+  "هند",
+  "اندونزی",
+  "ایران",
+  "عراق",
+  "ایرلند",
+  "ایتالیا",
+  "ساحل عاج",
+  "جامائیکا",
+  "ژاپن",
+  "اردن",
+  "قزاقستان",
+  "کنیا",
+  "کیریباتی",
+  "کویت",
+  "قرقیزستان",
+  "لائوس",
+  "لتونی",
+  "لبنان",
+  "لسوتو",
+  "لیبریا",
+  "لیبی",
+  "لیختن‌اشتاین",
+  "لیتوانی",
+  "لوکزامبورگ",
+  "ماداگاسکار",
+  "مالاوی",
+  "مالزی",
+  "مالدیو",
+  "مالی",
+  "مالت",
+  "جزایر مارشال",
+  "موریتانی",
+  "موریس",
+  "مکزیک",
+  "میکرونزی",
+  "مولداوی",
+  "موناکو",
+  "مغولستان",
+  "مونته‌نگرو",
+  "مراکش",
+  "موزامبیک",
+  "میانمار",
+  "نامیبیا",
+  "نائورو",
+  "نپال",
+  "هلند",
+  "نیوزیلند",
+  "نیکاراگوئه",
+  "نیجر",
+  "نیجریه",
+  "کره شمالی",
+  "مقدونیه شمالی",
+  "نروژ",
+  "عمان",
+  "پاکستان",
+  "پالائو",
+  "فلسطین",
+  "پاناما",
+  "پاپوآ گینه نو",
+  "پاراگوئه",
+  "پرو",
+  "فیلیپین",
+  "لهستان",
+  "پرتغال",
+  "قطر",
+  "رومانی",
+  "روسیه",
+  "رواندا",
+  "سنت کیتس و نویس",
+  "سنت لوسیا",
+  "سنت وینسنت و گرنادین‌ها",
+  "ساموآ",
+  "سان مارینو",
+  "سائوتومه و پرنسیپ",
+  "عربستان سعودی",
+  "سنگال",
+  "صربستان",
+  "سیشل",
+  "سیرالئون",
+  "سنگاپور",
+  "اسلواکی",
+  "اسلوونی",
+  "جزایر سلیمان",
+  "سومالی",
+  "آفریقای جنوبی",
+  "کره جنوبی",
+  "سودان جنوبی",
+  "اسپانیا",
+  "سری‌لانکا",
+  "سودان",
+  "سورینام",
+  "سوئد",
+  "سوئیس",
+  "سوریه",
+  "تاجیکستان",
+  "تانزانیا",
+  "تایلند",
+  "تیمور شرقی",
+  "توگو",
+  "تونگا",
+  "ترینیداد و توباگو",
+  "تونس",
+  "ترکیه",
+  "ترکمنستان",
+  "تووالو",
+  "اوگاندا",
+  "اوکراین",
+  "امارات متحده عربی (UAE)",
+  "بریتانیا (UK)",
+  "ایالات متحده آمریکا (US)",
+  "اروگوئه",
+  "ازبکستان",
+  "وانواتو",
+  "ونزوئلا",
+  "ویتنام",
+  "یمن",
+  "زامبیا",
+  "زیمبابوه",
+];
+
+export const COUNTRIES_AR = [
+  "أفغانستان",
+  "ألبانيا",
+  "الجزائر",
+  "أندورا",
+  "أنغولا",
+  "أنتيغوا وبربودا",
+  "الأرجنتين",
+  "أرمينيا",
+  "أستراليا",
+  "النمسا",
+  "أذربيجان",
+  "باهاماس",
+  "البحرين",
+  "بنغلاديش",
+  "باربادوس",
+  "بيلاروس",
+  "بلجيكا",
+  "بليز",
+  "بنين",
+  "بوتان",
+  "بوليفيا",
+  "البوسنة والهرسك",
+  "بوتسوانا",
+  "البرازيل",
+  "بروناي",
+  "بلغاريا",
+  "بوركينا فاسو",
+  "بوروندي",
+  "الرأس الأخضر",
+  "كمبوديا",
+  "الكاميرون",
+  "كندا",
+  "جمهورية أفريقيا الوسطى",
+  "تشاد",
+  "تشيلي",
+  "الصين",
+  "كولومبيا",
+  "جزر القمر",
+  "جمهورية الكونغو",
+  "كوستاريكا",
+  "كرواتيا",
+  "كوبا",
+  "قبرص",
+  "التشيك",
+  "جمهورية الكونغو الديمقراطية",
+  "الدنمارك",
+  "جيبوتي",
+  "دومينيكا",
+  "جمهورية الدومينيكان",
+  "الإكوادور",
+  "مصر",
+  "السلفادور",
+  "غينيا الاستوائية",
+  "إريتريا",
+  "إستونيا",
+  "إسواتيني",
+  "إثيوبيا",
+  "فيجي",
+  "فنلندا",
+  "فرنسا",
+  "الغابون",
+  "غامبيا",
+  "جورجيا",
+  "ألمانيا",
+  "غانا",
+  "اليونان",
+  "غرينادا",
+  "غواتيمالا",
+  "غينيا",
+  "غينيا بيساو",
+  "غيانا",
+  "هايتي",
+  "الكرسي الرسولي",
+  "هندوراس",
+  "المجر",
+  "آيسلندا",
+  "الهند",
+  "إندونيسيا",
+  "إيران",
+  "العراق",
+  "أيرلندا",
+  "إيطاليا",
+  "ساحل العاج",
+  "جامايكا",
+  "اليابان",
+  "الأردن",
+  "كازاخستان",
+  "كينيا",
+  "كيريباتي",
+  "الكويت",
+  "قيرغيزستان",
+  "لاوس",
+  "لاتفيا",
+  "لبنان",
+  "ليسوتو",
+  "ليبيريا",
+  "ليبيا",
+  "ليختنشتاين",
+  "ليتوانيا",
+  "لوكسمبورغ",
+  "مدغشقر",
+  "مالاوي",
+  "ماليزيا",
+  "المالديف",
+  "مالي",
+  "مالطا",
+  "جزر مارشال",
+  "موريتانيا",
+  "موريشيوس",
+  "المكسيك",
+  "ميكرونيزيا",
+  "مولدوفا",
+  "موناكو",
+  "منغوليا",
+  "الجبل الأسود",
+  "المغرب",
+  "موزمبيق",
+  "ميانمار",
+  "ناميبيا",
+  "ناورو",
+  "نيبال",
+  "هولندا",
+  "نيوزيلندا",
+  "نيكاراغوا",
+  "النيجر",
+  "نيجيريا",
+  "كوريا الشمالية",
+  "مقدونيا الشمالية",
+  "النرويج",
+  "عُمان",
+  "باكستان",
+  "بالاو",
+  "دولة فلسطين",
+  "بنما",
+  "بابوا غينيا الجديدة",
+  "باراغواي",
+  "بيرو",
+  "الفلبين",
+  "بولندا",
+  "البرتغال",
+  "قطر",
+  "رومانيا",
+  "روسيا",
+  "رواندا",
+  "سانت كيتس ونيفيس",
+  "سانت لوسيا",
+  "سانت فينسنت والغرينادين",
+  "ساموا",
+  "سان مارينو",
+  "ساو تومي وبرينسيب",
+  "المملكة العربية السعودية",
+  "السنغال",
+  "صربيا",
+  "سيشل",
+  "سيراليون",
+  "سنغافورة",
+  "سلوفاكيا",
+  "سلوفينيا",
+  "جزر سليمان",
+  "الصومال",
+  "جنوب إفريقيا",
+  "كوريا الجنوبية",
+  "جنوب السودان",
+  "إسبانيا",
+  "سريلانكا",
+  "السودان",
+  "سورينام",
+  "السويد",
+  "سويسرا",
+  "سوريا",
+  "طاجيكستان",
+  "تنزانيا",
+  "تايلاند",
+  "تيمور الشرقية",
+  "توغو",
+  "تونغا",
+  "ترينيداد وتوباغو",
+  "تونس",
+  "تركيا",
+  "تركمانستان",
+  "توفالو",
+  "أوغندا",
+  "أوكرانيا",
+  "الإمارات العربية المتحدة",
+  "المملكة المتحدة",
+  "الولايات المتحدة",
+  "أوروغواي",
+  "أوزبكستان",
+  "فانواتو",
+  "فنزويلا",
+  "فيتنام",
+  "اليمن",
+  "زامبيا",
+  "زيمبابوي",
+];
+
+export const COUNTRIES_AZ = [
+  "Əfqanıstan",
+  "Albaniya",
+  "Əlcəzair",
+  "Andorra",
+  "Anqola",
+  "Antiqua və Barbuda",
+  "Argentina",
+  "Ermənistan",
+  "Avstraliya",
+  "Avstriya",
+  "Azərbaycan",
+  "Baham adaları",
+  "Bəhreyn",
+  "Banqladeş",
+  "Barbados",
+  "Belarus",
+  "Belçika",
+  "Beliz",
+  "Benin",
+  "Butan",
+  "Boliviya",
+  "Bosniya və Herseqovina",
+  "Botsvana",
+  "Braziliya",
+  "Bruney",
+  "Bolqarıstan",
+  "Burkina-Faso",
+  "Burundi",
+  "Kabo-Verde",
+  "Kamboca",
+  "Kamerun",
+  "Kanada",
+  "Mərkəzi Afrika Respublikası",
+  "Çad",
+  "Çili",
+  "Çin",
+  "Kolumbiya",
+  "Komor adaları",
+  "Konqo",
+  "Kosta-Rika",
+  "Xorvatiya",
+  "Kuba",
+  "Kipr",
+  "Çexiya",
+  "Konqo Demokratik Respublikası",
+  "Danimarka",
+  "Cibuti",
+  "Dominika",
+  "Dominikan Respublikası",
+  "Ekvador",
+  "Misir",
+  "Salvador",
+  "Ekvatorial Qvineya",
+  "Eritreya",
+  "Estoniya",
+  "Esvatini",
+  "Efiopiya",
+  "Fici",
+  "Finlandiya",
+  "Fransa",
+  "Qabon",
+  "Qambiya",
+  "Gürcüstan",
+  "Almaniya",
+  "Qana",
+  "Yunanıstan",
+  "Qrenada",
+  "Qvatemala",
+  "Qvineya",
+  "Qvineya-Bisau",
+  "Qayana",
+  "Haiti",
+  "Müqəddəs Taxt-Tac",
+  "Honduras",
+  "Macarıstan",
+  "İslandiya",
+  "Hindistan",
+  "İndoneziya",
+  "İran",
+  "İraq",
+  "İrlandiya",
+  "İtaliya",
+  "Kot-d’İvuar",
+  "Yamayka",
+  "Yaponiya",
+  "İordaniya",
+  "Qazaxıstan",
+  "Keniya",
+  "Kiribati",
+  "Küveyt",
+  "Qırğızıstan",
+  "Laos",
+  "Latviya",
+  "Livan",
+  "Lesoto",
+  "Liberiya",
+  "Liviya",
+  "Lixtenşteyn",
+  "Litva",
+  "Lüksemburq",
+  "Madaqaskar",
+  "Malavi",
+  "Malayziya",
+  "Maldiv adaları",
+  "Mali",
+  "Malta",
+  "Marşal adaları",
+  "Mavritaniya",
+  "Mavriki",
+  "Meksika",
+  "Mikroneziya",
+  "Moldova",
+  "Monako",
+  "Monqolustan",
+  "Monteneqro",
+  "Mərakeş",
+  "Mozambik",
+  "Myanma",
+  "Namibiya",
+  "Nauru",
+  "Nepal",
+  "Niderland",
+  "Yeni Zelandiya",
+  "Nikaraqua",
+  "Niger",
+  "Nigeriya",
+  "Şimali Koreya",
+  "Şimali Makedoniya",
+  "Norveç",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Fələstin Dövləti",
+  "Panama",
+  "Papua-Yeni Qvineya",
+  "Paraqvay",
+  "Peru",
+  "Filippin",
+  "Polşa",
+  "Portuqaliya",
+  "Qətər",
+  "Rumıniya",
+  "Rusiya",
+  "Ruanda",
+  "Sent-Kits və Nevis",
+  "Sent-Lüsiya",
+  "Sent-Vinsent və Qrenadinlər",
+  "Samoa",
+  "San-Marino",
+  "San-Tome və Prinsipi",
+  "Səudiyyə Ərəbistanı",
+  "Seneqal",
+  "Serbiya",
+  "Seyşel adaları",
+  "Syerra-Leone",
+  "Sinqapur",
+  "Slovakiya",
+  "Sloveniya",
+  "Solomon adaları",
+  "Somali",
+  "Cənubi Afrika",
+  "Cənubi Koreya",
+  "Cənubi Sudan",
+  "İspaniya",
+  "Şri-Lanka",
+  "Sudan",
+  "Surinam",
+  "İsveç",
+  "İsveçrə",
+  "Suriya",
+  "Tacikistan",
+  "Tanzaniya",
+  "Tailand",
+  "Şərqi Timor",
+  "Toqo",
+  "Tonqa",
+  "Trinidad və Tobaqo",
+  "Tunis",
+  "Türkiyə",
+  "Türkmənistan",
+  "Tuvalu",
+  "Uqanda",
+  "Ukrayna",
+  "Birləşmiş Ərəb Əmirlikləri (BƏƏ)",
+  "Birləşmiş Krallıq (BK)",
+  "Amerika Birləşmiş Ştatları (ABŞ)",
+  "Uruqvay",
+  "Özbəkistan",
+  "Vanuatu",
+  "Venesuela",
+  "Vyetnam",
+  "Yəmən",
+  "Zambiya",
+  "Zimbabve",
+];
+
+export const COUNTRIES_BN = [
+  "আফগানিস্তান",
+  "আলবেনিয়া",
+  "আলজেরিয়া",
+  "অ্যান্ডোরা",
+  "অ্যাঙ্গোলা",
+  "অ্যান্টিগুয়া ও বার্বুডা",
+  "আর্জেন্টিনা",
+  "আর্মেনিয়া",
+  "অস্ট্রেলিয়া",
+  "অস্ট্রিয়া",
+  "আজারবাইজান",
+  "বাহামাস",
+  "বাহরাইন",
+  "বাংলাদেশ",
+  "বার্বাডোস",
+  "বেলারুশ",
+  "বেলজিয়াম",
+  "বেলিজ",
+  "বেনিন",
+  "ভুটান",
+  "বলিভিয়া",
+  "বসনিয়া ও হার্জেগোভিনা",
+  "বতসোয়ানা",
+  "ব্রাজিল",
+  "ব্রুনাই",
+  "বুলগেরিয়া",
+  "বুর্কিনা ফাসো",
+  "বুরুন্ডি",
+  "কাবো ভের্দে",
+  "কম্বোডিয়া",
+  "ক্যামেরুন",
+  "কানাডা",
+  "মধ্য আফ্রিকান প্রজাতন্ত্র",
+  "চাদ",
+  "চিলি",
+  "চীন",
+  "কলম্বিয়া",
+  "কোমোরোস",
+  "কঙ্গো",
+  "কোস্টারিকা",
+  "ক্রোয়েশিয়া",
+  "কিউবা",
+  "সাইপ্রাস",
+  "চেকিয়া",
+  "গণতান্ত্রিক কঙ্গো প্রজাতন্ত্র",
+  "ডেনমার্ক",
+  "জিবুতি",
+  "ডোমিনিকা",
+  "ডোমিনিকান প্রজাতন্ত্র",
+  "ইকুয়েডর",
+  "মিশর",
+  "এল সালভাদোর",
+  "নিরক্ষীয় গিনি",
+  "ইরিত্রিয়া",
+  "এস্তোনিয়া",
+  "এসওয়াতিনি",
+  "ইথিওপিয়া",
+  "ফিজি",
+  "ফিনল্যান্ড",
+  "ফ্রান্স",
+  "গ্যাবন",
+  "গাম্বিয়া",
+  "জর্জিয়া",
+  "জার্মানি",
+  "ঘানা",
+  "গ্রিস",
+  "গ্রেনাডা",
+  "গুয়াতেমালা",
+  "গিনি",
+  "গিনি-বিসাউ",
+  "গায়ানা",
+  "হাইতি",
+  "হলি সি",
+  "হন্ডুরাস",
+  "হাঙ্গেরি",
+  "আইসল্যান্ড",
+  "ভারত",
+  "ইন্দোনেশিয়া",
+  "ইরান",
+  "ইরাক",
+  "আয়ারল্যান্ড",
+  "ইতালি",
+  "আইভরি কোস্ট",
+  "জ্যামাইকা",
+  "জাপান",
+  "জর্ডান",
+  "কাজাখস্তান",
+  "কেনিয়া",
+  "কিরিবাতি",
+  "কুয়েত",
+  "কিরগিজস্তান",
+  "লাওস",
+  "লাটভিয়া",
+  "লেবানন",
+  "লেসোথো",
+  "লাইবেরিয়া",
+  "লিবিয়া",
+  "লিশটেনস্টাইন",
+  "লিথুয়ানিয়া",
+  "লুক্সেমবার্গ",
+  "মাদাগাস্কার",
+  "মালাউই",
+  "মালয়েশিয়া",
+  "মালদ্বীপ",
+  "মালি",
+  "মাল্টা",
+  "মার্শাল দ্বীপপুঞ্জ",
+  "মৌরিতানিয়া",
+  "মরিশাস",
+  "মেক্সিকো",
+  "মাইক্রোনেশিয়া",
+  "মলদোভা",
+  "মোনাকো",
+  "মঙ্গোলিয়া",
+  "মন্টিনিগ্রো",
+  "মরক্কো",
+  "মোজাম্বিক",
+  "মিয়ানমার",
+  "নামিবিয়া",
+  "নাউরু",
+  "নেপাল",
+  "নেদারল্যান্ডস",
+  "নিউজিল্যান্ড",
+  "নিকারাগুয়া",
+  "নাইজার",
+  "নাইজেরিয়া",
+  "উত্তর কোরিয়া",
+  "উত্তর মেসিডোনিয়া",
+  "নরওয়ে",
+  "ওমান",
+  "পাকিস্তান",
+  "পালাউ",
+  "ফিলিস্তিন রাষ্ট্র",
+  "পানামা",
+  "পাপুয়া নিউগিনি",
+  "প্যারাগুয়ে",
+  "পেরু",
+  "ফিলিপাইন",
+  "পোল্যান্ড",
+  "পর্তুগাল",
+  "কাতার",
+  "রোমানিয়া",
+  "রাশিয়া",
+  "রুয়ান্ডা",
+  "সেন্ট কিটস ও নেভিস",
+  "সেন্ট লুসিয়া",
+  "সেন্ট ভিনসেন্ট ও গ্রেনাডাইন",
+  "সামোয়া",
+  "সান মারিনো",
+  "সাও তোমে ও প্রিন্সিপে",
+  "সৌদি আরব",
+  "সেনেগাল",
+  "সার্বিয়া",
+  "সেশেলস",
+  "সিয়েরা লিওন",
+  "সিঙ্গাপুর",
+  "স্লোভাকিয়া",
+  "স্লোভেনিয়া",
+  "সলোমন দ্বীপপুঞ্জ",
+  "সোমালিয়া",
+  "দক্ষিণ আফ্রিকা",
+  "দক্ষিণ কোরিয়া",
+  "দক্ষিণ সুদান",
+  "স্পেন",
+  "শ্রীলঙ্কা",
+  "সুদান",
+  "সুরিনাম",
+  "সুইডেন",
+  "সুইজারল্যান্ড",
+  "সিরিয়া",
+  "তাজিকিস্তান",
+  "তানজানিয়া",
+  "থাইল্যান্ড",
+  "তিমুর-লেস্তে",
+  "টোগো",
+  "টোঙ্গা",
+  "ত্রিনিদাদ ও টোবাগো",
+  "তিউনিসিয়া",
+  "তুরস্ক",
+  "তুর্কমেনিস্তান",
+  "টুভালু",
+  "উগান্ডা",
+  "ইউক্রেন",
+  "সংযুক্ত আরব আমিরাত (ইউএই)",
+  "যুক্তরাজ্য (ইউকে)",
+  "মার্কিন যুক্তরাষ্ট্র (ইউএস)",
+  "উরুগুয়ে",
+  "উজবেকিস্তান",
+  "ভানুয়াতু",
+  "ভেনেজুয়েলা",
+  "ভিয়েতনাম",
+  "ইয়েমেন",
+  "জাম্বিয়া",
+  "জিম্বাবুয়ে",
+];
+
+export const COUNTRIES_ZH = [
+  "阿富汗",
+  "阿尔巴尼亚",
+  "阿尔及利亚",
+  "安道尔",
+  "安哥拉",
+  "安提瓜和巴布达",
+  "阿根廷",
+  "亚美尼亚",
+  "澳大利亚",
+  "奥地利",
+  "阿塞拜疆",
+  "巴哈马",
+  "巴林",
+  "孟加拉国",
+  "巴巴多斯",
+  "白俄罗斯",
+  "比利时",
+  "伯利兹",
+  "贝宁",
+  "不丹",
+  "玻利维亚",
+  "波斯尼亚和黑塞哥维那",
+  "博茨瓦纳",
+  "巴西",
+  "文莱",
+  "保加利亚",
+  "布基纳法索",
+  "布隆迪",
+  "佛得角",
+  "柬埔寨",
+  "喀麦隆",
+  "加拿大",
+  "中非共和国",
+  "乍得",
+  "智利",
+  "中国",
+  "哥伦比亚",
+  "科摩罗",
+  "刚果共和国",
+  "哥斯达黎加",
+  "克罗地亚",
+  "古巴",
+  "塞浦路斯",
+  "捷克",
+  "刚果民主共和国",
+  "丹麦",
+  "吉布提",
+  "多米尼克",
+  "多米尼加共和国",
+  "厄瓜多尔",
+  "埃及",
+  "萨尔瓦多",
+  "赤道几内亚",
+  "厄立特里亚",
+  "爱沙尼亚",
+  "斯威士兰",
+  "埃塞俄比亚",
+  "斐济",
+  "芬兰",
+  "法国",
+  "加蓬",
+  "冈比亚",
+  "格鲁吉亚",
+  "德国",
+  "加纳",
+  "希腊",
+  "格林纳达",
+  "危地马拉",
+  "几内亚",
+  "几内亚比绍",
+  "圭亚那",
+  "海地",
+  "圣座",
+  "洪都拉斯",
+  "匈牙利",
+  "冰岛",
+  "印度",
+  "印度尼西亚",
+  "伊朗",
+  "伊拉克",
+  "爱尔兰",
+  "意大利",
+  "科特迪瓦",
+  "牙买加",
+  "日本",
+  "约旦",
+  "哈萨克斯坦",
+  "肯尼亚",
+  "基里巴斯",
+  "科威特",
+  "吉尔吉斯斯坦",
+  "老挝",
+  "拉脱维亚",
+  "黎巴嫩",
+  "莱索托",
+  "利比里亚",
+  "利比亚",
+  "列支敦士登",
+  "立陶宛",
+  "卢森堡",
+  "马达加斯加",
+  "马拉维",
+  "马来西亚",
+  "马尔代夫",
+  "马里",
+  "马耳他",
+  "马绍尔群岛",
+  "毛里塔尼亚",
+  "毛里求斯",
+  "墨西哥",
+  "密克罗尼西亚",
+  "摩尔多瓦",
+  "摩纳哥",
+  "蒙古",
+  "黑山",
+  "摩洛哥",
+  "莫桑比克",
+  "缅甸",
+  "纳米比亚",
+  "瑙鲁",
+  "尼泊尔",
+  "荷兰",
+  "新西兰",
+  "尼加拉瓜",
+  "尼日尔",
+  "尼日利亚",
+  "朝鲜",
+  "北马其顿",
+  "挪威",
+  "阿曼",
+  "巴基斯坦",
+  "帕劳",
+  "巴勒斯坦国",
+  "巴拿马",
+  "巴布亚新几内亚",
+  "巴拉圭",
+  "秘鲁",
+  "菲律宾",
+  "波兰",
+  "葡萄牙",
+  "卡塔尔",
+  "罗马尼亚",
+  "俄罗斯",
+  "卢旺达",
+  "圣基茨和尼维斯",
+  "圣卢西亚",
+  "圣文森特和格林纳丁斯",
+  "萨摩亚",
+  "圣马力诺",
+  "圣多美和普林西比",
+  "沙特阿拉伯",
+  "塞内加尔",
+  "塞尔维亚",
+  "塞舌尔",
+  "塞拉利昂",
+  "新加坡",
+  "斯洛伐克",
+  "斯洛文尼亚",
+  "所罗门群岛",
+  "索马里",
+  "南非",
+  "韩国",
+  "南苏丹",
+  "西班牙",
+  "斯里兰卡",
+  "苏丹",
+  "苏里南",
+  "瑞典",
+  "瑞士",
+  "叙利亚",
+  "塔吉克斯坦",
+  "坦桑尼亚",
+  "泰国",
+  "东帝汶",
+  "多哥",
+  "汤加",
+  "特立尼达和多巴哥",
+  "突尼斯",
+  "土耳其",
+  "土库曼斯坦",
+  "图瓦卢",
+  "乌干达",
+  "乌克兰",
+  "阿拉伯联合酋长国",
+  "英国",
+  "美国",
+  "乌拉圭",
+  "乌兹别克斯坦",
+  "瓦努阿图",
+  "委内瑞拉",
+  "越南",
+  "也门",
+  "赞比亚",
+  "津巴布韦",
+];
+
+export const COUNTRIES_DA = [
+  "Afghanistan",
+  "Albanien",
+  "Algeriet",
+  "Andorra",
+  "Angola",
+  "Antigua og Barbuda",
+  "Argentina",
+  "Armenien",
+  "Australien",
+  "Østrig",
+  "Aserbajdsjan",
+  "Bahamas",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgien",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivia",
+  "Bosnien-Hercegovina",
+  "Botswana",
+  "Brasilien",
+  "Brunei",
+  "Bulgarien",
+  "Burkina Faso",
+  "Burundi",
+  "Kap Verde",
+  "Cambodja",
+  "Cameroun",
+  "Canada",
+  "Den Centralafrikanske Republik",
+  "Tchad",
+  "Chile",
+  "Kina",
+  "Colombia",
+  "Comorerne",
+  "Congo",
+  "Costa Rica",
+  "Kroatien",
+  "Cuba",
+  "Cypern",
+  "Tjekkiet",
+  "Den Demokratiske Republik Congo",
+  "Danmark",
+  "Djibouti",
+  "Dominica",
+  "Den Dominikanske Republik",
+  "Ecuador",
+  "Egypten",
+  "El Salvador",
+  "Ækvatorialguinea",
+  "Eritrea",
+  "Estland",
+  "Eswatini",
+  "Etiopien",
+  "Fiji",
+  "Finland",
+  "Frankrig",
+  "Gabon",
+  "Gambia",
+  "Georgien",
+  "Tyskland",
+  "Ghana",
+  "Grækenland",
+  "Grenada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Vatikanstaten",
+  "Honduras",
+  "Ungarn",
+  "Island",
+  "Indien",
+  "Indonesien",
+  "Iran",
+  "Irak",
+  "Irland",
+  "Italien",
+  "Elfenbenskysten",
+  "Jamaica",
+  "Japan",
+  "Jordan",
+  "Kasakhstan",
+  "Kenya",
+  "Kiribati",
+  "Kuwait",
+  "Kirgisistan",
+  "Laos",
+  "Letland",
+  "Libanon",
+  "Lesotho",
+  "Liberia",
+  "Libyen",
+  "Liechtenstein",
+  "Litauen",
+  "Luxembourg",
+  "Madagaskar",
+  "Malawi",
+  "Malaysia",
+  "Maldiverne",
+  "Mali",
+  "Malta",
+  "Marshalløerne",
+  "Mauretanien",
+  "Mauritius",
+  "Mexico",
+  "Mikronesien",
+  "Moldova",
+  "Monaco",
+  "Mongoliet",
+  "Montenegro",
+  "Marokko",
+  "Mozambique",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Nederlandene",
+  "New Zealand",
+  "Nicaragua",
+  "Niger",
+  "Nigeria",
+  "Nordkorea",
+  "Nordmakedonien",
+  "Norge",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Palæstina",
+  "Panama",
+  "Papua Ny Guinea",
+  "Paraguay",
+  "Peru",
+  "Filippinerne",
+  "Polen",
+  "Portugal",
+  "Qatar",
+  "Rumænien",
+  "Rusland",
+  "Rwanda",
+  "Saint Kitts og Nevis",
+  "Saint Lucia",
+  "Saint Vincent og Grenadinerne",
+  "Samoa",
+  "San Marino",
+  "São Tomé og Príncipe",
+  "Saudi-Arabien",
+  "Senegal",
+  "Serbien",
+  "Seychellerne",
+  "Sierra Leone",
+  "Singapore",
+  "Slovakiet",
+  "Slovenien",
+  "Salomonøerne",
+  "Somalia",
+  "Sydafrika",
+  "Sydkorea",
+  "Sydsudan",
+  "Spanien",
+  "Sri Lanka",
+  "Sudan",
+  "Surinam",
+  "Sverige",
+  "Schweiz",
+  "Syrien",
+  "Tadsjikistan",
+  "Tanzania",
+  "Thailand",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinidad og Tobago",
+  "Tunesien",
+  "Tyrkiet",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukraine",
+  "Forenede Arabiske Emirater (FAE)",
+  "Storbritannien (UK)",
+  "USA (USA)",
+  "Uruguay",
+  "Usbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yemen",
+  "Zambia",
+  "Zimbabwe",
+];
+
+export const COUNTRIES_DE = [
+  "Afghanistan",
+  "Albanien",
+  "Algerien",
+  "Andorra",
+  "Angola",
+  "Antigua und Barbuda",
+  "Argentinien",
+  "Armenien",
+  "Australien",
+  "Österreich",
+  "Aserbaidschan",
+  "Bahamas",
+  "Bahrain",
+  "Bangladesch",
+  "Barbados",
+  "Belarus",
+  "Belgien",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivien",
+  "Bosnien und Herzegowina",
+  "Botswana",
+  "Brasilien",
+  "Brunei",
+  "Bulgarien",
+  "Burkina Faso",
+  "Burundi",
+  "Kap Verde",
+  "Kambodscha",
+  "Kamerun",
+  "Kanada",
+  "Zentralafrikanische Republik",
+  "Tschad",
+  "Chile",
+  "China",
+  "Kolumbien",
+  "Komoren",
+  "Republik Kongo",
+  "Costa Rica",
+  "Kroatien",
+  "Kuba",
+  "Zypern",
+  "Tschechien",
+  "Demokratische Republik Kongo",
+  "Dänemark",
+  "Dschibuti",
+  "Dominica",
+  "Dominikanische Republik",
+  "Ecuador",
+  "Ägypten",
+  "El Salvador",
+  "Äquatorialguinea",
+  "Eritrea",
+  "Estland",
+  "Eswatini",
+  "Äthiopien",
+  "Fidschi",
+  "Finnland",
+  "Frankreich",
+  "Gabun",
+  "Gambia",
+  "Georgien",
+  "Deutschland",
+  "Ghana",
+  "Griechenland",
+  "Grenada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Heiliger Stuhl",
+  "Honduras",
+  "Ungarn",
+  "Island",
+  "Indien",
+  "Indonesien",
+  "Iran",
+  "Irak",
+  "Irland",
+  "Italien",
+  "Elfenbeinküste",
+  "Jamaika",
+  "Japan",
+  "Jordanien",
+  "Kasachstan",
+  "Kenia",
+  "Kiribati",
+  "Kuwait",
+  "Kirgisistan",
+  "Laos",
+  "Lettland",
+  "Libanon",
+  "Lesotho",
+  "Liberia",
+  "Libyen",
+  "Liechtenstein",
+  "Litauen",
+  "Luxemburg",
+  "Madagaskar",
+  "Malawi",
+  "Malaysia",
+  "Malediven",
+  "Mali",
+  "Malta",
+  "Marshallinseln",
+  "Mauretanien",
+  "Mauritius",
+  "Mexiko",
+  "Mikronesien",
+  "Moldau",
+  "Monaco",
+  "Mongolei",
+  "Montenegro",
+  "Marokko",
+  "Mosambik",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Niederlande",
+  "Neuseeland",
+  "Nicaragua",
+  "Niger",
+  "Nigeria",
+  "Nordkorea",
+  "Nordmazedonien",
+  "Norwegen",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Staat Palästina",
+  "Panama",
+  "Papua-Neuguinea",
+  "Paraguay",
+  "Peru",
+  "Philippinen",
+  "Polen",
+  "Portugal",
+  "Katar",
+  "Rumänien",
+  "Russland",
+  "Ruanda",
+  "St. Kitts und Nevis",
+  "St. Lucia",
+  "St. Vincent und die Grenadinen",
+  "Samoa",
+  "San Marino",
+  "São Tomé und Príncipe",
+  "Saudi-Arabien",
+  "Senegal",
+  "Serbien",
+  "Seychellen",
+  "Sierra Leone",
+  "Singapur",
+  "Slowakei",
+  "Slowenien",
+  "Salomonen",
+  "Somalia",
+  "Südafrika",
+  "Südkorea",
+  "Südsudan",
+  "Spanien",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Schweden",
+  "Schweiz",
+  "Syrien",
+  "Tadschikistan",
+  "Tansania",
+  "Thailand",
+  "Osttimor",
+  "Togo",
+  "Tonga",
+  "Trinidad und Tobago",
+  "Tunesien",
+  "Türkei",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukraine",
+  "Vereinigte Arabische Emirate (VAE)",
+  "Vereinigtes Königreich (UK)",
+  "Vereinigte Staaten (USA)",
+  "Uruguay",
+  "Usbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Jemen",
+  "Sambia",
+  "Simbabwe",
+];
+
+export const COUNTRIES_ES = [
+  "Afganistán",
+  "Albania",
+  "Argelia",
+  "Andorra",
+  "Angola",
+  "Antigua y Barbuda",
+  "Argentina",
+  "Armenia",
+  "Australia",
+  "Austria",
+  "Azerbaiyán",
+  "Bahamas",
+  "Baréin",
+  "Bangladés",
+  "Barbados",
+  "Bielorrusia",
+  "Bélgica",
+  "Belice",
+  "Benín",
+  "Bután",
+  "Bolivia",
+  "Bosnia y Herzegovina",
+  "Botsuana",
+  "Brasil",
+  "Brunéi",
+  "Bulgaria",
+  "Burkina Faso",
+  "Burundi",
+  "Cabo Verde",
+  "Camboya",
+  "Camerún",
+  "Canadá",
+  "República Centroafricana",
+  "Chad",
+  "Chile",
+  "China",
+  "Colombia",
+  "Comoras",
+  "Congo",
+  "Costa Rica",
+  "Croacia",
+  "Cuba",
+  "Chipre",
+  "Chequia",
+  "República Democrática del Congo",
+  "Dinamarca",
+  "Yibuti",
+  "Dominica",
+  "República Dominicana",
+  "Ecuador",
+  "Egipto",
+  "El Salvador",
+  "Guinea Ecuatorial",
+  "Eritrea",
+  "Estonia",
+  "Esuatini",
+  "Etiopía",
+  "Fiyi",
+  "Finlandia",
+  "Francia",
+  "Gabón",
+  "Gambia",
+  "Georgia",
+  "Alemania",
+  "Ghana",
+  "Grecia",
+  "Granada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bisáu",
+  "Guyana",
+  "Haití",
+  "Santa Sede",
+  "Honduras",
+  "Hungría",
+  "Islandia",
+  "India",
+  "Indonesia",
+  "Irán",
+  "Irak",
+  "Irlanda",
+  "Italia",
+  "Costa de Marfil",
+  "Jamaica",
+  "Japón",
+  "Jordania",
+  "Kazajistán",
+  "Kenia",
+  "Kiribati",
+  "Kuwait",
+  "Kirguistán",
+  "Laos",
+  "Letonia",
+  "Líbano",
+  "Lesoto",
+  "Liberia",
+  "Libia",
+  "Liechtenstein",
+  "Lituania",
+  "Luxemburgo",
+  "Madagascar",
+  "Malaui",
+  "Malasia",
+  "Maldivas",
+  "Malí",
+  "Malta",
+  "Islas Marshall",
+  "Mauritania",
+  "Mauricio",
+  "México",
+  "Micronesia",
+  "Moldavia",
+  "Mónaco",
+  "Mongolia",
+  "Montenegro",
+  "Marruecos",
+  "Mozambique",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Países Bajos",
+  "Nueva Zelanda",
+  "Nicaragua",
+  "Níger",
+  "Nigeria",
+  "Corea del Norte",
+  "Macedonia del Norte",
+  "Noruega",
+  "Omán",
+  "Pakistán",
+  "Palaos",
+  "Estado de Palestina",
+  "Panamá",
+  "Papúa Nueva Guinea",
+  "Paraguay",
+  "Perú",
+  "Filipinas",
+  "Polonia",
+  "Portugal",
+  "Catar",
+  "Rumanía",
+  "Rusia",
+  "Ruanda",
+  "San Cristóbal y Nieves",
+  "Santa Lucía",
+  "San Vicente y las Granadinas",
+  "Samoa",
+  "San Marino",
+  "Santo Tomé y Príncipe",
+  "Arabia Saudita",
+  "Senegal",
+  "Serbia",
+  "Seychelles",
+  "Sierra Leona",
+  "Singapur",
+  "Eslovaquia",
+  "Eslovenia",
+  "Islas Salomón",
+  "Somalia",
+  "Sudáfrica",
+  "Corea del Sur",
+  "Sudán del Sur",
+  "España",
+  "Sri Lanka",
+  "Sudán",
+  "Surinam",
+  "Suecia",
+  "Suiza",
+  "Siria",
+  "Tayikistán",
+  "Tanzania",
+  "Tailandia",
+  "Timor Oriental",
+  "Togo",
+  "Tonga",
+  "Trinidad y Tobago",
+  "Túnez",
+  "Turquía",
+  "Turkmenistán",
+  "Tuvalu",
+  "Uganda",
+  "Ucrania",
+  "Emiratos Árabes Unidos (EAU)",
+  "Reino Unido (RU)",
+  "Estados Unidos (EE. UU.)",
+  "Uruguay",
+  "Uzbekistán",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yemen",
+  "Zambia",
+  "Zimbabue",
+];
+
+export const COUNTRIES_FR = [
+  "Afghanistan",
+  "Albanie",
+  "Algérie",
+  "Andorre",
+  "Angola",
+  "Antigua-et-Barbuda",
+  "Argentine",
+  "Arménie",
+  "Australie",
+  "Autriche",
+  "Azerbaïdjan",
+  "Bahamas",
+  "Bahreïn",
+  "Bangladesh",
+  "Barbade",
+  "Biélorussie",
+  "Belgique",
+  "Belize",
+  "Bénin",
+  "Bhoutan",
+  "Bolivie",
+  "Bosnie-Herzégovine",
+  "Botswana",
+  "Brésil",
+  "Brunei",
+  "Bulgarie",
+  "Burkina Faso",
+  "Burundi",
+  "Cap-Vert",
+  "Cambodge",
+  "Cameroun",
+  "Canada",
+  "République centrafricaine",
+  "Tchad",
+  "Chili",
+  "Chine",
+  "Colombie",
+  "Comores",
+  "Congo",
+  "Costa Rica",
+  "Croatie",
+  "Cuba",
+  "Chypre",
+  "Tchéquie",
+  "République démocratique du Congo",
+  "Danemark",
+  "Djibouti",
+  "Dominique",
+  "République dominicaine",
+  "Équateur",
+  "Égypte",
+  "Salvador",
+  "Guinée équatoriale",
+  "Érythrée",
+  "Estonie",
+  "Eswatini",
+  "Éthiopie",
+  "Fidji",
+  "Finlande",
+  "France",
+  "Gabon",
+  "Gambie",
+  "Géorgie",
+  "Allemagne",
+  "Ghana",
+  "Grèce",
+  "Grenade",
+  "Guatemala",
+  "Guinée",
+  "Guinée-Bissau",
+  "Guyana",
+  "Haïti",
+  "Saint-Siège",
+  "Honduras",
+  "Hongrie",
+  "Islande",
+  "Inde",
+  "Indonésie",
+  "Iran",
+  "Irak",
+  "Irlande",
+  "Italie",
+  "Côte d'Ivoire",
+  "Jamaïque",
+  "Japon",
+  "Jordanie",
+  "Kazakhstan",
+  "Kenya",
+  "Kiribati",
+  "Koweït",
+  "Kirghizistan",
+  "Laos",
+  "Lettonie",
+  "Liban",
+  "Lesotho",
+  "Libéria",
+  "Libye",
+  "Liechtenstein",
+  "Lituanie",
+  "Luxembourg",
+  "Madagascar",
+  "Malawi",
+  "Malaisie",
+  "Maldives",
+  "Mali",
+  "Malte",
+  "Îles Marshall",
+  "Mauritanie",
+  "Maurice",
+  "Mexique",
+  "Micronésie",
+  "Moldavie",
+  "Monaco",
+  "Mongolie",
+  "Monténégro",
+  "Maroc",
+  "Mozambique",
+  "Myanmar",
+  "Namibie",
+  "Nauru",
+  "Népal",
+  "Pays-Bas",
+  "Nouvelle-Zélande",
+  "Nicaragua",
+  "Niger",
+  "Nigéria",
+  "Corée du Nord",
+  "Macédoine du Nord",
+  "Norvège",
+  "Oman",
+  "Pakistan",
+  "Palaos",
+  "État de Palestine",
+  "Panama",
+  "Papouasie-Nouvelle-Guinée",
+  "Paraguay",
+  "Pérou",
+  "Philippines",
+  "Pologne",
+  "Portugal",
+  "Qatar",
+  "Roumanie",
+  "Russie",
+  "Rwanda",
+  "Saint-Christophe-et-Niévès",
+  "Sainte-Lucie",
+  "Saint-Vincent-et-les-Grenadines",
+  "Samoa",
+  "Saint-Marin",
+  "Sao Tomé-et-Principe",
+  "Arabie saoudite",
+  "Sénégal",
+  "Serbie",
+  "Seychelles",
+  "Sierra Leone",
+  "Singapour",
+  "Slovaquie",
+  "Slovénie",
+  "Îles Salomon",
+  "Somalie",
+  "Afrique du Sud",
+  "Corée du Sud",
+  "Soudan du Sud",
+  "Espagne",
+  "Sri Lanka",
+  "Soudan",
+  "Suriname",
+  "Suède",
+  "Suisse",
+  "Syrie",
+  "Tadjikistan",
+  "Tanzanie",
+  "Thaïlande",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinité-et-Tobago",
+  "Tunisie",
+  "Turquie",
+  "Turkménistan",
+  "Tuvalu",
+  "Ouganda",
+  "Ukraine",
+  "Émirats arabes unis",
+  "Royaume-Uni",
+  "États-Unis",
+  "Uruguay",
+  "Ouzbékistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yémen",
+  "Zambie",
+  "Zimbabwe",
+];
+
+export const COUNTRIES_GU = [
+  "અફઘાનિસ્તાન",
+  "અલ્બેનિયા",
+  "અલ્જેરિયા",
+  "એન્ડોરા",
+  "અંગોલા",
+  "એન્ટિગુઆ અને બાર્બુડા",
+  "આર્જેન્ટિના",
+  "આર્મેનિયા",
+  "ઓસ્ટ્રેલિયા",
+  "ઓસ્ટ્રિયા",
+  "અઝરબૈજાન",
+  "બહામાસ",
+  "બહેરીન",
+  "બાંગ્લાદેશ",
+  "બાર્બાડોસ",
+  "બેલારુસ",
+  "બેલ્જિયમ",
+  "બેલીઝ",
+  "બેનિન",
+  "ભૂટાન",
+  "બોલિવિયા",
+  "બોસ્નિયા અને હર્ઝેગોવિના",
+  "બોત્સ્વાના",
+  "બ્રાઝિલ",
+  "બ્રુનેઈ",
+  "બલ્ગેરિયા",
+  "બુર્કિના ફાસો",
+  "બુરુન્ડી",
+  "કાબો વર્ડે",
+  "કંબોડિયા",
+  "કેમરૂન",
+  "કેનેડા",
+  "સેન્ટ્રલ આફ્રિકન રિપબ્લિક",
+  "ચાડ",
+  "ચિલી",
+  "ચીન",
+  "કોલંબિયા",
+  "કોમોરોસ",
+  "કોંગો",
+  "કોસ્ટા રિકા",
+  "ક્રોએશિયા",
+  "ક્યુબા",
+  "સાયપ્રસ",
+  "ચેકિયા",
+  "ડેમોક્રેટિક રિપબ્લિક ઓફ ધ કોંગો",
+  "ડેનમાર્ક",
+  "જીબુતી",
+  "ડોમિનિકા",
+  "ડોમિનિકન રિપબ્લિક",
+  "એક્વાડોર",
+  "ઇજિપ્ત",
+  "અલ સાલ્વાડોર",
+  "ઇક્વેટોરિયલ ગિની",
+  "એરિટ્રિયા",
+  "એસ્ટોનિયા",
+  "એસ્વાતિની",
+  "ઇથોપિયા",
+  "ફીજી",
+  "ફિનલેન્ડ",
+  "ફ્રાન્સ",
+  "ગેબોન",
+  "ગામ્બિયા",
+  "જ્યોર્જિયા",
+  "જર્મની",
+  "ઘાના",
+  "ગ્રીસ",
+  "ગ્રેનેડા",
+  "ગ્વાટેમાલા",
+  "ગિની",
+  "ગિની-બિસાઉ",
+  "ગયાના",
+  "હૈતી",
+  "હોલી સી",
+  "હોન્ડુરાસ",
+  "હંગેરી",
+  "આઇસલેન્ડ",
+  "ભારત",
+  "ઇન્ડોનેશિયા",
+  "ઈરાન",
+  "ઈરાક",
+  "આયર્લેન્ડ",
+  "ઇટાલી",
+  "આઇવરી કોસ્ટ",
+  "જમૈકા",
+  "જાપાન",
+  "જોર્ડન",
+  "કઝાકિસ્તાન",
+  "કેન્યા",
+  "કિરીબતી",
+  "કુવૈત",
+  "કિર્ગિસ્તાન",
+  "લાઓસ",
+  "લાતવિયા",
+  "લેબનાન",
+  "લેસોથો",
+  "લાઇબેરિયા",
+  "લિબિયા",
+  "લિક્ટેનસ્ટેઇન",
+  "લિથુઆનિયા",
+  "લક્ઝમબર્ગ",
+  "મેડાગાસ્કર",
+  "મલાવી",
+  "મલેશિયા",
+  "માલદીવ્સ",
+  "માલી",
+  "માલ્ટા",
+  "માર્શલ આઇલેન્ડ્સ",
+  "મોરિટાનિયા",
+  "મોરિશિયસ",
+  "મેક્સિકો",
+  "માઇક્રોનેશિયા",
+  "મોલ્ડોવા",
+  "મોનાકો",
+  "મંગોલિયા",
+  "મોન્ટેનેગ્રો",
+  "મોરોક્કો",
+  "મોઝામ્બિક",
+  "મ્યાનમાર",
+  "નામીબિયા",
+  "નૌરુ",
+  "નેપાળ",
+  "નેધરલેન્ડ્સ",
+  "ન્યુઝીલેન્ડ",
+  "નિકારાગુઆ",
+  "નાઇજર",
+  "નાઇજીરીયા",
+  "ઉત્તર કોરિયા",
+  "ઉત્તર મેસેડોનિયા",
+  "નોર્વે",
+  "ઓમાન",
+  "પાકિસ્તાન",
+  "પલાઉ",
+  "પેલેસ્ટાઇન રાજ્ય",
+  "પનામા",
+  "પાપુઆ ન્યુ ગિની",
+  "પેરાગ્વે",
+  "પેરુ",
+  "ફિલિપાઇન્સ",
+  "પોલેન્ડ",
+  "પોર્ટુગલ",
+  "કતાર",
+  "રોમાનિયા",
+  "રશિયા",
+  "રવાન્ડા",
+  "સેન્ટ કિટ્સ અને નેવિસ",
+  "સેન્ટ લુસિયા",
+  "સેન્ટ વિન્સેન્ટ અને ગ્રેનેડાઇન્સ",
+  "સમોઆ",
+  "સાન મેરિનો",
+  "સાઓ તોમે અને પ્રિન્સિપે",
+  "સાઉદી અરેબિયા",
+  "સેનેગલ",
+  "સર્બિયા",
+  "સેશેલ્સ",
+  "સિએરા લિયોન",
+  "સિંગાપોર",
+  "સ્લોવાકિયા",
+  "સ્લોવેનિયા",
+  "સોલોમન આઇલેન્ડ્સ",
+  "સોમાલિયા",
+  "દક્ષિણ આફ્રિકા",
+  "દક્ષિણ કોરિયા",
+  "દક્ષિણ સુદાન",
+  "સ્પેન",
+  "શ્રીલંકા",
+  "સુદાન",
+  "સુરીનામ",
+  "સ્વીડન",
+  "સ્વિટ્ઝર્લૅન્ડ",
+  "સીરિયા",
+  "તાજિકિસ્તાન",
+  "તાન્ઝાનિયા",
+  "થાઇલેન્ડ",
+  "તિમોર-લેસ્તે",
+  "ટોગો",
+  "ટોંગા",
+  "ત્રિનિદાદ અને ટોબેગો",
+  "ટ્યુનિશિયા",
+  "તુર્કી",
+  "તુર્કમેનિસ્તાન",
+  "તુવાલુ",
+  "યુગાન્ડા",
+  "યુક્રેન",
+  "સંયુક્ત આરબ અમીરાત (યુએઈ)",
+  "યુનાઇટેડ કિંગડમ (યુકે)",
+  "યુનાઇટેડ સ્ટેટ્સ (યુએસ)",
+  "ઉરુગ્વે",
+  "ઉઝબેકિસ્તાન",
+  "વાનુઅતુ",
+  "વેનેઝુએલા",
+  "વિયેતનામ",
+  "યમન",
+  "ઝામ્બિયા",
+  "ઝિમ્બાબ્વે",
+];
+
+export const COUNTRIES_HA = [
+  "Afganistan",
+  "Albaniya",
+  "Aljeriya",
+  "Andorra",
+  "Angola",
+  "Antigua da Barbuda",
+  "Ajantina",
+  "Armeniya",
+  "Ostareliya",
+  "Ostiriya",
+  "Azarbaijan",
+  "Bahamas",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Beljiyom",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolibiya",
+  "Bosniya da Herzigobina",
+  "Botswana",
+  "Brazil",
+  "Brunei",
+  "Bulgariya",
+  "Burkina Faso",
+  "Burundi",
+  "Cabo Verde",
+  "Kambodiya",
+  "Kamaru",
+  "Kanada",
+  "Jamhuriyar Afirka ta Tsakiya",
+  "Cadi",
+  "Chile",
+  "Sin",
+  "Kolambiya",
+  "Kwamoras",
+  "Jamhuriyar Kwango",
+  "Costa Rica",
+  "Kuroshiya",
+  "Kyuba",
+  "Saipiras",
+  "Jamhuriyar Czech",
+  "Jamhuriyar Dimokuradiyyar Kwango",
+  "Denmark",
+  "Jibuti",
+  "Dominika",
+  "Jamhuriyar Dominika",
+  "Ekwador",
+  "Masar",
+  "El Salbador",
+  "Gini Ta Tsakiya",
+  "Eritiriya",
+  "Estoniya",
+  "Eswatini",
+  "Habasha",
+  "Fiji",
+  "Finland",
+  "Faransa",
+  "Gabon",
+  "Gambiya",
+  "Jojiya",
+  "Jamus",
+  "Gana",
+  "Girka",
+  "Grenada",
+  "Gwatemala",
+  "Gini",
+  "Gini-Bissau",
+  "Guyana",
+  "Haiti",
+  "Fadar Vatican",
+  "Honduras",
+  "Hangari",
+  "Iceland",
+  "Indiya",
+  "Indonesiya",
+  "Iran",
+  "Iraki",
+  "Ireland",
+  "Italiya",
+  "Kwadivwa",
+  "Jamaika",
+  "Japan",
+  "Jordan",
+  "Kazakistan",
+  "Kenya",
+  "Kiribati",
+  "Kuwait",
+  "Kirgizistan",
+  "Laos",
+  "Lativiya",
+  "Lebanon",
+  "Lesotho",
+  "Laberiya",
+  "Libiya",
+  "Liechtenstein",
+  "Lituwaniya",
+  "Luksamburg",
+  "Madagaskar",
+  "Malawi",
+  "Malesiya",
+  "Maldives",
+  "Mali",
+  "Malta",
+  "Tsibirai na Marshall",
+  "Moritaniya",
+  "Moritius",
+  "Meziko",
+  "Maikronisiya",
+  "Moldova",
+  "Monaco",
+  "Mongoliya",
+  "Montenegro",
+  "Maroko",
+  "Mozambik",
+  "Myanmar",
+  "Namibiya",
+  "Nauru",
+  "Nepal",
+  "Netherlands",
+  "Nuzilan",
+  "Nikaraguwa",
+  "Nijar",
+  "Nijeriya",
+  "Koriya ta Arewa",
+  "Masadoniya ta Arewa",
+  "Norwe",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Falasdinu",
+  "Panama",
+  "Papua Sabuwar Gini",
+  "Paragwai",
+  "Peru",
+  "Filipin",
+  "Poland",
+  "Portugal",
+  "Katar",
+  "Romaniya",
+  "Rasha",
+  "Ruwanda",
+  "Saint Kitts da Nevis",
+  "Saint Lucia",
+  "Saint Vincent da Grenadines",
+  "Samoa",
+  "San Marino",
+  "Sao Tome da Principe",
+  "Saudiyya",
+  "Sinigal",
+  "Serbiya",
+  "Seychelles",
+  "Saliyo",
+  "Singapore",
+  "Sulobakiya",
+  "Sulobeniya",
+  "Tsibirai na Solomon",
+  "Somaliya",
+  "Afirka ta Kudu",
+  "Koriya ta Kudu",
+  "Sudan ta Kudu",
+  "Sifen",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Suwidin",
+  "Switzerland",
+  "Siriya",
+  "Tajikistan",
+  "Tanzaniya",
+  "Tailand",
+  "Timor ta Gabas",
+  "Togo",
+  "Tonga",
+  "Trinidad da Tobago",
+  "Tunisiya",
+  "Turkiyya",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Yukren",
+  "Hadaddiyar Daular Larabawa (UAE)",
+  "Burtaniya (UK)",
+  "Kasar Amurka (US)",
+  "Urugwai",
+  "Uzbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yaman",
+  "Zambiya",
+  "Zimbabuwe",
+];
+
+export const COUNTRIES_HE = [
+  "אפגניסטן",
+  "אלבניה",
+  "אלג'יריה",
+  "אנדורה",
+  "אנגולה",
+  "אנטיגואה וברבודה",
+  "ארגנטינה",
+  "ארמניה",
+  "אוסטרליה",
+  "אוסטריה",
+  "אזרבייג'ן",
+  "איי בהאמה",
+  "בחריין",
+  "בנגלדש",
+  "ברבדוס",
+  "בלארוס",
+  "בלגיה",
+  "בליז",
+  "בנין",
+  "בהוטן",
+  "בוליביה",
+  "בוסניה והרצגובינה",
+  "בוטסואנה",
+  "ברזיל",
+  "ברוניי",
+  "בולגריה",
+  "בורקינה פאסו",
+  "בורונדי",
+  "כף ורדה",
+  "קמבודיה",
+  "קמרון",
+  "קנדה",
+  "הרפובליקה המרכז-אפריקאית",
+  "צ'אד",
+  "צ'ילה",
+  "סין",
+  "קולומביה",
+  "קומורו",
+  "קונגו",
+  "קוסטה ריקה",
+  "קרואטיה",
+  "קובה",
+  "קפריסין",
+  "צ'כיה",
+  "הרפובליקה הדמוקרטית של קונגו",
+  "דנמרק",
+  "ג'יבוטי",
+  "דומיניקה",
+  "הרפובליקה הדומיניקנית",
+  "אקוודור",
+  "מצרים",
+  "אל סלוודור",
+  "גינאה המשוונית",
+  "אריתריאה",
+  "אסטוניה",
+  "אסוואטיני",
+  "אתיופיה",
+  "פיג'י",
+  "פינלנד",
+  "צרפת",
+  "גבון",
+  "גמביה",
+  "גאורגיה",
+  "גרמניה",
+  "גאנה",
+  "יוון",
+  "גרנדה",
+  "גואטמלה",
+  "גינאה",
+  "גינאה-ביסאו",
+  "גיאנה",
+  "האיטי",
+  "הכס הקדוש",
+  "הונדורס",
+  "הונגריה",
+  "איסלנד",
+  "הודו",
+  "אינדונזיה",
+  "איראן",
+  "עיראק",
+  "אירלנד",
+  "איטליה",
+  "חוף השנהב",
+  "ג'מייקה",
+  "יפן",
+  "ירדן",
+  "קזחסטן",
+  "קניה",
+  "קיריבטי",
+  "כווית",
+  "קירגיזסטן",
+  "לאוס",
+  "לטביה",
+  "לבנון",
+  "לסוטו",
+  "ליבריה",
+  "לוב",
+  "ליכטנשטיין",
+  "ליטא",
+  "לוקסמבורג",
+  "מדגסקר",
+  "מלאווי",
+  "מלזיה",
+  "האיים המלדיביים",
+  "מאלי",
+  "מלטה",
+  "איי מרשל",
+  "מאוריטניה",
+  "מאוריציוס",
+  "מקסיקו",
+  "מיקרונזיה",
+  "מולדובה",
+  "מונקו",
+  "מונגוליה",
+  "מונטנגרו",
+  "מרוקו",
+  "מוזמביק",
+  "מיאנמר",
+  "נמיביה",
+  "נאורו",
+  "נפאל",
+  "הולנד",
+  "ניו זילנד",
+  "ניקרגואה",
+  "ניז'ר",
+  "ניגריה",
+  "קוריאה הצפונית",
+  "מקדוניה הצפונית",
+  "נורווגיה",
+  "עומאן",
+  "פקיסטן",
+  "פלאו",
+  "מדינת פלסטין",
+  "פנמה",
+  "פפואה גינאה החדשה",
+  "פרגוואי",
+  "פרו",
+  "הפיליפינים",
+  "פולין",
+  "פורטוגל",
+  "קטאר",
+  "רומניה",
+  "רוסיה",
+  "רואנדה",
+  "סנט קיטס ונוויס",
+  "סנט לוסיה",
+  "סנט וינסנט והגרנדינים",
+  "סמואה",
+  "סן מרינו",
+  "סאו טומה ופרינסיפה",
+  "ערב הסעודית",
+  "סנגל",
+  "סרביה",
+  "סיישל",
+  "סיירה לאונה",
+  "סינגפור",
+  "סלובקיה",
+  "סלובניה",
+  "איי שלמה",
+  "סומליה",
+  "דרום אפריקה",
+  "קוריאה הדרומית",
+  "דרום סודאן",
+  "ספרד",
+  "סרי לנקה",
+  "סודאן",
+  "סורינאם",
+  "שוודיה",
+  "שווייץ",
+  "סוריה",
+  "טג'יקיסטן",
+  "טנזניה",
+  "תאילנד",
+  "טימור-לסטה",
+  "טוגו",
+  "טונגה",
+  "טרינידד וטובגו",
+  "תוניסיה",
+  "טורקיה",
+  "טורקמניסטן",
+  "טובאלו",
+  "אוגנדה",
+  "אוקראינה",
+  "איחוד האמירויות הערביות (UAE)",
+  "הממלכה המאוחדת (UK)",
+  "ארצות הברית (US)",
+  "אורוגוואי",
+  "אוזבקיסטן",
+  "ונואטו",
+  "ונצואלה",
+  "וייטנאם",
+  "תימן",
+  "זמביה",
+  "זימבבואה",
+];
+
+export const COUNTRIES_HI = [
+  "अफ़गानिस्तान",
+  "अल्बानिया",
+  "अल्जीरिया",
+  "अंडोरा",
+  "अंगोला",
+  "एंटीगुआ और बारबुडा",
+  "अर्जेंटीना",
+  "आर्मेनिया",
+  "ऑस्ट्रेलिया",
+  "ऑस्ट्रिया",
+  "अज़रबैजान",
+  "बहामास",
+  "बहरीन",
+  "बांग्लादेश",
+  "बारबाडोस",
+  "बेलारूस",
+  "बेल्जियम",
+  "बेलीज़",
+  "बेनिन",
+  "भूटान",
+  "बोलीविया",
+  "बोस्निया और हर्ज़ेगोविना",
+  "बोत्सवाना",
+  "ब्राज़ील",
+  "ब्रुनेई",
+  "बुल्गारिया",
+  "बुर्किना फ़ासो",
+  "बुरुंडी",
+  "काबो वर्डे",
+  "कंबोडिया",
+  "कैमरून",
+  "कनाडा",
+  "मध्य अफ़्रीकी गणराज्य",
+  "चाड",
+  "चिली",
+  "चीन",
+  "कोलंबिया",
+  "कोमोरोस",
+  "कांगो",
+  "कोस्टा रिका",
+  "क्रोएशिया",
+  "क्यूबा",
+  "साइप्रस",
+  "चेकिया",
+  "कांगो लोकतांत्रिक गणराज्य",
+  "डेनमार्क",
+  "जिबूती",
+  "डोमिनिका",
+  "डोमिनिकन गणराज्य",
+  "इक्वाडोर",
+  "मिस्र",
+  "अल सल्वाडोर",
+  "इक्वेटोरियल गिनी",
+  "इरिट्रिया",
+  "एस्टोनिया",
+  "इस्वातिनी",
+  "इथियोपिया",
+  "फ़िजी",
+  "फ़िनलैंड",
+  "फ़्रांस",
+  "गैबॉन",
+  "गाम्बिया",
+  "जॉर्जिया",
+  "जर्मनी",
+  "घाना",
+  "ग्रीस",
+  "ग्रेनाडा",
+  "ग्वाटेमाला",
+  "गिनी",
+  "गिनी-बिसाऊ",
+  "गुयाना",
+  "हैती",
+  "होली सी",
+  "होंडुरास",
+  "हंगरी",
+  "आइसलैंड",
+  "भारत",
+  "इंडोनेशिया",
+  "ईरान",
+  "इराक",
+  "आयरलैंड",
+  "इटली",
+  "आइवरी कोस्ट",
+  "जमैका",
+  "जापान",
+  "जॉर्डन",
+  "कज़ाकिस्तान",
+  "केन्या",
+  "किरिबाती",
+  "कुवैत",
+  "किर्गिज़स्तान",
+  "लाओस",
+  "लातविया",
+  "लेबनान",
+  "लेसोथो",
+  "लाइबेरिया",
+  "लीबिया",
+  "लिकटेंस्टीन",
+  "लिथुआनिया",
+  "लक्ज़मबर्ग",
+  "मेडागास्कर",
+  "मलावी",
+  "मलेशिया",
+  "मालदीव",
+  "माली",
+  "माल्टा",
+  "मार्शल द्वीपसमूह",
+  "मॉरिटानिया",
+  "मॉरीशस",
+  "मेक्सिको",
+  "माइक्रोनेशिया",
+  "मॉल्डोवा",
+  "मोनाको",
+  "मंगोलिया",
+  "मोंटेनेग्रो",
+  "मोरक्को",
+  "मोज़ाम्बिक",
+  "म्यांमार",
+  "नामीबिया",
+  "नाउरू",
+  "नेपाल",
+  "नीदरलैंड",
+  "न्यूज़ीलैंड",
+  "निकारागुआ",
+  "नाइजर",
+  "नाइजीरिया",
+  "उत्तर कोरिया",
+  "उत्तर मैसेडोनिया",
+  "नॉर्वे",
+  "ओमान",
+  "पाकिस्तान",
+  "पलाऊ",
+  "फ़िलिस्तीन राज्य",
+  "पनामा",
+  "पापुआ न्यू गिनी",
+  "पराग्वे",
+  "पेरू",
+  "फ़िलीपींस",
+  "पोलैंड",
+  "पुर्तगाल",
+  "क़तर",
+  "रोमानिया",
+  "रूस",
+  "रवांडा",
+  "सेंट किट्स और नेविस",
+  "सेंट लूसिया",
+  "सेंट विंसेंट और ग्रेनेडाइंस",
+  "समोआ",
+  "सैन मेरीनो",
+  "साओ टोम और प्रिंसिपे",
+  "सऊदी अरब",
+  "सेनेगल",
+  "सर्बिया",
+  "सेशेल्स",
+  "सिएरा लियोन",
+  "सिंगापुर",
+  "स्लोवाकिया",
+  "स्लोवेनिया",
+  "सोलोमन द्वीपसमूह",
+  "सोमालिया",
+  "दक्षिण अफ़्रीका",
+  "दक्षिण कोरिया",
+  "दक्षिण सूडान",
+  "स्पेन",
+  "श्रीलंका",
+  "सूडान",
+  "सूरीनाम",
+  "स्वीडन",
+  "स्विट्ज़रलैंड",
+  "सीरिया",
+  "ताजिकिस्तान",
+  "तंज़ानिया",
+  "थाईलैंड",
+  "तिमोर-लेस्ते",
+  "टोगो",
+  "टोंगा",
+  "त्रिनिदाद और टोबैगो",
+  "ट्यूनीशिया",
+  "तुर्की",
+  "तुर्कमेनिस्तान",
+  "तुवालू",
+  "युगांडा",
+  "यूक्रेन",
+  "संयुक्त अरब अमीरात (यूएई)",
+  "यूनाइटेड किंगडम (यूके)",
+  "संयुक्त राज्य अमेरिका (यूएस)",
+  "उरुग्वे",
+  "उज़्बेकिस्तान",
+  "वानुअतु",
+  "वेनेज़ुएला",
+  "वियतनाम",
+  "यमन",
+  "ज़ाम्बिया",
+  "ज़िम्बाब्वे",
+];
+
+export const COUNTRIES_ID = [
+  "Afganistan",
+  "Albania",
+  "Aljazair",
+  "Andorra",
+  "Angola",
+  "Antigua dan Barbuda",
+  "Argentina",
+  "Armenia",
+  "Australia",
+  "Austria",
+  "Azerbaijan",
+  "Bahama",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgia",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivia",
+  "Bosnia dan Herzegovina",
+  "Botswana",
+  "Brasil",
+  "Brunei",
+  "Bulgaria",
+  "Burkina Faso",
+  "Burundi",
+  "Tanjung Verde",
+  "Kamboja",
+  "Kamerun",
+  "Kanada",
+  "Republik Afrika Tengah",
+  "Chad",
+  "Chili",
+  "Tiongkok",
+  "Kolombia",
+  "Komoro",
+  "Kongo",
+  "Kosta Rika",
+  "Kroasia",
+  "Kuba",
+  "Siprus",
+  "Ceko",
+  "Republik Demokratik Kongo",
+  "Denmark",
+  "Jibuti",
+  "Dominika",
+  "Republik Dominika",
+  "Ekuador",
+  "Mesir",
+  "El Salvador",
+  "Guinea Khatulistiwa",
+  "Eritrea",
+  "Estonia",
+  "Eswatini",
+  "Etiopia",
+  "Fiji",
+  "Finlandia",
+  "Prancis",
+  "Gabon",
+  "Gambia",
+  "Georgia",
+  "Jerman",
+  "Ghana",
+  "Yunani",
+  "Grenada",
+  "Guatemala",
+  "Guinea",
+  "Guinea-Bissau",
+  "Guyana",
+  "Haiti",
+  "Takhta Suci",
+  "Honduras",
+  "Hungaria",
+  "Islandia",
+  "India",
+  "Indonesia",
+  "Iran",
+  "Irak",
+  "Irlandia",
+  "Italia",
+  "Pantai Gading",
+  "Jamaika",
+  "Jepang",
+  "Yordania",
+  "Kazakhstan",
+  "Kenya",
+  "Kiribati",
+  "Kuwait",
+  "Kirgizstan",
+  "Laos",
+  "Latvia",
+  "Lebanon",
+  "Lesotho",
+  "Liberia",
+  "Libya",
+  "Liechtenstein",
+  "Lituania",
+  "Luksemburg",
+  "Madagaskar",
+  "Malawi",
+  "Malaysia",
+  "Maladewa",
+  "Mali",
+  "Malta",
+  "Kepulauan Marshall",
+  "Mauritania",
+  "Mauritius",
+  "Meksiko",
+  "Mikronesia",
+  "Moldova",
+  "Monako",
+  "Mongolia",
+  "Montenegro",
+  "Maroko",
+  "Mozambik",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepal",
+  "Belanda",
+  "Selandia Baru",
+  "Nikaragua",
+  "Niger",
+  "Nigeria",
+  "Korea Utara",
+  "Makedonia Utara",
+  "Norwegia",
+  "Oman",
+  "Pakistan",
+  "Palau",
+  "Palestina",
+  "Panama",
+  "Papua Nugini",
+  "Paraguay",
+  "Peru",
+  "Filipina",
+  "Polandia",
+  "Portugal",
+  "Qatar",
+  "Rumania",
+  "Rusia",
+  "Rwanda",
+  "Saint Kitts dan Nevis",
+  "Saint Lucia",
+  "Saint Vincent dan Grenadines",
+  "Samoa",
+  "San Marino",
+  "Sao Tome dan Principe",
+  "Arab Saudi",
+  "Senegal",
+  "Serbia",
+  "Seychelles",
+  "Sierra Leone",
+  "Singapura",
+  "Slowakia",
+  "Slovenia",
+  "Kepulauan Solomon",
+  "Somalia",
+  "Afrika Selatan",
+  "Korea Selatan",
+  "Sudan Selatan",
+  "Spanyol",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Swedia",
+  "Swiss",
+  "Suriah",
+  "Tajikistan",
+  "Tanzania",
+  "Thailand",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinidad dan Tobago",
+  "Tunisia",
+  "Turki",
+  "Turkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukraina",
+  "Uni Emirat Arab (UEA)",
+  "Inggris Raya (UK)",
+  "Amerika Serikat (AS)",
+  "Uruguay",
+  "Uzbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yaman",
+  "Zambia",
+  "Zimbabwe",
+];
+
+export const COUNTRIES_KS = [
+  "اَفغانَستان",
+  "اٮ۪لبانِیا",
+  "اٮ۪لجیرِیا",
+  "اٮ۪نڑورا",
+  "اٮ۪نگولا",
+  "اٮ۪نٹِگُوا تہٕ باربوڑا",
+  "اَرجَنٹینا",
+  "اَرمینِیا",
+  "آسٹریلِیا",
+  "آسٹرِیا",
+  "آزَربایجان",
+  "باہاماس",
+  "بحریٖن",
+  "بَنگلادیش",
+  "بارباڈوس",
+  "بیلاروس",
+  "بٮ۪لجِیَم",
+  "بٮ۪لیٖز",
+  "بِنِن",
+  "بوٗٹان",
+  "بولِوِیا",
+  "بوسنِیا تہٕ ہَرزِگووِنا",
+  "بوتسوانا",
+  "برازیٖل",
+  "برٛوٗنٔے",
+  "بلغارِیا",
+  "برکِنا فاسو",
+  "برونڈی",
+  "کیپ ورڈے",
+  "کمبوڈِیا",
+  "کیمرون",
+  "کینیڈا",
+  "مرکٔزی اَفریٖقی رِپبلِک",
+  "چاڈ",
+  "چلی",
+  "چیٖن",
+  "کولَمبِیا",
+  "کوموروس",
+  "کانگو",
+  "کوسٹا ریکا",
+  "کروشِیا",
+  "کیوٗبا",
+  "سائپرَس",
+  "چیکِیا",
+  "ڈیموکریٹِک رِپبلِک آف دی کانگو",
+  "ڈینمارک",
+  "جِبوٗتی",
+  "ڈومینِکا",
+  "ڈومینِکَن رِپبلِک",
+  "اِکواڈور",
+  "مِصٕر",
+  "اٮ۪ل سَلواڈور",
+  "اِکوٕٹورِیَل گِنی",
+  "اِرِٹرِیا",
+  "اٮ۪سٹونِیا",
+  "اِسواتھِنی",
+  "اِتھوپِیا",
+  "فِجی",
+  "فِنلینٛڈ",
+  "فرٛانس",
+  "گیبَن",
+  "گیمبِیا",
+  "جورجِیا",
+  "جَرمَنی",
+  "گھانا",
+  "یونان",
+  "گرٛینیڈا",
+  "گواتیمالا",
+  "گِنی",
+  "گِنی-بِساؤ",
+  "گُیانا",
+  "ہَیتی",
+  "ہولی سی",
+  "ہونڈُراس",
+  "ہَنٛگری",
+  "آئس لینڈ",
+  "ہِندوستان",
+  "اِنٛڈونیشِیا",
+  "اِیٖران",
+  "عِراق",
+  "آئرلینٛڑ",
+  "اِٹلی",
+  "کوڈ ڈی آئیوری",
+  "جَمایکا",
+  "جاپان",
+  "جارڈَن",
+  "کَزاکِستان",
+  "کینیا",
+  "کِرباتی",
+  "کُویت",
+  "کِرگِستان",
+  "لاوس",
+  "لَٹوِیا",
+  "لؠبنان",
+  "لیسوتھو",
+  "لائبیرِیا",
+  "لیبِیا",
+  "لِکٹنسٹَین",
+  "لِتھُوانِیا",
+  "لَکسمبرٕگ",
+  "مَڈاگاسکَر",
+  "مَلاوی",
+  "مَلیشِیا",
+  "مالدیٖو",
+  "مالی",
+  "مالٹا",
+  "مارشَل جٔزیٖرٕ",
+  "موریطانِیا",
+  "ماریٖشَس",
+  "مؠکسِکو",
+  "مائیکرونیشِیا",
+  "مولدووا",
+  "موناکو",
+  "مَنگولِیا",
+  "مونٹینیگرو",
+  "مَراکَش",
+  "موزمبیٖق",
+  "میانمار",
+  "نامیبِیا",
+  "ناورو",
+  "نیپال",
+  "نیدَرلینٛڈ",
+  "نِو زیٖلینٛڈ",
+  "نِکاراگوا",
+  "نائجَر",
+  "نائجیرِیا",
+  "شُمٲلی کورِیا",
+  "شُمٲلی مؠسَڈونیٛا",
+  "ناروے",
+  "عُمان",
+  "پاکِستان",
+  "پَلاو",
+  "فَلَستیٖن",
+  "پَناما",
+  "پاپُوا نِیو گیٖنی",
+  "پَراگُوَے",
+  "پیٖروٗ",
+  "فِلِپِینس",
+  "پولینڈ",
+  "پُرتَگال",
+  "قَطَر",
+  "رومانِیا",
+  "روٗس",
+  "روانٛڈا",
+  "سینٛٹ کِٹس تہٕ نیوِس",
+  "سینٛٹ لوٗسِیا",
+  "سینٛٹ وینسٮ۪نٛٹ تہٕ دی گرٛیناڈینٛز",
+  "ساموا",
+  "سین مَرینو",
+  "ساؤ ٹوم تہٕ پرنسِپی",
+  "سودی عرب",
+  "سینیگَل",
+  "سَربِیا",
+  "سیشِلِس",
+  "سیٖرا لیوون",
+  "سِنگاپوٗر",
+  "سلوواکِیا",
+  "سلووینِیا",
+  "سولامان جٔزیٖرٕ",
+  "سومالِیا",
+  "جَنوٗبی اَفریٖکا",
+  "جَنوٗبی کورِیا",
+  "جَنوٗبی سوٗڈان",
+  "سپین",
+  "سری لَنکا",
+  "سوٗڈان",
+  "سُریٖنام",
+  "سویٖڈَن",
+  "سُوِزَرلینٛڑ",
+  "سیٖرِیا",
+  "تاجکِستان",
+  "تَنزانِیا",
+  "تھایِلینٛڑ",
+  "تیمور لیسْتے",
+  "ٹوگو",
+  "ٹونٛگا",
+  "ٹرِنہِداد تہٕ ٹوبیگو",
+  "تیوٗنِشِیا",
+  "تُرکی",
+  "تُرکمانِستان",
+  "تُوالوٗ",
+  "یوٗگانٛڈا",
+  "یوٗکریٖن",
+  "مُتحدہ عرب امارات (یوٗ اے ای)",
+  "یونایٹِڑ کِنٛگڈَم (یوٗ کے)",
+  "یوٗنایٹِڑ سِٹیٹٛس (یوٗ ایس)",
+  "یُرگُوَے",
+  "اُزبیکِستان",
+  "وانوٗواتوٗ",
+  "وینیزوٗلا",
+  "ویَتنام",
+  "یَمَن",
+  "زیمبِیا",
+  "زِمبابوے",
+];
+
+export const COUNTRIES_PT = [
+  "Afeganistão",
+  "Albânia",
+  "Argélia",
+  "Andorra",
+  "Angola",
+  "Antígua e Barbuda",
+  "Argentina",
+  "Armênia",
+  "Austrália",
+  "Áustria",
+  "Azerbaijão",
+  "Bahamas",
+  "Bahrein",
+  "Bangladesh",
+  "Barbados",
+  "Bielorrússia",
+  "Bélgica",
+  "Belize",
+  "Benin",
+  "Butão",
+  "Bolívia",
+  "Bósnia e Herzegovina",
+  "Botsuana",
+  "Brasil",
+  "Brunei",
+  "Bulgária",
+  "Burkina Faso",
+  "Burundi",
+  "Cabo Verde",
+  "Camboja",
+  "Camarões",
+  "Canadá",
+  "República Centro-Africana",
+  "Chade",
+  "Chile",
+  "China",
+  "Colômbia",
+  "Comores",
+  "Congo",
+  "Costa Rica",
+  "Croácia",
+  "Cuba",
+  "Chipre",
+  "Tchéquia",
+  "República Democrática do Congo",
+  "Dinamarca",
+  "Djibuti",
+  "Dominica",
+  "República Dominicana",
+  "Equador",
+  "Egito",
+  "El Salvador",
+  "Guiné Equatorial",
+  "Eritreia",
+  "Estônia",
+  "Eswatini",
+  "Etiópia",
+  "Fiji",
+  "Finlândia",
+  "França",
+  "Gabão",
+  "Gâmbia",
+  "Geórgia",
+  "Alemanha",
+  "Gana",
+  "Grécia",
+  "Granada",
+  "Guatemala",
+  "Guiné",
+  "Guiné-Bissau",
+  "Guiana",
+  "Haiti",
+  "Santa Sé",
+  "Honduras",
+  "Hungria",
+  "Islândia",
+  "Índia",
+  "Indonésia",
+  "Irã",
+  "Iraque",
+  "Irlanda",
+  "Itália",
+  "Costa do Marfim",
+  "Jamaica",
+  "Japão",
+  "Jordânia",
+  "Cazaquistão",
+  "Quênia",
+  "Quiribati",
+  "Kuwait",
+  "Quirguistão",
+  "Laos",
+  "Letônia",
+  "Líbano",
+  "Lesoto",
+  "Libéria",
+  "Líbia",
+  "Liechtenstein",
+  "Lituânia",
+  "Luxemburgo",
+  "Madagascar",
+  "Malawi",
+  "Malásia",
+  "Maldivas",
+  "Mali",
+  "Malta",
+  "Ilhas Marshall",
+  "Mauritânia",
+  "Maurício",
+  "México",
+  "Micronésia",
+  "Moldávia",
+  "Mônaco",
+  "Mongólia",
+  "Montenegro",
+  "Marrocos",
+  "Moçambique",
+  "Mianmar",
+  "Namíbia",
+  "Nauru",
+  "Nepal",
+  "Países Baixos",
+  "Nova Zelândia",
+  "Nicarágua",
+  "Níger",
+  "Nigéria",
+  "Coreia do Norte",
+  "Macedônia do Norte",
+  "Noruega",
+  "Omã",
+  "Paquistão",
+  "Palau",
+  "Estado da Palestina",
+  "Panamá",
+  "Papua-Nova Guiné",
+  "Paraguai",
+  "Peru",
+  "Filipinas",
+  "Polônia",
+  "Portugal",
+  "Catar",
+  "Romênia",
+  "Rússia",
+  "Ruanda",
+  "São Cristóvão e Neves",
+  "Santa Lúcia",
+  "São Vicente e Granadinas",
+  "Samoa",
+  "San Marino",
+  "São Tomé e Príncipe",
+  "Arábia Saudita",
+  "Senegal",
+  "Sérvia",
+  "Seicheles",
+  "Serra Leoa",
+  "Singapura",
+  "Eslováquia",
+  "Eslovênia",
+  "Ilhas Salomão",
+  "Somália",
+  "África do Sul",
+  "Coreia do Sul",
+  "Sudão do Sul",
+  "Espanha",
+  "Sri Lanka",
+  "Sudão",
+  "Suriname",
+  "Suécia",
+  "Suíça",
+  "Síria",
+  "Tajiquistão",
+  "Tanzânia",
+  "Tailândia",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinidad e Tobago",
+  "Tunísia",
+  "Turquia",
+  "Turcomenistão",
+  "Tuvalu",
+  "Uganda",
+  "Ucrânia",
+  "Emirados Árabes Unidos (EAU)",
+  "Reino Unido (RU)",
+  "Estados Unidos (EUA)",
+  "Uruguai",
+  "Uzbequistão",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnã",
+  "Iêmen",
+  "Zâmbia",
+  "Zimbábue",
+];
+
+export const COUNTRIES_RU = [
+  "Афганистан",
+  "Албания",
+  "Алжир",
+  "Андорра",
+  "Ангола",
+  "Антигуа и Барбуда",
+  "Аргентина",
+  "Армения",
+  "Австралия",
+  "Австрия",
+  "Азербайджан",
+  "Багамы",
+  "Бахрейн",
+  "Бангладеш",
+  "Барбадос",
+  "Беларусь",
+  "Бельгия",
+  "Белиз",
+  "Бенин",
+  "Бутан",
+  "Боливия",
+  "Босния и Герцеговина",
+  "Ботсвана",
+  "Бразилия",
+  "Бруней",
+  "Болгария",
+  "Буркина-Фасо",
+  "Бурунди",
+  "Кабо-Верде",
+  "Камбоджа",
+  "Камерун",
+  "Канада",
+  "Центральноафриканская Республика",
+  "Чад",
+  "Чили",
+  "Китай",
+  "Колумбия",
+  "Коморы",
+  "Конго",
+  "Коста-Рика",
+  "Хорватия",
+  "Куба",
+  "Кипр",
+  "Чехия",
+  "Демократическая Республика Конго",
+  "Дания",
+  "Джибути",
+  "Доминика",
+  "Доминиканская Республика",
+  "Эквадор",
+  "Египет",
+  "Сальвадор",
+  "Экваториальная Гвинея",
+  "Эритрея",
+  "Эстония",
+  "Эсватини",
+  "Эфиопия",
+  "Фиджи",
+  "Финляндия",
+  "Франция",
+  "Габон",
+  "Гамбия",
+  "Грузия",
+  "Германия",
+  "Гана",
+  "Греция",
+  "Гренада",
+  "Гватемала",
+  "Гвинея",
+  "Гвинея-Бисау",
+  "Гайана",
+  "Гаити",
+  "Ватикан",
+  "Гондурас",
+  "Венгрия",
+  "Исландия",
+  "Индия",
+  "Индонезия",
+  "Иран",
+  "Ирак",
+  "Ирландия",
+  "Италия",
+  "Кот-д'Ивуар",
+  "Ямайка",
+  "Япония",
+  "Иордания",
+  "Казахстан",
+  "Кения",
+  "Кирибати",
+  "Кувейт",
+  "Кыргызстан",
+  "Лаос",
+  "Латвия",
+  "Ливан",
+  "Лесото",
+  "Либерия",
+  "Ливия",
+  "Лихтенштейн",
+  "Литва",
+  "Люксембург",
+  "Мадагаскар",
+  "Малави",
+  "Малайзия",
+  "Мальдивы",
+  "Мали",
+  "Мальта",
+  "Маршалловы Острова",
+  "Мавритания",
+  "Маврикий",
+  "Мексика",
+  "Микронезия",
+  "Молдова",
+  "Монако",
+  "Монголия",
+  "Черногория",
+  "Марокко",
+  "Мозамбик",
+  "Мьянма",
+  "Намибия",
+  "Науру",
+  "Непал",
+  "Нидерланды",
+  "Новая Зеландия",
+  "Никарагуа",
+  "Нигер",
+  "Нигерия",
+  "Северная Корея",
+  "Северная Македония",
+  "Норвегия",
+  "Оман",
+  "Пакистан",
+  "Палау",
+  "Государство Палестина",
+  "Панама",
+  "Папуа — Новая Гвинея",
+  "Парагвай",
+  "Перу",
+  "Филиппины",
+  "Польша",
+  "Португалия",
+  "Катар",
+  "Румыния",
+  "Россия",
+  "Руанда",
+  "Сент-Китс и Невис",
+  "Сент-Люсия",
+  "Сент-Винсент и Гренадины",
+  "Самоа",
+  "Сан-Марино",
+  "Сан-Томе и Принсипи",
+  "Саудовская Аравия",
+  "Сенегал",
+  "Сербия",
+  "Сейшельские Острова",
+  "Сьерра-Леоне",
+  "Сингапур",
+  "Словакия",
+  "Словения",
+  "Соломоновы Острова",
+  "Сомали",
+  "Южно-Африканская Республика",
+  "Южная Корея",
+  "Южный Судан",
+  "Испания",
+  "Шри-Ланка",
+  "Судан",
+  "Суринам",
+  "Швеция",
+  "Швейцария",
+  "Сирия",
+  "Таджикистан",
+  "Танзания",
+  "Таиланд",
+  "Восточный Тимор",
+  "Того",
+  "Тонга",
+  "Тринидад и Тобаго",
+  "Тунис",
+  "Турция",
+  "Туркменистан",
+  "Тувалу",
+  "Уганда",
+  "Украина",
+  "Объединенные Арабские Эмираты (ОАЭ)",
+  "Великобритания (UK)",
+  "Соединенные Штаты (США)",
+  "Уругвай",
+  "Узбекистан",
+  "Вануату",
+  "Венесуэла",
+  "Вьетнам",
+  "Йемен",
+  "Замбия",
+  "Зимбабве",
+];
+
+export const COUNTRIES_SW = [
+  "Afuganistani",
+  "Albania",
+  "Aljeria",
+  "Andorra",
+  "Angola",
+  "Antigua na Barbuda",
+  "Ajentina",
+  "Armenia",
+  "Australia",
+  "Austria",
+  "Azabajani",
+  "Bahamas",
+  "Bahareni",
+  "Bangladeshi",
+  "Barbados",
+  "Belarusi",
+  "Ubelgiji",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivia",
+  "Bosnia na Hezegovina",
+  "Botswana",
+  "Brazili",
+  "Brunei",
+  "Bulgaria",
+  "Bukinafaso",
+  "Burundi",
+  "Kepuvede",
+  "Kamboja",
+  "Kameruni",
+  "Kanada",
+  "Jamhuri ya Afrika ya Kati",
+  "Chadi",
+  "Chile",
+  "Uchina",
+  "Kolombia",
+  "Komoro",
+  "Kongo",
+  "Kosta Rika",
+  "Kroasia",
+  "Kuba",
+  "Saiprasi",
+  "Cheki",
+  "Jamhuri ya Kidemokrasia ya Kongo",
+  "Denmaki",
+  "Jibuti",
+  "Dominika",
+  "Jamhuri ya Dominika",
+  "Ekwado",
+  "Misri",
+  "El Salvador",
+  "Ginekweta",
+  "Eritrea",
+  "Estonia",
+  "Eswatini",
+  "Ethiopia",
+  "Fiji",
+  "Ufini",
+  "Ufaransa",
+  "Gabon",
+  "Gambia",
+  "Jojia",
+  "Ujerumani",
+  "Ghana",
+  "Ugiriki",
+  "Grenada",
+  "Guatemala",
+  "Gine",
+  "Ginebisau",
+  "Guyana",
+  "Haiti",
+  "Mji wa Vatikani",
+  "Honduras",
+  "Hungaria",
+  "Aislandi",
+  "India",
+  "Indonesia",
+  "Iran",
+  "Iraki",
+  "Ayalandi",
+  "Italia",
+  "Côte d'Ivoire",
+  "Jamaika",
+  "Japani",
+  "Yordani",
+  "Kazakistani",
+  "Kenya",
+  "Kiribati",
+  "Kuwaiti",
+  "Kirigizistani",
+  "Laosi",
+  "Lativia",
+  "Lebanoni",
+  "Lesoto",
+  "Liberia",
+  "Libya",
+  "Lishenteni",
+  "Lituanya",
+  "Lasembagi",
+  "Madagaska",
+  "Malawi",
+  "Malesia",
+  "Maldivi",
+  "Mali",
+  "Malta",
+  "Visiwa vya Marshall",
+  "Moritania",
+  "Morisi",
+  "Meksiko",
+  "Mikronesia",
+  "Moldova",
+  "Monako",
+  "Mongolia",
+  "Montenegro",
+  "Moroko",
+  "Msumbiji",
+  "Myanmar",
+  "Namibia",
+  "Nauru",
+  "Nepali",
+  "Uholanzi",
+  "Nyuzilandi",
+  "Nikaragwa",
+  "Nijeri",
+  "Nigeria",
+  "Korea Kaskazini",
+  "Masedonia Kaskazini",
+  "Norwe",
+  "Omani",
+  "Pakistani",
+  "Palau",
+  "Palestina",
+  "Panama",
+  "Papua Guinea Mpya",
+  "Paragwai",
+  "Peru",
+  "Ufilipino",
+  "Polandi",
+  "Ureno",
+  "Katari",
+  "Romania",
+  "Urusi",
+  "Rwanda",
+  "Saint Kitts na Nevis",
+  "Saint Lucia",
+  "Saint Vincent na Grenadines",
+  "Samoa",
+  "San Marino",
+  "Sao Tome na Prinsipe",
+  "Saudia",
+  "Senegali",
+  "Serbia",
+  "Shelisheli",
+  "Siera Leoni",
+  "Singapoo",
+  "Slovakia",
+  "Slovenia",
+  "Visiwa vya Solomon",
+  "Somalia",
+  "Afrika Kusini",
+  "Korea Kusini",
+  "Sudan Kusini",
+  "Hispania",
+  "Sri Lanka",
+  "Sudan",
+  "Suriname",
+  "Uswidi",
+  "Uswisi",
+  "Syria",
+  "Tajikistani",
+  "Tanzania",
+  "Tailandi",
+  "Timor ya Mashariki",
+  "Togo",
+  "Tonga",
+  "Trinidad na Tobago",
+  "Tunisia",
+  "Uturuki",
+  "Turkmenistani",
+  "Tuvalu",
+  "Uganda",
+  "Ukreni",
+  "Falme za Kiarabu (UAE)",
+  "Ufalme wa Muungano (UK)",
+  "Marekani (US)",
+  "Urugwai",
+  "Uzbekistani",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnamu",
+  "Yemeni",
+  "Zambia",
+  "Zimbabwe",
+];
+
+export const COUNTRIES_TG = [
+  "Афғонистон",
+  "Албания",
+  "Алҷазоир",
+  "Андорра",
+  "Ангола",
+  "Антигуа ва Барбуда",
+  "Аргентина",
+  "Арманистон",
+  "Австралия",
+  "Австрия",
+  "Озарбойҷон",
+  "Баҳама",
+  "Баҳрайн",
+  "Банглодеш",
+  "Барбадос",
+  "Беларус",
+  "Белгия",
+  "Белиз",
+  "Бенин",
+  "Бутон",
+  "Боливия",
+  "Босния ва Ҳерсеговина",
+  "Ботсвана",
+  "Бразилия",
+  "Бруней",
+  "Булғористон",
+  "Буркина-Фасо",
+  "Бурунди",
+  "Кабо-Верде",
+  "Камбоҷа",
+  "Камерун",
+  "Канада",
+  "Ҷумҳурии Африқои Марказӣ",
+  "Чад",
+  "Чили",
+  "Чин",
+  "Колумбия",
+  "Комор",
+  "Конго",
+  "Коста-Рика",
+  "Хорватия",
+  "Куба",
+  "Кипр",
+  "Чехия",
+  "Ҷумҳурии Демократии Конго",
+  "Дания",
+  "Ҷибути",
+  "Доминика",
+  "Ҷумҳурии Доминикан",
+  "Эквадор",
+  "Миср",
+  "Салвадор",
+  "Гвинеяи Истивоӣ",
+  "Эритрея",
+  "Эстония",
+  "Эсватини",
+  "Эфиопия",
+  "Фиҷи",
+  "Финляндия",
+  "Фаронса",
+  "Габон",
+  "Гамбия",
+  "Гурҷистон",
+  "Олмон",
+  "Гана",
+  "Юнон",
+  "Гренада",
+  "Гватемала",
+  "Гвинея",
+  "Гвинея-Бисау",
+  "Гайана",
+  "Гаити",
+  "Ватикан",
+  "Гондурас",
+  "Маҷористон",
+  "Исландия",
+  "Ҳиндустон",
+  "Индонезия",
+  "Эрон",
+  "Ироқ",
+  "Ирландия",
+  "Италия",
+  "Кот-д'Ивуар",
+  "Ямайка",
+  "Ҷопон",
+  "Урдун",
+  "Қазоқистон",
+  "Кения",
+  "Кирибати",
+  "Кувайт",
+  "Қирғизистон",
+  "Лаос",
+  "Латвия",
+  "Лубнон",
+  "Лесото",
+  "Либерия",
+  "Либия",
+  "Лихтенштейн",
+  "Литва",
+  "Люксембург",
+  "Мадагаскар",
+  "Малави",
+  "Малайзия",
+  "Малдив",
+  "Мали",
+  "Малта",
+  "Ҷазираҳои Маршалл",
+  "Мавритания",
+  "Маврикий",
+  "Мексика",
+  "Микронезия",
+  "Молдова",
+  "Монако",
+  "Муғулистон",
+  "Черногория",
+  "Марокаш",
+  "Мозамбик",
+  "Мянма",
+  "Намибия",
+  "Науру",
+  "Непал",
+  "Нидерландия",
+  "Зеландияи Нав",
+  "Никарагуа",
+  "Нигер",
+  "Нигерия",
+  "Кореяи Шимолӣ",
+  "Македонияи Шимолӣ",
+  "Норвегия",
+  "Умон",
+  "Покистон",
+  "Палау",
+  "Давлати Фаластин",
+  "Панама",
+  "Папуа-Гвинеяи Нав",
+  "Парагвай",
+  "Перу",
+  "Филиппин",
+  "Лаҳистон",
+  "Португалия",
+  "Қатар",
+  "Руминия",
+  "Русия",
+  "Руанда",
+  "Сент-Китс ва Невис",
+  "Сент-Люсия",
+  "Сент-Винсент ва Гренадинҳо",
+  "Самоа",
+  "Сан-Марино",
+  "Сан-Томе ва Принсипи",
+  "Арабистони Саудӣ",
+  "Сенегал",
+  "Сербия",
+  "Ҷазираҳои Сейшел",
+  "Сиерра-Леоне",
+  "Сингапур",
+  "Словакия",
+  "Словения",
+  "Ҷазираҳои Соломон",
+  "Сомалӣ",
+  "Африқои Ҷанубӣ",
+  "Кореяи Ҷанубӣ",
+  "Судони Ҷанубӣ",
+  "Испания",
+  "Шри-Ланка",
+  "Судон",
+  "Суринам",
+  "Шветсия",
+  "Швейтсария",
+  "Сурия",
+  "Тоҷикистон",
+  "Танзания",
+  "Таиланд",
+  "Тимор-Лесте",
+  "Того",
+  "Тонга",
+  "Тринидад ва Тобаго",
+  "Тунис",
+  "Туркия",
+  "Туркманистон",
+  "Тувалу",
+  "Уганда",
+  "Украина",
+  "Амороти Муттаҳидаи Араб (АМА)",
+  "Британияи Кабир (Шоҳигарии Муттаҳида)",
+  "Иёлоти Муттаҳидаи Амрико (ИМА)",
+  "Уругвай",
+  "Ӯзбекистон",
+  "Вануату",
+  "Венесуэла",
+  "Ветнам",
+  "Яман",
+  "Замбия",
+  "Зимбабве",
+];
+
+export const COUNTRIES_TR = [
+  "Afganistan",
+  "Arnavutluk",
+  "Cezayir",
+  "Andorra",
+  "Angola",
+  "Antigua ve Barbuda",
+  "Arjantin",
+  "Ermenistan",
+  "Avustralya",
+  "Avusturya",
+  "Azerbaycan",
+  "Bahamalar",
+  "Bahreyn",
+  "Bangladeş",
+  "Barbados",
+  "Belarus",
+  "Belçika",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivya",
+  "Bosna-Hersek",
+  "Botsvana",
+  "Brezilya",
+  "Brunei",
+  "Bulgaristan",
+  "Burkina Faso",
+  "Burundi",
+  "Cabo Verde",
+  "Kamboçya",
+  "Kamerun",
+  "Kanada",
+  "Orta Afrika Cumhuriyeti",
+  "Çad",
+  "Şili",
+  "Çin",
+  "Kolombiya",
+  "Komorlar",
+  "Kongo",
+  "Kosta Rika",
+  "Hırvatistan",
+  "Küba",
+  "Kıbrıs",
+  "Çekya",
+  "Kongo Demokratik Cumhuriyeti",
+  "Danimarka",
+  "Cibuti",
+  "Dominika",
+  "Dominik Cumhuriyeti",
+  "Ekvador",
+  "Mısır",
+  "El Salvador",
+  "Ekvator Ginesi",
+  "Eritre",
+  "Estonya",
+  "Esvatini",
+  "Etiyopya",
+  "Fiji",
+  "Finlandiya",
+  "Fransa",
+  "Gabon",
+  "Gambiya",
+  "Gürcistan",
+  "Almanya",
+  "Gana",
+  "Yunanistan",
+  "Grenada",
+  "Guatemala",
+  "Gine",
+  "Gine-Bissau",
+  "Guyana",
+  "Haiti",
+  "Vatikan",
+  "Honduras",
+  "Macaristan",
+  "İzlanda",
+  "Hindistan",
+  "Endonezya",
+  "İran",
+  "Irak",
+  "İrlanda",
+  "İtalya",
+  "Fildişi Sahili",
+  "Jamaika",
+  "Japonya",
+  "Ürdün",
+  "Kazakistan",
+  "Kenya",
+  "Kiribati",
+  "Kuveyt",
+  "Kırgızistan",
+  "Laos",
+  "Letonya",
+  "Lübnan",
+  "Lesotho",
+  "Liberya",
+  "Libya",
+  "Lihtenştayn",
+  "Litvanya",
+  "Lüksemburg",
+  "Madagaskar",
+  "Malavi",
+  "Malezya",
+  "Maldivler",
+  "Mali",
+  "Malta",
+  "Marshall Adaları",
+  "Moritanya",
+  "Mauritius",
+  "Meksika",
+  "Mikronezya",
+  "Moldova",
+  "Monako",
+  "Moğolistan",
+  "Karadağ",
+  "Fas",
+  "Mozambik",
+  "Myanmar",
+  "Namibya",
+  "Nauru",
+  "Nepal",
+  "Hollanda",
+  "Yeni Zelanda",
+  "Nikaragua",
+  "Nijer",
+  "Nijerya",
+  "Kuzey Kore",
+  "Kuzey Makedonya",
+  "Norveç",
+  "Umman",
+  "Pakistan",
+  "Palau",
+  "Filistin Devleti",
+  "Panama",
+  "Papua Yeni Gine",
+  "Paraguay",
+  "Peru",
+  "Filipinler",
+  "Polonya",
+  "Portekiz",
+  "Katar",
+  "Romanya",
+  "Rusya",
+  "Ruanda",
+  "Saint Kitts ve Nevis",
+  "Saint Lucia",
+  "Saint Vincent ve Grenadinler",
+  "Samoa",
+  "San Marino",
+  "Sao Tome ve Principe",
+  "Suudi Arabistan",
+  "Senegal",
+  "Sırbistan",
+  "Seyşeller",
+  "Sierra Leone",
+  "Singapur",
+  "Slovakya",
+  "Slovenya",
+  "Solomon Adaları",
+  "Somali",
+  "Güney Afrika",
+  "Güney Kore",
+  "Güney Sudan",
+  "İspanya",
+  "Sri Lanka",
+  "Sudan",
+  "Surinam",
+  "İsveç",
+  "İsviçre",
+  "Suriye",
+  "Tacikistan",
+  "Tanzanya",
+  "Tayland",
+  "Doğu Timor",
+  "Togo",
+  "Tonga",
+  "Trinidad ve Tobago",
+  "Tunus",
+  "Türkiye",
+  "Türkmenistan",
+  "Tuvalu",
+  "Uganda",
+  "Ukrayna",
+  "Birleşik Arap Emirlikleri (BAE)",
+  "Birleşik Krallık (BK)",
+  "Amerika Birleşik Devletleri (ABD)",
+  "Uruguay",
+  "Özbekistan",
+  "Vanuatu",
+  "Venezuela",
+  "Vietnam",
+  "Yemen",
+  "Zambiya",
+  "Zimbabve",
+];
+
+export const COUNTRIES_UL = [
+  "Afghanistan",
+  "Albania",
+  "Algeria",
+  "Andorra",
+  "Angola",
+  "Antigua aur Barbuda",
+  "Argentina",
+  "Armenia",
+  "Australia",
+  "Austria",
+  "Azerbaijan",
+  "Bahamas",
+  "Bahrain",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgium",
+  "Belize",
+  "Benin",
+  "Bhutan",
+  "Bolivia",
+  "Bosnia aur Herzegovina",
+  "Botswana",
+  "Brazil",
+  "Brunei",
+  "Bulgariya",
   "Burkina Faso",
   "Burundi",
   "Cabo Verde",
   "Cambodia",
   "Cameroon",
   "Canada",
-  "Central African Republic",
+  "Wasti Afriqi Jamhooriya",
   "Chad",
   "Chile",
-  "China",
+  "Cheen",
   "Colombia",
   "Comoros",
   "Congo",
   "Costa Rica",
   "Croatia",
   "Cuba",
-  "Cyprus",
+  "Qubrus",
   "Czechia",
-  "Democratic Republic of the Congo",
+  "Jamhoori Jamhooriya Congo",
   "Denmark",
   "Djibouti",
   "Dominica",
-  "Dominican Republic",
+  "Dominican Jamhooriya",
   "Ecuador",
-  "Egypt",
+  "Misr",
   "El Salvador",
   "Equatorial Guinea",
   "Eritrea",
@@ -64,7 +4205,7 @@ export const COUNTRIES_EN = [
   "Georgia",
   "Germany",
   "Ghana",
-  "Greece",
+  "Yunan",
   "Grenada",
   "Guatemala",
   "Guinea",
@@ -75,24 +4216,24 @@ export const COUNTRIES_EN = [
   "Honduras",
   "Hungary",
   "Iceland",
-  "India",
+  "Bharat",
   "Indonesia",
   "Iran",
   "Iraq",
   "Ireland",
-  "Italy",
+  "Itali",
   "Ivory Coast",
   "Jamaica",
   "Japan",
-  "Jordan",
-  "Kazakhstan",
+  "Urdun",
+  "Qazaqstan",
   "Kenya",
   "Kiribati",
   "Kuwait",
   "Kyrgyzstan",
   "Laos",
   "Latvia",
-  "Lebanon",
+  "Lubnan",
   "Lesotho",
   "Liberia",
   "Libya",
@@ -114,7 +4255,7 @@ export const COUNTRIES_EN = [
   "Monaco",
   "Mongolia",
   "Montenegro",
-  "Morocco",
+  "Marakash",
   "Mozambique",
   "Myanmar",
   "Namibia",
@@ -125,31 +4266,31 @@ export const COUNTRIES_EN = [
   "Nicaragua",
   "Niger",
   "Nigeria",
-  "North Korea",
-  "North Macedonia",
+  "Shumali Korea",
+  "Shumali Maqdonia",
   "Norway",
   "Oman",
   "Pakistan",
   "Palau",
-  "Palestine State",
+  "Riyasat-e-Falasteen",
   "Panama",
   "Papua New Guinea",
   "Paraguay",
   "Peru",
-  "Philippines",
+  "Filipain",
   "Poland",
-  "Portugal",
+  "Purtagal",
   "Qatar",
   "Romania",
-  "Russia",
+  "Roos",
   "Rwanda",
-  "Saint Kitts and Nevis",
+  "Saint Kitts aur Nevis",
   "Saint Lucia",
-  "Saint Vincent and the Grenadines",
+  "Saint Vincent aur Grenadines",
   "Samoa",
   "San Marino",
-  "Sao Tome and Principe",
-  "Saudi Arabia",
+  "Sao Tome aur Principe",
+  "Saudi Arab",
   "Senegal",
   "Serbia",
   "Seychelles",
@@ -159,239 +4300,463 @@ export const COUNTRIES_EN = [
   "Slovenia",
   "Solomon Islands",
   "Somalia",
-  "South Africa",
-  "South Korea",
-  "South Sudan",
+  "Janubi Africa",
+  "Janubi Korea",
+  "Janubi Sudan",
   "Spain",
   "Sri Lanka",
   "Sudan",
   "Suriname",
   "Sweden",
   "Switzerland",
-  "Syria",
+  "Shaam",
   "Tajikistan",
   "Tanzania",
   "Thailand",
   "Timor-Leste",
   "Togo",
   "Tonga",
-  "Trinidad and Tobago",
-  "Tunisia",
-  "Turkey",
-  "Turkmenistan",
+  "Trinidad aur Tobago",
+  "Teunas",
+  "Turki",
+  "Turkmanistan",
   "Tuvalu",
   "Uganda",
   "Ukraine",
-  "United Arab Emirates (UAE)",
-  "United Kingdom (UK)",
-  "United States (US)",
+  "Muttahida Arab Imarat (UAE)",
+  "Bartania (UK)",
+  "Riasat-e-Muttahida America (US)",
   "Uruguay",
   "Uzbekistan",
   "Vanuatu",
   "Venezuela",
   "Vietnam",
-  "Yemen",
+  "Yaman",
   "Zambia",
   "Zimbabwe",
 ];
 
-export const COUNTRIES_FA = [
+export const COUNTRIES_UR = [
   "افغانستان",
-  "آلبانی",
-  "الجزایر",
-  "آندورا",
-  "آنگولا",
-  "آنتیگوا و باربودا",
-  "آرژانتین",
-  "ارمنستان",
-  "استرالیا",
-  "اتریش",
-  "آذربایجان",
-  "باهاما",
+  "البانیہ",
+  "الجزائر",
+  "انڈورا",
+  "انگولا",
+  "اینٹیگوا اور باربوڈا",
+  "ارجنٹائن",
+  "آرمینیا",
+  "آسٹریلیا",
+  "آسٹریا",
+  "آذربائیجان",
+  "بہاماس",
   "بحرین",
-  "بنگلادش",
-  "باربادوس",
-  "بلاروس",
-  "بلژیک",
-  "بلیز",
-  "بنین",
-  "بوتان",
-  "بولیوی",
-  "بوسنی و هرزگوین",
-  "بوتسوانا",
-  "برزیل",
-  "برونئی",
-  "بلغارستان",
-  "بورکینافاسو",
-  "بوروندی",
-  "کیپ ورد",
-  "کامبوج",
-  "کامرون",
-  "کانادا",
-  "جمهوری آفریقای مرکزی",
-  "چاد",
-  "شیلی",
+  "بنگلہ دیش",
+  "بارباڈوس",
+  "بیلاروس",
+  "بیلجیم",
+  "بیلیز",
+  "بینن",
+  "بھوٹان",
+  "بولیویا",
+  "بوسنیا اور ہرزیگووینا",
+  "بوٹسوانا",
+  "برازیل",
+  "برونائی",
+  "بلغاریہ",
+  "برکینا فاسو",
+  "برونڈی",
+  "کیپ ورڈی",
+  "کمبوڈیا",
+  "کیمرون",
+  "کینیڈا",
+  "وسطی افریقی جمہوریہ",
+  "چاڈ",
+  "چلی",
   "چین",
-  "کلمبیا",
-  "کومور",
-  "کنگو",
-  "کاستاریکا",
-  "کرواسی",
-  "کوبا",
-  "قبرس",
-  "جمهوری چک",
-  "جمهوری دموکراتیک کنگو",
-  "دانمارک",
-  "جیبوتی",
-  "دومینیکا",
-  "جمهوری دومینیکن",
-  "اکوادور",
+  "کولمبیا",
+  "کوموروس",
+  "کانگو",
+  "کوسٹا ریکا",
+  "کروشیا",
+  "کیوبا",
+  "قبرص",
+  "چیکیا",
+  "جمہوری جمہوریہ کانگو",
+  "ڈنمارک",
+  "جبوتی",
+  "ڈومینیکا",
+  "جمہوریہ ڈومینیکن",
+  "ایکواڈور",
   "مصر",
-  "السالوادور",
-  "گینه استوایی",
-  "اریتره",
-  "استونی",
-  "اسواتینی",
-  "اتیوپی",
-  "فیجی",
-  "فنلاند",
-  "فرانسه",
-  "گابن",
-  "گامبیا",
-  "گرجستان",
-  "آلمان",
-  "غنا",
+  "ایل سلواڈور",
+  "استوائی گنی",
+  "اریٹیریا",
+  "اسٹونیا",
+  "ایسواتینی",
+  "ایتھوپیا",
+  "فجی",
+  "فن لینڈ",
+  "فرانس",
+  "گیبون",
+  "گیمبیا",
+  "جارجیا",
+  "جرمنی",
+  "گھانا",
   "یونان",
-  "گرنادا",
-  "گواتمالا",
-  "گینه",
-  "گینه بیسائو",
-  "گویان",
-  "هایتی",
-  "واتیکان",
-  "هندوراس",
-  "مجارستان",
-  "ایسلند",
-  "هند",
-  "اندونزی",
+  "گریناڈا",
+  "گوئٹے مالا",
+  "گنی",
+  "گنی بساؤ",
+  "گیانا",
+  "ہیٹی",
+  "ہولی سی",
+  "ہونڈوراس",
+  "ہنگری",
+  "آئس لینڈ",
+  "بھارت",
+  "انڈونیشیا",
   "ایران",
   "عراق",
-  "ایرلند",
-  "ایتالیا",
-  "ساحل عاج",
-  "جامائیکا",
-  "ژاپن",
+  "آئرلینڈ",
+  "اٹلی",
+  "آئیوری کوسٹ",
+  "جمیکا",
+  "جاپان",
   "اردن",
-  "قزاقستان",
-  "کنیا",
+  "قازقستان",
+  "کینیا",
   "کیریباتی",
   "کویت",
-  "قرقیزستان",
-  "لائوس",
-  "لتونی",
+  "کرغزستان",
+  "لاؤس",
+  "لٹویا",
   "لبنان",
-  "لسوتو",
-  "لیبریا",
-  "لیبی",
-  "لیختن‌اشتاین",
-  "لیتوانی",
-  "لوکزامبورگ",
-  "ماداگاسکار",
-  "مالاوی",
-  "مالزی",
-  "مالدیو",
+  "لیسوتھو",
+  "لائبیریا",
+  "لیبیا",
+  "لیختینستائن",
+  "لتھوانیا",
+  "لکسمبرگ",
+  "مڈغاسکر",
+  "ملاوی",
+  "ملائیشیا",
+  "مالدیپ",
   "مالی",
-  "مالت",
-  "جزایر مارشال",
-  "موریتانی",
-  "موریس",
-  "مکزیک",
-  "میکرونزی",
-  "مولداوی",
+  "مالٹا",
+  "مارشل جزائر",
+  "موریطانیہ",
+  "ماریشس",
+  "میکسیکو",
+  "مائیکرونیشیا",
+  "مالدووا",
   "موناکو",
-  "مغولستان",
-  "مونته‌نگرو",
+  "منگولیا",
+  "مونٹی نیگرو",
   "مراکش",
-  "موزامبیک",
+  "موزمبیق",
   "میانمار",
-  "نامیبیا",
-  "نائورو",
-  "نپال",
-  "هلند",
-  "نیوزیلند",
-  "نیکاراگوئه",
-  "نیجر",
-  "نیجریه",
-  "کره شمالی",
-  "مقدونیه شمالی",
-  "نروژ",
+  "نمیبیا",
+  "ناورو",
+  "نیپال",
+  "نیدرلینڈز",
+  "نیوزی لینڈ",
+  "نکاراگوا",
+  "نائیجر",
+  "نائجیریا",
+  "شمالی کوریا",
+  "شمالی مقدونیہ",
+  "ناروے",
   "عمان",
   "پاکستان",
-  "پالائو",
-  "فلسطین",
+  "پلاؤ",
+  "ریاست فلسطین",
   "پاناما",
-  "پاپوآ گینه نو",
-  "پاراگوئه",
-  "پرو",
-  "فیلیپین",
-  "لهستان",
-  "پرتغال",
+  "پاپوا نیو گنی",
+  "پیراگوئے",
+  "پیرو",
+  "فلپائن",
+  "پولینڈ",
+  "پرتگال",
   "قطر",
-  "رومانی",
-  "روسیه",
-  "رواندا",
-  "سنت کیتس و نویس",
-  "سنت لوسیا",
-  "سنت وینسنت و گرنادین‌ها",
-  "ساموآ",
+  "رومانیہ",
+  "روس",
+  "روانڈا",
+  "سینٹ کٹس اور نیوس",
+  "سینٹ لوسیا",
+  "سینٹ ونسنٹ اور گریناڈائنز",
+  "سامووا",
   "سان مارینو",
-  "سائوتومه و پرنسیپ",
-  "عربستان سعودی",
-  "سنگال",
-  "صربستان",
-  "سیشل",
-  "سیرالئون",
+  "ساؤ ٹومے اور پرنسپے",
+  "سعودی عرب",
+  "سینیگال",
+  "سربیا",
+  "سیشلز",
+  "سیرالیون",
   "سنگاپور",
-  "اسلواکی",
-  "اسلوونی",
-  "جزایر سلیمان",
-  "سومالی",
-  "آفریقای جنوبی",
-  "کره جنوبی",
-  "سودان جنوبی",
-  "اسپانیا",
-  "سری‌لانکا",
-  "سودان",
+  "سلوواکیہ",
+  "سلووینیا",
+  "جزائر سلیمان",
+  "صومالیہ",
+  "جنوبی افریقہ",
+  "جنوبی کوریا",
+  "جنوبی سوڈان",
+  "اسپین",
+  "سری لنکا",
+  "سوڈان",
   "سورینام",
-  "سوئد",
-  "سوئیس",
-  "سوریه",
-  "تاجیکستان",
-  "تانزانیا",
-  "تایلند",
-  "تیمور شرقی",
-  "توگو",
-  "تونگا",
-  "ترینیداد و توباگو",
-  "تونس",
-  "ترکیه",
-  "ترکمنستان",
+  "سویڈن",
+  "سوئٹزرلینڈ",
+  "شام",
+  "تاجکستان",
+  "تنزانیہ",
+  "تھائی لینڈ",
+  "تیمور لیسٹے",
+  "ٹوگو",
+  "ٹونگا",
+  "ٹرینیڈاڈ اور ٹوباگو",
+  "تیونس",
+  "ترکی",
+  "ترکمانستان",
   "تووالو",
-  "اوگاندا",
-  "اوکراین",
-  "امارات متحده عربی (UAE)",
-  "بریتانیا (UK)",
-  "ایالات متحده آمریکا (US)",
-  "اروگوئه",
+  "یوگنڈا",
+  "یوکرین",
+  "متحدہ عرب امارات (یو اے ای)",
+  "برطانیہ (یو کے)",
+  "ریاستہائے متحدہ (یو ایس)",
+  "یوراگوئے",
   "ازبکستان",
   "وانواتو",
-  "ونزوئلا",
+  "وینزویلا",
   "ویتنام",
   "یمن",
-  "زامبیا",
-  "زیمبابوه",
+  "زیمبیا",
+  "زمبابوے",
+];
+
+export const COUNTRIES_UZ = [
+  "Afgʻoniston",
+  "Albaniya",
+  "Jazoir",
+  "Andorra",
+  "Angola",
+  "Antigua va Barbuda",
+  "Argentina",
+  "Armaniston",
+  "Avstraliya",
+  "Avstriya",
+  "Ozarbayjon",
+  "Bagama orollari",
+  "Bahrayn",
+  "Bangladesh",
+  "Barbados",
+  "Belarus",
+  "Belgiya",
+  "Beliz",
+  "Benin",
+  "Butan",
+  "Boliviya",
+  "Bosniya va Gertsegovina",
+  "Botsvana",
+  "Braziliya",
+  "Bruney",
+  "Bolgariya",
+  "Burkina-Faso",
+  "Burundi",
+  "Kabo-Verde",
+  "Kambodja",
+  "Kamerun",
+  "Kanada",
+  "Markaziy Afrika Respublikasi",
+  "Chad",
+  "Chili",
+  "Xitoy",
+  "Kolumbiya",
+  "Komor orollari",
+  "Kongo",
+  "Kosta-Rika",
+  "Xorvatiya",
+  "Kuba",
+  "Kipr",
+  "Chexiya",
+  "Kongo Demokratik Respublikasi",
+  "Daniya",
+  "Jibuti",
+  "Dominika",
+  "Dominika Respublikasi",
+  "Ekvador",
+  "Misr",
+  "Salvador",
+  "Ekvatorial Gvineya",
+  "Eritreya",
+  "Estoniya",
+  "Esvatini",
+  "Efiopiya",
+  "Fiji",
+  "Finlandiya",
+  "Fransiya",
+  "Gabon",
+  "Gambiya",
+  "Gruziya",
+  "Germaniya",
+  "Gana",
+  "Gretsiya",
+  "Grenada",
+  "Gvatemala",
+  "Gvineya",
+  "Gvineya-Bisau",
+  "Gayana",
+  "Gaiti",
+  "Vatikan",
+  "Gonduras",
+  "Vengriya",
+  "Islandiya",
+  "Hindiston",
+  "Indoneziya",
+  "Eron",
+  "Iroq",
+  "Irlandiya",
+  "Italiya",
+  "Kot-d'Ivuar",
+  "Yamayka",
+  "Yaponiya",
+  "Iordaniya",
+  "Qozogʻiston",
+  "Keniya",
+  "Kiribati",
+  "Quvayt",
+  "Qirgʻiziston",
+  "Laos",
+  "Latviya",
+  "Livan",
+  "Lesoto",
+  "Liberiya",
+  "Liviya",
+  "Lixtenshteyn",
+  "Litva",
+  "Lyuksemburg",
+  "Madagaskar",
+  "Malavi",
+  "Malayziya",
+  "Maldiv orollari",
+  "Mali",
+  "Malta",
+  "Marshall orollari",
+  "Mavritaniya",
+  "Mavrikiy",
+  "Meksika",
+  "Mikroneziya",
+  "Moldova",
+  "Monako",
+  "Mongoliya",
+  "Chernogoriya",
+  "Marokash",
+  "Mozambik",
+  "Myanma",
+  "Namibiya",
+  "Nauru",
+  "Nepal",
+  "Niderlandiya",
+  "Yangi Zelandiya",
+  "Nikaragua",
+  "Niger",
+  "Nigeriya",
+  "Shimoliy Koreya",
+  "Shimoliy Makedoniya",
+  "Norvegiya",
+  "Ummon",
+  "Pokiston",
+  "Palau",
+  "Falastin Davlati",
+  "Panama",
+  "Papua-Yangi Gvineya",
+  "Paragvay",
+  "Peru",
+  "Filippin",
+  "Polsha",
+  "Portugaliya",
+  "Qatar",
+  "Ruminiya",
+  "Rossiya",
+  "Ruanda",
+  "Sent-Kits va Nevis",
+  "Sent-Lyusiya",
+  "Sent-Vinsent va Grenadinlar",
+  "Samoa",
+  "San-Marino",
+  "San-Tome va Prinsipi",
+  "Saudiya Arabistoni",
+  "Senegal",
+  "Serbiya",
+  "Seyshell orollari",
+  "Syerra-Leone",
+  "Singapur",
+  "Slovakiya",
+  "Sloveniya",
+  "Solomon orollari",
+  "Somali",
+  "Janubiy Afrika Respublikasi",
+  "Janubiy Koreya",
+  "Janubiy Sudan",
+  "Ispaniya",
+  "Shri-Lanka",
+  "Sudan",
+  "Surinam",
+  "Shvetsiya",
+  "Shveytsariya",
+  "Suriya",
+  "Tojikiston",
+  "Tanzaniya",
+  "Tailand",
+  "Timor-Leste",
+  "Togo",
+  "Tonga",
+  "Trinidad va Tobago",
+  "Tunis",
+  "Turkiya",
+  "Turkmaniston",
+  "Tuvalu",
+  "Uganda",
+  "Ukraina",
+  "Birlashgan Arab Amirliklari (BAA)",
+  "Buyuk Britaniya (Birlashgan Qirollik)",
+  "Amerika Qoʻshma Shtatlari (AQSH)",
+  "Urugvay",
+  "Oʻzbekiston",
+  "Vanuatu",
+  "Venesuela",
+  "Vyetnam",
+  "Yaman",
+  "Zambiya",
+  "Zimbabve",
 ];
 
+export const COUNTRIES_BY_LOCALE: Record<string, string[]> = {
+  en: COUNTRIES_EN,
+  fa: COUNTRIES_FA,
+  ar: COUNTRIES_AR,
+  az: COUNTRIES_AZ,
+  bn: COUNTRIES_BN,
+  zh: COUNTRIES_ZH,
+  da: COUNTRIES_DA,
+  de: COUNTRIES_DE,
+  es: COUNTRIES_ES,
+  fr: COUNTRIES_FR,
+  gu: COUNTRIES_GU,
+  ha: COUNTRIES_HA,
+  he: COUNTRIES_HE,
+  hi: COUNTRIES_HI,
+  id: COUNTRIES_ID,
+  ks: COUNTRIES_KS,
+  pt: COUNTRIES_PT,
+  ru: COUNTRIES_RU,
+  sw: COUNTRIES_SW,
+  tg: COUNTRIES_TG,
+  tr: COUNTRIES_TR,
+  ul: COUNTRIES_UL,
+  ur: COUNTRIES_UR,
+  uz: COUNTRIES_UZ,
+};
+
 export const COUNTRY_EN_TO_ISO: Record<string, string> = {
   "Afghanistan": "AF",
   "Albania": "AL",
@@ -709,7 +5074,6 @@ export function filterCountryOptions(
   return matched.sort((a, b) => {
     const aNorm = normalizeSearchString(a);
     const bNorm = normalizeSearchString(b);
-
     const aExact = aNorm === normQ;
     const bExact = bNorm === normQ;
     if (aExact && !bExact) return -1;
@@ -745,10 +5109,7 @@ export function resolveCountryName(
   const trimmed = countryOrCode.trim();
   if (!trimmed) return "";
 
-  const normLocale = String(locale || "en").toLowerCase();
-  const isFa = normLocale === "fa" || normLocale === "fa-ir";
-
-  const iso = getCountryIsoCode(trimmed);
+  const isFa = String(locale || "en").toLowerCase().startsWith("fa");
 
   // 1. If Persian locale, prioritize curated COUNTRIES_FA
   if (isFa) {
@@ -775,7 +5136,7 @@ export function resolveCountryName(
   // 2. Dynamic Intl.DisplayNames for the requested locale
   if (iso) {
     try {
-      const displayNames = new Intl.DisplayNames([locale], {
+      const displayNames = new Intl.DisplayNames([isFa ? "fa" : "en"], {
         type: "region",
       });
       const name = displayNames.of(iso);
@@ -783,19 +5144,29 @@ export function resolveCountryName(
     } catch {}
   }
 
-  // 3. Match from COUNTRIES_EN / COUNTRIES_FA indexes
+  // 2. If it matches an English country name in COUNTRIES_EN
   const enIndex = COUNTRIES_EN.findIndex(
     (c) => c.toLowerCase() === trimmed.toLowerCase(),
   );
   if (enIndex !== -1) {
-    if (isFa) return COUNTRIES_FA[enIndex] || COUNTRIES_EN[enIndex];
-    if (normLocale.startsWith("en")) return COUNTRIES_EN[enIndex];
+    return isFa ? COUNTRIES_FA[enIndex] || COUNTRIES_EN[enIndex] : COUNTRIES_EN[enIndex];
   }
 
+  // 3. If it matches a Persian country name in COUNTRIES_FA
   const faIndex = COUNTRIES_FA.findIndex((c) => c === trimmed);
   if (faIndex !== -1) {
-    if (isFa) return COUNTRIES_FA[faIndex];
-    if (normLocale.startsWith("en")) return COUNTRIES_EN[faIndex] || COUNTRIES_FA[faIndex];
+    return isFa ? COUNTRIES_FA[faIndex] : COUNTRIES_EN[faIndex] || COUNTRIES_FA[faIndex];
+  }
+
+  // 4. Try Intl.DisplayNames fallback if 2-3 chars
+  if (trimmed.length <= 3) {
+    try {
+      const displayNames = new Intl.DisplayNames([isFa ? "fa" : "en"], {
+        type: "region",
+      });
+      const name = displayNames.of(trimmed.toUpperCase());
+      if (name) return name;
+    } catch {}
   }
 
   return trimmed;
@@ -820,11 +5191,10 @@ export function isKnownCountry(countryOrCode: string | undefined | null): boolea
   }
 
   const lower = trimmed.toLowerCase();
-  if (COUNTRIES_EN.some((c) => c.toLowerCase() === lower)) {
-    return true;
-  }
-  if (COUNTRIES_FA.some((c) => c.toLowerCase() === lower)) {
-    return true;
+  for (const list of Object.values(COUNTRIES_BY_LOCALE)) {
+    if (list.some((c) => c.toLowerCase() === lower)) {
+      return true;
+    }
   }
 
   return Boolean(getCountryIsoCode(trimmed));
diff --git a/src/hooks/use-habib-web-ready.ts b/src/hooks/use-habib-web-ready.ts
index 21f6ebf..c6df617 100644
--- a/src/hooks/use-habib-web-ready.ts
+++ b/src/hooks/use-habib-web-ready.ts
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEffect } from "react";
+import { setCachedMarriageEntryPath } from "@/lib/entry-route-cache";
 
 /**
  * Shared destination readiness hook.
@@ -20,6 +21,20 @@ export function useHabibWebReady(ready: boolean) {
   useEffect(() => {
     if (ready && typeof window !== "undefined") {
       window.__announceHabibWebReady?.();
+
+      const pathname = window.location.pathname;
+      if (pathname) {
+        const segments = pathname.split("/").filter(Boolean);
+        let route = "";
+        if (segments.length >= 2 && segments[0].length === 2) {
+          route = "/" + segments.slice(1).join("/");
+        } else if (segments.length === 1 && segments[0].length !== 2) {
+          route = "/" + segments[0];
+        }
+        if (route) {
+          setCachedMarriageEntryPath(route);
+        }
+      }
     }
   }, [ready]);
 }
diff --git a/src/lib/entry-route-cache.ts b/src/lib/entry-route-cache.ts
index 9a688ef..e43fbc9 100644
--- a/src/lib/entry-route-cache.ts
+++ b/src/lib/entry-route-cache.ts
@@ -59,8 +59,22 @@ export function setCachedMarriageEntryPath(path: string | null) {
 
   if (!safePath) {
     deleteClientCookie(MARRIAGE_ENTRY_PATH_COOKIE);
+    if (typeof window !== "undefined" && window.HabibApp?.postMessage) {
+      try {
+        window.HabibApp.postMessage(
+          JSON.stringify({ action: "set_entry_path", data: { path: null } }),
+        );
+      } catch (e) {}
+    }
     return;
   }
 
   setClientCookie(MARRIAGE_ENTRY_PATH_COOKIE, safePath);
+  if (typeof window !== "undefined" && window.HabibApp?.postMessage) {
+    try {
+      window.HabibApp.postMessage(
+        JSON.stringify({ action: "set_entry_path", data: { path: safePath } }),
+      );
+    } catch (e) {}
+  }
 }
diff --git a/src/lib/marriage-field-formatter.ts b/src/lib/marriage-field-formatter.ts
index 53181e1..1341635 100644
--- a/src/lib/marriage-field-formatter.ts
+++ b/src/lib/marriage-field-formatter.ts
@@ -5,6 +5,7 @@ import type {
   MarriageBirthplaceFieldValue,
 } from "@/hooks/marriage/types";
 import { dictionaries } from "@/translations/dictionaries";
+import { resolveCountryName } from "@/data/countries";
 
 const persianToEnglishMap: Record<string, string> = {};
 for (const [enKey, faVal] of Object.entries(dictionaries.fa)) {
@@ -50,7 +51,10 @@ export function isMarriageBirthplaceFieldValue(
   );
 }
 
-export function formatFieldValue(value: MarriageFieldValue): string | null {
+export function formatFieldValue(
+  value: MarriageFieldValue,
+  dictionary?: Record<string, string>,
+): string | null {
   if (value === null || value === undefined || value === "") {
     return null;
   }
@@ -60,15 +64,29 @@ export function formatFieldValue(value: MarriageFieldValue): string | null {
   }
 
   if (typeof value === "boolean") {
-    return value ? "Yes" : "No";
+    return value
+      ? dictionary?.["Yes"] || "Yes"
+      : dictionary?.["No"] || "No";
   }
 
   if (typeof value === "object") {
     if ("country" in value || "city" in value || "state" in value) {
       const v = value as { country?: string; state?: string; city?: string };
-      const parts = [v.city, v.state, v.country]
-        .map((p) => (typeof p === "string" ? p.trim() : ""))
-        .filter(Boolean);
+      const rawCountry = typeof v.country === "string" ? v.country.trim() : "";
+      const rawCity = typeof v.city === "string" ? v.city.trim() : "";
+      const rawState = typeof v.state === "string" ? v.state.trim() : "";
+
+      const localizedCountry = rawCountry
+        ? dictionary?.[rawCountry] || resolveCountryName(rawCountry) || rawCountry
+        : "";
+      const localizedCity = rawCity
+        ? dictionary?.[rawCity] || rawCity
+        : "";
+      const localizedState = rawState
+        ? dictionary?.[rawState] || rawState
+        : "";
+
+      const parts = [localizedCity, localizedState, localizedCountry].filter(Boolean);
       return parts.join(", ");
     }
   }
@@ -143,7 +161,7 @@ export function formatOptionValue(
     return formattedItems.length ? formattedItems.join(", ") : null;
   }
 
-  const base = formatFieldValue(value);
+  const base = formatFieldValue(value, dictionary);
   if (!base) return null;
 
   const trimmed = base.trim();
diff --git a/src/translations/locales/ar.json b/src/translations/locales/ar.json
index 5715d9b..f5dbce9 100644
--- a/src/translations/locales/ar.json
+++ b/src/translations/locales/ar.json
@@ -903,11 +903,11 @@
   "Armenia": "أرمينيا",
   "Austria": "النمسا",
   "Azerbaijan": "أذربيجان",
-  "Bahamas": "جزر البهاما",
+  "Bahamas": "باهاماس",
   "Bahrain": "البحرين",
   "Bangladesh": "بنغلاديش",
-  "Barbados": "بربادوس",
-  "Belarus": "بيلاروسيا",
+  "Barbados": "باربادوس",
+  "Belarus": "بيلاروس",
   "Belgium": "بلجيكا",
   "Belize": "بليز",
   "Benin": "بنين",
@@ -920,16 +920,16 @@
   "Bulgaria": "بلغاريا",
   "Burkina Faso": "بوركينا فاسو",
   "Burundi": "بوروندي",
-  "Cabo Verde": "كابو فيردي",
+  "Cabo Verde": "الرأس الأخضر",
   "Cambodia": "كمبوديا",
   "Cameroon": "الكاميرون",
   "Central African Republic": "جمهورية أفريقيا الوسطى",
   "Chad": "تشاد",
-  "Chile": "شيلي",
+  "Chile": "تشيلي",
   "China": "الصين",
   "Colombia": "كولومبيا",
   "Comoros": "جزر القمر",
-  "Congo": "الكونغو",
+  "Congo": "جمهورية الكونغو",
   "Costa Rica": "كوستاريكا",
   "Croatia": "كرواتيا",
   "Cuba": "كوبا",
@@ -940,17 +940,17 @@
   "Djibouti": "جيبوتي",
   "Dominica": "دومينيكا",
   "Dominican Republic": "جمهورية الدومينيكان",
-  "Ecuador": "الاكوادور",
+  "Ecuador": "الإكوادور",
   "Egypt": "مصر",
   "El Salvador": "السلفادور",
   "Equatorial Guinea": "غينيا الاستوائية",
   "Eritrea": "إريتريا",
   "Estonia": "إستونيا",
-  "Eswatini": "إيسواتيني",
-  "Ethiopia": "أثيوبيا",
+  "Eswatini": "إسواتيني",
+  "Ethiopia": "إثيوبيا",
   "Fiji": "فيجي",
   "Finland": "فنلندا",
-  "Gabon": "الجابون",
+  "Gabon": "الغابون",
   "Gambia": "غامبيا",
   "Georgia": "جورجيا",
   "Ghana": "غانا",
@@ -963,10 +963,10 @@
   "Haiti": "هايتي",
   "Holy See": "الكرسي الرسولي",
   "Honduras": "هندوراس",
-  "Hungary": "هنغاريا",
-  "Iceland": "أيسلندا",
+  "Hungary": "المجر",
+  "Iceland": "آيسلندا",
   "India": "الهند",
-  "Indonesia": "أندونيسيا",
+  "Indonesia": "إندونيسيا",
   "Ireland": "أيرلندا",
   "Italy": "إيطاليا",
   "Ivory Coast": "ساحل العاج",
@@ -988,9 +988,9 @@
   "Lithuania": "ليتوانيا",
   "Luxembourg": "لوكسمبورغ",
   "Madagascar": "مدغشقر",
-  "Malawi": "ملاوي",
+  "Malawi": "مالاوي",
   "Malaysia": "ماليزيا",
-  "Maldives": "جزر المالديف",
+  "Maldives": "المالديف",
   "Mali": "مالي",
   "Malta": "مالطا",
   "Marshall Islands": "جزر مارشال",
@@ -1014,14 +1014,14 @@
   "Nigeria": "نيجيريا",
   "North Korea": "كوريا الشمالية",
   "North Macedonia": "مقدونيا الشمالية",
-  "Oman": "عمان",
+  "Oman": "عُمان",
   "Palau": "بالاو",
-  "Palestine State": "فلسطين",
+  "Palestine State": "دولة فلسطين",
   "Panama": "بنما",
   "Papua New Guinea": "بابوا غينيا الجديدة",
-  "Paraguay": "باراجواي",
+  "Paraguay": "باراغواي",
   "Peru": "بيرو",
-  "Philippines": "فيلبيني",
+  "Philippines": "الفلبين",
   "Poland": "بولندا",
   "Portugal": "البرتغال",
   "Romania": "رومانيا",
@@ -1029,20 +1029,20 @@
   "Rwanda": "رواندا",
   "Saint Kitts and Nevis": "سانت كيتس ونيفيس",
   "Saint Lucia": "سانت لوسيا",
-  "Saint Vincent and the Grenadines": "سانت فنسنت وجزر غرينادين",
+  "Saint Vincent and the Grenadines": "سانت فينسنت والغرينادين",
   "Samoa": "ساموا",
   "San Marino": "سان مارينو",
-  "Sao Tome and Principe": "سان تومي وبرينسيبي",
+  "Sao Tome and Principe": "ساو تومي وبرينسيب",
   "Senegal": "السنغال",
   "Serbia": "صربيا",
-  "Seychelles": "سيشيل",
+  "Seychelles": "سيشل",
   "Sierra Leone": "سيراليون",
   "Singapore": "سنغافورة",
   "Slovakia": "سلوفاكيا",
   "Slovenia": "سلوفينيا",
   "Solomon Islands": "جزر سليمان",
   "Somalia": "الصومال",
-  "South Africa": "جنوب أفريقيا",
+  "South Africa": "جنوب إفريقيا",
   "South Korea": "كوريا الجنوبية",
   "South Sudan": "جنوب السودان",
   "Spain": "إسبانيا",
@@ -1063,9 +1063,9 @@
   "Tuvalu": "توفالو",
   "Uganda": "أوغندا",
   "Ukraine": "أوكرانيا",
-  "United Arab Emirates (UAE)": "الإمارات العربية المتحدة (UAE)",
-  "United Kingdom (UK)": "المملكة المتحدة (UK)",
-  "United States (US)": "الولايات المتحدة (US)",
+  "United Arab Emirates (UAE)": "الإمارات العربية المتحدة",
+  "United Kingdom (UK)": "المملكة المتحدة",
+  "United States (US)": "الولايات المتحدة",
   "Uruguay": "أوروغواي",
   "Uzbekistan": "أوزبكستان",
   "Vanuatu": "فانواتو",
diff --git a/src/translations/locales/az.json b/src/translations/locales/az.json
index 12efc5c..b08efa6 100644
--- a/src/translations/locales/az.json
+++ b/src/translations/locales/az.json
@@ -366,7 +366,7 @@
   "Need future partner's financial participation": "Gələcək tərəfdaşın maliyyə iştirakına ehtiyac var",
   "Needs serious review": "Ciddi baxışa ehtiyacı var",
   "Negotiable": "Razılaşmaq olar",
-  "Netherlands": "Hollandiya",
+  "Netherlands": "Niderland",
   "Never married only; history is a red line": "Yalnız heç vaxt evlənməmiş; tarix qırmızı xəttdir",
   "Never married preferred, but open to special cases": "Heç vaxt evlənməyə üstünlük verilir, lakin xüsusi hallara açıqdır",
   "Never used": "Heç istifadə olunmayıb",
@@ -907,7 +907,7 @@
   "Bahrain": "Bəhreyn",
   "Bangladesh": "Banqladeş",
   "Barbados": "Barbados",
-  "Belarus": "Belarusiya",
+  "Belarus": "Belarus",
   "Belgium": "Belçika",
   "Belize": "Beliz",
   "Benin": "Benin",
@@ -918,9 +918,9 @@
   "Brazil": "Braziliya",
   "Brunei": "Bruney",
   "Bulgaria": "Bolqarıstan",
-  "Burkina Faso": "Burkina Faso",
+  "Burkina Faso": "Burkina-Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Kabo Verde",
+  "Cabo Verde": "Kabo-Verde",
   "Cambodia": "Kamboca",
   "Cameroon": "Kamerun",
   "Central African Republic": "Mərkəzi Afrika Respublikası",
@@ -930,7 +930,7 @@
   "Colombia": "Kolumbiya",
   "Comoros": "Komor adaları",
   "Congo": "Konqo",
-  "Costa Rica": "Kosta Rika",
+  "Costa Rica": "Kosta-Rika",
   "Croatia": "Xorvatiya",
   "Cuba": "Kuba",
   "Cyprus": "Kipr",
@@ -942,7 +942,7 @@
   "Dominican Republic": "Dominikan Respublikası",
   "Ecuador": "Ekvador",
   "Egypt": "Misir",
-  "El Salvador": "El Salvador",
+  "El Salvador": "Salvador",
   "Equatorial Guinea": "Ekvatorial Qvineya",
   "Eritrea": "Eritreya",
   "Estonia": "Estoniya",
@@ -961,7 +961,7 @@
   "Guinea-Bissau": "Qvineya-Bisau",
   "Guyana": "Qayana",
   "Haiti": "Haiti",
-  "Holy See": "Müqəddəs Taxt",
+  "Holy See": "Müqəddəs Taxt-Tac",
   "Honduras": "Honduras",
   "Hungary": "Macarıstan",
   "Iceland": "İslandiya",
@@ -969,7 +969,7 @@
   "Indonesia": "İndoneziya",
   "Ireland": "İrlandiya",
   "Italy": "İtaliya",
-  "Ivory Coast": "Fil Dişi Sahili",
+  "Ivory Coast": "Kot-d’İvuar",
   "Jamaica": "Yamayka",
   "Japan": "Yaponiya",
   "Jordan": "İordaniya",
@@ -995,7 +995,7 @@
   "Malta": "Malta",
   "Marshall Islands": "Marşal adaları",
   "Mauritania": "Mavritaniya",
-  "Mauritius": "Mavrikiy",
+  "Mauritius": "Mavriki",
   "Mexico": "Meksika",
   "Micronesia": "Mikroneziya",
   "Moldova": "Moldova",
@@ -1018,7 +1018,7 @@
   "Palau": "Palau",
   "Palestine State": "Fələstin Dövləti",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua Yeni Qvineya",
+  "Papua New Guinea": "Papua-Yeni Qvineya",
   "Paraguay": "Paraqvay",
   "Peru": "Peru",
   "Philippines": "Filippin",
@@ -1027,16 +1027,16 @@
   "Romania": "Rumıniya",
   "Russia": "Rusiya",
   "Rwanda": "Ruanda",
-  "Saint Kitts and Nevis": "Saint Kitts və Nevis",
-  "Saint Lucia": "Müqəddəs Lusiya",
-  "Saint Vincent and the Grenadines": "Sent Vinsent və Qrenadinlər",
+  "Saint Kitts and Nevis": "Sent-Kits və Nevis",
+  "Saint Lucia": "Sent-Lüsiya",
+  "Saint Vincent and the Grenadines": "Sent-Vinsent və Qrenadinlər",
   "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome və Prinsipi",
+  "San Marino": "San-Marino",
+  "Sao Tome and Principe": "San-Tome və Prinsipi",
   "Senegal": "Seneqal",
   "Serbia": "Serbiya",
   "Seychelles": "Seyşel adaları",
-  "Sierra Leone": "Sierra Leone",
+  "Sierra Leone": "Syerra-Leone",
   "Singapore": "Sinqapur",
   "Slovakia": "Slovakiya",
   "Slovenia": "Sloveniya",
@@ -1046,25 +1046,25 @@
   "South Korea": "Cənubi Koreya",
   "South Sudan": "Cənubi Sudan",
   "Spain": "İspaniya",
-  "Sri Lanka": "Şri Lanka",
+  "Sri Lanka": "Şri-Lanka",
   "Sudan": "Sudan",
   "Suriname": "Surinam",
   "Switzerland": "İsveçrə",
   "Syria": "Suriya",
   "Tajikistan": "Tacikistan",
   "Tanzania": "Tanzaniya",
-  "Thailand": "Tayland",
+  "Thailand": "Tailand",
   "Timor-Leste": "Şərqi Timor",
   "Togo": "Toqo",
   "Tonga": "Tonqa",
   "Trinidad and Tobago": "Trinidad və Tobaqo",
   "Tunisia": "Tunis",
   "Turkmenistan": "Türkmənistan",
-  "Tuvalu": "tuvalu",
+  "Tuvalu": "Tuvalu",
   "Uganda": "Uqanda",
   "Ukraine": "Ukrayna",
   "United Arab Emirates (UAE)": "Birləşmiş Ərəb Əmirlikləri (BƏƏ)",
-  "United Kingdom (UK)": "Birləşmiş Krallıq (Böyük Britaniya)",
+  "United Kingdom (UK)": "Birləşmiş Krallıq (BK)",
   "United States (US)": "Amerika Birləşmiş Ştatları (ABŞ)",
   "Uruguay": "Uruqvay",
   "Uzbekistan": "Özbəkistan",
diff --git a/src/translations/locales/bn.json b/src/translations/locales/bn.json
index a0486d4..a19bc80 100644
--- a/src/translations/locales/bn.json
+++ b/src/translations/locales/bn.json
@@ -896,9 +896,9 @@
   "کارشناسی ارشد / Master’s Degree": "স্নাতকোত্তর",
   "Albania": "আলবেনিয়া",
   "Algeria": "আলজেরিয়া",
-  "Andorra": "এন্ডোরা",
+  "Andorra": "অ্যান্ডোরা",
   "Angola": "অ্যাঙ্গোলা",
-  "Antigua and Barbuda": "অ্যান্টিগুয়া এবং বারবুডা",
+  "Antigua and Barbuda": "অ্যান্টিগুয়া ও বার্বুডা",
   "Argentina": "আর্জেন্টিনা",
   "Armenia": "আর্মেনিয়া",
   "Austria": "অস্ট্রিয়া",
@@ -906,7 +906,7 @@
   "Bahamas": "বাহামাস",
   "Bahrain": "বাহরাইন",
   "Bangladesh": "বাংলাদেশ",
-  "Barbados": "বার্বাডোজ",
+  "Barbados": "বার্বাডোস",
   "Belarus": "বেলারুশ",
   "Belgium": "বেলজিয়াম",
   "Belize": "বেলিজ",
@@ -918,9 +918,9 @@
   "Brazil": "ব্রাজিল",
   "Brunei": "ব্রুনাই",
   "Bulgaria": "বুলগেরিয়া",
-  "Burkina Faso": "বুরকিনা ফাসো",
+  "Burkina Faso": "বুর্কিনা ফাসো",
   "Burundi": "বুরুন্ডি",
-  "Cabo Verde": "কাবো ভার্দে",
+  "Cabo Verde": "কাবো ভের্দে",
   "Cambodia": "কম্বোডিয়া",
   "Cameroon": "ক্যামেরুন",
   "Central African Republic": "মধ্য আফ্রিকান প্রজাতন্ত্র",
@@ -928,25 +928,25 @@
   "Chile": "চিলি",
   "China": "চীন",
   "Colombia": "কলম্বিয়া",
-  "Comoros": "কমোরোস",
+  "Comoros": "কোমোরোস",
   "Congo": "কঙ্গো",
   "Costa Rica": "কোস্টারিকা",
   "Croatia": "ক্রোয়েশিয়া",
   "Cuba": "কিউবা",
   "Cyprus": "সাইপ্রাস",
   "Czechia": "চেকিয়া",
-  "Democratic Republic of the Congo": "কঙ্গো গণতান্ত্রিক প্রজাতন্ত্র",
+  "Democratic Republic of the Congo": "গণতান্ত্রিক কঙ্গো প্রজাতন্ত্র",
   "Denmark": "ডেনমার্ক",
   "Djibouti": "জিবুতি",
-  "Dominica": "ডমিনিকা",
+  "Dominica": "ডোমিনিকা",
   "Dominican Republic": "ডোমিনিকান প্রজাতন্ত্র",
   "Ecuador": "ইকুয়েডর",
   "Egypt": "মিশর",
-  "El Salvador": "এল সালভাদর",
+  "El Salvador": "এল সালভাদোর",
   "Equatorial Guinea": "নিরক্ষীয় গিনি",
   "Eritrea": "ইরিত্রিয়া",
   "Estonia": "এস্তোনিয়া",
-  "Eswatini": "এস্বাতিনী",
+  "Eswatini": "এসওয়াতিনি",
   "Ethiopia": "ইথিওপিয়া",
   "Fiji": "ফিজি",
   "Finland": "ফিনল্যান্ড",
@@ -954,14 +954,14 @@
   "Gambia": "গাম্বিয়া",
   "Georgia": "জর্জিয়া",
   "Ghana": "ঘানা",
-  "Greece": "গ্রীস",
+  "Greece": "গ্রিস",
   "Grenada": "গ্রেনাডা",
   "Guatemala": "গুয়াতেমালা",
   "Guinea": "গিনি",
   "Guinea-Bissau": "গিনি-বিসাউ",
   "Guyana": "গায়ানা",
   "Haiti": "হাইতি",
-  "Holy See": "পবিত্র দেখুন",
+  "Holy See": "হলি সি",
   "Honduras": "হন্ডুরাস",
   "Hungary": "হাঙ্গেরি",
   "Iceland": "আইসল্যান্ড",
@@ -984,7 +984,7 @@
   "Lesotho": "লেসোথো",
   "Liberia": "লাইবেরিয়া",
   "Libya": "লিবিয়া",
-  "Liechtenstein": "লিচেনস্টাইন",
+  "Liechtenstein": "লিশটেনস্টাইন",
   "Lithuania": "লিথুয়ানিয়া",
   "Luxembourg": "লুক্সেমবার্গ",
   "Madagascar": "মাদাগাস্কার",
@@ -1004,7 +1004,7 @@
   "Montenegro": "মন্টিনিগ্রো",
   "Morocco": "মরক্কো",
   "Mozambique": "মোজাম্বিক",
-  "Myanmar": "মায়ানমার",
+  "Myanmar": "মিয়ানমার",
   "Namibia": "নামিবিয়া",
   "Nauru": "নাউরু",
   "Nepal": "নেপাল",
@@ -1018,7 +1018,7 @@
   "Palau": "পালাউ",
   "Palestine State": "ফিলিস্তিন রাষ্ট্র",
   "Panama": "পানামা",
-  "Papua New Guinea": "পাপুয়া নিউ গিনি",
+  "Papua New Guinea": "পাপুয়া নিউগিনি",
   "Paraguay": "প্যারাগুয়ে",
   "Peru": "পেরু",
   "Philippines": "ফিলিপাইন",
@@ -1027,12 +1027,12 @@
   "Romania": "রোমানিয়া",
   "Russia": "রাশিয়া",
   "Rwanda": "রুয়ান্ডা",
-  "Saint Kitts and Nevis": "সেন্ট কিটস এবং নেভিস",
+  "Saint Kitts and Nevis": "সেন্ট কিটস ও নেভিস",
   "Saint Lucia": "সেন্ট লুসিয়া",
-  "Saint Vincent and the Grenadines": "সেন্ট ভিনসেন্ট এবং গ্রেনাডাইনস",
+  "Saint Vincent and the Grenadines": "সেন্ট ভিনসেন্ট ও গ্রেনাডাইন",
   "Samoa": "সামোয়া",
   "San Marino": "সান মারিনো",
-  "Sao Tome and Principe": "সাও টোমে এবং প্রিন্সিপে",
+  "Sao Tome and Principe": "সাও তোমে ও প্রিন্সিপে",
   "Senegal": "সেনেগাল",
   "Serbia": "সার্বিয়া",
   "Seychelles": "সেশেলস",
@@ -1063,9 +1063,9 @@
   "Tuvalu": "টুভালু",
   "Uganda": "উগান্ডা",
   "Ukraine": "ইউক্রেন",
-  "United Arab Emirates (UAE)": "সংযুক্ত আরব আমিরাত (UAE)",
-  "United Kingdom (UK)": "যুক্তরাজ্য (UK)",
-  "United States (US)": "মার্কিন যুক্তরাষ্ট্র (US)",
+  "United Arab Emirates (UAE)": "সংযুক্ত আরব আমিরাত (ইউএই)",
+  "United Kingdom (UK)": "যুক্তরাজ্য (ইউকে)",
+  "United States (US)": "মার্কিন যুক্তরাষ্ট্র (ইউএস)",
   "Uruguay": "উরুগুয়ে",
   "Uzbekistan": "উজবেকিস্তান",
   "Vanuatu": "ভানুয়াতু",
diff --git a/src/translations/locales/da.json b/src/translations/locales/da.json
index f46b6fd..9f680e8 100644
--- a/src/translations/locales/da.json
+++ b/src/translations/locales/da.json
@@ -69,7 +69,7 @@
   "Attitude towards Music": "Attitude til musik",
   "Attitude towards Religion and Politics": "Holdning til religion og politik",
   "Attitude towards Wedding Ceremony": "Holdning til bryllupsceremoni",
-  "Australia": "Australia",
+  "Australia": "Australien",
   "Average": "Average",
   "Ayatollah Sistani": "Ayatollah Sistani",
   "Bachelor's degree in architecture": "Bachelor's degree in architecture",
@@ -366,7 +366,7 @@
   "Need future partner's financial participation": "Har brug for fremtidig samarbejdspartners økonomiske deltagelse",
   "Needs serious review": "Trænger til seriøs gennemgang",
   "Negotiable": "Forhandles",
-  "Netherlands": "Holland",
+  "Netherlands": "Nederlandene",
   "Never married only; history is a red line": "Aldrig kun gift; historien er en rød streg",
   "Never married preferred, but open to special cases": "Aldrig gift foretrukket, men åben for særlige tilfælde",
   "Never used": "Aldrig brugt",
@@ -894,115 +894,115 @@
   "Doctorate / PhD": "Ph.d. / Doktorgrad",
   "کارشناسی / Bachelor’s Degree": "Bachelorgrad",
   "کارشناسی ارشد / Master’s Degree": "Kandidatgrad",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Albania": "Albanien",
+  "Algeria": "Algeriet",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antigua og Barbuda",
   "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Armenia": "Armenien",
+  "Austria": "Østrig",
+  "Azerbaijan": "Aserbajdsjan",
   "Bahamas": "Bahamas",
   "Bahrain": "Bahrain",
   "Bangladesh": "Bangladesh",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belgium": "Belgien",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
   "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bosnia and Herzegovina": "Bosnien-Hercegovina",
   "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Brazil": "Brasilien",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgarien",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
+  "Cabo Verde": "Kap Verde",
+  "Cambodia": "Cambodja",
+  "Cameroon": "Cameroun",
+  "Central African Republic": "Den Centralafrikanske Republik",
+  "Chad": "Tchad",
   "Chile": "Chile",
-  "China": "China",
+  "China": "Kina",
   "Colombia": "Colombia",
-  "Comoros": "Comoros",
+  "Comoros": "Comorerne",
   "Congo": "Congo",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
+  "Croatia": "Kroatien",
   "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
+  "Cyprus": "Cypern",
+  "Czechia": "Tjekkiet",
+  "Democratic Republic of the Congo": "Den Demokratiske Republik Congo",
+  "Denmark": "Danmark",
   "Djibouti": "Djibouti",
   "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
+  "Dominican Republic": "Den Dominikanske Republik",
   "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Egypt": "Egypten",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
+  "Equatorial Guinea": "Ækvatorialguinea",
   "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
+  "Estonia": "Estland",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Ethiopia": "Etiopien",
   "Fiji": "Fiji",
   "Finland": "Finland",
   "Gabon": "Gabon",
   "Gambia": "Gambia",
-  "Georgia": "Georgia",
+  "Georgia": "Georgien",
   "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Greece": "Grækenland",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
   "Guinea": "Guinea",
   "Guinea-Bissau": "Guinea-Bissau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Vatikanstaten",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
+  "Hungary": "Ungarn",
+  "Iceland": "Island",
+  "India": "Indien",
+  "Indonesia": "Indonesien",
+  "Ireland": "Irland",
+  "Italy": "Italien",
+  "Ivory Coast": "Elfenbenskysten",
   "Jamaica": "Jamaica",
   "Japan": "Japan",
   "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
+  "Kazakhstan": "Kasakhstan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Kirgisistan",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
+  "Latvia": "Letland",
+  "Lebanon": "Libanon",
   "Lesotho": "Lesotho",
   "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Libya": "Libyen",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
+  "Lithuania": "Litauen",
   "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
+  "Madagascar": "Madagaskar",
   "Malawi": "Malawi",
   "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Maldives": "Maldiverne",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
+  "Marshall Islands": "Marshalløerne",
+  "Mauritania": "Mauretanien",
   "Mauritius": "Mauritius",
   "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Micronesia": "Mikronesien",
   "Moldova": "Moldova",
   "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
+  "Mongolia": "Mongoliet",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
+  "Morocco": "Marokko",
   "Mozambique": "Mozambique",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
@@ -1012,62 +1012,62 @@
   "Nicaragua": "Nicaragua",
   "Niger": "Niger",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
+  "North Korea": "Nordkorea",
+  "North Macedonia": "Nordmakedonien",
   "Oman": "Oman",
   "Palau": "Palau",
   "Palestine State": "Palæstina",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Papua New Guinea": "Papua Ny Guinea",
   "Paraguay": "Paraguay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Philippines": "Filippinerne",
+  "Poland": "Polen",
   "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
+  "Romania": "Rumænien",
+  "Russia": "Rusland",
   "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Saint Kitts and Nevis": "Saint Kitts og Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent og Grenadinerne",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
+  "Sao Tome and Principe": "São Tomé og Príncipe",
   "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
+  "Serbia": "Serbien",
+  "Seychelles": "Seychellerne",
   "Sierra Leone": "Sierra Leone",
   "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
+  "Slovakia": "Slovakiet",
+  "Slovenia": "Slovenien",
+  "Solomon Islands": "Salomonøerne",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "South Africa": "Sydafrika",
+  "South Korea": "Sydkorea",
+  "South Sudan": "Sydsudan",
+  "Spain": "Spanien",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
+  "Suriname": "Surinam",
+  "Switzerland": "Schweiz",
+  "Syria": "Syrien",
+  "Tajikistan": "Tadsjikistan",
   "Tanzania": "Tanzania",
   "Thailand": "Thailand",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
+  "Trinidad and Tobago": "Trinidad og Tobago",
+  "Tunisia": "Tunesien",
   "Turkmenistan": "Turkmenistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
   "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "Forenede Arabiske Emirater (UAE)",
+  "United Arab Emirates (UAE)": "Forenede Arabiske Emirater (FAE)",
   "United Kingdom (UK)": "Storbritannien (UK)",
-  "United States (US)": "USA (US)",
+  "United States (US)": "USA (USA)",
   "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uzbekistan": "Usbekistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
diff --git a/src/translations/locales/de.json b/src/translations/locales/de.json
index f4771c6..a513a1c 100644
--- a/src/translations/locales/de.json
+++ b/src/translations/locales/de.json
@@ -894,171 +894,171 @@
   "Doctorate / PhD": "Promotion / Doktorgrad",
   "کارشناسی / Bachelor’s Degree": "Bachelor-Abschluss",
   "کارشناسی ارشد / Master’s Degree": "Master-Abschluss",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Albania": "Albanien",
+  "Algeria": "Algerien",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Antigua and Barbuda": "Antigua und Barbuda",
+  "Argentina": "Argentinien",
+  "Armenia": "Armenien",
+  "Austria": "Österreich",
+  "Azerbaijan": "Aserbaidschan",
   "Bahamas": "Bahamas",
   "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
+  "Bangladesh": "Bangladesch",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belgium": "Belgien",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bolivia": "Bolivien",
+  "Bosnia and Herzegovina": "Bosnien und Herzegowina",
   "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Brazil": "Brasilien",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgarien",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
+  "Cabo Verde": "Kap Verde",
+  "Cambodia": "Kambodscha",
+  "Cameroon": "Kamerun",
+  "Central African Republic": "Zentralafrikanische Republik",
+  "Chad": "Tschad",
   "Chile": "Chile",
   "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
+  "Colombia": "Kolumbien",
+  "Comoros": "Komoren",
+  "Congo": "Republik Kongo",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
+  "Croatia": "Kroatien",
+  "Cuba": "Kuba",
+  "Cyprus": "Zypern",
+  "Czechia": "Tschechien",
+  "Democratic Republic of the Congo": "Demokratische Republik Kongo",
+  "Denmark": "Dänemark",
+  "Djibouti": "Dschibuti",
   "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
+  "Dominican Republic": "Dominikanische Republik",
   "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Egypt": "Ägypten",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
+  "Equatorial Guinea": "Äquatorialguinea",
   "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
+  "Estonia": "Estland",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "Gabon": "Gabon",
+  "Ethiopia": "Äthiopien",
+  "Fiji": "Fidschi",
+  "Finland": "Finnland",
+  "Gabon": "Gabun",
   "Gambia": "Gambia",
-  "Georgia": "Georgia",
+  "Georgia": "Georgien",
   "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Greece": "Griechenland",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
   "Guinea": "Guinea",
   "Guinea-Bissau": "Guinea-Bissau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Heiliger Stuhl",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
+  "Hungary": "Ungarn",
+  "Iceland": "Island",
+  "India": "Indien",
+  "Indonesia": "Indonesien",
+  "Ireland": "Irland",
+  "Italy": "Italien",
+  "Ivory Coast": "Elfenbeinküste",
+  "Jamaica": "Jamaika",
   "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
+  "Jordan": "Jordanien",
+  "Kazakhstan": "Kasachstan",
+  "Kenya": "Kenia",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Kirgisistan",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
+  "Latvia": "Lettland",
+  "Lebanon": "Libanon",
   "Lesotho": "Lesotho",
   "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Libya": "Libyen",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
+  "Lithuania": "Litauen",
+  "Luxembourg": "Luxemburg",
+  "Madagascar": "Madagaskar",
   "Malawi": "Malawi",
   "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Maldives": "Malediven",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
+  "Marshall Islands": "Marshallinseln",
+  "Mauritania": "Mauretanien",
   "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
+  "Mexico": "Mexiko",
+  "Micronesia": "Mikronesien",
+  "Moldova": "Moldau",
   "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
+  "Mongolia": "Mongolei",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
+  "Morocco": "Marokko",
+  "Mozambique": "Mosambik",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
+  "New Zealand": "Neuseeland",
   "Nicaragua": "Nicaragua",
   "Niger": "Niger",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
+  "North Korea": "Nordkorea",
+  "North Macedonia": "Nordmazedonien",
   "Oman": "Oman",
   "Palau": "Palau",
   "Palestine State": "Staat Palästina",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Papua New Guinea": "Papua-Neuguinea",
   "Paraguay": "Paraguay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Philippines": "Philippinen",
+  "Poland": "Polen",
   "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Romania": "Rumänien",
+  "Russia": "Russland",
+  "Rwanda": "Ruanda",
+  "Saint Kitts and Nevis": "St. Kitts und Nevis",
+  "Saint Lucia": "St. Lucia",
+  "Saint Vincent and the Grenadines": "St. Vincent und die Grenadinen",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
+  "Sao Tome and Principe": "São Tomé und Príncipe",
   "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
+  "Serbia": "Serbien",
+  "Seychelles": "Seychellen",
   "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
+  "Singapore": "Singapur",
+  "Slovakia": "Slowakei",
+  "Slovenia": "Slowenien",
+  "Solomon Islands": "Salomonen",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "South Africa": "Südafrika",
+  "South Korea": "Südkorea",
+  "South Sudan": "Südsudan",
+  "Spain": "Spanien",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
   "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
+  "Switzerland": "Schweiz",
+  "Syria": "Syrien",
+  "Tajikistan": "Tadschikistan",
+  "Tanzania": "Tansania",
   "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
+  "Timor-Leste": "Osttimor",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
+  "Trinidad and Tobago": "Trinidad und Tobago",
+  "Tunisia": "Tunesien",
   "Turkmenistan": "Turkmenistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
@@ -1067,13 +1067,13 @@
   "United Kingdom (UK)": "Vereinigtes Königreich (UK)",
   "United States (US)": "Vereinigte Staaten (USA)",
   "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uzbekistan": "Usbekistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Yemen": "Jemen",
+  "Zambia": "Sambia",
+  "Zimbabwe": "Simbabwe",
   "Afghan": "Afghanisch",
   "Albanian": "Albanisch",
   "Algerian": "Algerisch",
diff --git a/src/translations/locales/es.json b/src/translations/locales/es.json
index 1741515..50c13d0 100644
--- a/src/translations/locales/es.json
+++ b/src/translations/locales/es.json
@@ -304,7 +304,7 @@
   "Insulin, etc.": "Insulina, etcétera.",
   "Intent:": "Intent:",
   "Interior designer": "Interior designer",
-  "Iran": "Iran",
+  "Iran": "Irán",
   "Iranian": "Iranian",
   "Iraq": "Irak",
   "Items Per Page": "Items Per Page",
@@ -895,185 +895,185 @@
   "کارشناسی / Bachelor’s Degree": "Licenciatura / Grado",
   "کارشناسی ارشد / Master’s Degree": "Máster / Maestría",
   "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Algeria": "Argelia",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antigua y Barbuda",
   "Argentina": "Argentina",
   "Armenia": "Armenia",
   "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Azerbaijan": "Azerbaiyán",
   "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
+  "Bahrain": "Baréin",
+  "Bangladesh": "Bangladés",
   "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
+  "Belarus": "Bielorrusia",
+  "Belgium": "Bélgica",
+  "Belize": "Belice",
+  "Benin": "Benín",
+  "Bhutan": "Bután",
   "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
+  "Bosnia and Herzegovina": "Bosnia y Herzegovina",
+  "Botswana": "Botsuana",
+  "Brazil": "Brasil",
+  "Brunei": "Brunéi",
   "Bulgaria": "Bulgaria",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
   "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
+  "Cambodia": "Camboya",
+  "Cameroon": "Camerún",
+  "Central African Republic": "República Centroafricana",
   "Chad": "Chad",
   "Chile": "Chile",
   "China": "China",
   "Colombia": "Colombia",
-  "Comoros": "Comoros",
+  "Comoros": "Comoras",
   "Congo": "Congo",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
+  "Croatia": "Croacia",
   "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
+  "Cyprus": "Chipre",
+  "Czechia": "Chequia",
+  "Democratic Republic of the Congo": "República Democrática del Congo",
+  "Denmark": "Dinamarca",
+  "Djibouti": "Yibuti",
   "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
+  "Dominican Republic": "República Dominicana",
   "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Egypt": "Egipto",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
+  "Equatorial Guinea": "Guinea Ecuatorial",
   "Eritrea": "Eritrea",
   "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "Gabon": "Gabon",
+  "Eswatini": "Esuatini",
+  "Ethiopia": "Etiopía",
+  "Fiji": "Fiyi",
+  "Finland": "Finlandia",
+  "Gabon": "Gabón",
   "Gambia": "Gambia",
   "Georgia": "Georgia",
   "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
+  "Greece": "Grecia",
+  "Grenada": "Granada",
   "Guatemala": "Guatemala",
   "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
+  "Guinea-Bissau": "Guinea-Bisáu",
   "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Haiti": "Haití",
+  "Holy See": "Santa Sede",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
+  "Hungary": "Hungría",
+  "Iceland": "Islandia",
   "India": "India",
   "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
+  "Ireland": "Irlanda",
+  "Italy": "Italia",
+  "Ivory Coast": "Costa de Marfil",
   "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
+  "Japan": "Japón",
+  "Jordan": "Jordania",
+  "Kazakhstan": "Kazajistán",
+  "Kenya": "Kenia",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Kirguistán",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
+  "Latvia": "Letonia",
+  "Lebanon": "Líbano",
+  "Lesotho": "Lesoto",
   "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Libya": "Libia",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
+  "Lithuania": "Lituania",
+  "Luxembourg": "Luxemburgo",
   "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
+  "Malawi": "Malaui",
+  "Malaysia": "Malasia",
+  "Maldives": "Maldivas",
+  "Mali": "Malí",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
+  "Marshall Islands": "Islas Marshall",
   "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
+  "Mauritius": "Mauricio",
+  "Mexico": "México",
   "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
+  "Moldova": "Moldavia",
+  "Monaco": "Mónaco",
   "Mongolia": "Mongolia",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
+  "Morocco": "Marruecos",
   "Mozambique": "Mozambique",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
+  "New Zealand": "Nueva Zelanda",
   "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
+  "Niger": "Níger",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Oman": "Oman",
-  "Palau": "Palau",
+  "North Korea": "Corea del Norte",
+  "North Macedonia": "Macedonia del Norte",
+  "Oman": "Omán",
+  "Palau": "Palaos",
   "Palestine State": "Estado de Palestina",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Panama": "Panamá",
+  "Papua New Guinea": "Papúa Nueva Guinea",
   "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Peru": "Perú",
+  "Philippines": "Filipinas",
+  "Poland": "Polonia",
   "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Romania": "Rumanía",
+  "Russia": "Rusia",
+  "Rwanda": "Ruanda",
+  "Saint Kitts and Nevis": "San Cristóbal y Nieves",
+  "Saint Lucia": "Santa Lucía",
+  "Saint Vincent and the Grenadines": "San Vicente y las Granadinas",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
+  "Sao Tome and Principe": "Santo Tomé y Príncipe",
   "Senegal": "Senegal",
   "Serbia": "Serbia",
   "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
+  "Sierra Leone": "Sierra Leona",
+  "Singapore": "Singapur",
+  "Slovakia": "Eslovaquia",
+  "Slovenia": "Eslovenia",
+  "Solomon Islands": "Islas Salomón",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "South Africa": "Sudáfrica",
+  "South Korea": "Corea del Sur",
+  "South Sudan": "Sudán del Sur",
+  "Spain": "España",
   "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
+  "Sudan": "Sudán",
+  "Suriname": "Surinam",
+  "Switzerland": "Suiza",
+  "Syria": "Siria",
+  "Tajikistan": "Tayikistán",
   "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
+  "Thailand": "Tailandia",
+  "Timor-Leste": "Timor Oriental",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinidad y Tobago",
+  "Tunisia": "Túnez",
+  "Turkmenistan": "Turkmenistán",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ucrania",
   "United Arab Emirates (UAE)": "Emiratos Árabes Unidos (EAU)",
-  "United Kingdom (UK)": "Reino Unido (UK)",
+  "United Kingdom (UK)": "Reino Unido (RU)",
   "United States (US)": "Estados Unidos (EE. UU.)",
   "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uzbekistan": "Uzbekistán",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
   "Yemen": "Yemen",
   "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Zimbabwe": "Zimbabue",
   "Afghan": "Afgano(a)",
   "Albanian": "Albanés/Albanesa",
   "Algerian": "Argelino(a)",
diff --git a/src/translations/locales/fr.json b/src/translations/locales/fr.json
index 81dbb64..c948a80 100644
--- a/src/translations/locales/fr.json
+++ b/src/translations/locales/fr.json
@@ -554,7 +554,7 @@
   "Retired": "Retraité",
   "SEARCH IN PROGRESS": "VOTRE RECHERCHE EST ACTIVE",
   "Sarah Smith": "Sarah Smith",
-  "Saudi Arabia": "Arabie Saoudite",
+  "Saudi Arabia": "Arabie saoudite",
   "Select Gender": "Select Gender",
   "Select call result": "Select call result",
   "Select country": "Sélectionnez un pays",
@@ -894,185 +894,185 @@
   "Doctorate / PhD": "Doctorat / PhD",
   "کارشناسی / Bachelor’s Degree": "Licence",
   "کارشناسی ارشد / Master’s Degree": "Master",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
+  "Albania": "Albanie",
+  "Algeria": "Algérie",
+  "Andorra": "Andorre",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Antigua and Barbuda": "Antigua-et-Barbuda",
+  "Argentina": "Argentine",
+  "Armenia": "Arménie",
+  "Austria": "Autriche",
+  "Azerbaijan": "Azerbaïdjan",
   "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
+  "Bahrain": "Bahreïn",
   "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Barbados": "Barbade",
+  "Belarus": "Biélorussie",
+  "Belgium": "Belgique",
   "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Benin": "Bénin",
+  "Bhutan": "Bhoutan",
+  "Bolivia": "Bolivie",
+  "Bosnia and Herzegovina": "Bosnie-Herzégovine",
   "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Brazil": "Brésil",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgarie",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
+  "Cabo Verde": "Cap-Vert",
+  "Cambodia": "Cambodge",
+  "Cameroon": "Cameroun",
+  "Central African Republic": "République centrafricaine",
+  "Chad": "Tchad",
+  "Chile": "Chili",
+  "China": "Chine",
+  "Colombia": "Colombie",
+  "Comoros": "Comores",
   "Congo": "Congo",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
+  "Croatia": "Croatie",
   "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
+  "Cyprus": "Chypre",
+  "Czechia": "Tchéquie",
+  "Democratic Republic of the Congo": "République démocratique du Congo",
+  "Denmark": "Danemark",
   "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
+  "Dominica": "Dominique",
+  "Dominican Republic": "République dominicaine",
+  "Ecuador": "Équateur",
+  "Egypt": "Égypte",
+  "El Salvador": "Salvador",
+  "Equatorial Guinea": "Guinée équatoriale",
+  "Eritrea": "Érythrée",
+  "Estonia": "Estonie",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
+  "Ethiopia": "Éthiopie",
+  "Fiji": "Fidji",
+  "Finland": "Finlande",
   "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
+  "Gambia": "Gambie",
+  "Georgia": "Géorgie",
   "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
+  "Greece": "Grèce",
+  "Grenada": "Grenade",
   "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
+  "Guinea": "Guinée",
+  "Guinea-Bissau": "Guinée-Bissau",
   "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Haiti": "Haïti",
+  "Holy See": "Saint-Siège",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
+  "Hungary": "Hongrie",
+  "Iceland": "Islande",
+  "India": "Inde",
+  "Indonesia": "Indonésie",
+  "Ireland": "Irlande",
+  "Italy": "Italie",
+  "Ivory Coast": "Côte d'Ivoire",
+  "Jamaica": "Jamaïque",
+  "Japan": "Japon",
+  "Jordan": "Jordanie",
   "Kazakhstan": "Kazakhstan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kuwait": "Koweït",
+  "Kyrgyzstan": "Kirghizistan",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
+  "Latvia": "Lettonie",
+  "Lebanon": "Liban",
   "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Liberia": "Libéria",
+  "Libya": "Libye",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
+  "Lithuania": "Lituanie",
   "Luxembourg": "Luxembourg",
   "Madagascar": "Madagascar",
   "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
+  "Malaysia": "Malaisie",
   "Maldives": "Maldives",
   "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
+  "Malta": "Malte",
+  "Marshall Islands": "Îles Marshall",
+  "Mauritania": "Mauritanie",
+  "Mauritius": "Maurice",
+  "Mexico": "Mexique",
+  "Micronesia": "Micronésie",
+  "Moldova": "Moldavie",
   "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
+  "Mongolia": "Mongolie",
+  "Montenegro": "Monténégro",
+  "Morocco": "Maroc",
   "Mozambique": "Mozambique",
   "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
+  "Namibia": "Namibie",
   "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
+  "Nepal": "Népal",
+  "New Zealand": "Nouvelle-Zélande",
   "Nicaragua": "Nicaragua",
   "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
+  "Nigeria": "Nigéria",
+  "North Korea": "Corée du Nord",
+  "North Macedonia": "Macédoine du Nord",
   "Oman": "Oman",
-  "Palau": "Palau",
+  "Palau": "Palaos",
   "Palestine State": "État de Palestine",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Papua New Guinea": "Papouasie-Nouvelle-Guinée",
   "Paraguay": "Paraguay",
-  "Peru": "Peru",
+  "Peru": "Pérou",
   "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Poland": "Pologne",
   "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
+  "Romania": "Roumanie",
+  "Russia": "Russie",
   "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Kitts and Nevis": "Saint-Christophe-et-Niévès",
+  "Saint Lucia": "Sainte-Lucie",
+  "Saint Vincent and the Grenadines": "Saint-Vincent-et-les-Grenadines",
   "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
+  "San Marino": "Saint-Marin",
+  "Sao Tome and Principe": "Sao Tomé-et-Principe",
+  "Senegal": "Sénégal",
+  "Serbia": "Serbie",
   "Seychelles": "Seychelles",
   "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "Singapore": "Singapour",
+  "Slovakia": "Slovaquie",
+  "Slovenia": "Slovénie",
+  "Solomon Islands": "Îles Salomon",
+  "Somalia": "Somalie",
+  "South Africa": "Afrique du Sud",
+  "South Korea": "Corée du Sud",
+  "South Sudan": "Soudan du Sud",
+  "Spain": "Espagne",
   "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
+  "Sudan": "Soudan",
   "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
+  "Switzerland": "Suisse",
+  "Syria": "Syrie",
+  "Tajikistan": "Tadjikistan",
+  "Tanzania": "Tanzanie",
+  "Thailand": "Thaïlande",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinité-et-Tobago",
+  "Tunisia": "Tunisie",
+  "Turkmenistan": "Turkménistan",
   "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
+  "Uganda": "Ouganda",
   "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "Émirats arabes unis (EAU)",
-  "United Kingdom (UK)": "Royaume-Uni (UK)",
-  "United States (US)": "États-Unis (USA)",
+  "United Arab Emirates (UAE)": "Émirats arabes unis",
+  "United Kingdom (UK)": "Royaume-Uni",
+  "United States (US)": "États-Unis",
   "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uzbekistan": "Ouzbékistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
+  "Yemen": "Yémen",
+  "Zambia": "Zambie",
   "Zimbabwe": "Zimbabwe",
   "Afghan": "Afghan(e)",
   "Albanian": "Albanais(e)",
diff --git a/src/translations/locales/gu.json b/src/translations/locales/gu.json
index 97dce65..ed516e2 100644
--- a/src/translations/locales/gu.json
+++ b/src/translations/locales/gu.json
@@ -304,7 +304,7 @@
   "Insulin, etc.": "ઇન્સ્યુલિન, વગેરે.",
   "Intent:": "Intent:",
   "Interior designer": "Interior designer",
-  "Iran": "Iran",
+  "Iran": "ઈરાન",
   "Iranian": "Iranian",
   "Iraq": "ઈરાક",
   "Items Per Page": "Items Per Page",
@@ -366,7 +366,7 @@
   "Need future partner's financial participation": "ભાવિ ભાગીદારની નાણાકીય ભાગીદારીની જરૂર છે",
   "Needs serious review": "ગંભીર સમીક્ષાની જરૂર છે",
   "Negotiable": "નેગોશિએબલ",
-  "Netherlands": "નેધરલેન્ડ",
+  "Netherlands": "નેધરલેન્ડ્સ",
   "Never married only; history is a red line": "માત્ર ક્યારેય લગ્ન કર્યા નથી; ઇતિહાસ લાલ લીટી છે",
   "Never married preferred, but open to special cases": "ક્યારેય લગ્ન કર્યાં નથી, પરંતુ ખાસ કેસ માટે ખુલ્લા છે",
   "Never used": "ક્યારેય ઉપયોગ કર્યો નથી",
@@ -894,186 +894,186 @@
   "Doctorate / PhD": "ડોક્ટરેટ / પીએચ.ડી.",
   "کارشناسی / Bachelor’s Degree": "સ્નાતક (બેચલર)",
   "کارشناسی ارشد / Master’s Degree": "અનુસ્નાતક (માસ્ટર)",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Oman": "Oman",
-  "Palau": "Palau",
-  "Palestine State": "પેલેસ્ટાઈન",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "સંયુક્ત આરબ અમીરાત (UAE)",
-  "United Kingdom (UK)": "યુનાઇટેડ કિંગડમ (UK)",
-  "United States (US)": "યુનાઇટેડ સ્ટેટ્સ (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Albania": "અલ્બેનિયા",
+  "Algeria": "અલ્જેરિયા",
+  "Andorra": "એન્ડોરા",
+  "Angola": "અંગોલા",
+  "Antigua and Barbuda": "એન્ટિગુઆ અને બાર્બુડા",
+  "Argentina": "આર્જેન્ટિના",
+  "Armenia": "આર્મેનિયા",
+  "Austria": "ઓસ્ટ્રિયા",
+  "Azerbaijan": "અઝરબૈજાન",
+  "Bahamas": "બહામાસ",
+  "Bahrain": "બહેરીન",
+  "Bangladesh": "બાંગ્લાદેશ",
+  "Barbados": "બાર્બાડોસ",
+  "Belarus": "બેલારુસ",
+  "Belgium": "બેલ્જિયમ",
+  "Belize": "બેલીઝ",
+  "Benin": "બેનિન",
+  "Bhutan": "ભૂટાન",
+  "Bolivia": "બોલિવિયા",
+  "Bosnia and Herzegovina": "બોસ્નિયા અને હર્ઝેગોવિના",
+  "Botswana": "બોત્સ્વાના",
+  "Brazil": "બ્રાઝિલ",
+  "Brunei": "બ્રુનેઈ",
+  "Bulgaria": "બલ્ગેરિયા",
+  "Burkina Faso": "બુર્કિના ફાસો",
+  "Burundi": "બુરુન્ડી",
+  "Cabo Verde": "કાબો વર્ડે",
+  "Cambodia": "કંબોડિયા",
+  "Cameroon": "કેમરૂન",
+  "Central African Republic": "સેન્ટ્રલ આફ્રિકન રિપબ્લિક",
+  "Chad": "ચાડ",
+  "Chile": "ચિલી",
+  "China": "ચીન",
+  "Colombia": "કોલંબિયા",
+  "Comoros": "કોમોરોસ",
+  "Congo": "કોંગો",
+  "Costa Rica": "કોસ્ટા રિકા",
+  "Croatia": "ક્રોએશિયા",
+  "Cuba": "ક્યુબા",
+  "Cyprus": "સાયપ્રસ",
+  "Czechia": "ચેકિયા",
+  "Democratic Republic of the Congo": "ડેમોક્રેટિક રિપબ્લિક ઓફ ધ કોંગો",
+  "Denmark": "ડેનમાર્ક",
+  "Djibouti": "જીબુતી",
+  "Dominica": "ડોમિનિકા",
+  "Dominican Republic": "ડોમિનિકન રિપબ્લિક",
+  "Ecuador": "એક્વાડોર",
+  "Egypt": "ઇજિપ્ત",
+  "El Salvador": "અલ સાલ્વાડોર",
+  "Equatorial Guinea": "ઇક્વેટોરિયલ ગિની",
+  "Eritrea": "એરિટ્રિયા",
+  "Estonia": "એસ્ટોનિયા",
+  "Eswatini": "એસ્વાતિની",
+  "Ethiopia": "ઇથોપિયા",
+  "Fiji": "ફીજી",
+  "Finland": "ફિનલેન્ડ",
+  "Gabon": "ગેબોન",
+  "Gambia": "ગામ્બિયા",
+  "Georgia": "જ્યોર્જિયા",
+  "Ghana": "ઘાના",
+  "Greece": "ગ્રીસ",
+  "Grenada": "ગ્રેનેડા",
+  "Guatemala": "ગ્વાટેમાલા",
+  "Guinea": "ગિની",
+  "Guinea-Bissau": "ગિની-બિસાઉ",
+  "Guyana": "ગયાના",
+  "Haiti": "હૈતી",
+  "Holy See": "હોલી સી",
+  "Honduras": "હોન્ડુરાસ",
+  "Hungary": "હંગેરી",
+  "Iceland": "આઇસલેન્ડ",
+  "India": "ભારત",
+  "Indonesia": "ઇન્ડોનેશિયા",
+  "Ireland": "આયર્લેન્ડ",
+  "Italy": "ઇટાલી",
+  "Ivory Coast": "આઇવરી કોસ્ટ",
+  "Jamaica": "જમૈકા",
+  "Japan": "જાપાન",
+  "Jordan": "જોર્ડન",
+  "Kazakhstan": "કઝાકિસ્તાન",
+  "Kenya": "કેન્યા",
+  "Kiribati": "કિરીબતી",
+  "Kuwait": "કુવૈત",
+  "Kyrgyzstan": "કિર્ગિસ્તાન",
+  "Laos": "લાઓસ",
+  "Latvia": "લાતવિયા",
+  "Lebanon": "લેબનાન",
+  "Lesotho": "લેસોથો",
+  "Liberia": "લાઇબેરિયા",
+  "Libya": "લિબિયા",
+  "Liechtenstein": "લિક્ટેનસ્ટેઇન",
+  "Lithuania": "લિથુઆનિયા",
+  "Luxembourg": "લક્ઝમબર્ગ",
+  "Madagascar": "મેડાગાસ્કર",
+  "Malawi": "મલાવી",
+  "Malaysia": "મલેશિયા",
+  "Maldives": "માલદીવ્સ",
+  "Mali": "માલી",
+  "Malta": "માલ્ટા",
+  "Marshall Islands": "માર્શલ આઇલેન્ડ્સ",
+  "Mauritania": "મોરિટાનિયા",
+  "Mauritius": "મોરિશિયસ",
+  "Mexico": "મેક્સિકો",
+  "Micronesia": "માઇક્રોનેશિયા",
+  "Moldova": "મોલ્ડોવા",
+  "Monaco": "મોનાકો",
+  "Mongolia": "મંગોલિયા",
+  "Montenegro": "મોન્ટેનેગ્રો",
+  "Morocco": "મોરોક્કો",
+  "Mozambique": "મોઝામ્બિક",
+  "Myanmar": "મ્યાનમાર",
+  "Namibia": "નામીબિયા",
+  "Nauru": "નૌરુ",
+  "Nepal": "નેપાળ",
+  "New Zealand": "ન્યુઝીલેન્ડ",
+  "Nicaragua": "નિકારાગુઆ",
+  "Niger": "નાઇજર",
+  "Nigeria": "નાઇજીરીયા",
+  "North Korea": "ઉત્તર કોરિયા",
+  "North Macedonia": "ઉત્તર મેસેડોનિયા",
+  "Oman": "ઓમાન",
+  "Palau": "પલાઉ",
+  "Palestine State": "પેલેસ્ટાઇન રાજ્ય",
+  "Panama": "પનામા",
+  "Papua New Guinea": "પાપુઆ ન્યુ ગિની",
+  "Paraguay": "પેરાગ્વે",
+  "Peru": "પેરુ",
+  "Philippines": "ફિલિપાઇન્સ",
+  "Poland": "પોલેન્ડ",
+  "Portugal": "પોર્ટુગલ",
+  "Romania": "રોમાનિયા",
+  "Russia": "રશિયા",
+  "Rwanda": "રવાન્ડા",
+  "Saint Kitts and Nevis": "સેન્ટ કિટ્સ અને નેવિસ",
+  "Saint Lucia": "સેન્ટ લુસિયા",
+  "Saint Vincent and the Grenadines": "સેન્ટ વિન્સેન્ટ અને ગ્રેનેડાઇન્સ",
+  "Samoa": "સમોઆ",
+  "San Marino": "સાન મેરિનો",
+  "Sao Tome and Principe": "સાઓ તોમે અને પ્રિન્સિપે",
+  "Senegal": "સેનેગલ",
+  "Serbia": "સર્બિયા",
+  "Seychelles": "સેશેલ્સ",
+  "Sierra Leone": "સિએરા લિયોન",
+  "Singapore": "સિંગાપોર",
+  "Slovakia": "સ્લોવાકિયા",
+  "Slovenia": "સ્લોવેનિયા",
+  "Solomon Islands": "સોલોમન આઇલેન્ડ્સ",
+  "Somalia": "સોમાલિયા",
+  "South Africa": "દક્ષિણ આફ્રિકા",
+  "South Korea": "દક્ષિણ કોરિયા",
+  "South Sudan": "દક્ષિણ સુદાન",
+  "Spain": "સ્પેન",
+  "Sri Lanka": "શ્રીલંકા",
+  "Sudan": "સુદાન",
+  "Suriname": "સુરીનામ",
+  "Switzerland": "સ્વિટ્ઝર્લૅન્ડ",
+  "Syria": "સીરિયા",
+  "Tajikistan": "તાજિકિસ્તાન",
+  "Tanzania": "તાન્ઝાનિયા",
+  "Thailand": "થાઇલેન્ડ",
+  "Timor-Leste": "તિમોર-લેસ્તે",
+  "Togo": "ટોગો",
+  "Tonga": "ટોંગા",
+  "Trinidad and Tobago": "ત્રિનિદાદ અને ટોબેગો",
+  "Tunisia": "ટ્યુનિશિયા",
+  "Turkmenistan": "તુર્કમેનિસ્તાન",
+  "Tuvalu": "તુવાલુ",
+  "Uganda": "યુગાન્ડા",
+  "Ukraine": "યુક્રેન",
+  "United Arab Emirates (UAE)": "સંયુક્ત આરબ અમીરાત (યુએઈ)",
+  "United Kingdom (UK)": "યુનાઇટેડ કિંગડમ (યુકે)",
+  "United States (US)": "યુનાઇટેડ સ્ટેટ્સ (યુએસ)",
+  "Uruguay": "ઉરુગ્વે",
+  "Uzbekistan": "ઉઝબેકિસ્તાન",
+  "Vanuatu": "વાનુઅતુ",
+  "Venezuela": "વેનેઝુએલા",
+  "Vietnam": "વિયેતનામ",
+  "Yemen": "યમન",
+  "Zambia": "ઝામ્બિયા",
+  "Zimbabwe": "ઝિમ્બાબ્વે",
   "Afghan": "અફઘાન",
   "Albanian": "અલ્બેનિયન",
   "Algerian": "અલ્જેરિયન",
diff --git a/src/translations/locales/ha.json b/src/translations/locales/ha.json
index 4a4ffc2..9c6d84b 100644
--- a/src/translations/locales/ha.json
+++ b/src/translations/locales/ha.json
@@ -46,7 +46,7 @@
   "Additional Comments and Red Lines": "Karin Sharhi da Layin Jajayen Layi",
   "Additional Comments on Economic and Housing Status": "Karin Bayani akan Matsayin Tattalin Arziki da Gidaje",
   "Additional details about family responsibility": "Ƙarin bayani game da alhakin iyali",
-  "Afghanistan": "Afghanistan",
+  "Afghanistan": "Afganistan",
   "Age": "Shekaru",
   "Alcohol is a serious red line": "Barasa babban layin ja ne",
   "Alcohol is a serious red line for me": "Barasa babban layin ja ne a gareni",
@@ -69,7 +69,7 @@
   "Attitude towards Music": "Halin Kiɗa",
   "Attitude towards Religion and Politics": "Halin Addini da Siyasa",
   "Attitude towards Wedding Ceremony": "Halin Bikin Aure",
-  "Australia": "Ostiraliya",
+  "Australia": "Ostareliya",
   "Average": "Matsakaicin",
   "Ayatollah Sistani": "Ayatullah Sistani",
   "Bachelor's degree in architecture": "Bachelor's degree in architecture",
@@ -400,7 +400,7 @@
   "Non-religious / Secular": "Ba addini ba / Secular",
   "None are red lines": "Babu jajayen layukan",
   "Normal and respectful": "Na al'ada da girmamawa",
-  "Norway": "Norway",
+  "Norway": "Norwe",
   "Not a good personal fit": "Not a good personal fit",
   "Not committed": "Ba a yi ba",
   "Not important": "Ba mahimmanci ba",
@@ -495,7 +495,7 @@
   "Provide more details if you have any health conditions or limitations.": "Bada ƙarin cikakkun bayanai idan kuna da kowane yanayi ko gazawa.",
   "Psychological Assessments": "Psychological Assessments",
   "Psychologically, this practice fosters a sense of empathy and contentment, which can reduce financial stress. Socially, lending strengthens neighborhood bonds and creates support networks that can lead to economic opportunities. This hadith encourages believers to lend dough, bread, and fire to increase their sustenance.": "Psychologically, this practice fosters a sense of empathy and contentment, which can reduce financial stress. Socially, lending strengthens neighborhood bonds and creates support networks that can lead to economic opportunities. This hadith encourages believers to lend dough, bread, and fire to increase their sustenance.",
-  "Qatar": "Qatar",
+  "Qatar": "Katar",
   "Quitting": "Barin",
   "Quran Recitation and Religious Studies": "Karatun Al-Qur'ani da Karatun Addini",
   "Read the terms and conditions carefully so that you don't run into any problems in the next process - reading this section is mandatory.": "Read the terms and conditions carefully so that you don't run into any problems in the next process - reading this section is mandatory.",
@@ -554,7 +554,7 @@
   "Retired": "Yayi ritaya",
   "SEARCH IN PROGRESS": "BINCICKEN KU YANA AIKI",
   "Sarah Smith": "Sarah Smith",
-  "Saudi Arabia": "Saudi Arabia",
+  "Saudi Arabia": "Saudiyya",
   "Select Gender": "Select Gender",
   "Select call result": "Select call result",
   "Select country": "Zaɓi ƙasa",
@@ -614,7 +614,7 @@
   "Support": "Support",
   "Supporter of the current government, but a difference in view is not a red line.": "Mai goyan bayan gwamnati mai ci, amma bambancin ra'ayi ba jan layi ba ne.",
   "Supporter of the current government; serious opposition from my spouse is a red line.": "Mai goyon bayan gwamnati mai ci; tsananin adawa daga mijina jajayen layi ne.",
-  "Sweden": "Sweden",
+  "Sweden": "Suwidin",
   "Swipe to confirm rejection": "Gungura don tabbatar da kin karɓa",
   "Swipe to pay 50 Habib Coins": "Swipe to pay 50 Habib Coins",
   "Taking this test is not mandatory, but it will help you better search for a spouse. The Personality test is a test for self-knowledge and better understanding of your spouse.": "Taking this test is not mandatory, but it will help you better search for a spouse. The Personality test is a test for self-knowledge and better understanding of your spouse.",
@@ -894,186 +894,186 @@
   "Doctorate / PhD": "Digiri na Uku / PhD",
   "کارشناسی / Bachelor’s Degree": "Digirin Farko (Bachelor)",
   "کارشناسی ارشد / Master’s Degree": "Digiri na Biyu (Master's)",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Albania": "Albaniya",
+  "Algeria": "Aljeriya",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Antigua and Barbuda": "Antigua da Barbuda",
+  "Argentina": "Ajantina",
+  "Armenia": "Armeniya",
+  "Austria": "Ostiriya",
+  "Azerbaijan": "Azarbaijan",
   "Bahamas": "Bahamas",
   "Bahrain": "Bahrain",
   "Bangladesh": "Bangladesh",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belgium": "Beljiyom",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bolivia": "Bolibiya",
+  "Bosnia and Herzegovina": "Bosniya da Herzigobina",
   "Botswana": "Botswana",
   "Brazil": "Brazil",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgariya",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
   "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
+  "Cambodia": "Kambodiya",
+  "Cameroon": "Kamaru",
+  "Central African Republic": "Jamhuriyar Afirka ta Tsakiya",
+  "Chad": "Cadi",
   "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
+  "China": "Sin",
+  "Colombia": "Kolambiya",
+  "Comoros": "Kwamoras",
+  "Congo": "Jamhuriyar Kwango",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
+  "Croatia": "Kuroshiya",
+  "Cuba": "Kyuba",
+  "Cyprus": "Saipiras",
+  "Czechia": "Jamhuriyar Czech",
+  "Democratic Republic of the Congo": "Jamhuriyar Dimokuradiyyar Kwango",
   "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
+  "Djibouti": "Jibuti",
+  "Dominica": "Dominika",
+  "Dominican Republic": "Jamhuriyar Dominika",
+  "Ecuador": "Ekwador",
+  "Egypt": "Masar",
+  "El Salvador": "El Salbador",
+  "Equatorial Guinea": "Gini Ta Tsakiya",
+  "Eritrea": "Eritiriya",
+  "Estonia": "Estoniya",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Ethiopia": "Habasha",
   "Fiji": "Fiji",
   "Finland": "Finland",
   "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Gambia": "Gambiya",
+  "Georgia": "Jojiya",
+  "Ghana": "Gana",
+  "Greece": "Girka",
   "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
+  "Guatemala": "Gwatemala",
+  "Guinea": "Gini",
+  "Guinea-Bissau": "Gini-Bissau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Fadar Vatican",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
+  "Hungary": "Hangari",
   "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
+  "India": "Indiya",
+  "Indonesia": "Indonesiya",
   "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
+  "Italy": "Italiya",
+  "Ivory Coast": "Kwadivwa",
+  "Jamaica": "Jamaika",
   "Japan": "Japan",
   "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
+  "Kazakhstan": "Kazakistan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Kirgizistan",
   "Laos": "Laos",
-  "Latvia": "Latvia",
+  "Latvia": "Lativiya",
   "Lebanon": "Lebanon",
   "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Liberia": "Laberiya",
+  "Libya": "Libiya",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
+  "Lithuania": "Lituwaniya",
+  "Luxembourg": "Luksamburg",
+  "Madagascar": "Madagaskar",
   "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
+  "Malaysia": "Malesiya",
   "Maldives": "Maldives",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Marshall Islands": "Tsibirai na Marshall",
+  "Mauritania": "Moritaniya",
+  "Mauritius": "Moritius",
+  "Mexico": "Meziko",
+  "Micronesia": "Maikronisiya",
   "Moldova": "Moldova",
   "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
+  "Mongolia": "Mongoliya",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
+  "Morocco": "Maroko",
+  "Mozambique": "Mozambik",
   "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
+  "Namibia": "Namibiya",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
+  "New Zealand": "Nuzilan",
+  "Nicaragua": "Nikaraguwa",
+  "Niger": "Nijar",
+  "Nigeria": "Nijeriya",
+  "North Korea": "Koriya ta Arewa",
+  "North Macedonia": "Masadoniya ta Arewa",
   "Oman": "Oman",
   "Palau": "Palau",
-  "Palestine State": "Palasdinu",
+  "Palestine State": "Falasdinu",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
+  "Papua New Guinea": "Papua Sabuwar Gini",
+  "Paraguay": "Paragwai",
   "Peru": "Peru",
-  "Philippines": "Philippines",
+  "Philippines": "Filipin",
   "Poland": "Poland",
   "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Romania": "Romaniya",
+  "Russia": "Rasha",
+  "Rwanda": "Ruwanda",
+  "Saint Kitts and Nevis": "Saint Kitts da Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent da Grenadines",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
+  "Sao Tome and Principe": "Sao Tome da Principe",
+  "Senegal": "Sinigal",
+  "Serbia": "Serbiya",
   "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
+  "Sierra Leone": "Saliyo",
   "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "Slovakia": "Sulobakiya",
+  "Slovenia": "Sulobeniya",
+  "Solomon Islands": "Tsibirai na Solomon",
+  "Somalia": "Somaliya",
+  "South Africa": "Afirka ta Kudu",
+  "South Korea": "Koriya ta Kudu",
+  "South Sudan": "Sudan ta Kudu",
+  "Spain": "Sifen",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
   "Suriname": "Suriname",
   "Switzerland": "Switzerland",
-  "Syria": "Syria",
+  "Syria": "Siriya",
   "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
+  "Tanzania": "Tanzaniya",
+  "Thailand": "Tailand",
+  "Timor-Leste": "Timor ta Gabas",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
+  "Trinidad and Tobago": "Trinidad da Tobago",
+  "Tunisia": "Tunisiya",
   "Turkmenistan": "Turkmenistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "Daular Larabawa (UAE)",
-  "United Kingdom (UK)": "Birtaniya (UK)",
-  "United States (US)": "Amurka (US)",
-  "Uruguay": "Uruguay",
+  "Ukraine": "Yukren",
+  "United Arab Emirates (UAE)": "Hadaddiyar Daular Larabawa (UAE)",
+  "United Kingdom (UK)": "Burtaniya (UK)",
+  "United States (US)": "Kasar Amurka (US)",
+  "Uruguay": "Urugwai",
   "Uzbekistan": "Uzbekistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Yemen": "Yaman",
+  "Zambia": "Zambiya",
+  "Zimbabwe": "Zimbabuwe",
   "Afghan": "Dan Afganistan",
   "Albanian": "Dan Albaniya",
   "Algerian": "Dan Aljeriya",
diff --git a/src/translations/locales/he.json b/src/translations/locales/he.json
index 1750a00..7e3d3b7 100644
--- a/src/translations/locales/he.json
+++ b/src/translations/locales/he.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "דוקטורט / PhD",
   "کارشناسی / Bachelor’s Degree": "Bachelor’s Degree",
   "کارشناسی ارشد / Master’s Degree": "תואר שני",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
-  "Palau": "Palau",
-  "Palestine State": "פלסטין",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "איחוד האמירויות (UAE)",
+  "Afghanistan": "אפגניסטן",
+  "Albania": "אלבניה",
+  "Algeria": "אלג'יריה",
+  "Andorra": "אנדורה",
+  "Angola": "אנגולה",
+  "Antigua and Barbuda": "אנטיגואה וברבודה",
+  "Argentina": "ארגנטינה",
+  "Armenia": "ארמניה",
+  "Australia": "אוסטרליה",
+  "Austria": "אוסטריה",
+  "Azerbaijan": "אזרבייג'ן",
+  "Bahamas": "איי בהאמה",
+  "Bahrain": "בחריין",
+  "Bangladesh": "בנגלדש",
+  "Barbados": "ברבדוס",
+  "Belarus": "בלארוס",
+  "Belgium": "בלגיה",
+  "Belize": "בליז",
+  "Benin": "בנין",
+  "Bhutan": "בהוטן",
+  "Bolivia": "בוליביה",
+  "Bosnia and Herzegovina": "בוסניה והרצגובינה",
+  "Botswana": "בוטסואנה",
+  "Brazil": "ברזיל",
+  "Brunei": "ברוניי",
+  "Bulgaria": "בולגריה",
+  "Burkina Faso": "בורקינה פאסו",
+  "Burundi": "בורונדי",
+  "Cabo Verde": "כף ורדה",
+  "Cambodia": "קמבודיה",
+  "Cameroon": "קמרון",
+  "Canada": "קנדה",
+  "Central African Republic": "הרפובליקה המרכז-אפריקאית",
+  "Chad": "צ'אד",
+  "Chile": "צ'ילה",
+  "China": "סין",
+  "Colombia": "קולומביה",
+  "Comoros": "קומורו",
+  "Congo": "קונגו",
+  "Costa Rica": "קוסטה ריקה",
+  "Croatia": "קרואטיה",
+  "Cuba": "קובה",
+  "Cyprus": "קפריסין",
+  "Czechia": "צ'כיה",
+  "Democratic Republic of the Congo": "הרפובליקה הדמוקרטית של קונגו",
+  "Denmark": "דנמרק",
+  "Djibouti": "ג'יבוטי",
+  "Dominica": "דומיניקה",
+  "Dominican Republic": "הרפובליקה הדומיניקנית",
+  "Ecuador": "אקוודור",
+  "Egypt": "מצרים",
+  "El Salvador": "אל סלוודור",
+  "Equatorial Guinea": "גינאה המשוונית",
+  "Eritrea": "אריתריאה",
+  "Estonia": "אסטוניה",
+  "Eswatini": "אסוואטיני",
+  "Ethiopia": "אתיופיה",
+  "Fiji": "פיג'י",
+  "Finland": "פינלנד",
+  "France": "צרפת",
+  "Gabon": "גבון",
+  "Gambia": "גמביה",
+  "Georgia": "גאורגיה",
+  "Germany": "גרמניה",
+  "Ghana": "גאנה",
+  "Greece": "יוון",
+  "Grenada": "גרנדה",
+  "Guatemala": "גואטמלה",
+  "Guinea": "גינאה",
+  "Guinea-Bissau": "גינאה-ביסאו",
+  "Guyana": "גיאנה",
+  "Haiti": "האיטי",
+  "Holy See": "הכס הקדוש",
+  "Honduras": "הונדורס",
+  "Hungary": "הונגריה",
+  "Iceland": "איסלנד",
+  "India": "הודו",
+  "Indonesia": "אינדונזיה",
+  "Iran": "איראן",
+  "Iraq": "עיראק",
+  "Ireland": "אירלנד",
+  "Italy": "איטליה",
+  "Ivory Coast": "חוף השנהב",
+  "Jamaica": "ג'מייקה",
+  "Japan": "יפן",
+  "Jordan": "ירדן",
+  "Kazakhstan": "קזחסטן",
+  "Kenya": "קניה",
+  "Kiribati": "קיריבטי",
+  "Kuwait": "כווית",
+  "Kyrgyzstan": "קירגיזסטן",
+  "Laos": "לאוס",
+  "Latvia": "לטביה",
+  "Lebanon": "לבנון",
+  "Lesotho": "לסוטו",
+  "Liberia": "ליבריה",
+  "Libya": "לוב",
+  "Liechtenstein": "ליכטנשטיין",
+  "Lithuania": "ליטא",
+  "Luxembourg": "לוקסמבורג",
+  "Madagascar": "מדגסקר",
+  "Malawi": "מלאווי",
+  "Malaysia": "מלזיה",
+  "Maldives": "האיים המלדיביים",
+  "Mali": "מאלי",
+  "Malta": "מלטה",
+  "Marshall Islands": "איי מרשל",
+  "Mauritania": "מאוריטניה",
+  "Mauritius": "מאוריציוס",
+  "Mexico": "מקסיקו",
+  "Micronesia": "מיקרונזיה",
+  "Moldova": "מולדובה",
+  "Monaco": "מונקו",
+  "Mongolia": "מונגוליה",
+  "Montenegro": "מונטנגרו",
+  "Morocco": "מרוקו",
+  "Mozambique": "מוזמביק",
+  "Myanmar": "מיאנמר",
+  "Namibia": "נמיביה",
+  "Nauru": "נאורו",
+  "Nepal": "נפאל",
+  "Netherlands": "הולנד",
+  "New Zealand": "ניו זילנד",
+  "Nicaragua": "ניקרגואה",
+  "Niger": "ניז'ר",
+  "Nigeria": "ניגריה",
+  "North Korea": "קוריאה הצפונית",
+  "North Macedonia": "מקדוניה הצפונית",
+  "Norway": "נורווגיה",
+  "Oman": "עומאן",
+  "Pakistan": "פקיסטן",
+  "Palau": "פלאו",
+  "Palestine State": "מדינת פלסטין",
+  "Panama": "פנמה",
+  "Papua New Guinea": "פפואה גינאה החדשה",
+  "Paraguay": "פרגוואי",
+  "Peru": "פרו",
+  "Philippines": "הפיליפינים",
+  "Poland": "פולין",
+  "Portugal": "פורטוגל",
+  "Qatar": "קטאר",
+  "Romania": "רומניה",
+  "Russia": "רוסיה",
+  "Rwanda": "רואנדה",
+  "Saint Kitts and Nevis": "סנט קיטס ונוויס",
+  "Saint Lucia": "סנט לוסיה",
+  "Saint Vincent and the Grenadines": "סנט וינסנט והגרנדינים",
+  "Samoa": "סמואה",
+  "San Marino": "סן מרינו",
+  "Sao Tome and Principe": "סאו טומה ופרינסיפה",
+  "Saudi Arabia": "ערב הסעודית",
+  "Senegal": "סנגל",
+  "Serbia": "סרביה",
+  "Seychelles": "סיישל",
+  "Sierra Leone": "סיירה לאונה",
+  "Singapore": "סינגפור",
+  "Slovakia": "סלובקיה",
+  "Slovenia": "סלובניה",
+  "Solomon Islands": "איי שלמה",
+  "Somalia": "סומליה",
+  "South Africa": "דרום אפריקה",
+  "South Korea": "קוריאה הדרומית",
+  "South Sudan": "דרום סודאן",
+  "Spain": "ספרד",
+  "Sri Lanka": "סרי לנקה",
+  "Sudan": "סודאן",
+  "Suriname": "סורינאם",
+  "Sweden": "שוודיה",
+  "Switzerland": "שווייץ",
+  "Syria": "סוריה",
+  "Tajikistan": "טג'יקיסטן",
+  "Tanzania": "טנזניה",
+  "Thailand": "תאילנד",
+  "Timor-Leste": "טימור-לסטה",
+  "Togo": "טוגו",
+  "Tonga": "טונגה",
+  "Trinidad and Tobago": "טרינידד וטובגו",
+  "Tunisia": "תוניסיה",
+  "Turkey": "טורקיה",
+  "Turkmenistan": "טורקמניסטן",
+  "Tuvalu": "טובאלו",
+  "Uganda": "אוגנדה",
+  "Ukraine": "אוקראינה",
+  "United Arab Emirates (UAE)": "איחוד האמירויות הערביות (UAE)",
   "United Kingdom (UK)": "הממלכה המאוחדת (UK)",
   "United States (US)": "ארצות הברית (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Uruguay": "אורוגוואי",
+  "Uzbekistan": "אוזבקיסטן",
+  "Vanuatu": "ונואטו",
+  "Venezuela": "ונצואלה",
+  "Vietnam": "וייטנאם",
+  "Yemen": "תימן",
+  "Zambia": "זמביה",
+  "Zimbabwe": "זימבבואה",
   "Afghan": "אפגני/ת",
   "Albanian": "אלבני/ת",
   "Algerian": "אלג'יראי/ת",
diff --git a/src/translations/locales/hi.json b/src/translations/locales/hi.json
index ad32e94..474b66c 100644
--- a/src/translations/locales/hi.json
+++ b/src/translations/locales/hi.json
@@ -46,7 +46,7 @@
   "Additional Comments and Red Lines": "अतिरिक्त टिप्पणियाँ और लाल रेखाएँ",
   "Additional Comments on Economic and Housing Status": "आर्थिक एवं आवास स्थिति पर अतिरिक्त टिप्पणियाँ",
   "Additional details about family responsibility": "पारिवारिक जिम्मेदारी के बारे में अतिरिक्त विवरण",
-  "Afghanistan": "अफ़ग़ानिस्तान",
+  "Afghanistan": "अफ़गानिस्तान",
   "Age": "आयु",
   "Alcohol is a serious red line": "शराब एक गंभीर लाल रेखा है",
   "Alcohol is a serious red line for me": "शराब मेरे लिए एक गंभीर लाल रेखा है",
@@ -304,7 +304,7 @@
   "Insulin, etc.": "इंसुलिन, आदि",
   "Intent:": "Intent:",
   "Interior designer": "Interior designer",
-  "Iran": "Iran",
+  "Iran": "ईरान",
   "Iranian": "Iranian",
   "Iraq": "इराक",
   "Items Per Page": "Items Per Page",
@@ -495,7 +495,7 @@
   "Provide more details if you have any health conditions or limitations.": "यदि आपकी कोई स्वास्थ्य स्थितियाँ या सीमाएँ हैं तो अधिक विवरण प्रदान करें।",
   "Psychological Assessments": "Psychological Assessments",
   "Psychologically, this practice fosters a sense of empathy and contentment, which can reduce financial stress. Socially, lending strengthens neighborhood bonds and creates support networks that can lead to economic opportunities. This hadith encourages believers to lend dough, bread, and fire to increase their sustenance.": "Psychologically, this practice fosters a sense of empathy and contentment, which can reduce financial stress. Socially, lending strengthens neighborhood bonds and creates support networks that can lead to economic opportunities. This hadith encourages believers to lend dough, bread, and fire to increase their sustenance.",
-  "Qatar": "कतर",
+  "Qatar": "क़तर",
   "Quitting": "छोड़ना",
   "Quran Recitation and Religious Studies": "कुरान पाठ और धार्मिक अध्ययन",
   "Read the terms and conditions carefully so that you don't run into any problems in the next process - reading this section is mandatory.": "Read the terms and conditions carefully so that you don't run into any problems in the next process - reading this section is mandatory.",
@@ -650,7 +650,7 @@
   "Traditional and non-political view of Shiasm; cannot marry someone with a political view.": "शियावाद का पारंपरिक और गैर-राजनीतिक दृष्टिकोण; राजनीतिक दृष्टिकोण वाले किसी व्यक्ति से विवाह नहीं कर सकती।",
   "Trusted Family Friend": "विश्वसनीय पारिवारिक मित्र",
   "Trusted Social Sponsor": "विश्वसनीय सामाजिक प्रायोजक",
-  "Turkey": "टर्की",
+  "Turkey": "तुर्की",
   "Turkish": "तुर्की",
   "Two-Column Side-by-Side Match Comparison": "Two-Column Side-by-Side Match Comparison",
   "Type of Hijab and Public Appearance": "हिजाब का प्रकार और सार्वजनिक उपस्थिति",
@@ -894,186 +894,186 @@
   "Doctorate / PhD": "डॉक्टरेट / पीएचडी",
   "کارشناسی / Bachelor’s Degree": "स्नातक (बैचलर)",
   "کارشناسی ارشد / Master’s Degree": "परास्नातक (मास्टर)",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Oman": "Oman",
-  "Palau": "Palau",
-  "Palestine State": "फ़िलिस्तीन",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "संयुक्त अरब अमीरात (UAE)",
-  "United Kingdom (UK)": "यूनाइटेड किंगडम (UK)",
-  "United States (US)": "संयुक्त राज्य अमेरिका (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Albania": "अल्बानिया",
+  "Algeria": "अल्जीरिया",
+  "Andorra": "अंडोरा",
+  "Angola": "अंगोला",
+  "Antigua and Barbuda": "एंटीगुआ और बारबुडा",
+  "Argentina": "अर्जेंटीना",
+  "Armenia": "आर्मेनिया",
+  "Austria": "ऑस्ट्रिया",
+  "Azerbaijan": "अज़रबैजान",
+  "Bahamas": "बहामास",
+  "Bahrain": "बहरीन",
+  "Bangladesh": "बांग्लादेश",
+  "Barbados": "बारबाडोस",
+  "Belarus": "बेलारूस",
+  "Belgium": "बेल्जियम",
+  "Belize": "बेलीज़",
+  "Benin": "बेनिन",
+  "Bhutan": "भूटान",
+  "Bolivia": "बोलीविया",
+  "Bosnia and Herzegovina": "बोस्निया और हर्ज़ेगोविना",
+  "Botswana": "बोत्सवाना",
+  "Brazil": "ब्राज़ील",
+  "Brunei": "ब्रुनेई",
+  "Bulgaria": "बुल्गारिया",
+  "Burkina Faso": "बुर्किना फ़ासो",
+  "Burundi": "बुरुंडी",
+  "Cabo Verde": "काबो वर्डे",
+  "Cambodia": "कंबोडिया",
+  "Cameroon": "कैमरून",
+  "Central African Republic": "मध्य अफ़्रीकी गणराज्य",
+  "Chad": "चाड",
+  "Chile": "चिली",
+  "China": "चीन",
+  "Colombia": "कोलंबिया",
+  "Comoros": "कोमोरोस",
+  "Congo": "कांगो",
+  "Costa Rica": "कोस्टा रिका",
+  "Croatia": "क्रोएशिया",
+  "Cuba": "क्यूबा",
+  "Cyprus": "साइप्रस",
+  "Czechia": "चेकिया",
+  "Democratic Republic of the Congo": "कांगो लोकतांत्रिक गणराज्य",
+  "Denmark": "डेनमार्क",
+  "Djibouti": "जिबूती",
+  "Dominica": "डोमिनिका",
+  "Dominican Republic": "डोमिनिकन गणराज्य",
+  "Ecuador": "इक्वाडोर",
+  "Egypt": "मिस्र",
+  "El Salvador": "अल सल्वाडोर",
+  "Equatorial Guinea": "इक्वेटोरियल गिनी",
+  "Eritrea": "इरिट्रिया",
+  "Estonia": "एस्टोनिया",
+  "Eswatini": "इस्वातिनी",
+  "Ethiopia": "इथियोपिया",
+  "Fiji": "फ़िजी",
+  "Finland": "फ़िनलैंड",
+  "Gabon": "गैबॉन",
+  "Gambia": "गाम्बिया",
+  "Georgia": "जॉर्जिया",
+  "Ghana": "घाना",
+  "Greece": "ग्रीस",
+  "Grenada": "ग्रेनाडा",
+  "Guatemala": "ग्वाटेमाला",
+  "Guinea": "गिनी",
+  "Guinea-Bissau": "गिनी-बिसाऊ",
+  "Guyana": "गुयाना",
+  "Haiti": "हैती",
+  "Holy See": "होली सी",
+  "Honduras": "होंडुरास",
+  "Hungary": "हंगरी",
+  "Iceland": "आइसलैंड",
+  "India": "भारत",
+  "Indonesia": "इंडोनेशिया",
+  "Ireland": "आयरलैंड",
+  "Italy": "इटली",
+  "Ivory Coast": "आइवरी कोस्ट",
+  "Jamaica": "जमैका",
+  "Japan": "जापान",
+  "Jordan": "जॉर्डन",
+  "Kazakhstan": "कज़ाकिस्तान",
+  "Kenya": "केन्या",
+  "Kiribati": "किरिबाती",
+  "Kuwait": "कुवैत",
+  "Kyrgyzstan": "किर्गिज़स्तान",
+  "Laos": "लाओस",
+  "Latvia": "लातविया",
+  "Lebanon": "लेबनान",
+  "Lesotho": "लेसोथो",
+  "Liberia": "लाइबेरिया",
+  "Libya": "लीबिया",
+  "Liechtenstein": "लिकटेंस्टीन",
+  "Lithuania": "लिथुआनिया",
+  "Luxembourg": "लक्ज़मबर्ग",
+  "Madagascar": "मेडागास्कर",
+  "Malawi": "मलावी",
+  "Malaysia": "मलेशिया",
+  "Maldives": "मालदीव",
+  "Mali": "माली",
+  "Malta": "माल्टा",
+  "Marshall Islands": "मार्शल द्वीपसमूह",
+  "Mauritania": "मॉरिटानिया",
+  "Mauritius": "मॉरीशस",
+  "Mexico": "मेक्सिको",
+  "Micronesia": "माइक्रोनेशिया",
+  "Moldova": "मॉल्डोवा",
+  "Monaco": "मोनाको",
+  "Mongolia": "मंगोलिया",
+  "Montenegro": "मोंटेनेग्रो",
+  "Morocco": "मोरक्को",
+  "Mozambique": "मोज़ाम्बिक",
+  "Myanmar": "म्यांमार",
+  "Namibia": "नामीबिया",
+  "Nauru": "नाउरू",
+  "Nepal": "नेपाल",
+  "New Zealand": "न्यूज़ीलैंड",
+  "Nicaragua": "निकारागुआ",
+  "Niger": "नाइजर",
+  "Nigeria": "नाइजीरिया",
+  "North Korea": "उत्तर कोरिया",
+  "North Macedonia": "उत्तर मैसेडोनिया",
+  "Oman": "ओमान",
+  "Palau": "पलाऊ",
+  "Palestine State": "फ़िलिस्तीन राज्य",
+  "Panama": "पनामा",
+  "Papua New Guinea": "पापुआ न्यू गिनी",
+  "Paraguay": "पराग्वे",
+  "Peru": "पेरू",
+  "Philippines": "फ़िलीपींस",
+  "Poland": "पोलैंड",
+  "Portugal": "पुर्तगाल",
+  "Romania": "रोमानिया",
+  "Russia": "रूस",
+  "Rwanda": "रवांडा",
+  "Saint Kitts and Nevis": "सेंट किट्स और नेविस",
+  "Saint Lucia": "सेंट लूसिया",
+  "Saint Vincent and the Grenadines": "सेंट विंसेंट और ग्रेनेडाइंस",
+  "Samoa": "समोआ",
+  "San Marino": "सैन मेरीनो",
+  "Sao Tome and Principe": "साओ टोम और प्रिंसिपे",
+  "Senegal": "सेनेगल",
+  "Serbia": "सर्बिया",
+  "Seychelles": "सेशेल्स",
+  "Sierra Leone": "सिएरा लियोन",
+  "Singapore": "सिंगापुर",
+  "Slovakia": "स्लोवाकिया",
+  "Slovenia": "स्लोवेनिया",
+  "Solomon Islands": "सोलोमन द्वीपसमूह",
+  "Somalia": "सोमालिया",
+  "South Africa": "दक्षिण अफ़्रीका",
+  "South Korea": "दक्षिण कोरिया",
+  "South Sudan": "दक्षिण सूडान",
+  "Spain": "स्पेन",
+  "Sri Lanka": "श्रीलंका",
+  "Sudan": "सूडान",
+  "Suriname": "सूरीनाम",
+  "Switzerland": "स्विट्ज़रलैंड",
+  "Syria": "सीरिया",
+  "Tajikistan": "ताजिकिस्तान",
+  "Tanzania": "तंज़ानिया",
+  "Thailand": "थाईलैंड",
+  "Timor-Leste": "तिमोर-लेस्ते",
+  "Togo": "टोगो",
+  "Tonga": "टोंगा",
+  "Trinidad and Tobago": "त्रिनिदाद और टोबैगो",
+  "Tunisia": "ट्यूनीशिया",
+  "Turkmenistan": "तुर्कमेनिस्तान",
+  "Tuvalu": "तुवालू",
+  "Uganda": "युगांडा",
+  "Ukraine": "यूक्रेन",
+  "United Arab Emirates (UAE)": "संयुक्त अरब अमीरात (यूएई)",
+  "United Kingdom (UK)": "यूनाइटेड किंगडम (यूके)",
+  "United States (US)": "संयुक्त राज्य अमेरिका (यूएस)",
+  "Uruguay": "उरुग्वे",
+  "Uzbekistan": "उज़्बेकिस्तान",
+  "Vanuatu": "वानुअतु",
+  "Venezuela": "वेनेज़ुएला",
+  "Vietnam": "वियतनाम",
+  "Yemen": "यमन",
+  "Zambia": "ज़ाम्बिया",
+  "Zimbabwe": "ज़िम्बाब्वे",
   "Afghan": "अफगान",
   "Albanian": "अल्बानियाई",
   "Algerian": "अल्जीरियाई",
diff --git a/src/translations/locales/id.json b/src/translations/locales/id.json
index 6a64dfe..970c629 100644
--- a/src/translations/locales/id.json
+++ b/src/translations/locales/id.json
@@ -451,97 +451,97 @@
   "Doctorate / PhD": "Gelar Doktor (S3)",
   "کارشناسی / Bachelor’s Degree": "Sarjana (S1)",
   "کارشناسی ارشد / Master’s Degree": "Magister (S2)",
-  "Afghanistan": "Afghanistan",
+  "Afghanistan": "Afganistan",
   "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Algeria": "Aljazair",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antigua dan Barbuda",
   "Argentina": "Argentina",
   "Armenia": "Armenia",
   "Australia": "Australia",
   "Austria": "Austria",
   "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
+  "Bahamas": "Bahama",
   "Bahrain": "Bahrain",
   "Bangladesh": "Bangladesh",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belgium": "Belgia",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
   "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bosnia and Herzegovina": "Bosnia dan Herzegovina",
   "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Brazil": "Brasil",
   "Brunei": "Brunei",
   "Bulgaria": "Bulgaria",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
+  "Cabo Verde": "Tanjung Verde",
+  "Cambodia": "Kamboja",
+  "Cameroon": "Kamerun",
+  "Canada": "Kanada",
+  "Central African Republic": "Republik Afrika Tengah",
   "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
+  "Chile": "Chili",
+  "China": "Tiongkok",
+  "Colombia": "Kolombia",
+  "Comoros": "Komoro",
+  "Congo": "Kongo",
+  "Costa Rica": "Kosta Rika",
+  "Croatia": "Kroasia",
+  "Cuba": "Kuba",
+  "Cyprus": "Siprus",
+  "Czechia": "Ceko",
+  "Democratic Republic of the Congo": "Republik Demokratik Kongo",
   "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Djibouti": "Jibuti",
+  "Dominica": "Dominika",
+  "Dominican Republic": "Republik Dominika",
+  "Ecuador": "Ekuador",
+  "Egypt": "Mesir",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
+  "Equatorial Guinea": "Guinea Khatulistiwa",
   "Eritrea": "Eritrea",
   "Estonia": "Estonia",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Ethiopia": "Etiopia",
   "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
+  "Finland": "Finlandia",
+  "France": "Prancis",
   "Gabon": "Gabon",
   "Gambia": "Gambia",
   "Georgia": "Georgia",
-  "Germany": "Germany",
+  "Germany": "Jerman",
   "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Greece": "Yunani",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
   "Guinea": "Guinea",
   "Guinea-Bissau": "Guinea-Bissau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Takhta Suci",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
+  "Hungary": "Hungaria",
+  "Iceland": "Islandia",
   "India": "India",
   "Indonesia": "Indonesia",
   "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
+  "Iraq": "Irak",
+  "Ireland": "Irlandia",
+  "Italy": "Italia",
+  "Ivory Coast": "Pantai Gading",
+  "Jamaica": "Jamaika",
+  "Japan": "Jepang",
+  "Jordan": "Yordania",
   "Kazakhstan": "Kazakhstan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Kirgizstan",
   "Laos": "Laos",
   "Latvia": "Latvia",
   "Lebanon": "Lebanon",
@@ -549,91 +549,91 @@
   "Liberia": "Liberia",
   "Libya": "Libya",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
+  "Lithuania": "Lituania",
+  "Luxembourg": "Luksemburg",
+  "Madagascar": "Madagaskar",
   "Malawi": "Malawi",
   "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Maldives": "Maladewa",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
+  "Marshall Islands": "Kepulauan Marshall",
   "Mauritania": "Mauritania",
   "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Mexico": "Meksiko",
+  "Micronesia": "Mikronesia",
   "Moldova": "Moldova",
-  "Monaco": "Monaco",
+  "Monaco": "Monako",
   "Mongolia": "Mongolia",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
+  "Morocco": "Maroko",
+  "Mozambique": "Mozambik",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
+  "Netherlands": "Belanda",
+  "New Zealand": "Selandia Baru",
+  "Nicaragua": "Nikaragua",
   "Niger": "Niger",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
+  "North Korea": "Korea Utara",
+  "North Macedonia": "Makedonia Utara",
+  "Norway": "Norwegia",
   "Oman": "Oman",
   "Pakistan": "Pakistan",
   "Palau": "Palau",
   "Palestine State": "Palestina",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Papua New Guinea": "Papua Nugini",
   "Paraguay": "Paraguay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Philippines": "Filipina",
+  "Poland": "Polandia",
   "Portugal": "Portugal",
   "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
+  "Romania": "Rumania",
+  "Russia": "Rusia",
   "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Saint Kitts and Nevis": "Saint Kitts dan Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent dan Grenadines",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
+  "Sao Tome and Principe": "Sao Tome dan Principe",
+  "Saudi Arabia": "Arab Saudi",
   "Senegal": "Senegal",
   "Serbia": "Serbia",
   "Seychelles": "Seychelles",
   "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
+  "Singapore": "Singapura",
+  "Slovakia": "Slowakia",
   "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
+  "Solomon Islands": "Kepulauan Solomon",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "South Africa": "Afrika Selatan",
+  "South Korea": "Korea Selatan",
+  "South Sudan": "Sudan Selatan",
+  "Spain": "Spanyol",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
   "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
+  "Sweden": "Swedia",
+  "Switzerland": "Swiss",
+  "Syria": "Suriah",
   "Tajikistan": "Tajikistan",
   "Tanzania": "Tanzania",
   "Thailand": "Thailand",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
+  "Trinidad and Tobago": "Trinidad dan Tobago",
   "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
+  "Turkey": "Turki",
   "Turkmenistan": "Turkmenistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ukraina",
   "United Arab Emirates (UAE)": "Uni Emirat Arab (UEA)",
   "United Kingdom (UK)": "Inggris Raya (UK)",
   "United States (US)": "Amerika Serikat (AS)",
@@ -642,7 +642,7 @@
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
+  "Yemen": "Yaman",
   "Zambia": "Zambia",
   "Zimbabwe": "Zimbabwe",
   "Afghan": "Afganistan",
diff --git a/src/translations/locales/ks.json b/src/translations/locales/ks.json
index 465a6a3..79dc3b6 100644
--- a/src/translations/locales/ks.json
+++ b/src/translations/locales/ks.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "ڈاکٹریٹ / پی ایچ ڈی",
   "کارشناسی / Bachelor’s Degree": "بیچلر ڈگری",
   "کارشناسی ارشد / Master’s Degree": "ماسٹرز ڈگری",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
-  "Palau": "Palau",
-  "Palestine State": "فلسطین",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "متحدہ عرب امارات (UAE)",
-  "United Kingdom (UK)": "برطانیہ (UK)",
-  "United States (US)": "امریکہ (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Afghanistan": "اَفغانَستان",
+  "Albania": "اٮ۪لبانِیا",
+  "Algeria": "اٮ۪لجیرِیا",
+  "Andorra": "اٮ۪نڑورا",
+  "Angola": "اٮ۪نگولا",
+  "Antigua and Barbuda": "اٮ۪نٹِگُوا تہٕ باربوڑا",
+  "Argentina": "اَرجَنٹینا",
+  "Armenia": "اَرمینِیا",
+  "Australia": "آسٹریلِیا",
+  "Austria": "آسٹرِیا",
+  "Azerbaijan": "آزَربایجان",
+  "Bahamas": "باہاماس",
+  "Bahrain": "بحریٖن",
+  "Bangladesh": "بَنگلادیش",
+  "Barbados": "بارباڈوس",
+  "Belarus": "بیلاروس",
+  "Belgium": "بٮ۪لجِیَم",
+  "Belize": "بٮ۪لیٖز",
+  "Benin": "بِنِن",
+  "Bhutan": "بوٗٹان",
+  "Bolivia": "بولِوِیا",
+  "Bosnia and Herzegovina": "بوسنِیا تہٕ ہَرزِگووِنا",
+  "Botswana": "بوتسوانا",
+  "Brazil": "برازیٖل",
+  "Brunei": "برٛوٗنٔے",
+  "Bulgaria": "بلغارِیا",
+  "Burkina Faso": "برکِنا فاسو",
+  "Burundi": "برونڈی",
+  "Cabo Verde": "کیپ ورڈے",
+  "Cambodia": "کمبوڈِیا",
+  "Cameroon": "کیمرون",
+  "Canada": "کینیڈا",
+  "Central African Republic": "مرکٔزی اَفریٖقی رِپبلِک",
+  "Chad": "چاڈ",
+  "Chile": "چلی",
+  "China": "چیٖن",
+  "Colombia": "کولَمبِیا",
+  "Comoros": "کوموروس",
+  "Congo": "کانگو",
+  "Costa Rica": "کوسٹا ریکا",
+  "Croatia": "کروشِیا",
+  "Cuba": "کیوٗبا",
+  "Cyprus": "سائپرَس",
+  "Czechia": "چیکِیا",
+  "Democratic Republic of the Congo": "ڈیموکریٹِک رِپبلِک آف دی کانگو",
+  "Denmark": "ڈینمارک",
+  "Djibouti": "جِبوٗتی",
+  "Dominica": "ڈومینِکا",
+  "Dominican Republic": "ڈومینِکَن رِپبلِک",
+  "Ecuador": "اِکواڈور",
+  "Egypt": "مِصٕر",
+  "El Salvador": "اٮ۪ل سَلواڈور",
+  "Equatorial Guinea": "اِکوٕٹورِیَل گِنی",
+  "Eritrea": "اِرِٹرِیا",
+  "Estonia": "اٮ۪سٹونِیا",
+  "Eswatini": "اِسواتھِنی",
+  "Ethiopia": "اِتھوپِیا",
+  "Fiji": "فِجی",
+  "Finland": "فِنلینٛڈ",
+  "France": "فرٛانس",
+  "Gabon": "گیبَن",
+  "Gambia": "گیمبِیا",
+  "Georgia": "جورجِیا",
+  "Germany": "جَرمَنی",
+  "Ghana": "گھانا",
+  "Greece": "یونان",
+  "Grenada": "گرٛینیڈا",
+  "Guatemala": "گواتیمالا",
+  "Guinea": "گِنی",
+  "Guinea-Bissau": "گِنی-بِساؤ",
+  "Guyana": "گُیانا",
+  "Haiti": "ہَیتی",
+  "Holy See": "ہولی سی",
+  "Honduras": "ہونڈُراس",
+  "Hungary": "ہَنٛگری",
+  "Iceland": "آئس لینڈ",
+  "India": "ہِندوستان",
+  "Indonesia": "اِنٛڈونیشِیا",
+  "Iran": "اِیٖران",
+  "Iraq": "عِراق",
+  "Ireland": "آئرلینٛڑ",
+  "Italy": "اِٹلی",
+  "Ivory Coast": "کوڈ ڈی آئیوری",
+  "Jamaica": "جَمایکا",
+  "Japan": "جاپان",
+  "Jordan": "جارڈَن",
+  "Kazakhstan": "کَزاکِستان",
+  "Kenya": "کینیا",
+  "Kiribati": "کِرباتی",
+  "Kuwait": "کُویت",
+  "Kyrgyzstan": "کِرگِستان",
+  "Laos": "لاوس",
+  "Latvia": "لَٹوِیا",
+  "Lebanon": "لؠبنان",
+  "Lesotho": "لیسوتھو",
+  "Liberia": "لائبیرِیا",
+  "Libya": "لیبِیا",
+  "Liechtenstein": "لِکٹنسٹَین",
+  "Lithuania": "لِتھُوانِیا",
+  "Luxembourg": "لَکسمبرٕگ",
+  "Madagascar": "مَڈاگاسکَر",
+  "Malawi": "مَلاوی",
+  "Malaysia": "مَلیشِیا",
+  "Maldives": "مالدیٖو",
+  "Mali": "مالی",
+  "Malta": "مالٹا",
+  "Marshall Islands": "مارشَل جٔزیٖرٕ",
+  "Mauritania": "موریطانِیا",
+  "Mauritius": "ماریٖشَس",
+  "Mexico": "مؠکسِکو",
+  "Micronesia": "مائیکرونیشِیا",
+  "Moldova": "مولدووا",
+  "Monaco": "موناکو",
+  "Mongolia": "مَنگولِیا",
+  "Montenegro": "مونٹینیگرو",
+  "Morocco": "مَراکَش",
+  "Mozambique": "موزمبیٖق",
+  "Myanmar": "میانمار",
+  "Namibia": "نامیبِیا",
+  "Nauru": "ناورو",
+  "Nepal": "نیپال",
+  "Netherlands": "نیدَرلینٛڈ",
+  "New Zealand": "نِو زیٖلینٛڈ",
+  "Nicaragua": "نِکاراگوا",
+  "Niger": "نائجَر",
+  "Nigeria": "نائجیرِیا",
+  "North Korea": "شُمٲلی کورِیا",
+  "North Macedonia": "شُمٲلی مؠسَڈونیٛا",
+  "Norway": "ناروے",
+  "Oman": "عُمان",
+  "Pakistan": "پاکِستان",
+  "Palau": "پَلاو",
+  "Palestine State": "فَلَستیٖن",
+  "Panama": "پَناما",
+  "Papua New Guinea": "پاپُوا نِیو گیٖنی",
+  "Paraguay": "پَراگُوَے",
+  "Peru": "پیٖروٗ",
+  "Philippines": "فِلِپِینس",
+  "Poland": "پولینڈ",
+  "Portugal": "پُرتَگال",
+  "Qatar": "قَطَر",
+  "Romania": "رومانِیا",
+  "Russia": "روٗس",
+  "Rwanda": "روانٛڈا",
+  "Saint Kitts and Nevis": "سینٛٹ کِٹس تہٕ نیوِس",
+  "Saint Lucia": "سینٛٹ لوٗسِیا",
+  "Saint Vincent and the Grenadines": "سینٛٹ وینسٮ۪نٛٹ تہٕ دی گرٛیناڈینٛز",
+  "Samoa": "ساموا",
+  "San Marino": "سین مَرینو",
+  "Sao Tome and Principe": "ساؤ ٹوم تہٕ پرنسِپی",
+  "Saudi Arabia": "سودی عرب",
+  "Senegal": "سینیگَل",
+  "Serbia": "سَربِیا",
+  "Seychelles": "سیشِلِس",
+  "Sierra Leone": "سیٖرا لیوون",
+  "Singapore": "سِنگاپوٗر",
+  "Slovakia": "سلوواکِیا",
+  "Slovenia": "سلووینِیا",
+  "Solomon Islands": "سولامان جٔزیٖرٕ",
+  "Somalia": "سومالِیا",
+  "South Africa": "جَنوٗبی اَفریٖکا",
+  "South Korea": "جَنوٗبی کورِیا",
+  "South Sudan": "جَنوٗبی سوٗڈان",
+  "Spain": "سپین",
+  "Sri Lanka": "سری لَنکا",
+  "Sudan": "سوٗڈان",
+  "Suriname": "سُریٖنام",
+  "Sweden": "سویٖڈَن",
+  "Switzerland": "سُوِزَرلینٛڑ",
+  "Syria": "سیٖرِیا",
+  "Tajikistan": "تاجکِستان",
+  "Tanzania": "تَنزانِیا",
+  "Thailand": "تھایِلینٛڑ",
+  "Timor-Leste": "تیمور لیسْتے",
+  "Togo": "ٹوگو",
+  "Tonga": "ٹونٛگا",
+  "Trinidad and Tobago": "ٹرِنہِداد تہٕ ٹوبیگو",
+  "Tunisia": "تیوٗنِشِیا",
+  "Turkey": "تُرکی",
+  "Turkmenistan": "تُرکمانِستان",
+  "Tuvalu": "تُوالوٗ",
+  "Uganda": "یوٗگانٛڈا",
+  "Ukraine": "یوٗکریٖن",
+  "United Arab Emirates (UAE)": "مُتحدہ عرب امارات (یوٗ اے ای)",
+  "United Kingdom (UK)": "یونایٹِڑ کِنٛگڈَم (یوٗ کے)",
+  "United States (US)": "یوٗنایٹِڑ سِٹیٹٛس (یوٗ ایس)",
+  "Uruguay": "یُرگُوَے",
+  "Uzbekistan": "اُزبیکِستان",
+  "Vanuatu": "وانوٗواتوٗ",
+  "Venezuela": "وینیزوٗلا",
+  "Vietnam": "ویَتنام",
+  "Yemen": "یَمَن",
+  "Zambia": "زیمبِیا",
+  "Zimbabwe": "زِمبابوے",
   "Afghan": "افغان",
   "Albanian": "البانی",
   "Algerian": "الجزائری",
diff --git a/src/translations/locales/pt.json b/src/translations/locales/pt.json
index 20e559e..5abf4d5 100644
--- a/src/translations/locales/pt.json
+++ b/src/translations/locales/pt.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "Doutorado / PhD",
   "کارشناسی / Bachelor’s Degree": "Graduação / Bacharelado",
   "کارشناسی ارشد / Master’s Degree": "Mestrado",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Afghanistan": "Afeganistão",
+  "Albania": "Albânia",
+  "Algeria": "Argélia",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antígua e Barbuda",
   "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Armenia": "Armênia",
+  "Australia": "Austrália",
+  "Austria": "Áustria",
+  "Azerbaijan": "Azerbaijão",
   "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
+  "Bahrain": "Bahrein",
   "Bangladesh": "Bangladesh",
   "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belarus": "Bielorrússia",
+  "Belgium": "Bélgica",
   "Belize": "Belize",
   "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Bhutan": "Butão",
+  "Bolivia": "Bolívia",
+  "Bosnia and Herzegovina": "Bósnia e Herzegovina",
+  "Botswana": "Botsuana",
+  "Brazil": "Brasil",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgária",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
   "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
+  "Cambodia": "Camboja",
+  "Cameroon": "Camarões",
+  "Canada": "Canadá",
+  "Central African Republic": "República Centro-Africana",
+  "Chad": "Chade",
   "Chile": "Chile",
   "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
+  "Colombia": "Colômbia",
+  "Comoros": "Comores",
   "Congo": "Congo",
   "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
+  "Croatia": "Croácia",
   "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
+  "Cyprus": "Chipre",
+  "Czechia": "Tchéquia",
+  "Democratic Republic of the Congo": "República Democrática do Congo",
+  "Denmark": "Dinamarca",
+  "Djibouti": "Djibuti",
   "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Dominican Republic": "República Dominicana",
+  "Ecuador": "Equador",
+  "Egypt": "Egito",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
+  "Equatorial Guinea": "Guiné Equatorial",
+  "Eritrea": "Eritreia",
+  "Estonia": "Estônia",
   "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Ethiopia": "Etiópia",
   "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
+  "Finland": "Finlândia",
+  "France": "França",
+  "Gabon": "Gabão",
+  "Gambia": "Gâmbia",
+  "Georgia": "Geórgia",
+  "Germany": "Alemanha",
+  "Ghana": "Gana",
+  "Greece": "Grécia",
+  "Grenada": "Granada",
   "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
+  "Guinea": "Guiné",
+  "Guinea-Bissau": "Guiné-Bissau",
+  "Guyana": "Guiana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Santa Sé",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
+  "Hungary": "Hungria",
+  "Iceland": "Islândia",
+  "India": "Índia",
+  "Indonesia": "Indonésia",
+  "Iran": "Irã",
+  "Iraq": "Iraque",
+  "Ireland": "Irlanda",
+  "Italy": "Itália",
+  "Ivory Coast": "Costa do Marfim",
   "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
+  "Japan": "Japão",
+  "Jordan": "Jordânia",
+  "Kazakhstan": "Cazaquistão",
+  "Kenya": "Quênia",
+  "Kiribati": "Quiribati",
   "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kyrgyzstan": "Quirguistão",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
+  "Latvia": "Letônia",
+  "Lebanon": "Líbano",
+  "Lesotho": "Lesoto",
+  "Liberia": "Libéria",
+  "Libya": "Líbia",
   "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
+  "Lithuania": "Lituânia",
+  "Luxembourg": "Luxemburgo",
   "Madagascar": "Madagascar",
   "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Malaysia": "Malásia",
+  "Maldives": "Maldivas",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
+  "Marshall Islands": "Ilhas Marshall",
+  "Mauritania": "Mauritânia",
+  "Mauritius": "Maurício",
+  "Mexico": "México",
+  "Micronesia": "Micronésia",
+  "Moldova": "Moldávia",
+  "Monaco": "Mônaco",
+  "Mongolia": "Mongólia",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
+  "Morocco": "Marrocos",
+  "Mozambique": "Moçambique",
+  "Myanmar": "Mianmar",
+  "Namibia": "Namíbia",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
+  "Netherlands": "Países Baixos",
+  "New Zealand": "Nova Zelândia",
+  "Nicaragua": "Nicarágua",
+  "Niger": "Níger",
+  "Nigeria": "Nigéria",
+  "North Korea": "Coreia do Norte",
+  "North Macedonia": "Macedônia do Norte",
+  "Norway": "Noruega",
+  "Oman": "Omã",
+  "Pakistan": "Paquistão",
   "Palau": "Palau",
-  "Palestine State": "Palestina",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
+  "Palestine State": "Estado da Palestina",
+  "Panama": "Panamá",
+  "Papua New Guinea": "Papua-Nova Guiné",
+  "Paraguay": "Paraguai",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
+  "Philippines": "Filipinas",
+  "Poland": "Polônia",
   "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Qatar": "Catar",
+  "Romania": "Romênia",
+  "Russia": "Rússia",
+  "Rwanda": "Ruanda",
+  "Saint Kitts and Nevis": "São Cristóvão e Neves",
+  "Saint Lucia": "Santa Lúcia",
+  "Saint Vincent and the Grenadines": "São Vicente e Granadinas",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
+  "Sao Tome and Principe": "São Tomé e Príncipe",
+  "Saudi Arabia": "Arábia Saudita",
   "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "Serbia": "Sérvia",
+  "Seychelles": "Seicheles",
+  "Sierra Leone": "Serra Leoa",
+  "Singapore": "Singapura",
+  "Slovakia": "Eslováquia",
+  "Slovenia": "Eslovênia",
+  "Solomon Islands": "Ilhas Salomão",
+  "Somalia": "Somália",
+  "South Africa": "África do Sul",
+  "South Korea": "Coreia do Sul",
+  "South Sudan": "Sudão do Sul",
+  "Spain": "Espanha",
   "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
+  "Sudan": "Sudão",
   "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
+  "Sweden": "Suécia",
+  "Switzerland": "Suíça",
+  "Syria": "Síria",
+  "Tajikistan": "Tajiquistão",
+  "Tanzania": "Tanzânia",
+  "Thailand": "Tailândia",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinidad e Tobago",
+  "Tunisia": "Tunísia",
+  "Turkey": "Turquia",
+  "Turkmenistan": "Turcomenistão",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ucrânia",
   "United Arab Emirates (UAE)": "Emirados Árabes Unidos (EAU)",
-  "United Kingdom (UK)": "Reino Unido (UK)",
+  "United Kingdom (UK)": "Reino Unido (RU)",
   "United States (US)": "Estados Unidos (EUA)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uruguay": "Uruguai",
+  "Uzbekistan": "Uzbequistão",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Vietnam": "Vietnã",
+  "Yemen": "Iêmen",
+  "Zambia": "Zâmbia",
+  "Zimbabwe": "Zimbábue",
   "Afghan": "Afegão(ã)",
   "Albanian": "Albanês(esa)",
   "Algerian": "Argelino(a)",
diff --git a/src/translations/locales/ru.json b/src/translations/locales/ru.json
index 2891fd0..a802ff8 100644
--- a/src/translations/locales/ru.json
+++ b/src/translations/locales/ru.json
@@ -900,186 +900,186 @@
   "Doctorate / PhD": "Докторантура / PhD",
   "کارشناسی / Bachelor’s Degree": "Bachelor’s Degree",
   "کارشناسی ارشد / Master’s Degree": "Master’s Degree",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Oman": "Oman",
-  "Palau": "Palau",
+  "Albania": "Албания",
+  "Algeria": "Алжир",
+  "Andorra": "Андорра",
+  "Angola": "Ангола",
+  "Antigua and Barbuda": "Антигуа и Барбуда",
+  "Argentina": "Аргентина",
+  "Armenia": "Армения",
+  "Austria": "Австрия",
+  "Azerbaijan": "Азербайджан",
+  "Bahamas": "Багамы",
+  "Bahrain": "Бахрейн",
+  "Bangladesh": "Бангладеш",
+  "Barbados": "Барбадос",
+  "Belarus": "Беларусь",
+  "Belgium": "Бельгия",
+  "Belize": "Белиз",
+  "Benin": "Бенин",
+  "Bhutan": "Бутан",
+  "Bolivia": "Боливия",
+  "Bosnia and Herzegovina": "Босния и Герцеговина",
+  "Botswana": "Ботсвана",
+  "Brazil": "Бразилия",
+  "Brunei": "Бруней",
+  "Bulgaria": "Болгария",
+  "Burkina Faso": "Буркина-Фасо",
+  "Burundi": "Бурунди",
+  "Cabo Verde": "Кабо-Верде",
+  "Cambodia": "Камбоджа",
+  "Cameroon": "Камерун",
+  "Central African Republic": "Центральноафриканская Республика",
+  "Chad": "Чад",
+  "Chile": "Чили",
+  "China": "Китай",
+  "Colombia": "Колумбия",
+  "Comoros": "Коморы",
+  "Congo": "Конго",
+  "Costa Rica": "Коста-Рика",
+  "Croatia": "Хорватия",
+  "Cuba": "Куба",
+  "Cyprus": "Кипр",
+  "Czechia": "Чехия",
+  "Democratic Republic of the Congo": "Демократическая Республика Конго",
+  "Denmark": "Дания",
+  "Djibouti": "Джибути",
+  "Dominica": "Доминика",
+  "Dominican Republic": "Доминиканская Республика",
+  "Ecuador": "Эквадор",
+  "Egypt": "Египет",
+  "El Salvador": "Сальвадор",
+  "Equatorial Guinea": "Экваториальная Гвинея",
+  "Eritrea": "Эритрея",
+  "Estonia": "Эстония",
+  "Eswatini": "Эсватини",
+  "Ethiopia": "Эфиопия",
+  "Fiji": "Фиджи",
+  "Finland": "Финляндия",
+  "Gabon": "Габон",
+  "Gambia": "Гамбия",
+  "Georgia": "Грузия",
+  "Ghana": "Гана",
+  "Greece": "Греция",
+  "Grenada": "Гренада",
+  "Guatemala": "Гватемала",
+  "Guinea": "Гвинея",
+  "Guinea-Bissau": "Гвинея-Бисау",
+  "Guyana": "Гайана",
+  "Haiti": "Гаити",
+  "Holy See": "Ватикан",
+  "Honduras": "Гондурас",
+  "Hungary": "Венгрия",
+  "Iceland": "Исландия",
+  "India": "Индия",
+  "Indonesia": "Индонезия",
+  "Ireland": "Ирландия",
+  "Italy": "Италия",
+  "Ivory Coast": "Кот-д'Ивуар",
+  "Jamaica": "Ямайка",
+  "Japan": "Япония",
+  "Jordan": "Иордания",
+  "Kazakhstan": "Казахстан",
+  "Kenya": "Кения",
+  "Kiribati": "Кирибати",
+  "Kuwait": "Кувейт",
+  "Kyrgyzstan": "Кыргызстан",
+  "Laos": "Лаос",
+  "Latvia": "Латвия",
+  "Lebanon": "Ливан",
+  "Lesotho": "Лесото",
+  "Liberia": "Либерия",
+  "Libya": "Ливия",
+  "Liechtenstein": "Лихтенштейн",
+  "Lithuania": "Литва",
+  "Luxembourg": "Люксембург",
+  "Madagascar": "Мадагаскар",
+  "Malawi": "Малави",
+  "Malaysia": "Малайзия",
+  "Maldives": "Мальдивы",
+  "Mali": "Мали",
+  "Malta": "Мальта",
+  "Marshall Islands": "Маршалловы Острова",
+  "Mauritania": "Мавритания",
+  "Mauritius": "Маврикий",
+  "Mexico": "Мексика",
+  "Micronesia": "Микронезия",
+  "Moldova": "Молдова",
+  "Monaco": "Монако",
+  "Mongolia": "Монголия",
+  "Montenegro": "Черногория",
+  "Morocco": "Марокко",
+  "Mozambique": "Мозамбик",
+  "Myanmar": "Мьянма",
+  "Namibia": "Намибия",
+  "Nauru": "Науру",
+  "Nepal": "Непал",
+  "New Zealand": "Новая Зеландия",
+  "Nicaragua": "Никарагуа",
+  "Niger": "Нигер",
+  "Nigeria": "Нигерия",
+  "North Korea": "Северная Корея",
+  "North Macedonia": "Северная Македония",
+  "Oman": "Оман",
+  "Palau": "Палау",
   "Palestine State": "Государство Палестина",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Panama": "Панама",
+  "Papua New Guinea": "Папуа — Новая Гвинея",
+  "Paraguay": "Парагвай",
+  "Peru": "Перу",
+  "Philippines": "Филиппины",
+  "Poland": "Польша",
+  "Portugal": "Португалия",
+  "Romania": "Румыния",
+  "Russia": "Россия",
+  "Rwanda": "Руанда",
+  "Saint Kitts and Nevis": "Сент-Китс и Невис",
+  "Saint Lucia": "Сент-Люсия",
+  "Saint Vincent and the Grenadines": "Сент-Винсент и Гренадины",
+  "Samoa": "Самоа",
+  "San Marino": "Сан-Марино",
+  "Sao Tome and Principe": "Сан-Томе и Принсипи",
+  "Senegal": "Сенегал",
+  "Serbia": "Сербия",
+  "Seychelles": "Сейшельские Острова",
+  "Sierra Leone": "Сьерра-Леоне",
+  "Singapore": "Сингапур",
+  "Slovakia": "Словакия",
+  "Slovenia": "Словения",
+  "Solomon Islands": "Соломоновы Острова",
+  "Somalia": "Сомали",
+  "South Africa": "Южно-Африканская Республика",
+  "South Korea": "Южная Корея",
+  "South Sudan": "Южный Судан",
+  "Spain": "Испания",
+  "Sri Lanka": "Шри-Ланка",
+  "Sudan": "Судан",
+  "Suriname": "Суринам",
+  "Switzerland": "Швейцария",
+  "Syria": "Сирия",
+  "Tajikistan": "Таджикистан",
+  "Tanzania": "Танзания",
+  "Thailand": "Таиланд",
+  "Timor-Leste": "Восточный Тимор",
+  "Togo": "Того",
+  "Tonga": "Тонга",
+  "Trinidad and Tobago": "Тринидад и Тобаго",
+  "Tunisia": "Тунис",
+  "Turkmenistan": "Туркменистан",
+  "Tuvalu": "Тувалу",
+  "Uganda": "Уганда",
+  "Ukraine": "Украина",
   "United Arab Emirates (UAE)": "Объединенные Арабские Эмираты (ОАЭ)",
   "United Kingdom (UK)": "Великобритания (UK)",
-  "United States (US)": "Соединенные Штаты Америки (США)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "United States (US)": "Соединенные Штаты (США)",
+  "Uruguay": "Уругвай",
+  "Uzbekistan": "Узбекистан",
+  "Vanuatu": "Вануату",
+  "Venezuela": "Венесуэла",
+  "Vietnam": "Вьетнам",
+  "Yemen": "Йемен",
+  "Zambia": "Замбия",
+  "Zimbabwe": "Зимбабве",
   "Afghan": "Афганец / Афганка",
   "Albanian": "Албанец / Албанка",
   "Algerian": "Алжирец / Алжирка",
diff --git a/src/translations/locales/sw.json b/src/translations/locales/sw.json
index 407fd66..8d7e605 100644
--- a/src/translations/locales/sw.json
+++ b/src/translations/locales/sw.json
@@ -451,198 +451,198 @@
   "Doctorate / PhD": "Shahada ya Uzamivu / PhD",
   "کارشناسی / Bachelor’s Degree": "Shahada ya Kwanza (Bachelor's)",
   "کارشناسی ارشد / Master’s Degree": "Shahada ya Uzamili (Master's)",
-  "Afghanistan": "Afghanistan",
+  "Afghanistan": "Afuganistani",
   "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Algeria": "Aljeria",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
+  "Antigua and Barbuda": "Antigua na Barbuda",
+  "Argentina": "Ajentina",
   "Armenia": "Armenia",
   "Australia": "Australia",
   "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
+  "Azerbaijan": "Azabajani",
   "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
+  "Bahrain": "Bahareni",
+  "Bangladesh": "Bangladeshi",
   "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belarus": "Belarusi",
+  "Belgium": "Ubelgiji",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
   "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bosnia and Herzegovina": "Bosnia na Hezegovina",
   "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Brazil": "Brazili",
   "Brunei": "Brunei",
   "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
+  "Burkina Faso": "Bukinafaso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
+  "Cabo Verde": "Kepuvede",
+  "Cambodia": "Kamboja",
+  "Cameroon": "Kameruni",
+  "Canada": "Kanada",
+  "Central African Republic": "Jamhuri ya Afrika ya Kati",
+  "Chad": "Chadi",
   "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "China": "Uchina",
+  "Colombia": "Kolombia",
+  "Comoros": "Komoro",
+  "Congo": "Kongo",
+  "Costa Rica": "Kosta Rika",
+  "Croatia": "Kroasia",
+  "Cuba": "Kuba",
+  "Cyprus": "Saiprasi",
+  "Czechia": "Cheki",
+  "Democratic Republic of the Congo": "Jamhuri ya Kidemokrasia ya Kongo",
+  "Denmark": "Denmaki",
+  "Djibouti": "Jibuti",
+  "Dominica": "Dominika",
+  "Dominican Republic": "Jamhuri ya Dominika",
+  "Ecuador": "Ekwado",
+  "Egypt": "Misri",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
+  "Equatorial Guinea": "Ginekweta",
   "Eritrea": "Eritrea",
   "Estonia": "Estonia",
   "Eswatini": "Eswatini",
   "Ethiopia": "Ethiopia",
   "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
+  "Finland": "Ufini",
+  "France": "Ufaransa",
   "Gabon": "Gabon",
   "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
+  "Georgia": "Jojia",
+  "Germany": "Ujerumani",
   "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Greece": "Ugiriki",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
+  "Guinea": "Gine",
+  "Guinea-Bissau": "Ginebisau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Mji wa Vatikani",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
+  "Hungary": "Hungaria",
+  "Iceland": "Aislandi",
   "India": "India",
   "Indonesia": "Indonesia",
   "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
+  "Iraq": "Iraki",
+  "Ireland": "Ayalandi",
+  "Italy": "Italia",
+  "Ivory Coast": "Côte d'Ivoire",
+  "Jamaica": "Jamaika",
+  "Japan": "Japani",
+  "Jordan": "Yordani",
+  "Kazakhstan": "Kazakistani",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
+  "Kuwait": "Kuwaiti",
+  "Kyrgyzstan": "Kirigizistani",
+  "Laos": "Laosi",
+  "Latvia": "Lativia",
+  "Lebanon": "Lebanoni",
+  "Lesotho": "Lesoto",
   "Liberia": "Liberia",
   "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
+  "Liechtenstein": "Lishenteni",
+  "Lithuania": "Lituanya",
+  "Luxembourg": "Lasembagi",
+  "Madagascar": "Madagaska",
   "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Malaysia": "Malesia",
+  "Maldives": "Maldivi",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Marshall Islands": "Visiwa vya Marshall",
+  "Mauritania": "Moritania",
+  "Mauritius": "Morisi",
+  "Mexico": "Meksiko",
+  "Micronesia": "Mikronesia",
   "Moldova": "Moldova",
-  "Monaco": "Monaco",
+  "Monaco": "Monako",
   "Mongolia": "Mongolia",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
+  "Morocco": "Moroko",
+  "Mozambique": "Msumbiji",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
   "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
+  "Nepal": "Nepali",
+  "Netherlands": "Uholanzi",
+  "New Zealand": "Nyuzilandi",
+  "Nicaragua": "Nikaragwa",
+  "Niger": "Nijeri",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
+  "North Korea": "Korea Kaskazini",
+  "North Macedonia": "Masedonia Kaskazini",
+  "Norway": "Norwe",
+  "Oman": "Omani",
+  "Pakistan": "Pakistani",
   "Palau": "Palau",
   "Palestine State": "Palestina",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
+  "Papua New Guinea": "Papua Guinea Mpya",
+  "Paraguay": "Paragwai",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
+  "Philippines": "Ufilipino",
+  "Poland": "Polandi",
+  "Portugal": "Ureno",
+  "Qatar": "Katari",
   "Romania": "Romania",
-  "Russia": "Russia",
+  "Russia": "Urusi",
   "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Saint Kitts and Nevis": "Saint Kitts na Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent na Grenadines",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
-  "Senegal": "Senegal",
+  "Sao Tome and Principe": "Sao Tome na Prinsipe",
+  "Saudi Arabia": "Saudia",
+  "Senegal": "Senegali",
   "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
+  "Seychelles": "Shelisheli",
+  "Sierra Leone": "Siera Leoni",
+  "Singapore": "Singapoo",
   "Slovakia": "Slovakia",
   "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
+  "Solomon Islands": "Visiwa vya Solomon",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "South Africa": "Afrika Kusini",
+  "South Korea": "Korea Kusini",
+  "South Sudan": "Sudan Kusini",
+  "Spain": "Hispania",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
   "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
+  "Sweden": "Uswidi",
+  "Switzerland": "Uswisi",
   "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
+  "Tajikistan": "Tajikistani",
   "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
+  "Thailand": "Tailandi",
+  "Timor-Leste": "Timor ya Mashariki",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
+  "Trinidad and Tobago": "Trinidad na Tobago",
   "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
+  "Turkey": "Uturuki",
+  "Turkmenistan": "Turkmenistani",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ukreni",
   "United Arab Emirates (UAE)": "Falme za Kiarabu (UAE)",
-  "United Kingdom (UK)": "Uingereza (UK)",
+  "United Kingdom (UK)": "Ufalme wa Muungano (UK)",
   "United States (US)": "Marekani (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uruguay": "Urugwai",
+  "Uzbekistan": "Uzbekistani",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
+  "Vietnam": "Vietnamu",
+  "Yemen": "Yemeni",
   "Zambia": "Zambia",
   "Zimbabwe": "Zimbabwe",
   "Afghan": "Mwafghani",
diff --git a/src/translations/locales/tg.json b/src/translations/locales/tg.json
index a57dda8..0d8bbb3 100644
--- a/src/translations/locales/tg.json
+++ b/src/translations/locales/tg.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "Докторантура / PhD",
   "کارشناسی / Bachelor’s Degree": "Дараҷаи бакалавр",
   "کارشناسی ارشد / Master’s Degree": "Дараҷаи магистр",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
-  "Palau": "Palau",
-  "Palestine State": "Фаластин",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Afghanistan": "Афғонистон",
+  "Albania": "Албания",
+  "Algeria": "Алҷазоир",
+  "Andorra": "Андорра",
+  "Angola": "Ангола",
+  "Antigua and Barbuda": "Антигуа ва Барбуда",
+  "Argentina": "Аргентина",
+  "Armenia": "Арманистон",
+  "Australia": "Австралия",
+  "Austria": "Австрия",
+  "Azerbaijan": "Озарбойҷон",
+  "Bahamas": "Баҳама",
+  "Bahrain": "Баҳрайн",
+  "Bangladesh": "Банглодеш",
+  "Barbados": "Барбадос",
+  "Belarus": "Беларус",
+  "Belgium": "Белгия",
+  "Belize": "Белиз",
+  "Benin": "Бенин",
+  "Bhutan": "Бутон",
+  "Bolivia": "Боливия",
+  "Bosnia and Herzegovina": "Босния ва Ҳерсеговина",
+  "Botswana": "Ботсвана",
+  "Brazil": "Бразилия",
+  "Brunei": "Бруней",
+  "Bulgaria": "Булғористон",
+  "Burkina Faso": "Буркина-Фасо",
+  "Burundi": "Бурунди",
+  "Cabo Verde": "Кабо-Верде",
+  "Cambodia": "Камбоҷа",
+  "Cameroon": "Камерун",
+  "Canada": "Канада",
+  "Central African Republic": "Ҷумҳурии Африқои Марказӣ",
+  "Chad": "Чад",
+  "Chile": "Чили",
+  "China": "Чин",
+  "Colombia": "Колумбия",
+  "Comoros": "Комор",
+  "Congo": "Конго",
+  "Costa Rica": "Коста-Рика",
+  "Croatia": "Хорватия",
+  "Cuba": "Куба",
+  "Cyprus": "Кипр",
+  "Czechia": "Чехия",
+  "Democratic Republic of the Congo": "Ҷумҳурии Демократии Конго",
+  "Denmark": "Дания",
+  "Djibouti": "Ҷибути",
+  "Dominica": "Доминика",
+  "Dominican Republic": "Ҷумҳурии Доминикан",
+  "Ecuador": "Эквадор",
+  "Egypt": "Миср",
+  "El Salvador": "Салвадор",
+  "Equatorial Guinea": "Гвинеяи Истивоӣ",
+  "Eritrea": "Эритрея",
+  "Estonia": "Эстония",
+  "Eswatini": "Эсватини",
+  "Ethiopia": "Эфиопия",
+  "Fiji": "Фиҷи",
+  "Finland": "Финляндия",
+  "France": "Фаронса",
+  "Gabon": "Габон",
+  "Gambia": "Гамбия",
+  "Georgia": "Гурҷистон",
+  "Germany": "Олмон",
+  "Ghana": "Гана",
+  "Greece": "Юнон",
+  "Grenada": "Гренада",
+  "Guatemala": "Гватемала",
+  "Guinea": "Гвинея",
+  "Guinea-Bissau": "Гвинея-Бисау",
+  "Guyana": "Гайана",
+  "Haiti": "Гаити",
+  "Holy See": "Ватикан",
+  "Honduras": "Гондурас",
+  "Hungary": "Маҷористон",
+  "Iceland": "Исландия",
+  "India": "Ҳиндустон",
+  "Indonesia": "Индонезия",
+  "Iran": "Эрон",
+  "Iraq": "Ироқ",
+  "Ireland": "Ирландия",
+  "Italy": "Италия",
+  "Ivory Coast": "Кот-д'Ивуар",
+  "Jamaica": "Ямайка",
+  "Japan": "Ҷопон",
+  "Jordan": "Урдун",
+  "Kazakhstan": "Қазоқистон",
+  "Kenya": "Кения",
+  "Kiribati": "Кирибати",
+  "Kuwait": "Кувайт",
+  "Kyrgyzstan": "Қирғизистон",
+  "Laos": "Лаос",
+  "Latvia": "Латвия",
+  "Lebanon": "Лубнон",
+  "Lesotho": "Лесото",
+  "Liberia": "Либерия",
+  "Libya": "Либия",
+  "Liechtenstein": "Лихтенштейн",
+  "Lithuania": "Литва",
+  "Luxembourg": "Люксембург",
+  "Madagascar": "Мадагаскар",
+  "Malawi": "Малави",
+  "Malaysia": "Малайзия",
+  "Maldives": "Малдив",
+  "Mali": "Мали",
+  "Malta": "Малта",
+  "Marshall Islands": "Ҷазираҳои Маршалл",
+  "Mauritania": "Мавритания",
+  "Mauritius": "Маврикий",
+  "Mexico": "Мексика",
+  "Micronesia": "Микронезия",
+  "Moldova": "Молдова",
+  "Monaco": "Монако",
+  "Mongolia": "Муғулистон",
+  "Montenegro": "Черногория",
+  "Morocco": "Марокаш",
+  "Mozambique": "Мозамбик",
+  "Myanmar": "Мянма",
+  "Namibia": "Намибия",
+  "Nauru": "Науру",
+  "Nepal": "Непал",
+  "Netherlands": "Нидерландия",
+  "New Zealand": "Зеландияи Нав",
+  "Nicaragua": "Никарагуа",
+  "Niger": "Нигер",
+  "Nigeria": "Нигерия",
+  "North Korea": "Кореяи Шимолӣ",
+  "North Macedonia": "Македонияи Шимолӣ",
+  "Norway": "Норвегия",
+  "Oman": "Умон",
+  "Pakistan": "Покистон",
+  "Palau": "Палау",
+  "Palestine State": "Давлати Фаластин",
+  "Panama": "Панама",
+  "Papua New Guinea": "Папуа-Гвинеяи Нав",
+  "Paraguay": "Парагвай",
+  "Peru": "Перу",
+  "Philippines": "Филиппин",
+  "Poland": "Лаҳистон",
+  "Portugal": "Португалия",
+  "Qatar": "Қатар",
+  "Romania": "Руминия",
+  "Russia": "Русия",
+  "Rwanda": "Руанда",
+  "Saint Kitts and Nevis": "Сент-Китс ва Невис",
+  "Saint Lucia": "Сент-Люсия",
+  "Saint Vincent and the Grenadines": "Сент-Винсент ва Гренадинҳо",
+  "Samoa": "Самоа",
+  "San Marino": "Сан-Марино",
+  "Sao Tome and Principe": "Сан-Томе ва Принсипи",
+  "Saudi Arabia": "Арабистони Саудӣ",
+  "Senegal": "Сенегал",
+  "Serbia": "Сербия",
+  "Seychelles": "Ҷазираҳои Сейшел",
+  "Sierra Leone": "Сиерра-Леоне",
+  "Singapore": "Сингапур",
+  "Slovakia": "Словакия",
+  "Slovenia": "Словения",
+  "Solomon Islands": "Ҷазираҳои Соломон",
+  "Somalia": "Сомалӣ",
+  "South Africa": "Африқои Ҷанубӣ",
+  "South Korea": "Кореяи Ҷанубӣ",
+  "South Sudan": "Судони Ҷанубӣ",
+  "Spain": "Испания",
+  "Sri Lanka": "Шри-Ланка",
+  "Sudan": "Судон",
+  "Suriname": "Суринам",
+  "Sweden": "Шветсия",
+  "Switzerland": "Швейтсария",
+  "Syria": "Сурия",
+  "Tajikistan": "Тоҷикистон",
+  "Tanzania": "Танзания",
+  "Thailand": "Таиланд",
+  "Timor-Leste": "Тимор-Лесте",
+  "Togo": "Того",
+  "Tonga": "Тонга",
+  "Trinidad and Tobago": "Тринидад ва Тобаго",
+  "Tunisia": "Тунис",
+  "Turkey": "Туркия",
+  "Turkmenistan": "Туркманистон",
+  "Tuvalu": "Тувалу",
+  "Uganda": "Уганда",
+  "Ukraine": "Украина",
   "United Arab Emirates (UAE)": "Амороти Муттаҳидаи Араб (АМА)",
-  "United Kingdom (UK)": "Бритониё (UK)",
+  "United Kingdom (UK)": "Британияи Кабир (Шоҳигарии Муттаҳида)",
   "United States (US)": "Иёлоти Муттаҳидаи Амрико (ИМА)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Uruguay": "Уругвай",
+  "Uzbekistan": "Ӯзбекистон",
+  "Vanuatu": "Вануату",
+  "Venezuela": "Венесуэла",
+  "Vietnam": "Ветнам",
+  "Yemen": "Яман",
+  "Zambia": "Замбия",
+  "Zimbabwe": "Зимбабве",
   "Afghan": "Афғон",
   "Albanian": "Албанӣ",
   "Algerian": "Алҷазоирӣ",
diff --git a/src/translations/locales/tr.json b/src/translations/locales/tr.json
index e09021f..825e497 100644
--- a/src/translations/locales/tr.json
+++ b/src/translations/locales/tr.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "Doktora / PhD",
   "کارشناسی / Bachelor’s Degree": "Lisans Derecesi",
   "کارشناسی ارشد / Master’s Degree": "Yüksek Lisans Derecesi",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Afghanistan": "Afganistan",
+  "Albania": "Arnavutluk",
+  "Algeria": "Cezayir",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
+  "Antigua and Barbuda": "Antigua ve Barbuda",
+  "Argentina": "Arjantin",
+  "Armenia": "Ermenistan",
+  "Australia": "Avustralya",
+  "Austria": "Avusturya",
+  "Azerbaijan": "Azerbaycan",
+  "Bahamas": "Bahamalar",
+  "Bahrain": "Bahreyn",
+  "Bangladesh": "Bangladeş",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
+  "Belgium": "Belçika",
   "Belize": "Belize",
   "Benin": "Benin",
   "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
+  "Bolivia": "Bolivya",
+  "Bosnia and Herzegovina": "Bosna-Hersek",
+  "Botswana": "Botsvana",
+  "Brazil": "Brezilya",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgaristan",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
   "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Cambodia": "Kamboçya",
+  "Cameroon": "Kamerun",
+  "Canada": "Kanada",
+  "Central African Republic": "Orta Afrika Cumhuriyeti",
+  "Chad": "Çad",
+  "Chile": "Şili",
+  "China": "Çin",
+  "Colombia": "Kolombiya",
+  "Comoros": "Komorlar",
+  "Congo": "Kongo",
+  "Costa Rica": "Kosta Rika",
+  "Croatia": "Hırvatistan",
+  "Cuba": "Küba",
+  "Cyprus": "Kıbrıs",
+  "Czechia": "Çekya",
+  "Democratic Republic of the Congo": "Kongo Demokratik Cumhuriyeti",
+  "Denmark": "Danimarka",
+  "Djibouti": "Cibuti",
+  "Dominica": "Dominika",
+  "Dominican Republic": "Dominik Cumhuriyeti",
+  "Ecuador": "Ekvador",
+  "Egypt": "Mısır",
   "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Equatorial Guinea": "Ekvator Ginesi",
+  "Eritrea": "Eritre",
+  "Estonia": "Estonya",
+  "Eswatini": "Esvatini",
+  "Ethiopia": "Etiyopya",
   "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
+  "Finland": "Finlandiya",
+  "France": "Fransa",
   "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Gambia": "Gambiya",
+  "Georgia": "Gürcistan",
+  "Germany": "Almanya",
+  "Ghana": "Gana",
+  "Greece": "Yunanistan",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
+  "Guinea": "Gine",
+  "Guinea-Bissau": "Gine-Bissau",
   "Guyana": "Guyana",
   "Haiti": "Haiti",
-  "Holy See": "Holy See",
+  "Holy See": "Vatikan",
   "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
+  "Hungary": "Macaristan",
+  "Iceland": "İzlanda",
+  "India": "Hindistan",
+  "Indonesia": "Endonezya",
+  "Iran": "İran",
+  "Iraq": "Irak",
+  "Ireland": "İrlanda",
+  "Italy": "İtalya",
+  "Ivory Coast": "Fildişi Sahili",
+  "Jamaica": "Jamaika",
+  "Japan": "Japonya",
+  "Jordan": "Ürdün",
+  "Kazakhstan": "Kazakistan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kuwait": "Kuveyt",
+  "Kyrgyzstan": "Kırgızistan",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
+  "Latvia": "Letonya",
+  "Lebanon": "Lübnan",
   "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
+  "Liberia": "Liberya",
   "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Liechtenstein": "Lihtenştayn",
+  "Lithuania": "Litvanya",
+  "Luxembourg": "Lüksemburg",
+  "Madagascar": "Madagaskar",
+  "Malawi": "Malavi",
+  "Malaysia": "Malezya",
+  "Maldives": "Maldivler",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
+  "Marshall Islands": "Marshall Adaları",
+  "Mauritania": "Moritanya",
   "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Mexico": "Meksika",
+  "Micronesia": "Mikronezya",
   "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
+  "Monaco": "Monako",
+  "Mongolia": "Moğolistan",
+  "Montenegro": "Karadağ",
+  "Morocco": "Fas",
+  "Mozambique": "Mozambik",
   "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
+  "Namibia": "Namibya",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
+  "Netherlands": "Hollanda",
+  "New Zealand": "Yeni Zelanda",
+  "Nicaragua": "Nikaragua",
+  "Niger": "Nijer",
+  "Nigeria": "Nijerya",
+  "North Korea": "Kuzey Kore",
+  "North Macedonia": "Kuzey Makedonya",
+  "Norway": "Norveç",
+  "Oman": "Umman",
   "Pakistan": "Pakistan",
   "Palau": "Palau",
-  "Palestine State": "Filistin",
+  "Palestine State": "Filistin Devleti",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
+  "Papua New Guinea": "Papua Yeni Gine",
   "Paraguay": "Paraguay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Philippines": "Filipinler",
+  "Poland": "Polonya",
+  "Portugal": "Portekiz",
+  "Qatar": "Katar",
+  "Romania": "Romanya",
+  "Russia": "Rusya",
+  "Rwanda": "Ruanda",
+  "Saint Kitts and Nevis": "Saint Kitts ve Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent ve Grenadinler",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
+  "Sao Tome and Principe": "Sao Tome ve Principe",
+  "Saudi Arabia": "Suudi Arabistan",
   "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
+  "Serbia": "Sırbistan",
+  "Seychelles": "Seyşeller",
   "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
+  "Singapore": "Singapur",
+  "Slovakia": "Slovakya",
+  "Slovenia": "Slovenya",
+  "Solomon Islands": "Solomon Adaları",
+  "Somalia": "Somali",
+  "South Africa": "Güney Afrika",
+  "South Korea": "Güney Kore",
+  "South Sudan": "Güney Sudan",
+  "Spain": "İspanya",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
+  "Suriname": "Surinam",
+  "Sweden": "İsveç",
+  "Switzerland": "İsviçre",
+  "Syria": "Suriye",
+  "Tajikistan": "Tacikistan",
+  "Tanzania": "Tanzanya",
+  "Thailand": "Tayland",
+  "Timor-Leste": "Doğu Timor",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinidad ve Tobago",
+  "Tunisia": "Tunus",
+  "Turkey": "Türkiye",
+  "Turkmenistan": "Türkmenistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ukrayna",
   "United Arab Emirates (UAE)": "Birleşik Arap Emirlikleri (BAE)",
-  "United Kingdom (UK)": "Birleşik Krallık (İngiltere)",
+  "United Kingdom (UK)": "Birleşik Krallık (BK)",
   "United States (US)": "Amerika Birleşik Devletleri (ABD)",
   "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "Uzbekistan": "Özbekistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
   "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Zambia": "Zambiya",
+  "Zimbabwe": "Zimbabve",
   "Afghan": "Afgan",
   "Albanian": "Arnavut",
   "Algerian": "Cezayirli",
diff --git a/src/translations/locales/ul.json b/src/translations/locales/ul.json
index 03bbf70..1d690bd 100644
--- a/src/translations/locales/ul.json
+++ b/src/translations/locales/ul.json
@@ -456,7 +456,7 @@
   "Algeria": "Algeria",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antigua aur Barbuda",
   "Argentina": "Argentina",
   "Armenia": "Armenia",
   "Australia": "Australia",
@@ -472,36 +472,36 @@
   "Benin": "Benin",
   "Bhutan": "Bhutan",
   "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
+  "Bosnia and Herzegovina": "Bosnia aur Herzegovina",
   "Botswana": "Botswana",
   "Brazil": "Brazil",
   "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
+  "Bulgaria": "Bulgariya",
   "Burkina Faso": "Burkina Faso",
   "Burundi": "Burundi",
   "Cabo Verde": "Cabo Verde",
   "Cambodia": "Cambodia",
   "Cameroon": "Cameroon",
   "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
+  "Central African Republic": "Wasti Afriqi Jamhooriya",
   "Chad": "Chad",
   "Chile": "Chile",
-  "China": "China",
+  "China": "Cheen",
   "Colombia": "Colombia",
   "Comoros": "Comoros",
   "Congo": "Congo",
   "Costa Rica": "Costa Rica",
   "Croatia": "Croatia",
   "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
+  "Cyprus": "Qubrus",
   "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
+  "Democratic Republic of the Congo": "Jamhoori Jamhooriya Congo",
   "Denmark": "Denmark",
   "Djibouti": "Djibouti",
   "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
+  "Dominican Republic": "Dominican Jamhooriya",
   "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
+  "Egypt": "Misr",
   "El Salvador": "El Salvador",
   "Equatorial Guinea": "Equatorial Guinea",
   "Eritrea": "Eritrea",
@@ -516,7 +516,7 @@
   "Georgia": "Georgia",
   "Germany": "Germany",
   "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Greece": "Yunan",
   "Grenada": "Grenada",
   "Guatemala": "Guatemala",
   "Guinea": "Guinea",
@@ -527,24 +527,24 @@
   "Honduras": "Honduras",
   "Hungary": "Hungary",
   "Iceland": "Iceland",
-  "India": "India",
+  "India": "Bharat",
   "Indonesia": "Indonesia",
   "Iran": "Iran",
   "Iraq": "Iraq",
   "Ireland": "Ireland",
-  "Italy": "Italy",
+  "Italy": "Itali",
   "Ivory Coast": "Ivory Coast",
   "Jamaica": "Jamaica",
   "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
+  "Jordan": "Urdun",
+  "Kazakhstan": "Qazaqstan",
   "Kenya": "Kenya",
   "Kiribati": "Kiribati",
   "Kuwait": "Kuwait",
   "Kyrgyzstan": "Kyrgyzstan",
   "Laos": "Laos",
   "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
+  "Lebanon": "Lubnan",
   "Lesotho": "Lesotho",
   "Liberia": "Liberia",
   "Libya": "Libya",
@@ -566,7 +566,7 @@
   "Monaco": "Monaco",
   "Mongolia": "Mongolia",
   "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
+  "Morocco": "Marakash",
   "Mozambique": "Mozambique",
   "Myanmar": "Myanmar",
   "Namibia": "Namibia",
@@ -577,31 +577,31 @@
   "Nicaragua": "Nicaragua",
   "Niger": "Niger",
   "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
+  "North Korea": "Shumali Korea",
+  "North Macedonia": "Shumali Maqdonia",
   "Norway": "Norway",
   "Oman": "Oman",
   "Pakistan": "Pakistan",
   "Palau": "Palau",
-  "Palestine State": "Palestine",
+  "Palestine State": "Riyasat-e-Falasteen",
   "Panama": "Panama",
   "Papua New Guinea": "Papua New Guinea",
   "Paraguay": "Paraguay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
+  "Philippines": "Filipain",
   "Poland": "Poland",
-  "Portugal": "Portugal",
+  "Portugal": "Purtagal",
   "Qatar": "Qatar",
   "Romania": "Romania",
-  "Russia": "Russia",
+  "Russia": "Roos",
   "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
+  "Saint Kitts and Nevis": "Saint Kitts aur Nevis",
   "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Saint Vincent and the Grenadines": "Saint Vincent aur Grenadines",
   "Samoa": "Samoa",
   "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
+  "Sao Tome and Principe": "Sao Tome aur Principe",
+  "Saudi Arabia": "Saudi Arab",
   "Senegal": "Senegal",
   "Serbia": "Serbia",
   "Seychelles": "Seychelles",
@@ -611,38 +611,38 @@
   "Slovenia": "Slovenia",
   "Solomon Islands": "Solomon Islands",
   "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
+  "South Africa": "Janubi Africa",
+  "South Korea": "Janubi Korea",
+  "South Sudan": "Janubi Sudan",
   "Spain": "Spain",
   "Sri Lanka": "Sri Lanka",
   "Sudan": "Sudan",
   "Suriname": "Suriname",
   "Sweden": "Sweden",
   "Switzerland": "Switzerland",
-  "Syria": "Syria",
+  "Syria": "Shaam",
   "Tajikistan": "Tajikistan",
   "Tanzania": "Tanzania",
   "Thailand": "Thailand",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinidad aur Tobago",
+  "Tunisia": "Teunas",
+  "Turkey": "Turki",
+  "Turkmenistan": "Turkmanistan",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
   "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "United Arab Emirates (UAE)",
-  "United Kingdom (UK)": "United Kingdom (UK)",
-  "United States (US)": "United States (US)",
+  "United Arab Emirates (UAE)": "Muttahida Arab Imarat (UAE)",
+  "United Kingdom (UK)": "Bartania (UK)",
+  "United States (US)": "Riasat-e-Muttahida America (US)",
   "Uruguay": "Uruguay",
   "Uzbekistan": "Uzbekistan",
   "Vanuatu": "Vanuatu",
   "Venezuela": "Venezuela",
   "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
+  "Yemen": "Yaman",
   "Zambia": "Zambia",
   "Zimbabwe": "Zimbabwe",
   "Afghan": "Afghani",
diff --git a/src/translations/locales/ur.json b/src/translations/locales/ur.json
index 4177b1b..3c9657a 100644
--- a/src/translations/locales/ur.json
+++ b/src/translations/locales/ur.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "ڈاکٹریٹ / پی ایچ ڈی",
   "کارشناسی / Bachelor’s Degree": "بیچلر ڈگری",
   "کارشناسی ارشد / Master’s Degree": "ماسٹرز ڈگری",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
-  "Andorra": "Andorra",
-  "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
-  "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
-  "Bangladesh": "Bangladesh",
-  "Barbados": "Barbados",
-  "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
-  "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
-  "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
-  "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
-  "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
-  "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
-  "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
-  "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
-  "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
-  "Mali": "Mali",
-  "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
-  "Palau": "Palau",
-  "Palestine State": "فلسطین",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "متحدہ عرب امارات (UAE)",
-  "United Kingdom (UK)": "برطانیہ (UK)",
-  "United States (US)": "ریاستہائے متحدہ امریکہ (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Afghanistan": "افغانستان",
+  "Albania": "البانیہ",
+  "Algeria": "الجزائر",
+  "Andorra": "انڈورا",
+  "Angola": "انگولا",
+  "Antigua and Barbuda": "اینٹیگوا اور باربوڈا",
+  "Argentina": "ارجنٹائن",
+  "Armenia": "آرمینیا",
+  "Australia": "آسٹریلیا",
+  "Austria": "آسٹریا",
+  "Azerbaijan": "آذربائیجان",
+  "Bahamas": "بہاماس",
+  "Bahrain": "بحرین",
+  "Bangladesh": "بنگلہ دیش",
+  "Barbados": "بارباڈوس",
+  "Belarus": "بیلاروس",
+  "Belgium": "بیلجیم",
+  "Belize": "بیلیز",
+  "Benin": "بینن",
+  "Bhutan": "بھوٹان",
+  "Bolivia": "بولیویا",
+  "Bosnia and Herzegovina": "بوسنیا اور ہرزیگووینا",
+  "Botswana": "بوٹسوانا",
+  "Brazil": "برازیل",
+  "Brunei": "برونائی",
+  "Bulgaria": "بلغاریہ",
+  "Burkina Faso": "برکینا فاسو",
+  "Burundi": "برونڈی",
+  "Cabo Verde": "کیپ ورڈی",
+  "Cambodia": "کمبوڈیا",
+  "Cameroon": "کیمرون",
+  "Canada": "کینیڈا",
+  "Central African Republic": "وسطی افریقی جمہوریہ",
+  "Chad": "چاڈ",
+  "Chile": "چلی",
+  "China": "چین",
+  "Colombia": "کولمبیا",
+  "Comoros": "کوموروس",
+  "Congo": "کانگو",
+  "Costa Rica": "کوسٹا ریکا",
+  "Croatia": "کروشیا",
+  "Cuba": "کیوبا",
+  "Cyprus": "قبرص",
+  "Czechia": "چیکیا",
+  "Democratic Republic of the Congo": "جمہوری جمہوریہ کانگو",
+  "Denmark": "ڈنمارک",
+  "Djibouti": "جبوتی",
+  "Dominica": "ڈومینیکا",
+  "Dominican Republic": "جمہوریہ ڈومینیکن",
+  "Ecuador": "ایکواڈور",
+  "Egypt": "مصر",
+  "El Salvador": "ایل سلواڈور",
+  "Equatorial Guinea": "استوائی گنی",
+  "Eritrea": "اریٹیریا",
+  "Estonia": "اسٹونیا",
+  "Eswatini": "ایسواتینی",
+  "Ethiopia": "ایتھوپیا",
+  "Fiji": "فجی",
+  "Finland": "فن لینڈ",
+  "France": "فرانس",
+  "Gabon": "گیبون",
+  "Gambia": "گیمبیا",
+  "Georgia": "جارجیا",
+  "Germany": "جرمنی",
+  "Ghana": "گھانا",
+  "Greece": "یونان",
+  "Grenada": "گریناڈا",
+  "Guatemala": "گوئٹے مالا",
+  "Guinea": "گنی",
+  "Guinea-Bissau": "گنی بساؤ",
+  "Guyana": "گیانا",
+  "Haiti": "ہیٹی",
+  "Holy See": "ہولی سی",
+  "Honduras": "ہونڈوراس",
+  "Hungary": "ہنگری",
+  "Iceland": "آئس لینڈ",
+  "India": "بھارت",
+  "Indonesia": "انڈونیشیا",
+  "Iran": "ایران",
+  "Iraq": "عراق",
+  "Ireland": "آئرلینڈ",
+  "Italy": "اٹلی",
+  "Ivory Coast": "آئیوری کوسٹ",
+  "Jamaica": "جمیکا",
+  "Japan": "جاپان",
+  "Jordan": "اردن",
+  "Kazakhstan": "قازقستان",
+  "Kenya": "کینیا",
+  "Kiribati": "کیریباتی",
+  "Kuwait": "کویت",
+  "Kyrgyzstan": "کرغزستان",
+  "Laos": "لاؤس",
+  "Latvia": "لٹویا",
+  "Lebanon": "لبنان",
+  "Lesotho": "لیسوتھو",
+  "Liberia": "لائبیریا",
+  "Libya": "لیبیا",
+  "Liechtenstein": "لیختینستائن",
+  "Lithuania": "لتھوانیا",
+  "Luxembourg": "لکسمبرگ",
+  "Madagascar": "مڈغاسکر",
+  "Malawi": "ملاوی",
+  "Malaysia": "ملائیشیا",
+  "Maldives": "مالدیپ",
+  "Mali": "مالی",
+  "Malta": "مالٹا",
+  "Marshall Islands": "مارشل جزائر",
+  "Mauritania": "موریطانیہ",
+  "Mauritius": "ماریشس",
+  "Mexico": "میکسیکو",
+  "Micronesia": "مائیکرونیشیا",
+  "Moldova": "مالدووا",
+  "Monaco": "موناکو",
+  "Mongolia": "منگولیا",
+  "Montenegro": "مونٹی نیگرو",
+  "Morocco": "مراکش",
+  "Mozambique": "موزمبیق",
+  "Myanmar": "میانمار",
+  "Namibia": "نمیبیا",
+  "Nauru": "ناورو",
+  "Nepal": "نیپال",
+  "Netherlands": "نیدرلینڈز",
+  "New Zealand": "نیوزی لینڈ",
+  "Nicaragua": "نکاراگوا",
+  "Niger": "نائیجر",
+  "Nigeria": "نائجیریا",
+  "North Korea": "شمالی کوریا",
+  "North Macedonia": "شمالی مقدونیہ",
+  "Norway": "ناروے",
+  "Oman": "عمان",
+  "Pakistan": "پاکستان",
+  "Palau": "پلاؤ",
+  "Palestine State": "ریاست فلسطین",
+  "Panama": "پاناما",
+  "Papua New Guinea": "پاپوا نیو گنی",
+  "Paraguay": "پیراگوئے",
+  "Peru": "پیرو",
+  "Philippines": "فلپائن",
+  "Poland": "پولینڈ",
+  "Portugal": "پرتگال",
+  "Qatar": "قطر",
+  "Romania": "رومانیہ",
+  "Russia": "روس",
+  "Rwanda": "روانڈا",
+  "Saint Kitts and Nevis": "سینٹ کٹس اور نیوس",
+  "Saint Lucia": "سینٹ لوسیا",
+  "Saint Vincent and the Grenadines": "سینٹ ونسنٹ اور گریناڈائنز",
+  "Samoa": "سامووا",
+  "San Marino": "سان مارینو",
+  "Sao Tome and Principe": "ساؤ ٹومے اور پرنسپے",
+  "Saudi Arabia": "سعودی عرب",
+  "Senegal": "سینیگال",
+  "Serbia": "سربیا",
+  "Seychelles": "سیشلز",
+  "Sierra Leone": "سیرالیون",
+  "Singapore": "سنگاپور",
+  "Slovakia": "سلوواکیہ",
+  "Slovenia": "سلووینیا",
+  "Solomon Islands": "جزائر سلیمان",
+  "Somalia": "صومالیہ",
+  "South Africa": "جنوبی افریقہ",
+  "South Korea": "جنوبی کوریا",
+  "South Sudan": "جنوبی سوڈان",
+  "Spain": "اسپین",
+  "Sri Lanka": "سری لنکا",
+  "Sudan": "سوڈان",
+  "Suriname": "سورینام",
+  "Sweden": "سویڈن",
+  "Switzerland": "سوئٹزرلینڈ",
+  "Syria": "شام",
+  "Tajikistan": "تاجکستان",
+  "Tanzania": "تنزانیہ",
+  "Thailand": "تھائی لینڈ",
+  "Timor-Leste": "تیمور لیسٹے",
+  "Togo": "ٹوگو",
+  "Tonga": "ٹونگا",
+  "Trinidad and Tobago": "ٹرینیڈاڈ اور ٹوباگو",
+  "Tunisia": "تیونس",
+  "Turkey": "ترکی",
+  "Turkmenistan": "ترکمانستان",
+  "Tuvalu": "تووالو",
+  "Uganda": "یوگنڈا",
+  "Ukraine": "یوکرین",
+  "United Arab Emirates (UAE)": "متحدہ عرب امارات (یو اے ای)",
+  "United Kingdom (UK)": "برطانیہ (یو کے)",
+  "United States (US)": "ریاستہائے متحدہ (یو ایس)",
+  "Uruguay": "یوراگوئے",
+  "Uzbekistan": "ازبکستان",
+  "Vanuatu": "وانواتو",
+  "Venezuela": "وینزویلا",
+  "Vietnam": "ویتنام",
+  "Yemen": "یمن",
+  "Zambia": "زیمبیا",
+  "Zimbabwe": "زمبابوے",
   "Afghan": "افغان",
   "Albanian": "البانی",
   "Algerian": "الجزائری",
diff --git a/src/translations/locales/uz.json b/src/translations/locales/uz.json
index 72f9a23..e26e7e1 100644
--- a/src/translations/locales/uz.json
+++ b/src/translations/locales/uz.json
@@ -451,200 +451,200 @@
   "Doctorate / PhD": "Doktorantura / PhD",
   "کارشناسی / Bachelor’s Degree": "Bakalavr darajasi",
   "کارشناسی ارشد / Master’s Degree": "Magistr darajasi",
-  "Afghanistan": "Afghanistan",
-  "Albania": "Albania",
-  "Algeria": "Algeria",
+  "Afghanistan": "Afgʻoniston",
+  "Albania": "Albaniya",
+  "Algeria": "Jazoir",
   "Andorra": "Andorra",
   "Angola": "Angola",
-  "Antigua and Barbuda": "Antigua and Barbuda",
+  "Antigua and Barbuda": "Antigua va Barbuda",
   "Argentina": "Argentina",
-  "Armenia": "Armenia",
-  "Australia": "Australia",
-  "Austria": "Austria",
-  "Azerbaijan": "Azerbaijan",
-  "Bahamas": "Bahamas",
-  "Bahrain": "Bahrain",
+  "Armenia": "Armaniston",
+  "Australia": "Avstraliya",
+  "Austria": "Avstriya",
+  "Azerbaijan": "Ozarbayjon",
+  "Bahamas": "Bagama orollari",
+  "Bahrain": "Bahrayn",
   "Bangladesh": "Bangladesh",
   "Barbados": "Barbados",
   "Belarus": "Belarus",
-  "Belgium": "Belgium",
-  "Belize": "Belize",
+  "Belgium": "Belgiya",
+  "Belize": "Beliz",
   "Benin": "Benin",
-  "Bhutan": "Bhutan",
-  "Bolivia": "Bolivia",
-  "Bosnia and Herzegovina": "Bosnia and Herzegovina",
-  "Botswana": "Botswana",
-  "Brazil": "Brazil",
-  "Brunei": "Brunei",
-  "Bulgaria": "Bulgaria",
-  "Burkina Faso": "Burkina Faso",
+  "Bhutan": "Butan",
+  "Bolivia": "Boliviya",
+  "Bosnia and Herzegovina": "Bosniya va Gertsegovina",
+  "Botswana": "Botsvana",
+  "Brazil": "Braziliya",
+  "Brunei": "Bruney",
+  "Bulgaria": "Bolgariya",
+  "Burkina Faso": "Burkina-Faso",
   "Burundi": "Burundi",
-  "Cabo Verde": "Cabo Verde",
-  "Cambodia": "Cambodia",
-  "Cameroon": "Cameroon",
-  "Canada": "Canada",
-  "Central African Republic": "Central African Republic",
+  "Cabo Verde": "Kabo-Verde",
+  "Cambodia": "Kambodja",
+  "Cameroon": "Kamerun",
+  "Canada": "Kanada",
+  "Central African Republic": "Markaziy Afrika Respublikasi",
   "Chad": "Chad",
-  "Chile": "Chile",
-  "China": "China",
-  "Colombia": "Colombia",
-  "Comoros": "Comoros",
-  "Congo": "Congo",
-  "Costa Rica": "Costa Rica",
-  "Croatia": "Croatia",
-  "Cuba": "Cuba",
-  "Cyprus": "Cyprus",
-  "Czechia": "Czechia",
-  "Democratic Republic of the Congo": "Democratic Republic of the Congo",
-  "Denmark": "Denmark",
-  "Djibouti": "Djibouti",
-  "Dominica": "Dominica",
-  "Dominican Republic": "Dominican Republic",
-  "Ecuador": "Ecuador",
-  "Egypt": "Egypt",
-  "El Salvador": "El Salvador",
-  "Equatorial Guinea": "Equatorial Guinea",
-  "Eritrea": "Eritrea",
-  "Estonia": "Estonia",
-  "Eswatini": "Eswatini",
-  "Ethiopia": "Ethiopia",
+  "Chile": "Chili",
+  "China": "Xitoy",
+  "Colombia": "Kolumbiya",
+  "Comoros": "Komor orollari",
+  "Congo": "Kongo",
+  "Costa Rica": "Kosta-Rika",
+  "Croatia": "Xorvatiya",
+  "Cuba": "Kuba",
+  "Cyprus": "Kipr",
+  "Czechia": "Chexiya",
+  "Democratic Republic of the Congo": "Kongo Demokratik Respublikasi",
+  "Denmark": "Daniya",
+  "Djibouti": "Jibuti",
+  "Dominica": "Dominika",
+  "Dominican Republic": "Dominika Respublikasi",
+  "Ecuador": "Ekvador",
+  "Egypt": "Misr",
+  "El Salvador": "Salvador",
+  "Equatorial Guinea": "Ekvatorial Gvineya",
+  "Eritrea": "Eritreya",
+  "Estonia": "Estoniya",
+  "Eswatini": "Esvatini",
+  "Ethiopia": "Efiopiya",
   "Fiji": "Fiji",
-  "Finland": "Finland",
-  "France": "France",
+  "Finland": "Finlandiya",
+  "France": "Fransiya",
   "Gabon": "Gabon",
-  "Gambia": "Gambia",
-  "Georgia": "Georgia",
-  "Germany": "Germany",
-  "Ghana": "Ghana",
-  "Greece": "Greece",
+  "Gambia": "Gambiya",
+  "Georgia": "Gruziya",
+  "Germany": "Germaniya",
+  "Ghana": "Gana",
+  "Greece": "Gretsiya",
   "Grenada": "Grenada",
-  "Guatemala": "Guatemala",
-  "Guinea": "Guinea",
-  "Guinea-Bissau": "Guinea-Bissau",
-  "Guyana": "Guyana",
-  "Haiti": "Haiti",
-  "Holy See": "Holy See",
-  "Honduras": "Honduras",
-  "Hungary": "Hungary",
-  "Iceland": "Iceland",
-  "India": "India",
-  "Indonesia": "Indonesia",
-  "Iran": "Iran",
-  "Iraq": "Iraq",
-  "Ireland": "Ireland",
-  "Italy": "Italy",
-  "Ivory Coast": "Ivory Coast",
-  "Jamaica": "Jamaica",
-  "Japan": "Japan",
-  "Jordan": "Jordan",
-  "Kazakhstan": "Kazakhstan",
-  "Kenya": "Kenya",
+  "Guatemala": "Gvatemala",
+  "Guinea": "Gvineya",
+  "Guinea-Bissau": "Gvineya-Bisau",
+  "Guyana": "Gayana",
+  "Haiti": "Gaiti",
+  "Holy See": "Vatikan",
+  "Honduras": "Gonduras",
+  "Hungary": "Vengriya",
+  "Iceland": "Islandiya",
+  "India": "Hindiston",
+  "Indonesia": "Indoneziya",
+  "Iran": "Eron",
+  "Iraq": "Iroq",
+  "Ireland": "Irlandiya",
+  "Italy": "Italiya",
+  "Ivory Coast": "Kot-d'Ivuar",
+  "Jamaica": "Yamayka",
+  "Japan": "Yaponiya",
+  "Jordan": "Iordaniya",
+  "Kazakhstan": "Qozogʻiston",
+  "Kenya": "Keniya",
   "Kiribati": "Kiribati",
-  "Kuwait": "Kuwait",
-  "Kyrgyzstan": "Kyrgyzstan",
+  "Kuwait": "Quvayt",
+  "Kyrgyzstan": "Qirgʻiziston",
   "Laos": "Laos",
-  "Latvia": "Latvia",
-  "Lebanon": "Lebanon",
-  "Lesotho": "Lesotho",
-  "Liberia": "Liberia",
-  "Libya": "Libya",
-  "Liechtenstein": "Liechtenstein",
-  "Lithuania": "Lithuania",
-  "Luxembourg": "Luxembourg",
-  "Madagascar": "Madagascar",
-  "Malawi": "Malawi",
-  "Malaysia": "Malaysia",
-  "Maldives": "Maldives",
+  "Latvia": "Latviya",
+  "Lebanon": "Livan",
+  "Lesotho": "Lesoto",
+  "Liberia": "Liberiya",
+  "Libya": "Liviya",
+  "Liechtenstein": "Lixtenshteyn",
+  "Lithuania": "Litva",
+  "Luxembourg": "Lyuksemburg",
+  "Madagascar": "Madagaskar",
+  "Malawi": "Malavi",
+  "Malaysia": "Malayziya",
+  "Maldives": "Maldiv orollari",
   "Mali": "Mali",
   "Malta": "Malta",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
+  "Marshall Islands": "Marshall orollari",
+  "Mauritania": "Mavritaniya",
+  "Mauritius": "Mavrikiy",
+  "Mexico": "Meksika",
+  "Micronesia": "Mikroneziya",
   "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
+  "Monaco": "Monako",
+  "Mongolia": "Mongoliya",
+  "Montenegro": "Chernogoriya",
+  "Morocco": "Marokash",
+  "Mozambique": "Mozambik",
+  "Myanmar": "Myanma",
+  "Namibia": "Namibiya",
   "Nauru": "Nauru",
   "Nepal": "Nepal",
-  "Netherlands": "Netherlands",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
+  "Netherlands": "Niderlandiya",
+  "New Zealand": "Yangi Zelandiya",
+  "Nicaragua": "Nikaragua",
   "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Norway": "Norway",
-  "Oman": "Oman",
-  "Pakistan": "Pakistan",
+  "Nigeria": "Nigeriya",
+  "North Korea": "Shimoliy Koreya",
+  "North Macedonia": "Shimoliy Makedoniya",
+  "Norway": "Norvegiya",
+  "Oman": "Ummon",
+  "Pakistan": "Pokiston",
   "Palau": "Palau",
-  "Palestine State": "Falastin",
+  "Palestine State": "Falastin Davlati",
   "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
+  "Papua New Guinea": "Papua-Yangi Gvineya",
+  "Paraguay": "Paragvay",
   "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
+  "Philippines": "Filippin",
+  "Poland": "Polsha",
+  "Portugal": "Portugaliya",
   "Qatar": "Qatar",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
+  "Romania": "Ruminiya",
+  "Russia": "Rossiya",
+  "Rwanda": "Ruanda",
+  "Saint Kitts and Nevis": "Sent-Kits va Nevis",
+  "Saint Lucia": "Sent-Lyusiya",
+  "Saint Vincent and the Grenadines": "Sent-Vinsent va Grenadinlar",
   "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Saudi Arabia": "Saudi Arabia",
+  "San Marino": "San-Marino",
+  "Sao Tome and Principe": "San-Tome va Prinsipi",
+  "Saudi Arabia": "Saudiya Arabistoni",
   "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
+  "Serbia": "Serbiya",
+  "Seychelles": "Seyshell orollari",
+  "Sierra Leone": "Syerra-Leone",
+  "Singapore": "Singapur",
+  "Slovakia": "Slovakiya",
+  "Slovenia": "Sloveniya",
+  "Solomon Islands": "Solomon orollari",
+  "Somalia": "Somali",
+  "South Africa": "Janubiy Afrika Respublikasi",
+  "South Korea": "Janubiy Koreya",
+  "South Sudan": "Janubiy Sudan",
+  "Spain": "Ispaniya",
+  "Sri Lanka": "Shri-Lanka",
   "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Sweden": "Sweden",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
+  "Suriname": "Surinam",
+  "Sweden": "Shvetsiya",
+  "Switzerland": "Shveytsariya",
+  "Syria": "Suriya",
+  "Tajikistan": "Tojikiston",
+  "Tanzania": "Tanzaniya",
+  "Thailand": "Tailand",
   "Timor-Leste": "Timor-Leste",
   "Togo": "Togo",
   "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkey": "Turkey",
-  "Turkmenistan": "Turkmenistan",
+  "Trinidad and Tobago": "Trinidad va Tobago",
+  "Tunisia": "Tunis",
+  "Turkey": "Turkiya",
+  "Turkmenistan": "Turkmaniston",
   "Tuvalu": "Tuvalu",
   "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
+  "Ukraine": "Ukraina",
   "United Arab Emirates (UAE)": "Birlashgan Arab Amirliklari (BAA)",
-  "United Kingdom (UK)": "Buyuk Britaniya (UK)",
-  "United States (US)": "Amerika Qo'shma Shtatlari (AQSH)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
+  "United Kingdom (UK)": "Buyuk Britaniya (Birlashgan Qirollik)",
+  "United States (US)": "Amerika Qoʻshma Shtatlari (AQSH)",
+  "Uruguay": "Urugvay",
+  "Uzbekistan": "Oʻzbekiston",
   "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Venezuela": "Venesuela",
+  "Vietnam": "Vyetnam",
+  "Yemen": "Yaman",
+  "Zambia": "Zambiya",
+  "Zimbabwe": "Zimbabve",
   "Afghan": "Afg'on",
   "Albanian": "Alban",
   "Algerian": "Jazoiriy",
diff --git a/src/translations/locales/zh.json b/src/translations/locales/zh.json
index b02b06f..b15b75d 100644
--- a/src/translations/locales/zh.json
+++ b/src/translations/locales/zh.json
@@ -650,7 +650,7 @@
   "Traditional and non-political view of Shiasm; cannot marry someone with a political view.": "对什叶派的传统和非政治观点；不能与有政治观点的人结婚。",
   "Trusted Family Friend": "值得信赖的家庭朋友",
   "Trusted Social Sponsor": "值得信赖的社会赞助商",
-  "Turkey": "火鸡",
+  "Turkey": "土耳其",
   "Turkish": "土耳其",
   "Two-Column Side-by-Side Match Comparison": "Two-Column Side-by-Side Match Comparison",
   "Type of Hijab and Public Appearance": "Type of Hijab and Public Appearance",
@@ -929,7 +929,7 @@
   "China": "中国",
   "Colombia": "哥伦比亚",
   "Comoros": "科摩罗",
-  "Congo": "刚果",
+  "Congo": "刚果共和国",
   "Costa Rica": "哥斯达黎加",
   "Croatia": "克罗地亚",
   "Cuba": "古巴",
@@ -939,20 +939,20 @@
   "Denmark": "丹麦",
   "Djibouti": "吉布提",
   "Dominica": "多米尼克",
-  "Dominican Republic": "多明尼加共和国",
+  "Dominican Republic": "多米尼加共和国",
   "Ecuador": "厄瓜多尔",
   "Egypt": "埃及",
   "El Salvador": "萨尔瓦多",
   "Equatorial Guinea": "赤道几内亚",
   "Eritrea": "厄立特里亚",
   "Estonia": "爱沙尼亚",
-  "Eswatini": "史瓦帝尼",
+  "Eswatini": "斯威士兰",
   "Ethiopia": "埃塞俄比亚",
   "Fiji": "斐济",
   "Finland": "芬兰",
   "Gabon": "加蓬",
   "Gambia": "冈比亚",
-  "Georgia": "乔治亚州",
+  "Georgia": "格鲁吉亚",
   "Ghana": "加纳",
   "Greece": "希腊",
   "Grenada": "格林纳达",
@@ -961,7 +961,7 @@
   "Guinea-Bissau": "几内亚比绍",
   "Guyana": "圭亚那",
   "Haiti": "海地",
-  "Holy See": "教廷",
+  "Holy See": "圣座",
   "Honduras": "洪都拉斯",
   "Hungary": "匈牙利",
   "Iceland": "冰岛",
@@ -983,97 +983,97 @@
   "Lebanon": "黎巴嫩",
   "Lesotho": "莱索托",
   "Liberia": "利比里亚",
-  "Libya": "Libya",
+  "Libya": "利比亚",
   "Liechtenstein": "列支敦士登",
   "Lithuania": "立陶宛",
   "Luxembourg": "卢森堡",
-  "Madagascar": "Madagascar",
+  "Madagascar": "马达加斯加",
   "Malawi": "马拉维",
   "Malaysia": "马来西亚",
   "Maldives": "马尔代夫",
-  "Mali": "Mali",
+  "Mali": "马里",
   "Malta": "马耳他",
-  "Marshall Islands": "Marshall Islands",
-  "Mauritania": "Mauritania",
-  "Mauritius": "Mauritius",
-  "Mexico": "Mexico",
-  "Micronesia": "Micronesia",
-  "Moldova": "Moldova",
-  "Monaco": "Monaco",
-  "Mongolia": "Mongolia",
-  "Montenegro": "Montenegro",
-  "Morocco": "Morocco",
-  "Mozambique": "Mozambique",
-  "Myanmar": "Myanmar",
-  "Namibia": "Namibia",
-  "Nauru": "Nauru",
-  "Nepal": "Nepal",
-  "New Zealand": "New Zealand",
-  "Nicaragua": "Nicaragua",
-  "Niger": "Niger",
-  "Nigeria": "Nigeria",
-  "North Korea": "North Korea",
-  "North Macedonia": "North Macedonia",
-  "Oman": "Oman",
-  "Palau": "Palau",
-  "Palestine State": "巴勒斯坦",
-  "Panama": "Panama",
-  "Papua New Guinea": "Papua New Guinea",
-  "Paraguay": "Paraguay",
-  "Peru": "Peru",
-  "Philippines": "Philippines",
-  "Poland": "Poland",
-  "Portugal": "Portugal",
-  "Romania": "Romania",
-  "Russia": "Russia",
-  "Rwanda": "Rwanda",
-  "Saint Kitts and Nevis": "Saint Kitts and Nevis",
-  "Saint Lucia": "Saint Lucia",
-  "Saint Vincent and the Grenadines": "Saint Vincent and the Grenadines",
-  "Samoa": "Samoa",
-  "San Marino": "San Marino",
-  "Sao Tome and Principe": "Sao Tome and Principe",
-  "Senegal": "Senegal",
-  "Serbia": "Serbia",
-  "Seychelles": "Seychelles",
-  "Sierra Leone": "Sierra Leone",
-  "Singapore": "Singapore",
-  "Slovakia": "Slovakia",
-  "Slovenia": "Slovenia",
-  "Solomon Islands": "Solomon Islands",
-  "Somalia": "Somalia",
-  "South Africa": "South Africa",
-  "South Korea": "South Korea",
-  "South Sudan": "South Sudan",
-  "Spain": "Spain",
-  "Sri Lanka": "Sri Lanka",
-  "Sudan": "Sudan",
-  "Suriname": "Suriname",
-  "Switzerland": "Switzerland",
-  "Syria": "Syria",
-  "Tajikistan": "Tajikistan",
-  "Tanzania": "Tanzania",
-  "Thailand": "Thailand",
-  "Timor-Leste": "Timor-Leste",
-  "Togo": "Togo",
-  "Tonga": "Tonga",
-  "Trinidad and Tobago": "Trinidad and Tobago",
-  "Tunisia": "Tunisia",
-  "Turkmenistan": "Turkmenistan",
-  "Tuvalu": "Tuvalu",
-  "Uganda": "Uganda",
-  "Ukraine": "Ukraine",
-  "United Arab Emirates (UAE)": "阿拉伯联合酋长国（阿联酋）",
-  "United Kingdom (UK)": "英国 (UK)",
-  "United States (US)": "美国 (US)",
-  "Uruguay": "Uruguay",
-  "Uzbekistan": "Uzbekistan",
-  "Vanuatu": "Vanuatu",
-  "Venezuela": "Venezuela",
-  "Vietnam": "Vietnam",
-  "Yemen": "Yemen",
-  "Zambia": "Zambia",
-  "Zimbabwe": "Zimbabwe",
+  "Marshall Islands": "马绍尔群岛",
+  "Mauritania": "毛里塔尼亚",
+  "Mauritius": "毛里求斯",
+  "Mexico": "墨西哥",
+  "Micronesia": "密克罗尼西亚",
+  "Moldova": "摩尔多瓦",
+  "Monaco": "摩纳哥",
+  "Mongolia": "蒙古",
+  "Montenegro": "黑山",
+  "Morocco": "摩洛哥",
+  "Mozambique": "莫桑比克",
+  "Myanmar": "缅甸",
+  "Namibia": "纳米比亚",
+  "Nauru": "瑙鲁",
+  "Nepal": "尼泊尔",
+  "New Zealand": "新西兰",
+  "Nicaragua": "尼加拉瓜",
+  "Niger": "尼日尔",
+  "Nigeria": "尼日利亚",
+  "North Korea": "朝鲜",
+  "North Macedonia": "北马其顿",
+  "Oman": "阿曼",
+  "Palau": "帕劳",
+  "Palestine State": "巴勒斯坦国",
+  "Panama": "巴拿马",
+  "Papua New Guinea": "巴布亚新几内亚",
+  "Paraguay": "巴拉圭",
+  "Peru": "秘鲁",
+  "Philippines": "菲律宾",
+  "Poland": "波兰",
+  "Portugal": "葡萄牙",
+  "Romania": "罗马尼亚",
+  "Russia": "俄罗斯",
+  "Rwanda": "卢旺达",
+  "Saint Kitts and Nevis": "圣基茨和尼维斯",
+  "Saint Lucia": "圣卢西亚",
+  "Saint Vincent and the Grenadines": "圣文森特和格林纳丁斯",
+  "Samoa": "萨摩亚",
+  "San Marino": "圣马力诺",
+  "Sao Tome and Principe": "圣多美和普林西比",
+  "Senegal": "塞内加尔",
+  "Serbia": "塞尔维亚",
+  "Seychelles": "塞舌尔",
+  "Sierra Leone": "塞拉利昂",
+  "Singapore": "新加坡",
+  "Slovakia": "斯洛伐克",
+  "Slovenia": "斯洛文尼亚",
+  "Solomon Islands": "所罗门群岛",
+  "Somalia": "索马里",
+  "South Africa": "南非",
+  "South Korea": "韩国",
+  "South Sudan": "南苏丹",
+  "Spain": "西班牙",
+  "Sri Lanka": "斯里兰卡",
+  "Sudan": "苏丹",
+  "Suriname": "苏里南",
+  "Switzerland": "瑞士",
+  "Syria": "叙利亚",
+  "Tajikistan": "塔吉克斯坦",
+  "Tanzania": "坦桑尼亚",
+  "Thailand": "泰国",
+  "Timor-Leste": "东帝汶",
+  "Togo": "多哥",
+  "Tonga": "汤加",
+  "Trinidad and Tobago": "特立尼达和多巴哥",
+  "Tunisia": "突尼斯",
+  "Turkmenistan": "土库曼斯坦",
+  "Tuvalu": "图瓦卢",
+  "Uganda": "乌干达",
+  "Ukraine": "乌克兰",
+  "United Arab Emirates (UAE)": "阿拉伯联合酋长国",
+  "United Kingdom (UK)": "英国",
+  "United States (US)": "美国",
+  "Uruguay": "乌拉圭",
+  "Uzbekistan": "乌兹别克斯坦",
+  "Vanuatu": "瓦努阿图",
+  "Venezuela": "委内瑞拉",
+  "Vietnam": "越南",
+  "Yemen": "也门",
+  "Zambia": "赞比亚",
+  "Zimbabwe": "津巴布韦",
   "Afghan": "阿富汗籍",
   "Albanian": "阿尔巴尼亚籍",
   "Algerian": "阿尔及利亚籍",

From 8830dee187a323ba7710343bfff4e8589ba31cb1 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 13:34:29 +0330
Subject: [PATCH 02/21] fix ssr loading

---
 .../finding-match/finding-match-client.tsx    |  9 +-
 src/app/layout.tsx                            |  4 +
 src/app/new-match/new-match-client.tsx        | 92 ++++++-------------
 .../request-accepted-client.tsx               | 43 ++++++---
 src/app/request-sent/request-sent-client.tsx  | 37 ++++++--
 src/data/countries.ts                         |  3 +-
 src/hooks/marriage/use-profile-main.ts        | 50 +++++++++-
 src/lib/auth-bridge.ts                        | 23 +++++
 8 files changed, 167 insertions(+), 94 deletions(-)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index 6a619a6..fb12ca1 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -11,7 +11,6 @@ import MarriageAdvisorsOverlay, {
   useMarriageAdvisorsOverlay,
 } from "@/components/Componentes/marriage-advisors-overlay";
 import Button from "@/components/Componentes/button";
-import { PageLoadingSkeleton } from "@/components/Componentes/page-loading-skeleton";
 import { FixToTheEnd } from "@/components/Componentes/fix-to-the-end";
 import { PageBackground } from "@/components/Componentes/page-background";
 import PageHeader from "@/components/Componentes/page-header";
@@ -57,18 +56,14 @@ export default function FindingMatchClient() {
     }
   }, [profile, locale, router]);
 
-  // Signal Flutter to lift its loading cover once the profile is available.
-  useHabibWebReady(!!profile && !isLoading);
+  // Signal Flutter to lift its loading cover immediately so page renders with 0ms latency.
+  useHabibWebReady(true);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
     return getSubmitPath(profile) !== "/finding-match";
   }, [profile]);
 
-  if ((isLoading && !profile) || !profile) {
-    return <PageLoadingSkeleton />;
-  }
-
   const copy = {
     title: t["SEARCH IN PROGRESS"],
     description:
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7d5f4f4..d852bea 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -216,6 +216,10 @@ export default async function RootLayout({
                   if (!config) return;
                   configApplied = true;
                   window.__HABIB_BOOTSTRAP__ = config;
+                  if (config.marriage) {
+                    window.__HABIB_MARRIAGE_INITIAL_DATA__ = config.marriage;
+                    window.dispatchEvent(new CustomEvent('habib:marriage-initial-data', { detail: config.marriage }));
+                  }
                   var safe = config.safeArea || {};
                   root.style.setProperty('--safe-top', (Number(safe.top) || 0) + 'px');
                   root.style.setProperty('--safe-bottom', (Number(safe.bottom) || 0) + 'px');
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 44669f5..489a896 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -488,6 +488,7 @@ export default function NewMatchClient() {
   const { isAdvisorOpen, openAdvisors, closeAdvisors } =
     useMarriageAdvisorsOverlay();
   const { isProfileOpen, openProfile, closeProfile } = useMatchProfileOverlay();
+  const [isOpeningProfile, setIsOpeningProfile] = useState(false);
   const { data: profile, isError, isLoading } = useMarriageProfileQuery();
   const [isPaymentSheetOpen, setIsPaymentSheetOpen] = useState(false);
   const [isDeclineConfirmOpen, setIsDeclineConfirmOpen] = useState(false);
@@ -594,8 +595,23 @@ export default function NewMatchClient() {
     }
   }, [profile, locale, router, isLoading, isError]);
 
-  // Signal Flutter to lift its loading cover once the profile is available.
-  useHabibWebReady(!!profile && !isLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
+
+  const handleOpenProfile = () => {
+    if (profile) {
+      openProfile();
+    } else {
+      setIsOpeningProfile(true);
+    }
+  };
+
+  useEffect(() => {
+    if (isOpeningProfile && profile) {
+      setIsOpeningProfile(false);
+      openProfile();
+    }
+  }, [isOpeningProfile, profile, openProfile]);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
@@ -625,65 +641,6 @@ export default function NewMatchClient() {
     }
   }
 
-  if ((isLoading && !profile) || !profile) {
-    return (
-      <>
-        <PageBackground />
-        <PageHeader profile={profile} sticky />
-
-        <main
-          style={{
-            paddingBottom: `${20 + bottom}px`,
-          }}
-          className="min-h-0 flex-1 flex flex-col gap-3.5 pt-4 pb-1 text-center"
-        >
-          {/* 1. Header Section Skeleton */}
-          <section className="flex flex-col items-center shrink-0">
-            <LoadingSkeleton className="h-[56px] w-[56px] rounded-full" />
-            <LoadingSkeleton className="h-6 w-[200px] mt-2.5" />
-            <LoadingSkeleton className="h-3.5 w-[260px] mt-1.5" />
-          </section>
-
-          {/* 2. Match Card Skeleton */}
-          <section className="w-full rounded-[16px] border border-white/80 bg-white px-4 py-4 shadow-none flex flex-col items-center shrink-0">
-            {/* Name line */}
-            <LoadingSkeleton className="h-4 w-[130px]" />
-
-            {/* Subtitle / Details lines */}
-            <div className="mt-2.5 w-full flex flex-col items-center gap-2 min-h-[40px]">
-              <LoadingSkeleton className="h-3 w-[180px]" />
-              <LoadingSkeleton className="h-3 w-[150px]" />
-            </div>
-
-            {/* Button skeleton */}
-            <LoadingSkeleton className="mt-3.5 h-[40px] w-full rounded-[10px]" />
-          </section>
-
-          {/* 3. Advisor Card Skeleton */}
-          <section className="w-full shrink-0">
-            <div className="rounded-[14px] border border-white/80 bg-white/75 px-4 py-3.5 text-left shadow-none backdrop-blur-sm">
-              <LoadingSkeleton className="h-4 w-[120px]" />
-              <div className="mt-1.5 space-y-1">
-                <LoadingSkeleton className="h-2.5 w-[240px]" />
-                <LoadingSkeleton className="h-2.5 w-[160px]" />
-              </div>
-
-              <div className="mt-3.5 flex items-center justify-between gap-3">
-                <div className="flex items-center pl-1">
-                  <LoadingSkeleton className="h-[28px] w-[28px] rounded-full border-2 border-white" />
-                  <LoadingSkeleton className="-ml-1.5 h-[28px] w-[28px] rounded-full border-2 border-white" />
-                  <LoadingSkeleton className="-ml-1.5 h-[28px] w-[28px] rounded-full border-2 border-white" />
-                </div>
-
-                <LoadingSkeleton className="h-[36px] w-[100px] rounded-[9px]" />
-              </div>
-            </div>
-          </section>
-        </main>
-      </>
-    );
-  }
-
   const isFemaleProfile = profile?.gender === "female";
   const matchHeadingTitle = isFemaleProfile
     ? t["New Marriage Proposal"]
@@ -868,11 +825,12 @@ export default function NewMatchClient() {
                       {/* Button */}
                       <button
                         type="button"
+                        disabled={isOpeningProfile && isLoading}
                         onClick={() => {
                           if (isMale && !hasActiveSub) {
                             setIsPaymentSheetOpen(true);
                           } else {
-                            openProfile();
+                            handleOpenProfile();
                           }
                         }}
                         className="
@@ -895,8 +853,14 @@ export default function NewMatchClient() {
                           border-none
                         "
                       >
-                        <Ic name="eye" className="size-5 text-white" />
-                        <span>{t["View more details"]}</span>
+                        {isOpeningProfile && isLoading ? (
+                          <LoadingThreeDot />
+                        ) : (
+                          <>
+                            <Ic name="eye" className="size-5 text-white" />
+                            <span>{t["View more details"]}</span>
+                          </>
+                        )}
                       </button>
                     </div>
                   </>
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 8dd67dd..2354021 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -20,7 +20,6 @@ import { LoadingThreeDot } from "@/components/Componentes/loading-three-dot";
 import OutcomeSelectionSheet from "@/components/Componentes/outcome-selection-sheet";
 import { PageBackground } from "@/components/Componentes/page-background";
 import PageHeader from "@/components/Componentes/page-header";
-import { PageLoadingSkeleton } from "@/components/Componentes/page-loading-skeleton";
 import SubscriptionRequiredSheet from "@/components/Componentes/subscription-required-sheet";
 import SwipeButton from "@/components/Componentes/swipe-button";
 import type {
@@ -243,6 +242,7 @@ export default function RequestAcceptedClient() {
   const [hasConfirmedFemaleContact, setHasConfirmedFemaleContact] =
     useState(false);
   const [showPaymentSuccessToast, setShowPaymentSuccessToast] = useState(false);
+  const [isOpeningProfile, setIsOpeningProfile] = useState(false);
   const { data: profile, isLoading } = useMarriageProfileQuery();
 
   const isFemaleProfile = profile?.gender === "female";
@@ -258,8 +258,23 @@ export default function RequestAcceptedClient() {
     }
   }, [profile, router, locale, noContactReportedSuccess]);
 
-  // Signal Flutter to lift its loading cover once the profile is available.
-  useHabibWebReady(!!profile && !isLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
+
+  const handleOpenProfile = () => {
+    if (profile) {
+      openProfile();
+    } else {
+      setIsOpeningProfile(true);
+    }
+  };
+
+  useEffect(() => {
+    if (isOpeningProfile && profile) {
+      setIsOpeningProfile(false);
+      openProfile();
+    }
+  }, [isOpeningProfile, profile, openProfile]);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
@@ -297,10 +312,6 @@ export default function RequestAcceptedClient() {
     enabled: false,
   });
 
-  if ((isLoading && !profile) || !profile) {
-    return <PageLoadingSkeleton />;
-  }
-
   const titleText = isFemaleProfile
     ? t["Request Approved"]
     : caseStatus === "payment_done" || caseStatus === "contacted"
@@ -687,10 +698,15 @@ export default function RequestAcceptedClient() {
                         <>
                           <button
                             type="button"
-                            onClick={() => openProfile()}
+                            disabled={isOpeningProfile && isLoading}
+                            onClick={handleOpenProfile}
                             className="flex-1 h-[50px] px-3 rounded-[14px] border border-[#E2E8F0] bg-white/95 backdrop-blur-sm text-[#334155] font-bold text-[14px] shadow-sm flex items-center justify-center transition-transform active:scale-[0.98] cursor-pointer hover:bg-[#F8FAFC]"
                           >
-                            {t["View Profile"]}
+                            {isOpeningProfile && isLoading ? (
+                              <LoadingThreeDot />
+                            ) : (
+                              t["View Profile"]
+                            )}
                           </button>
 
                           <button
@@ -729,10 +745,15 @@ export default function RequestAcceptedClient() {
                       ) : (
                         <button
                           type="button"
-                          onClick={() => openProfile()}
+                          disabled={isOpeningProfile && isLoading}
+                          onClick={handleOpenProfile}
                           className="flex-1 min-h-[48px] px-3.5 py-2.5 rounded-[14px] border border-[#E2E8F0] bg-white/95 backdrop-blur-sm text-[#475569] font-bold text-[14px] leading-tight shadow-sm flex items-center justify-center text-center whitespace-nowrap transition-all hover:bg-[#F8FAFC] active:scale-[0.98] cursor-pointer"
                         >
-                          {primaryActionText}
+                          {isOpeningProfile && isLoading ? (
+                            <LoadingThreeDot />
+                          ) : (
+                            primaryActionText
+                          )}
                         </button>
                       )}
 
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index f6be4c2..6f1d08f 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -3,9 +3,9 @@
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useHabibWebReady } from "@/hooks/use-habib-web-ready";
-import { PageLoadingSkeleton } from "@/components/Componentes/page-loading-skeleton";
+import { LoadingThreeDot } from "@/components/Componentes/loading-three-dot";
 import AdvisorActionsCard from "@/components/Componentes/advisor-actions-card";
 import MarriageAdvisorsOverlay, {
   useMarriageAdvisorsOverlay,
@@ -33,6 +33,7 @@ export default function RequestSentClient() {
     useMarriageAdvisorsOverlay();
   const { isProfileOpen, openProfile, closeProfile } =
     useMatchProfileOverlay();
+  const [isOpeningProfile, setIsOpeningProfile] = useState(false);
   const { data: profile, isLoading } = useMarriageProfileQuery({
     refetchInterval: 3000,
   });
@@ -47,17 +48,28 @@ export default function RequestSentClient() {
     }
   }, [profile, locale, router]);
 
-  // Signal Flutter to lift its loading cover once the profile is available.
-  useHabibWebReady(!!profile && !isLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
     return getSubmitPath(profile) !== "/request-sent";
   }, [profile]);
 
-  if ((isLoading && !profile) || !profile) {
-    return <PageLoadingSkeleton />;
-  }
+  const handleOpenProfile = () => {
+    if (profile) {
+      openProfile();
+    } else {
+      setIsOpeningProfile(true);
+    }
+  };
+
+  useEffect(() => {
+    if (isOpeningProfile && profile) {
+      setIsOpeningProfile(false);
+      openProfile();
+    }
+  }, [isOpeningProfile, profile, openProfile]);
 
   const copy = {
     advisorTitle: t["Get an advisor"],
@@ -123,11 +135,16 @@ export default function RequestSentClient() {
             {/* Button */}
             <button
               type="button"
-              onClick={openProfile}
+              disabled={isOpeningProfile && isLoading}
+              onClick={handleOpenProfile}
               className="mt-12 w-full max-w-[300px] cursor-pointer transition-transform active:scale-[0.97]"
             >
-              <div className="rounded-[14px] bg-gradient-to-r from-[#FF6687] to-[#FF456C] px-6 py-4 text-[16px] font-bold text-white shadow-sm hover:opacity-95">
-                {requestSentCopy.matchProfile}
+              <div className="flex items-center justify-center min-h-[54px] rounded-[14px] bg-gradient-to-r from-[#FF6687] to-[#FF456C] px-6 py-4 text-[16px] font-bold text-white shadow-sm hover:opacity-95">
+                {isOpeningProfile && isLoading ? (
+                  <LoadingThreeDot />
+                ) : (
+                  requestSentCopy.matchProfile
+                )}
               </div>
             </button>
           </section>
diff --git a/src/data/countries.ts b/src/data/countries.ts
index b57bb62..dd02a39 100644
--- a/src/data/countries.ts
+++ b/src/data/countries.ts
@@ -5110,6 +5110,7 @@ export function resolveCountryName(
   if (!trimmed) return "";
 
   const isFa = String(locale || "en").toLowerCase().startsWith("fa");
+  const iso = getCountryIsoCode(trimmed);
 
   // 1. If Persian locale, prioritize curated COUNTRIES_FA
   if (isFa) {
@@ -5136,7 +5137,7 @@ export function resolveCountryName(
   // 2. Dynamic Intl.DisplayNames for the requested locale
   if (iso) {
     try {
-      const displayNames = new Intl.DisplayNames([isFa ? "fa" : "en"], {
+      const displayNames = new Intl.DisplayNames([locale], {
         type: "region",
       });
       const name = displayNames.of(iso);
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index 7196011..4cd6f59 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -1,6 +1,8 @@
 "use client";
 
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect } from "react";
+import { authBridge } from "@/lib/auth-bridge";
 import { setCachedMarriageEntryPath } from "@/lib/entry-route-cache";
 import {
   getSubmitPath,
@@ -11,6 +13,27 @@ import type { QueryOptions } from "./options";
 import { marriageQueryKeys } from "./query-keys";
 import type { MarriageProfileResponse } from "./types";
 
+export function getInitialMarriageProfile(): MarriageProfileResponse | undefined {
+  const data = authBridge.getMarriageData();
+  if (!data) return undefined;
+
+  return {
+    id: data.id ?? 0,
+    status: data.status,
+    gender: data.gender,
+    age: data.age ?? null,
+    is_registering_for_self: data.is_registering_for_self ?? null,
+    can_edit_profile: data.can_edit_profile ?? true,
+    can_message_expert: data.can_message_expert ?? true,
+    active_subscription: data.active_subscription ?? null,
+    is_ready_for_match: data.is_ready_for_match ?? true,
+    active_case: data.active_case ?? null,
+    needs_subscription: data.needs_subscription ?? false,
+    recommended_plan: data.recommended_plan ?? null,
+    match_summary: data.match_summary ?? null,
+  } as MarriageProfileResponse;
+}
+
 export async function getMarriageProfile() {
   console.log("🌐 [Profile API] Sending GET /api/marriage/profile/main/ ...");
   try {
@@ -44,9 +67,34 @@ export async function getMarriageProfile() {
 export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
   options?: QueryOptions<MarriageProfileResponse, TData>,
 ) {
+  const queryClient = useQueryClient();
+
+  useEffect(() => {
+    const handleInitialData = (e: Event) => {
+      const customEvent = e as CustomEvent;
+      const initial = getInitialMarriageProfile();
+      if (initial) {
+        queryClient.setQueryData(marriageQueryKeys.profile(), (old: any) => {
+          if (!old) return initial;
+          return {
+            ...old,
+            ...initial,
+            match_summary: initial.match_summary ?? old.match_summary,
+          };
+        });
+      }
+    };
+
+    window.addEventListener("habib:marriage-initial-data", handleInitialData);
+    return () => {
+      window.removeEventListener("habib:marriage-initial-data", handleInitialData);
+    };
+  }, [queryClient]);
+
   const query = useQuery({
     staleTime: 5 * 60 * 1000,
     refetchOnWindowFocus: false,
+    initialData: getInitialMarriageProfile as any,
     ...options,
     queryFn: getMarriageProfile,
     queryKey: marriageQueryKeys.profile(),
diff --git a/src/lib/auth-bridge.ts b/src/lib/auth-bridge.ts
index 4bfc8a7..b698e60 100644
--- a/src/lib/auth-bridge.ts
+++ b/src/lib/auth-bridge.ts
@@ -23,6 +23,7 @@ function postFlutterMessage(payload: Record<string, unknown>) {
 class AuthBridge {
   private token: string | null = null;
   private coins = 0;
+  private marriageData: Record<string, any> | null = null;
   private isReady = false;
   private loginRequested = false;
   private readyCallbacks: Array<() => void> = [];
@@ -33,6 +34,10 @@ class AuthBridge {
     this.init();
   }
 
+  public getMarriageData(): Record<string, any> | null {
+    return this.marriageData;
+  }
+
   private syncFromStorage() {
     if (typeof window === "undefined") {
       return false;
@@ -41,8 +46,15 @@ class AuthBridge {
     const win = window as Window & {
       HABIB_TOKEN?: string;
       HABIB_COINS?: number;
+      HABIB_MARRIAGE?: Record<string, any>;
+      __HABIB_MARRIAGE_INITIAL_DATA__?: Record<string, any>;
     };
 
+    if (win.HABIB_MARRIAGE || win.__HABIB_MARRIAGE_INITIAL_DATA__) {
+      this.marriageData =
+        win.HABIB_MARRIAGE ?? win.__HABIB_MARRIAGE_INITIAL_DATA__ ?? null;
+    }
+
     const token =
       win.HABIB_TOKEN ??
       getClientCookie(TOKEN_COOKIE_NAME) ??
@@ -88,6 +100,17 @@ class AuthBridge {
         (event) => {
           if (event.action === "login") {
             this.handleLoginResponse(event.success);
+          } else if (
+            event.action === "initial_config" &&
+            event.data &&
+            (event.data as any).marriage
+          ) {
+            this.marriageData = (event.data as any).marriage;
+            window.dispatchEvent(
+              new CustomEvent("habib:marriage-initial-data", {
+                detail: this.marriageData,
+              }),
+            );
           }
         },
       );

From c89cc8e9581498ca4c5172910734beada6f1f4c5 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 13:48:40 +0330
Subject: [PATCH 03/21] fix auth

---
 src/app/layout.tsx                               | 12 ++++++++++++
 src/app/questions-list/questions-list-client.tsx |  5 +----
 src/lib/auth-bridge.ts                           |  9 +++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index d852bea..45a2dfa 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -132,6 +132,7 @@ export default async function RootLayout({
                 var HABIB_TOKEN_COOKIE = 'HABIB_TOKEN';
                 var HABIB_COINS_COOKIE = 'HABIB_COINS';
                 var HABIB_ENTRY_PATH_COOKIE = 'HABIB_MARRIAGE_ENTRY_PATH';
+                var HABIB_MARRIAGE_DATA_COOKIE = 'HABIB_MARRIAGE_DATA';
                 var HABIB_COOKIE_MAX_AGE = 60 * 60 * 24 * 30;
 
                 function writeCookie(name, value) {
@@ -158,6 +159,17 @@ export default async function RootLayout({
                   return '';
                 }
 
+                var earlyMarriageCookie = readCookie(HABIB_MARRIAGE_DATA_COOKIE) || readCookie('habib_marriage_data');
+                if (earlyMarriageCookie) {
+                  try {
+                    var parsedEarlyMarriage = JSON.parse(earlyMarriageCookie);
+                    if (parsedEarlyMarriage && typeof parsedEarlyMarriage === 'object') {
+                      window.__HABIB_MARRIAGE_INITIAL_DATA__ = parsedEarlyMarriage;
+                      window.HABIB_MARRIAGE = parsedEarlyMarriage;
+                    }
+                  } catch (e) {}
+                }
+
                 if (!Object.getOwnPropertyDescriptor(window, 'HABIB_TOKEN')) {
                   Object.defineProperty(window, 'HABIB_TOKEN', {
                     configurable: true,
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index e468b76..0cd0396 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -113,10 +113,7 @@ export default function QuestionsListClient() {
     [profile],
   );
   const isProfileRedirecting =
-    profileTargetPath !== null &&
-    profileTargetPath !== "/questions-list" &&
-    (!hasCompletedMarriageProfileBasics(profile) ||
-      profile?.can_edit_profile === false);
+    profileTargetPath !== null && profileTargetPath !== "/questions-list";
 
   useEffect(() => {
     if (isProfileRedirecting && profileTargetPath) {
diff --git a/src/lib/auth-bridge.ts b/src/lib/auth-bridge.ts
index b698e60..ec17c7a 100644
--- a/src/lib/auth-bridge.ts
+++ b/src/lib/auth-bridge.ts
@@ -53,6 +53,15 @@ class AuthBridge {
     if (win.HABIB_MARRIAGE || win.__HABIB_MARRIAGE_INITIAL_DATA__) {
       this.marriageData =
         win.HABIB_MARRIAGE ?? win.__HABIB_MARRIAGE_INITIAL_DATA__ ?? null;
+    } else {
+      const rawMarriageCookie =
+        getClientCookie("HABIB_MARRIAGE_DATA") ??
+        getClientCookie("habib_marriage_data");
+      if (rawMarriageCookie) {
+        try {
+          this.marriageData = JSON.parse(decodeURIComponent(rawMarriageCookie));
+        } catch (e) {}
+      }
     }
 
     const token =

From 6960754c1d7b7fcf3d76f93863c200e0dd10db64 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 14:06:20 +0330
Subject: [PATCH 04/21] fix match hook start

---
 src/app/finding-match/finding-match-client.tsx | 9 +++++++--
 src/hooks/marriage/use-match-start.ts          | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index fb12ca1..9db5fdf 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -31,7 +31,7 @@ export default function FindingMatchClient() {
   const { dictionary: t, locale } = useI18n();
   const { isAdvisorOpen, openAdvisors, closeAdvisors } =
     useMarriageAdvisorsOverlay();
-  const { data: profile, isLoading } = useMarriageProfileQuery({
+  const { data: profile, isLoading, isFetched } = useMarriageProfileQuery({
     refetchInterval: 3000,
   });
 
@@ -50,11 +50,16 @@ export default function FindingMatchClient() {
     if (!profile) {
       return;
     }
+    // Don't bounce away from finding-match if we only have preliminary initialData
+    // with pending_info before the fresh server query finishes
+    if (!isFetched && profile.status === "pending_info") {
+      return;
+    }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/finding-match") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, locale, router]);
+  }, [profile, isFetched, locale, router]);
 
   // Signal Flutter to lift its loading cover immediately so page renders with 0ms latency.
   useHabibWebReady(true);
diff --git a/src/hooks/marriage/use-match-start.ts b/src/hooks/marriage/use-match-start.ts
index 0f2b33d..600c5ac 100644
--- a/src/hooks/marriage/use-match-start.ts
+++ b/src/hooks/marriage/use-match-start.ts
@@ -25,6 +25,13 @@ export function useStartMarriageMatchMutation(
     mutationFn: startMarriageMatch,
     onSuccess: async (data, variables, onMutateResult, context) => {
       setCachedMarriageEntryPath("/finding-match");
+      queryClient.setQueryData(marriageQueryKeys.profile(), (old: any) => {
+        if (!old) return old;
+        return {
+          ...old,
+          status: "waiting",
+        };
+      });
       Promise.all([
         queryClient.invalidateQueries({
           queryKey: marriageQueryKeys.profile(),

From 2e1267bc489cdee102747dbf03b9e938ee3a6731 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 14:24:07 +0330
Subject: [PATCH 05/21] refactor: update layout styles, adjust component
 dimensions, and refine profile redirection logic

---
 .../finding-match/finding-match-client.tsx    | 38 ++++++++++---------
 src/app/new-match/new-match-client.tsx        |  2 +-
 .../questions-list/questions-list-client.tsx  | 14 ++++++-
 src/components/Componentes/button.tsx         |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index 9db5fdf..d4f88dc 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -111,25 +111,27 @@ export default function FindingMatchClient() {
       />
 
       <main
-        style={{ paddingBottom: "calc(80px + var(--safe-bottom))" }}
+        style={{
+          minHeight: "calc(100dvh - 56px - max(12px, calc(var(--safe-top) + 6px)))",
+          paddingBottom: "calc(90px + var(--safe-bottom))",
+        }}
         className="flex min-h-0 flex-1 flex-col justify-between text-center page-slide-enter"
       >
-
-        <section className="mt-6 flex flex-1 flex-col items-center px-[23px]">
+        <section className="mt-8 sm:mt-12 flex flex-col items-center px-4">
           <div className="relative h-[124px] w-[130px]" aria-hidden="true">
             <Image
               src={matchImageSrc}
               alt=""
               fill
-              sizes="58px"
+              sizes="130px"
               className="object-cover"
               priority
             />
           </div>
-          <h1 className="mt-4 group-16 font-bold leading-none tracking-[0.02em] text-[#171717] uppercase">
+          <h1 className="mt-5 group-16 font-bold leading-none tracking-[0.02em] text-[#171717] uppercase">
             {copy.title}
           </h1>
-          <p className="mt-3 max-w-[320px] mx-auto text-center group-12 leading-[1.35] font-semibold text-[#747474]">
+          <p className="mt-3 max-w-[320px] mx-auto text-center group-12 leading-[1.4] font-semibold text-[#747474]">
             {copy.description}
           </p>
           {unseenRejection && (
@@ -177,22 +179,24 @@ export default function FindingMatchClient() {
           )}{" "}
         </section>
 
-        <AdvisorActionsCard
-          title={copy.advisorTitle}
-          description={copy.advisorDescription}
-          avatars={advisorAvatars}
-          extraCount={7}
-          getAdvisorLabel={copy.getAdvisor}
-          onGetAdvisor={openAdvisors}
-        />
+        <div className="mt-auto pt-6 pb-2">
+          <AdvisorActionsCard
+            title={copy.advisorTitle}
+            description={copy.advisorDescription}
+            avatars={advisorAvatars}
+            extraCount={7}
+            getAdvisorLabel={copy.getAdvisor}
+            onGetAdvisor={openAdvisors}
+          />
+        </div>
 
         <FixToTheEnd>
           {profile?.can_edit_profile === false ? (
             <div
-              className="inline-flex w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 py-[17px] text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
+              className="inline-flex h-[52px] w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
               aria-live="polite"
             >
-              <Ic name="lock" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
               <span className="group-16 leading-none font-semibold">
                 {t["Profile is locked"]}
               </span>
@@ -202,7 +206,7 @@ export default function FindingMatchClient() {
               variant="dark"
               href={localizePath("/questions-list", locale)}
             >
-              <Ic name="pencil" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              <Ic name="pencil" aria-hidden="true" className="size-[18px] shrink-0" />
               <span>{copy.editProfile}</span>
             </Button>
           )}
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 489a896..53fdf95 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -899,7 +899,7 @@ export default function NewMatchClient() {
             className="inline-flex w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] px-4 h-[52px] text-center text-[#747474] shadow-none"
             role="status"
           >
-            <Ic name="lock" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+            <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
             <span className="group-16 leading-none font-semibold">
               {t["Profile is locked"]}
             </span>
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index 0cd0396..0ef9c97 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -112,8 +112,18 @@ export default function QuestionsListClient() {
     () => (profile ? getSubmitPath(profile) : null),
     [profile],
   );
-  const isProfileRedirecting =
-    profileTargetPath !== null && profileTargetPath !== "/questions-list";
+  const isProfileRedirecting = useMemo(() => {
+    if (!profile || !profileTargetPath) return false;
+    if (profileTargetPath === "/questions-list") return false;
+    // Allow users to view and edit profile sections when profile is waiting or in match pool and can_edit_profile is not locked
+    if (
+      profileTargetPath === "/finding-match" &&
+      profile.can_edit_profile !== false
+    ) {
+      return false;
+    }
+    return true;
+  }, [profile, profileTargetPath]);
 
   useEffect(() => {
     if (isProfileRedirecting && profileTargetPath) {
diff --git a/src/components/Componentes/button.tsx b/src/components/Componentes/button.tsx
index 5dbac6e..a62aa28 100644
--- a/src/components/Componentes/button.tsx
+++ b/src/components/Componentes/button.tsx
@@ -162,7 +162,7 @@ export function Button({
     <span className="flex w-full min-w-0 max-w-full items-center justify-center gap-2">
       {renderArrow("left")}
       <span className="flex min-w-0 max-w-full flex-1 flex-col items-center justify-center">
-        <span className="block w-full min-w-0 max-w-full truncate text-center group-16 font-semibold leading-none">
+        <span className="flex w-full min-w-0 max-w-full items-center justify-center gap-2 truncate text-center group-16 font-semibold leading-none">
           {children}
         </span>
         {description && !isOutlined ? (

From 916513ea902235b3d6b900ea90f608a64b6a8b32 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 14:35:16 +0330
Subject: [PATCH 06/21] refactor(ui): improve layout consistency and profile
 redirection logic

Refactor various client components to improve UI responsiveness, spacing, and icon sizing. Additionally, update the profile redirection logic to allow users to access specific sections when their profile is not locked.

- Update `FindingMatchClient` with improved min-height, padding, and responsive spacing.
- Standardize icon sizes using `size-[18px]` in `FindingMatchClient` and `NewMatchClient`.
- Refactor `isProfileRedirecting` in `QuestionsListClient` using `useMemo` to allow access to `finding-match` when `can_edit_profile` is true.
- Adjust `Button` component to use flexbox for better text alignment and centering.
---
 src/app/finding-match/finding-match-client.tsx | 4 ++--
 src/components/Componentes/fix-to-the-end.tsx  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index d4f88dc..abc9f47 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -117,7 +117,7 @@ export default function FindingMatchClient() {
         }}
         className="flex min-h-0 flex-1 flex-col justify-between text-center page-slide-enter"
       >
-        <section className="mt-8 sm:mt-12 flex flex-col items-center px-4">
+        <section className="mt-20 flex flex-1 flex-col items-center w-full">
           <div className="relative h-[124px] w-[130px]" aria-hidden="true">
             <Image
               src={matchImageSrc}
@@ -179,7 +179,7 @@ export default function FindingMatchClient() {
           )}{" "}
         </section>
 
-        <div className="mt-auto pt-6 pb-2">
+        <div className="mt-auto pt-6 pb-2 w-full">
           <AdvisorActionsCard
             title={copy.advisorTitle}
             description={copy.advisorDescription}
diff --git a/src/components/Componentes/fix-to-the-end.tsx b/src/components/Componentes/fix-to-the-end.tsx
index 2103239..0a78ba7 100644
--- a/src/components/Componentes/fix-to-the-end.tsx
+++ b/src/components/Componentes/fix-to-the-end.tsx
@@ -10,9 +10,12 @@ type FixToTheEndProps = {
 export function FixToTheEnd({ children, className }: FixToTheEndProps) {
   return (
     <div
-      style={{ paddingBottom: "calc(16px + var(--safe-bottom))" }}
+      style={{
+        paddingInline: "var(--app-shell-px, 17px)",
+        paddingBottom: "calc(16px + var(--safe-bottom))",
+      }}
       className={[
-        "question-fix-to-end fixed inset-x-0 bottom-0 z-20 mx-auto w-full max-w-[834px] bg-[#F5F5F5]/95 px-[17px] md:px-8 pt-3 backdrop-blur-md",
+        "question-fix-to-end fixed inset-x-0 bottom-0 z-20 mx-auto w-full max-w-[834px] bg-[#F5F5F5]/95 pt-3 backdrop-blur-md",
         className,
       ]
         .filter(Boolean)

From 99889adf1edd660b7f0161de3e2295c5d03a3b87 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sat, 29 Aug 2026 14:41:06 +0330
Subject: [PATCH 07/21] fix(ui): move profile action button outside of main
 container

Relocate the profile edit/lock button from inside the `<main>` element
to outside of it. This prevents the `page-slide-enter` animation's
`will-change: transform` property from creating a new containing block,
which was causing layout issues with `position: fixed` elements.
---
 .../finding-match/finding-match-client.tsx    | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index abc9f47..d330b89 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -189,30 +189,32 @@ export default function FindingMatchClient() {
             onGetAdvisor={openAdvisors}
           />
         </div>
-
-        <FixToTheEnd>
-          {profile?.can_edit_profile === false ? (
-            <div
-              className="inline-flex h-[52px] w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
-              aria-live="polite"
-            >
-              <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
-              <span className="group-16 leading-none font-semibold">
-                {t["Profile is locked"]}
-              </span>
-            </div>
-          ) : (
-            <Button
-              variant="dark"
-              href={localizePath("/questions-list", locale)}
-            >
-              <Ic name="pencil" aria-hidden="true" className="size-[18px] shrink-0" />
-              <span>{copy.editProfile}</span>
-            </Button>
-          )}
-        </FixToTheEnd>
       </main>
 
+      {/* Outside <main>: page-slide-enter sets will-change:transform which makes
+          main the containing block for position:fixed and narrows the button. */}
+      <FixToTheEnd>
+        {profile?.can_edit_profile === false ? (
+          <div
+            className="inline-flex h-[52px] w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
+            aria-live="polite"
+          >
+            <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
+            <span className="group-16 leading-none font-semibold">
+              {t["Profile is locked"]}
+            </span>
+          </div>
+        ) : (
+          <Button
+            variant="dark"
+            href={localizePath("/questions-list", locale)}
+          >
+            <Ic name="pencil" aria-hidden="true" className="size-[18px] shrink-0" />
+            <span>{copy.editProfile}</span>
+          </Button>
+        )}
+      </FixToTheEnd>
+
       <MarriageAdvisorsOverlay
         open={isAdvisorOpen}
         onClose={closeAdvisors}

From e06f5bd344186dd366b249e20f9bfda59897162d Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 03:42:31 +0330
Subject: [PATCH 08/21] fix: prevent premature redirects using stale
 initialData and improve payment error handling for Habcoin transactions

---
 src/app/api/proxy/route.ts                    |  2 +-
 src/app/new-match/new-match-client.tsx        | 22 ++++++++++++++-----
 .../request-accepted-client.tsx               | 20 ++++++++++++-----
 src/app/request-sent/request-sent-client.tsx  |  7 ++++--
 src/hooks/marriage/use-profile-main.ts        |  5 +++++
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/app/api/proxy/route.ts b/src/app/api/proxy/route.ts
index c007bf1..c33d945 100644
--- a/src/app/api/proxy/route.ts
+++ b/src/app/api/proxy/route.ts
@@ -150,7 +150,7 @@ function getRequestHeaders(request: NextRequest, targetUrl: URL) {
   const securityKey =
     process.env.NEXT_PUBLIC_SECURITY_KEY ||
     process.env.SECURITY_KEY ||
-    "t5yugymks5458fd4ghfg6h6";
+    "t5yugymks5458fd4ghfg6h6fg";
   if (securityKey && !headers.has("security-key")) {
     headers.set("security-key", securityKey);
   }
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 53fdf95..8578b76 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -489,7 +489,8 @@ export default function NewMatchClient() {
     useMarriageAdvisorsOverlay();
   const { isProfileOpen, openProfile, closeProfile } = useMatchProfileOverlay();
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isError, isLoading } = useMarriageProfileQuery();
+  const { data: profile, isError, isLoading, isFetched } =
+    useMarriageProfileQuery();
   const [isPaymentSheetOpen, setIsPaymentSheetOpen] = useState(false);
   const [isDeclineConfirmOpen, setIsDeclineConfirmOpen] = useState(false);
   const [paymentError, setPaymentError] = useState<string | null>(null);
@@ -523,8 +524,7 @@ export default function NewMatchClient() {
   });
 
   const handlePayment = async () => {
-    const recommendedPlanId = profile?.recommended_plan?.id;
-    if (!recommendedPlanId) return;
+    const recommendedPlanId = profile?.recommended_plan?.id ?? 1;
 
     try {
       setPaymentError(null);
@@ -539,9 +539,13 @@ export default function NewMatchClient() {
     } catch (err: any) {
       console.error("Payment failed", err);
       const msg =
-        err?.response?.data?.error || err?.message || "Payment failed";
+        err?.response?.data?.error ||
+        err?.response?.data?.detail ||
+        err?.response?.data?.message ||
+        err?.message ||
+        "Payment failed";
       const modalT = (t as any).paymentModal || {};
-      if (msg === "Not enough coins") {
+      if (msg === "Not enough coins" || msg?.includes?.("Not enough coins")) {
         setIsInsufficientCoins(true);
         setPaymentError(
           modalT.insufficientCoins ||
@@ -575,6 +579,7 @@ export default function NewMatchClient() {
   useEffect(() => {
     console.log("🔍 [NewMatchClient] Current React Query Profile State:", {
       isLoading,
+      isFetched,
       isError,
       hasProfile: Boolean(profile),
       profileId: profile?.id,
@@ -589,11 +594,16 @@ export default function NewMatchClient() {
     if (!profile) {
       return;
     }
+    // Don't redirect based on stale native-injected initialData that may be
+    // missing active_case; wait for the first real server response.
+    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+      return;
+    }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/new-match") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, locale, router, isLoading, isError]);
+  }, [profile, locale, router, isLoading, isFetched, isError]);
 
   // Signal Flutter to lift its loading cover immediately with 0ms latency.
   useHabibWebReady(true);
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 2354021..0e9b40d 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -243,7 +243,7 @@ export default function RequestAcceptedClient() {
     useState(false);
   const [showPaymentSuccessToast, setShowPaymentSuccessToast] = useState(false);
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isLoading } = useMarriageProfileQuery();
+  const { data: profile, isLoading, isFetched } = useMarriageProfileQuery();
 
   const isFemaleProfile = profile?.gender === "female";
   const contactSharedAtStr = profile?.active_case?.contact_shared_at;
@@ -252,11 +252,14 @@ export default function RequestAcceptedClient() {
     if (!profile || noContactReportedSuccess) {
       return;
     }
+    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+      return;
+    }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/request-accepted") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, router, locale, noContactReportedSuccess]);
+  }, [profile, isFetched, router, locale, noContactReportedSuccess]);
 
   // Signal Flutter to lift its loading cover immediately with 0ms latency.
   useHabibWebReady(true);
@@ -368,7 +371,8 @@ export default function RequestAcceptedClient() {
   };
 
   const handlePayment = async () => {
-    if (!recommendedPlanId || paymentMutation.isPending) {
+    const planId = recommendedPlanId ?? 1;
+    if (paymentMutation.isPending) {
       return;
     }
 
@@ -376,7 +380,7 @@ export default function RequestAcceptedClient() {
       setPaymentError(null);
       setIsInsufficientCoins(false);
       const paymentResponse =
-        await paymentMutation.mutateAsync(recommendedPlanId);
+        await paymentMutation.mutateAsync(planId);
       const paymentUrl = extractHabcoinPaymentUrl(paymentResponse);
 
       if (paymentUrl) {
@@ -394,8 +398,12 @@ export default function RequestAcceptedClient() {
     } catch (err: any) {
       console.error("Habcoin payment request failed", err);
       const msg =
-        err?.response?.data?.error || err?.message || "Payment failed";
-      if (msg === "Not enough coins") {
+        err?.response?.data?.error ||
+        err?.response?.data?.detail ||
+        err?.response?.data?.message ||
+        err?.message ||
+        "Payment failed";
+      if (msg === "Not enough coins" || msg?.includes?.("Not enough coins")) {
         setIsInsufficientCoins(true);
         setPaymentError(
           t["Insufficient coin balance. Please recharge your account."] ||
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index 6f1d08f..4b26ad6 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -34,7 +34,7 @@ export default function RequestSentClient() {
   const { isProfileOpen, openProfile, closeProfile } =
     useMatchProfileOverlay();
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isLoading } = useMarriageProfileQuery({
+  const { data: profile, isLoading, isFetched } = useMarriageProfileQuery({
     refetchInterval: 3000,
   });
 
@@ -42,11 +42,14 @@ export default function RequestSentClient() {
     if (!profile) {
       return;
     }
+    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+      return;
+    }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/request-sent") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, locale, router]);
+  }, [profile, isFetched, locale, router]);
 
   // Signal Flutter to lift its loading cover immediately with 0ms latency.
   useHabibWebReady(true);
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index 4cd6f59..4cb411e 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -79,6 +79,7 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
           return {
             ...old,
             ...initial,
+            active_case: initial.active_case ?? old.active_case,
             match_summary: initial.match_summary ?? old.match_summary,
           };
         });
@@ -95,6 +96,10 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
     staleTime: 5 * 60 * 1000,
     refetchOnWindowFocus: false,
     initialData: getInitialMarriageProfile as any,
+    // Native-injected initialData is a snapshot from app-launch time and can be
+    // incomplete (e.g. missing active_case). Marking it stale forces a fresh
+    // fetch on mount instead of trusting it for the whole staleTime window.
+    initialDataUpdatedAt: 0,
     ...options,
     queryFn: getMarriageProfile,
     queryKey: marriageQueryKeys.profile(),

From c332ec235dcf050ed3a967730c03d63d4c0db1df Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 04:04:05 +0330
Subject: [PATCH 09/21] refactor: fix layout scrolling behavior by enabling
 sticky headers and adjusting section min-heights

---
 src/app/globals.css                |  4 +---
 src/app/marriage-advisors/page.tsx |  4 ++--
 src/app/new-match/profile/page.tsx | 12 ++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index 67bd8fa..937a4c1 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -342,13 +342,11 @@ body.section-overlay-open .app-shell {
   height: 100%;
   height: 100dvh;
   z-index: 50;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
   overscroll-behavior: none;
   touch-action: pan-y;
   -webkit-overflow-scrolling: touch;
   padding-inline: 17px;
-  padding-bottom: var(--safe-bottom, 0px);
   box-sizing: border-box;
   background-color: var(--background);
   background-image: var(--default-page-background-image);
diff --git a/src/app/marriage-advisors/page.tsx b/src/app/marriage-advisors/page.tsx
index d3bc8aa..42bb2e1 100644
--- a/src/app/marriage-advisors/page.tsx
+++ b/src/app/marriage-advisors/page.tsx
@@ -50,7 +50,7 @@ export default function MarriageAdvisorsPage({
         className="-mx-[17px] flex h-dvh flex-col overflow-hidden pb-10"
         style={mainStyle}
       >
-        <StickyHeader sticky={false} className="shrink-0">
+        <StickyHeader sticky className="shrink-0">
           <div className="flex items-center justify-between gap-3">
             <NavigationButton
               variant="transparent"
@@ -68,7 +68,7 @@ export default function MarriageAdvisorsPage({
           </div>
         </StickyHeader>
 
-        <section className="flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-32 pt-5 flex flex-col items-center gap-4">
+        <section className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-32 pt-5 flex flex-col items-center gap-4">
           {isLoading && <AdvisorsSkeleton />}
 
           {isError && (
diff --git a/src/app/new-match/profile/page.tsx b/src/app/new-match/profile/page.tsx
index 7f6f9b3..0c5ad3b 100644
--- a/src/app/new-match/profile/page.tsx
+++ b/src/app/new-match/profile/page.tsx
@@ -181,12 +181,12 @@ function NewMatchProfileSkeleton({
     <>
       <PageBackground />
       <main className="-mx-[17px] flex h-dvh flex-col overflow-hidden bg-[#F5F5F5]">
-        <StickyHeader sticky={false} className="shrink-0">
+        <StickyHeader sticky className="shrink-0">
           <div className="flex items-center justify-between gap-3">
             {!hideBackButton ? (
               <NavigationButton
                 variant="transparent"
-                icon="exit"
+                icon="back"
                 iconLabel={t["Go back"]}
                 onClick={onClose}
               />
@@ -203,7 +203,7 @@ function NewMatchProfileSkeleton({
           </div>
         </StickyHeader>
 
-        <section className="flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-6 pt-5">
+        <section className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-6 pt-5">
           <div className="flex flex-col items-center justify-center w-full">
             <LoadingSkeleton className="size-[90px] rounded-full shadow-sm" />
             <LoadingSkeleton className="mt-3.5 h-7 w-44 rounded-xl shadow-xs" />
@@ -619,11 +619,11 @@ export default function NewMatchProfilePage({
       ) : null}
 
       <main className={mainClass} style={mainStyle}>
-        <StickyHeader sticky={false} className="shrink-0">
+        <StickyHeader sticky className="shrink-0">
           <div className="flex items-center justify-between gap-3">
             <NavigationButton
               variant="transparent"
-              icon="exit"
+              icon="back"
               iconLabel={t["Go back"]}
               onClick={onClose}
             />
@@ -637,7 +637,7 @@ export default function NewMatchProfilePage({
           </div>
         </StickyHeader>
 
-        <section className="flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-6 pt-5">
+        <section className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-[17px] pb-6 pt-5">
           <div
             className="mx-auto flex flex-col items-center justify-center"
             style={{

From a99a66d80155cd89ab95b85f3637b63ce1245bca Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 04:46:10 +0330
Subject: [PATCH 10/21] refactor: standardize profile opening flow using async
 refetching and replace deprecated useEffect-based logic across match modules

---
 src/app/new-match/new-match-client.tsx        | 63 +++++++++++++------
 src/app/new-match/profile/page.tsx            |  2 +-
 .../request-accepted-client.tsx               | 38 ++++++-----
 src/app/request-sent/request-sent-client.tsx  | 33 +++++-----
 4 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 8578b76..fcb440b 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -488,9 +488,15 @@ export default function NewMatchClient() {
   const { isAdvisorOpen, openAdvisors, closeAdvisors } =
     useMarriageAdvisorsOverlay();
   const { isProfileOpen, openProfile, closeProfile } = useMatchProfileOverlay();
+  const {
+    data: profile,
+    isError,
+    isLoading,
+    isFetched,
+    isFetching,
+    refetch: refetchProfile,
+  } = useMarriageProfileQuery();
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isError, isLoading, isFetched } =
-    useMarriageProfileQuery();
   const [isPaymentSheetOpen, setIsPaymentSheetOpen] = useState(false);
   const [isDeclineConfirmOpen, setIsDeclineConfirmOpen] = useState(false);
   const [paymentError, setPaymentError] = useState<string | null>(null);
@@ -608,20 +614,43 @@ export default function NewMatchClient() {
   // Signal Flutter to lift its loading cover immediately with 0ms latency.
   useHabibWebReady(true);
 
-  const handleOpenProfile = () => {
-    if (profile) {
-      openProfile();
-    } else {
+  const handleOpenProfile = async () => {
+    // If profile has not yet completed its initial server fetch or is in flight:
+    if (!isFetched || isFetching) {
       setIsOpeningProfile(true);
+      try {
+        const result = await refetchProfile();
+        const freshProfile = result.data ?? profile;
+        setIsOpeningProfile(false);
+
+        const isMaleUser = freshProfile?.gender === "male";
+        const hasActiveSubscription =
+          !!freshProfile?.active_subscription &&
+          freshProfile.active_subscription.is_active !== false &&
+          freshProfile.active_subscription.is_valid !== false;
+
+        if (isMaleUser && !hasActiveSubscription) {
+          setIsPaymentSheetOpen(true);
+        } else {
+          openProfile();
+        }
+      } catch (err) {
+        setIsOpeningProfile(false);
+        if (isMale && !hasActiveSub) {
+          setIsPaymentSheetOpen(true);
+        } else {
+          openProfile();
+        }
+      }
+      return;
     }
-  };
 
-  useEffect(() => {
-    if (isOpeningProfile && profile) {
-      setIsOpeningProfile(false);
+    if (isMale && !hasActiveSub) {
+      setIsPaymentSheetOpen(true);
+    } else {
       openProfile();
     }
-  }, [isOpeningProfile, profile, openProfile]);
+  };
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
@@ -835,14 +864,8 @@ export default function NewMatchClient() {
                       {/* Button */}
                       <button
                         type="button"
-                        disabled={isOpeningProfile && isLoading}
-                        onClick={() => {
-                          if (isMale && !hasActiveSub) {
-                            setIsPaymentSheetOpen(true);
-                          } else {
-                            handleOpenProfile();
-                          }
-                        }}
+                        disabled={isOpeningProfile}
+                        onClick={handleOpenProfile}
                         className="
                           mt-2.5
                           flex
@@ -863,7 +886,7 @@ export default function NewMatchClient() {
                           border-none
                         "
                       >
-                        {isOpeningProfile && isLoading ? (
+                        {isOpeningProfile ? (
                           <LoadingThreeDot />
                         ) : (
                           <>
diff --git a/src/app/new-match/profile/page.tsx b/src/app/new-match/profile/page.tsx
index 0c5ad3b..d45edc5 100644
--- a/src/app/new-match/profile/page.tsx
+++ b/src/app/new-match/profile/page.tsx
@@ -688,7 +688,7 @@ export default function NewMatchProfilePage({
 
           <MatchPublicProfileFields
             publicInfo={profile?.match_summary?.public_info}
-            isCandidateFemale={true}
+            isCandidateFemale={isCandidateFemale}
             dictionary={t}
           />
         </section>
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 0e9b40d..8dbc305 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -241,9 +241,14 @@ export default function RequestAcceptedClient() {
     useState(false);
   const [hasConfirmedFemaleContact, setHasConfirmedFemaleContact] =
     useState(false);
-  const [showPaymentSuccessToast, setShowPaymentSuccessToast] = useState(false);
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isLoading, isFetched } = useMarriageProfileQuery();
+  const {
+    data: profile,
+    isLoading,
+    isFetched,
+    isFetching,
+    refetch: refetchProfile,
+  } = useMarriageProfileQuery();
 
   const isFemaleProfile = profile?.gender === "female";
   const contactSharedAtStr = profile?.active_case?.contact_shared_at;
@@ -264,21 +269,20 @@ export default function RequestAcceptedClient() {
   // Signal Flutter to lift its loading cover immediately with 0ms latency.
   useHabibWebReady(true);
 
-  const handleOpenProfile = () => {
-    if (profile) {
-      openProfile();
-    } else {
+  const handleOpenProfile = async () => {
+    if (!isFetched || isFetching) {
       setIsOpeningProfile(true);
+      try {
+        await refetchProfile();
+      } finally {
+        setIsOpeningProfile(false);
+        openProfile();
+      }
+      return;
     }
+    openProfile();
   };
 
-  useEffect(() => {
-    if (isOpeningProfile && profile) {
-      setIsOpeningProfile(false);
-      openProfile();
-    }
-  }, [isOpeningProfile, profile, openProfile]);
-
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
     return getSubmitPath(profile) !== "/request-accepted";
@@ -706,11 +710,11 @@ export default function RequestAcceptedClient() {
                         <>
                           <button
                             type="button"
-                            disabled={isOpeningProfile && isLoading}
+                            disabled={isOpeningProfile}
                             onClick={handleOpenProfile}
                             className="flex-1 h-[50px] px-3 rounded-[14px] border border-[#E2E8F0] bg-white/95 backdrop-blur-sm text-[#334155] font-bold text-[14px] shadow-sm flex items-center justify-center transition-transform active:scale-[0.98] cursor-pointer hover:bg-[#F8FAFC]"
                           >
-                            {isOpeningProfile && isLoading ? (
+                            {isOpeningProfile ? (
                               <LoadingThreeDot />
                             ) : (
                               t["View Profile"]
@@ -753,11 +757,11 @@ export default function RequestAcceptedClient() {
                       ) : (
                         <button
                           type="button"
-                          disabled={isOpeningProfile && isLoading}
+                          disabled={isOpeningProfile}
                           onClick={handleOpenProfile}
                           className="flex-1 min-h-[48px] px-3.5 py-2.5 rounded-[14px] border border-[#E2E8F0] bg-white/95 backdrop-blur-sm text-[#475569] font-bold text-[14px] leading-tight shadow-sm flex items-center justify-center text-center whitespace-nowrap transition-all hover:bg-[#F8FAFC] active:scale-[0.98] cursor-pointer"
                         >
-                          {isOpeningProfile && isLoading ? (
+                          {isOpeningProfile ? (
                             <LoadingThreeDot />
                           ) : (
                             primaryActionText
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index 4b26ad6..631df4d 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -34,7 +34,13 @@ export default function RequestSentClient() {
   const { isProfileOpen, openProfile, closeProfile } =
     useMatchProfileOverlay();
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
-  const { data: profile, isLoading, isFetched } = useMarriageProfileQuery({
+  const {
+    data: profile,
+    isLoading,
+    isFetched,
+    isFetching,
+    refetch: refetchProfile,
+  } = useMarriageProfileQuery({
     refetchInterval: 3000,
   });
 
@@ -59,21 +65,20 @@ export default function RequestSentClient() {
     return getSubmitPath(profile) !== "/request-sent";
   }, [profile]);
 
-  const handleOpenProfile = () => {
-    if (profile) {
-      openProfile();
-    } else {
+  const handleOpenProfile = async () => {
+    if (!isFetched || isFetching) {
       setIsOpeningProfile(true);
+      try {
+        await refetchProfile();
+      } finally {
+        setIsOpeningProfile(false);
+        openProfile();
+      }
+      return;
     }
+    openProfile();
   };
 
-  useEffect(() => {
-    if (isOpeningProfile && profile) {
-      setIsOpeningProfile(false);
-      openProfile();
-    }
-  }, [isOpeningProfile, profile, openProfile]);
-
   const copy = {
     advisorTitle: t["Get an advisor"],
     advisorDescription:
@@ -138,12 +143,12 @@ export default function RequestSentClient() {
             {/* Button */}
             <button
               type="button"
-              disabled={isOpeningProfile && isLoading}
+              disabled={isOpeningProfile}
               onClick={handleOpenProfile}
               className="mt-12 w-full max-w-[300px] cursor-pointer transition-transform active:scale-[0.97]"
             >
               <div className="flex items-center justify-center min-h-[54px] rounded-[14px] bg-gradient-to-r from-[#FF6687] to-[#FF456C] px-6 py-4 text-[16px] font-bold text-white shadow-sm hover:opacity-95">
-                {isOpeningProfile && isLoading ? (
+                {isOpeningProfile ? (
                   <LoadingThreeDot />
                 ) : (
                   requestSentCopy.matchProfile

From d405660fee04656e1cb1012b56d1bda05580cd6f Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 05:00:02 +0330
Subject: [PATCH 11/21] refactor: remove server-side data fetching and
 hydration to prioritize instant client-side rendering and signal immediate
 loading completion to Flutter

---
 src/app/request-accepted/request-accepted-client.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 8dbc305..20344d5 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -239,8 +239,7 @@ export default function RequestAcceptedClient() {
     useState(false);
   const [noContactReportedSuccess, setNoContactReportedSuccess] =
     useState(false);
-  const [hasConfirmedFemaleContact, setHasConfirmedFemaleContact] =
-    useState(false);
+  const [showPaymentSuccessToast, setShowPaymentSuccessToast] = useState(false);
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
   const {
     data: profile,

From 293815b3327f57efe2074940665bf6ed291f3c50 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 05:01:43 +0330
Subject: [PATCH 12/21] refactor(request-accepted): replace female contact
 state with payment success toast state

---
 src/app/request-accepted/request-accepted-client.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 20344d5..94aa180 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -239,6 +239,8 @@ export default function RequestAcceptedClient() {
     useState(false);
   const [noContactReportedSuccess, setNoContactReportedSuccess] =
     useState(false);
+  const [hasConfirmedFemaleContact, setHasConfirmedFemaleContact] =
+    useState(false);
   const [showPaymentSuccessToast, setShowPaymentSuccessToast] = useState(false);
   const [isOpeningProfile, setIsOpeningProfile] = useState(false);
   const {

From 3480a921369d53f791a99ef377ecae9a53f75ff8 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 05:04:24 +0330
Subject: [PATCH 13/21] refactor: simplify routing by removing server-side data
 fetching and hydration across all app pages

---
 src/app/[lang]/page.tsx                       | 31 ++----------
 .../candidate-contact-client.tsx              |  4 +-
 src/app/candidate-contact/page.tsx            | 38 +--------------
 src/app/finding-match/page.tsx                | 38 +--------------
 src/app/intro/page.tsx                        | 41 +---------------
 src/app/new-match/page.tsx                    | 38 +--------------
 src/app/page.tsx                              | 13 -----
 src/app/questions-list/page.tsx               | 48 +------------------
 .../questions-list/questions-list-client.tsx  |  5 +-
 src/app/request-accepted/page.tsx             | 38 +--------------
 src/app/request-sent/page.tsx                 | 38 +--------------
 src/app/terms/page.tsx                        |  5 +-
 12 files changed, 23 insertions(+), 314 deletions(-)

diff --git a/src/app/[lang]/page.tsx b/src/app/[lang]/page.tsx
index 419e558..6531f24 100644
--- a/src/app/[lang]/page.tsx
+++ b/src/app/[lang]/page.tsx
@@ -7,11 +7,6 @@ import {
   isAuthenticatedToken,
   MARRIAGE_ENTRY_PATH_COOKIE,
 } from "@/lib/entry-route-cache";
-import {
-  getSubmitPath,
-  hasCompletedMarriageProfileBasics,
-} from "@/lib/get-submit-path";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
 import { localizePath } from "@/translations/config";
 
 export const dynamic = "force-dynamic";
@@ -27,7 +22,7 @@ export default async function LocaleEntryPage({
     cookieStore.get("habib_token")?.value;
   const hasToken = isAuthenticatedToken(token);
 
-  // 1. If not authenticated, render <Intro /> instantly in SSR
+  // 1. If not authenticated, render <Intro /> instantly
   if (!hasToken) {
     return <Intro />;
   }
@@ -45,26 +40,6 @@ export default async function LocaleEntryPage({
     redirect(localizePath(cachedEntryPath, lang));
   }
 
-  // 3. Deep SSR Profile Resolution: resolve profile & redirect directly on server
-  const profile = await fetchProfileSSR(token);
-  if (profile) {
-    const isBasicsCompleted = hasCompletedMarriageProfileBasics(profile);
-    if (!isBasicsCompleted) {
-      return <Intro />;
-    }
-
-    const targetPath = getSubmitPath(profile);
-    if (targetPath === "/intro") {
-      return <Intro />;
-    }
-
-    redirect(localizePath(targetPath, lang));
-  }
-
-  // 4. Graceful Fallback if server fetch was unreachable
-  return (
-    <>
-      <EntryRouteResolver anonymousEntryVisible={false} />
-    </>
-  );
+  // 3. Instant non-blocking client-side resolver fallback
+  return <EntryRouteResolver anonymousEntryVisible={false} />;
 }
diff --git a/src/app/candidate-contact/candidate-contact-client.tsx b/src/app/candidate-contact/candidate-contact-client.tsx
index 6361447..500d786 100644
--- a/src/app/candidate-contact/candidate-contact-client.tsx
+++ b/src/app/candidate-contact/candidate-contact-client.tsx
@@ -60,8 +60,8 @@ export default function CandidateContactClient() {
     }
   }, [profile, router, locale]);
 
-  // Signal Flutter to lift its loading cover once the profile is available.
-  useHabibWebReady(!!profile && !isProfileLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
diff --git a/src/app/candidate-contact/page.tsx b/src/app/candidate-contact/page.tsx
index 0260429..e64fbd4 100644
--- a/src/app/candidate-contact/page.tsx
+++ b/src/app/candidate-contact/page.tsx
@@ -1,39 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import CandidateContactClient from "./candidate-contact-client";
 
-export const dynamic = "force-dynamic";
-
-export default async function CandidateContactPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <CandidateContactClient />
-    </HydrationBoundary>
-  );
+export default function CandidateContactPage() {
+  return <CandidateContactClient />;
 }
diff --git a/src/app/finding-match/page.tsx b/src/app/finding-match/page.tsx
index 2e2f3dd..bdc695a 100644
--- a/src/app/finding-match/page.tsx
+++ b/src/app/finding-match/page.tsx
@@ -1,39 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import FindingMatchClient from "./finding-match-client";
 
-export const dynamic = "force-dynamic";
-
-export default async function FindingMatchPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <FindingMatchClient />
-    </HydrationBoundary>
-  );
+export default function FindingMatchPage() {
+  return <FindingMatchClient />;
 }
diff --git a/src/app/intro/page.tsx b/src/app/intro/page.tsx
index 89223f9..a953d9f 100644
--- a/src/app/intro/page.tsx
+++ b/src/app/intro/page.tsx
@@ -1,42 +1,5 @@
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
-import { fetchConfigSSR } from "@/lib/ssr-fetch";
 import IntroClient from "./intro-client";
 
-export const dynamic = "force-dynamic";
-
-/**
- * Server Component wrapper for the Intro page.
- *
- * Follows the same SSR-prefetch pattern as questions-list/page.tsx:
- * create a server QueryClient, prefetch critical data, dehydrate, and
- * wrap the client component in HydrationBoundary so TanStack Query
- * hydrates the cache instantly — no client-side waterfall.
- *
- * Config is the only data Intro needs. Even if the fetch fails, IntroClient
- * has a local fallback image so the UI is never broken.
- */
-export default async function IntroPage() {
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 30 * 1000 },
-    },
-  });
-
-  // Prefetch marriage config — Intro uses it for the video thumbnail.
-  // Failure is non-blocking because IntroClient has a fallbackSrc.
-  await queryClient.prefetchQuery({
-    queryKey: marriageQueryKeys.config(),
-    queryFn: () => fetchConfigSSR(),
-  });
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <IntroClient />
-    </HydrationBoundary>
-  );
+export default function IntroPage() {
+  return <IntroClient />;
 }
diff --git a/src/app/new-match/page.tsx b/src/app/new-match/page.tsx
index f51ac53..953d260 100644
--- a/src/app/new-match/page.tsx
+++ b/src/app/new-match/page.tsx
@@ -1,39 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import NewMatchClient from "./new-match-client";
 
-export const dynamic = "force-dynamic";
-
-export default async function NewMatchPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <NewMatchClient />
-    </HydrationBoundary>
-  );
+export default function NewMatchPage() {
+  return <NewMatchClient />;
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index aae23df..b42f0bf 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -5,11 +5,6 @@ import {
   isAuthenticatedToken,
   MARRIAGE_ENTRY_PATH_COOKIE,
 } from "@/lib/entry-route-cache";
-import {
-  getSubmitPath,
-  hasCompletedMarriageProfileBasics,
-} from "@/lib/get-submit-path";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
 import {
   defaultLocale,
   isLocale,
@@ -57,13 +52,5 @@ export default async function RootPage() {
     redirect(localizePath(cachedEntryPath, targetLocale));
   }
 
-  const profile = await fetchProfileSSR(token);
-  if (profile) {
-    const targetPath = hasCompletedMarriageProfileBasics(profile)
-      ? getSubmitPath(profile)
-      : "/intro";
-    redirect(localizePath(targetPath, targetLocale));
-  }
-
   redirect(`/${targetLocale}`);
 }
diff --git a/src/app/questions-list/page.tsx b/src/app/questions-list/page.tsx
index b1bf27d..1c92f21 100644
--- a/src/app/questions-list/page.tsx
+++ b/src/app/questions-list/page.tsx
@@ -1,49 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import QuestionsListClient from "./questions-list-client";
 
-export const dynamic = "force-dynamic";
-
-/**
- * Server Component wrapper for questions-list.
- *
- * Prefetches the marriage profile server-side using the HABIB_TOKEN cookie
- * (Flutter sets it via WebViewCookieManager before loadRequest). The profile
- * determines which page the user should see — having it in the HTML avoids
- * the white-flash caused by waiting for the client-side API call.
- *
- * The sections/form-overview loads client-side with shimmer — that's fine.
- */
-export default async function QuestionsListPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <QuestionsListClient />
-    </HydrationBoundary>
-  );
+export default function QuestionsListPage() {
+  return <QuestionsListClient />;
 }
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index 0ef9c97..9ff6c95 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -136,9 +136,8 @@ export default function QuestionsListClient() {
     void fetchGeoCountryCode();
   }, []);
 
-  // Signal Flutter to lift its loading cover once the profile is available
-  // (either from SSR hydration or client-side fetch).
-  useHabibWebReady(!!profile && !isProfileLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
 
   const startMatchMutation = useStartMarriageMatchMutation({
     onSuccess: () => {
diff --git a/src/app/request-accepted/page.tsx b/src/app/request-accepted/page.tsx
index b6f1e3a..e276a56 100644
--- a/src/app/request-accepted/page.tsx
+++ b/src/app/request-accepted/page.tsx
@@ -1,39 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import RequestAcceptedClient from "./request-accepted-client";
 
-export const dynamic = "force-dynamic";
-
-export default async function RequestAcceptedPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <RequestAcceptedClient />
-    </HydrationBoundary>
-  );
+export default function RequestAcceptedPage() {
+  return <RequestAcceptedClient />;
 }
diff --git a/src/app/request-sent/page.tsx b/src/app/request-sent/page.tsx
index 4e9b4d2..85156ee 100644
--- a/src/app/request-sent/page.tsx
+++ b/src/app/request-sent/page.tsx
@@ -1,39 +1,5 @@
-import { cookies } from "next/headers";
-import {
-  dehydrate,
-  HydrationBoundary,
-  QueryClient,
-} from "@tanstack/react-query";
-import { isAuthenticatedToken } from "@/lib/entry-route-cache";
-import { fetchProfileSSR } from "@/lib/ssr-fetch";
-import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import RequestSentClient from "./request-sent-client";
 
-export const dynamic = "force-dynamic";
-
-export default async function RequestSentPage() {
-  const cookieStore = await cookies();
-
-  const token =
-    cookieStore.get("HABIB_TOKEN")?.value ??
-    cookieStore.get("habib_token")?.value;
-
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: { staleTime: 10 * 1000 },
-    },
-  });
-
-  if (isAuthenticatedToken(token)) {
-    await queryClient.prefetchQuery({
-      queryKey: marriageQueryKeys.profile(),
-      queryFn: () => fetchProfileSSR(token!),
-    });
-  }
-
-  return (
-    <HydrationBoundary state={dehydrate(queryClient)}>
-      <RequestSentClient />
-    </HydrationBoundary>
-  );
+export default function RequestSentPage() {
+  return <RequestSentClient />;
 }
diff --git a/src/app/terms/page.tsx b/src/app/terms/page.tsx
index c43e18a..778ad61 100644
--- a/src/app/terms/page.tsx
+++ b/src/app/terms/page.tsx
@@ -18,9 +18,8 @@ export default function TermsRoute() {
   const router = useRouter();
   const { locale, dictionary: t } = useI18n();
 
-  // Signal Flutter when profile data is available (or failed — the page
-  // has its own loading/error UI so the cover can safely be removed).
-  useHabibWebReady(!isLoading);
+  // Signal Flutter to lift its loading cover immediately with 0ms latency.
+  useHabibWebReady(true);
 
   useEffect(() => {
     if (!isLoading && profile) {

From 5148c60ad8cfb78c20bec36bcf4f2b4cbf35f3e1 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 05:22:39 +0330
Subject: [PATCH 14/21] feat: implement initial server-side injection of
 marriage data into window global and improve cookie parsing robustness

---
 src/app/layout.tsx     | 26 ++++++++++++++++++++++++++
 src/lib/auth-bridge.ts | 23 +++++++++++++++++++----
 src/lib/cookies.ts     |  8 +++++++-
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 45a2dfa..bbeb056 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -85,6 +85,24 @@ export default async function RootLayout({
         ? cookieLocale
         : defaultLocale;
 
+  const rawMarriageCookie =
+    cookieStore.get("HABIB_MARRIAGE_DATA")?.value ??
+    cookieStore.get("habib_marriage_data")?.value;
+
+  let initialMarriageJson: string | null = null;
+  if (rawMarriageCookie) {
+    try {
+      const decoded = decodeURIComponent(rawMarriageCookie);
+      JSON.parse(decoded);
+      initialMarriageJson = decoded;
+    } catch {
+      try {
+        JSON.parse(rawMarriageCookie);
+        initialMarriageJson = rawMarriageCookie;
+      } catch {}
+    }
+  }
+
   return (
     <html
       lang={locale}
@@ -99,6 +117,14 @@ export default async function RootLayout({
         />
         <link rel="preconnect" href="https://habibapp.com" />
         <link rel="dns-prefetch" href="https://habibapp.com" />
+        {initialMarriageJson && (
+          <script
+            id="habib-early-marriage-initial-data"
+            dangerouslySetInnerHTML={{
+              __html: `window.__HABIB_MARRIAGE_INITIAL_DATA__ = ${initialMarriageJson}; window.HABIB_MARRIAGE = window.__HABIB_MARRIAGE_INITIAL_DATA__;`,
+            }}
+          />
+        )}
         <script
           id="habib-core-bootstrap"
           dangerouslySetInnerHTML={{
diff --git a/src/lib/auth-bridge.ts b/src/lib/auth-bridge.ts
index ec17c7a..fb4542e 100644
--- a/src/lib/auth-bridge.ts
+++ b/src/lib/auth-bridge.ts
@@ -35,6 +35,9 @@ class AuthBridge {
   }
 
   public getMarriageData(): Record<string, any> | null {
+    if (!this.marriageData) {
+      this.syncFromStorage();
+    }
     return this.marriageData;
   }
 
@@ -48,19 +51,31 @@ class AuthBridge {
       HABIB_COINS?: number;
       HABIB_MARRIAGE?: Record<string, any>;
       __HABIB_MARRIAGE_INITIAL_DATA__?: Record<string, any>;
+      __HABIB_BOOTSTRAP__?: Record<string, any>;
     };
 
-    if (win.HABIB_MARRIAGE || win.__HABIB_MARRIAGE_INITIAL_DATA__) {
+    if (
+      win.HABIB_MARRIAGE ||
+      win.__HABIB_MARRIAGE_INITIAL_DATA__ ||
+      win.__HABIB_BOOTSTRAP__?.marriage
+    ) {
       this.marriageData =
-        win.HABIB_MARRIAGE ?? win.__HABIB_MARRIAGE_INITIAL_DATA__ ?? null;
+        win.HABIB_MARRIAGE ??
+        win.__HABIB_MARRIAGE_INITIAL_DATA__ ??
+        win.__HABIB_BOOTSTRAP__?.marriage ??
+        null;
     } else {
       const rawMarriageCookie =
         getClientCookie("HABIB_MARRIAGE_DATA") ??
         getClientCookie("habib_marriage_data");
       if (rawMarriageCookie) {
         try {
-          this.marriageData = JSON.parse(decodeURIComponent(rawMarriageCookie));
-        } catch (e) {}
+          this.marriageData = JSON.parse(rawMarriageCookie);
+        } catch {
+          try {
+            this.marriageData = JSON.parse(decodeURIComponent(rawMarriageCookie));
+          } catch {}
+        }
       }
     }
 
diff --git a/src/lib/cookies.ts b/src/lib/cookies.ts
index 2bd0a92..53dcebc 100644
--- a/src/lib/cookies.ts
+++ b/src/lib/cookies.ts
@@ -18,7 +18,13 @@ export function getClientCookie(name: string) {
     new RegExp(`(?:^|; )${escapeCookieName(name)}=([^;]*)`),
   );
 
-  return match ? decodeURIComponent(match[1]) : null;
+  if (!match) return null;
+
+  try {
+    return decodeURIComponent(match[1]);
+  } catch {
+    return match[1];
+  }
 }
 
 export function setClientCookie(

From a5e4cf05840a017475ffaa0b6c48a734defe46b2 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 05:42:24 +0330
Subject: [PATCH 15/21] feat(auth): implement early marriage data hydration via
 root layout

Inject marriage data into the global window object from cookies during
the initial server-side render to prevent hydration mismatches and
reduce client-side latency.

- Add script injection in `RootLayout` to bootstrap `window.HABIB_MARRIAGE`
- Update `AuthBridge` to support `__HABIB_BOOTSTRAP__` and improved
  cookie parsing logic
- Enhance `getClientCookie` with robust URI decoding error handling
---
 .../candidate-contact-client.tsx                | 16 ++++++++++------
 src/app/new-match/new-match-client.tsx          |  5 +++--
 .../questions-list/questions-list-client.tsx    |  7 ++++---
 .../request-accepted-client.tsx                 |  5 +++--
 src/app/request-sent/request-sent-client.tsx    |  5 +++--
 src/app/terms/page.tsx                          |  5 +++--
 src/hooks/use-habib-web-ready.ts                | 17 ++++++++++++++++-
 7 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/app/candidate-contact/candidate-contact-client.tsx b/src/app/candidate-contact/candidate-contact-client.tsx
index 500d786..a5acd36 100644
--- a/src/app/candidate-contact/candidate-contact-client.tsx
+++ b/src/app/candidate-contact/candidate-contact-client.tsx
@@ -45,10 +45,13 @@ export default function CandidateContactClient() {
   const { isProfileOpen, openProfile, closeProfile } =
     useMatchProfileOverlay();
 
-  const { data: profile, isLoading: isProfileLoading } =
-    useMarriageProfileQuery({
-      refetchInterval: 3000,
-    });
+  const {
+    data: profile,
+    isLoading: isProfileLoading,
+    isFetched,
+  } = useMarriageProfileQuery({
+    refetchInterval: 3000,
+  });
 
   useEffect(() => {
     if (!profile) {
@@ -60,8 +63,9 @@ export default function CandidateContactClient() {
     }
   }, [profile, router, locale]);
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover once profile is available or query finished.
+  const isVisuallyReady = Boolean(profile) || isFetched;
+  useHabibWebReady(isVisuallyReady);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index fcb440b..5ebfdbc 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -611,8 +611,9 @@ export default function NewMatchClient() {
     }
   }, [profile, locale, router, isLoading, isFetched, isError]);
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover only once match summary is populated in DOM or query finished.
+  const isVisuallyReady = Boolean(profile?.match_summary) || isFetched || isError;
+  useHabibWebReady(isVisuallyReady);
 
   const handleOpenProfile = async () => {
     // If profile has not yet completed its initial server fetch or is in flight:
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index 9ff6c95..56b28c3 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -91,7 +91,7 @@ export default function QuestionsListClient() {
   const { dictionary: t, locale } = useI18n();
   const router = useRouter();
   const queryClient = useQueryClient();
-  const { data: profile, isLoading: isProfileLoading, isError: isProfileError, refetch: refetchProfile } =
+  const { data: profile, isLoading: isProfileLoading, isError: isProfileError, isFetched: isProfileFetched, refetch: refetchProfile } =
     useMarriageProfileQuery();
   const { data: overview, isLoading: isSchemaLoading, isError: isSchemaError, refetch: refetchOverview } = useFormOverviewQuery(
     "profile",
@@ -136,8 +136,9 @@ export default function QuestionsListClient() {
     void fetchGeoCountryCode();
   }, []);
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover once the profile is available or query finished.
+  const isVisuallyReady = Boolean(profile) || isProfileFetched;
+  useHabibWebReady(isVisuallyReady);
 
   const startMatchMutation = useStartMarriageMatchMutation({
     onSuccess: () => {
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 94aa180..4eb6c6d 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -267,8 +267,9 @@ export default function RequestAcceptedClient() {
     }
   }, [profile, isFetched, router, locale, noContactReportedSuccess]);
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover only once profile is populated in DOM or query finished.
+  const isVisuallyReady = Boolean(profile) || isFetched;
+  useHabibWebReady(isVisuallyReady);
 
   const handleOpenProfile = async () => {
     if (!isFetched || isFetching) {
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index 631df4d..b6e21f7 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -57,8 +57,9 @@ export default function RequestSentClient() {
     }
   }, [profile, isFetched, locale, router]);
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover only once profile is populated in DOM or query finished.
+  const isVisuallyReady = Boolean(profile) || isFetched;
+  useHabibWebReady(isVisuallyReady);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
diff --git a/src/app/terms/page.tsx b/src/app/terms/page.tsx
index 778ad61..4ab90c7 100644
--- a/src/app/terms/page.tsx
+++ b/src/app/terms/page.tsx
@@ -18,8 +18,9 @@ export default function TermsRoute() {
   const router = useRouter();
   const { locale, dictionary: t } = useI18n();
 
-  // Signal Flutter to lift its loading cover immediately with 0ms latency.
-  useHabibWebReady(true);
+  // Signal Flutter to lift its loading cover once profile or fallback is ready.
+  const isVisuallyReady = Boolean(profile) || !isLoading || isError;
+  useHabibWebReady(isVisuallyReady);
 
   useEffect(() => {
     if (!isLoading && profile) {
diff --git a/src/hooks/use-habib-web-ready.ts b/src/hooks/use-habib-web-ready.ts
index c6df617..ea5ac5e 100644
--- a/src/hooks/use-habib-web-ready.ts
+++ b/src/hooks/use-habib-web-ready.ts
@@ -20,7 +20,17 @@ import { setCachedMarriageEntryPath } from "@/lib/entry-route-cache";
 export function useHabibWebReady(ready: boolean) {
   useEffect(() => {
     if (ready && typeof window !== "undefined") {
-      window.__announceHabibWebReady?.();
+      let cancelled = false;
+
+      // Double requestAnimationFrame guarantees the browser has executed layout & paint
+      // of the ready DOM state to the GPU compositor before Flutter lifts the native cover.
+      const raf1 = requestAnimationFrame(() => {
+        const raf2 = requestAnimationFrame(() => {
+          if (!cancelled) {
+            window.__announceHabibWebReady?.();
+          }
+        });
+      });
 
       const pathname = window.location.pathname;
       if (pathname) {
@@ -35,6 +45,11 @@ export function useHabibWebReady(ready: boolean) {
           setCachedMarriageEntryPath(route);
         }
       }
+
+      return () => {
+        cancelled = true;
+        cancelAnimationFrame(raf1);
+      };
     }
   }, [ready]);
 }

From 3df506ec7a0761971d8f9820f7624f3f55d3c797 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 06:26:33 +0330
Subject: [PATCH 16/21] refactor(ui): optimize flutter loading signal and
 profile data freshness

Update client components to signal readiness to the Flutter wrapper
immediately upon mounting, rather than waiting for data hydration.
Additionally, adjust profile query settings to prioritize fresh
server-side data.

- Force `useHabibWebReady(true)` in all client-side route components
- Set `staleTime` to 0 in `useMarriageProfileQuery` to ensure fresh
  data on mount
- Simplify `queryClient.setQueryData` logic in profile hook
---
 src/app/candidate-contact/candidate-contact-client.tsx | 5 ++---
 src/app/new-match/new-match-client.tsx                 | 5 ++---
 src/app/questions-list/questions-list-client.tsx       | 5 ++---
 src/app/request-accepted/request-accepted-client.tsx   | 5 ++---
 src/app/request-sent/request-sent-client.tsx           | 5 ++---
 src/app/terms/page.tsx                                 | 5 ++---
 src/hooks/marriage/use-profile-main.ts                 | 9 ++-------
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/app/candidate-contact/candidate-contact-client.tsx b/src/app/candidate-contact/candidate-contact-client.tsx
index a5acd36..16f1961 100644
--- a/src/app/candidate-contact/candidate-contact-client.tsx
+++ b/src/app/candidate-contact/candidate-contact-client.tsx
@@ -63,9 +63,8 @@ export default function CandidateContactClient() {
     }
   }, [profile, router, locale]);
 
-  // Signal Flutter to lift its loading cover once profile is available or query finished.
-  const isVisuallyReady = Boolean(profile) || isFetched;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 5ebfdbc..12f0044 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -611,9 +611,8 @@ export default function NewMatchClient() {
     }
   }, [profile, locale, router, isLoading, isFetched, isError]);
 
-  // Signal Flutter to lift its loading cover only once match summary is populated in DOM or query finished.
-  const isVisuallyReady = Boolean(profile?.match_summary) || isFetched || isError;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   const handleOpenProfile = async () => {
     // If profile has not yet completed its initial server fetch or is in flight:
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index 56b28c3..d49ab79 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -136,9 +136,8 @@ export default function QuestionsListClient() {
     void fetchGeoCountryCode();
   }, []);
 
-  // Signal Flutter to lift its loading cover once the profile is available or query finished.
-  const isVisuallyReady = Boolean(profile) || isProfileFetched;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   const startMatchMutation = useStartMarriageMatchMutation({
     onSuccess: () => {
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 4eb6c6d..1e43a19 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -267,9 +267,8 @@ export default function RequestAcceptedClient() {
     }
   }, [profile, isFetched, router, locale, noContactReportedSuccess]);
 
-  // Signal Flutter to lift its loading cover only once profile is populated in DOM or query finished.
-  const isVisuallyReady = Boolean(profile) || isFetched;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   const handleOpenProfile = async () => {
     if (!isFetched || isFetching) {
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index b6e21f7..d3e80b8 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -57,9 +57,8 @@ export default function RequestSentClient() {
     }
   }, [profile, isFetched, locale, router]);
 
-  // Signal Flutter to lift its loading cover only once profile is populated in DOM or query finished.
-  const isVisuallyReady = Boolean(profile) || isFetched;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   const isRedirecting = useMemo(() => {
     if (!profile) return false;
diff --git a/src/app/terms/page.tsx b/src/app/terms/page.tsx
index 4ab90c7..f694391 100644
--- a/src/app/terms/page.tsx
+++ b/src/app/terms/page.tsx
@@ -18,9 +18,8 @@ export default function TermsRoute() {
   const router = useRouter();
   const { locale, dictionary: t } = useI18n();
 
-  // Signal Flutter to lift its loading cover once profile or fallback is ready.
-  const isVisuallyReady = Boolean(profile) || !isLoading || isError;
-  useHabibWebReady(isVisuallyReady);
+  // Signal Flutter to lift its loading cover immediately on mount
+  useHabibWebReady(true);
 
   useEffect(() => {
     if (!isLoading && profile) {
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index 4cb411e..3e846fc 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -77,10 +77,8 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
         queryClient.setQueryData(marriageQueryKeys.profile(), (old: any) => {
           if (!old) return initial;
           return {
-            ...old,
             ...initial,
-            active_case: initial.active_case ?? old.active_case,
-            match_summary: initial.match_summary ?? old.match_summary,
+            ...old,
           };
         });
       }
@@ -93,12 +91,9 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
   }, [queryClient]);
 
   const query = useQuery({
-    staleTime: 5 * 60 * 1000,
+    staleTime: 0, // Prioritize fresh server data from /api/marriage/profile/main/ on mount
     refetchOnWindowFocus: false,
     initialData: getInitialMarriageProfile as any,
-    // Native-injected initialData is a snapshot from app-launch time and can be
-    // incomplete (e.g. missing active_case). Marking it stale forces a fresh
-    // fetch on mount instead of trusting it for the whole staleTime window.
     initialDataUpdatedAt: 0,
     ...options,
     queryFn: getMarriageProfile,

From f24938d5a174a2f4d884e87d98ab6208de474ed6 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 06:38:22 +0330
Subject: [PATCH 17/21] feat(auth): hydrate marriage profile via root layout
 providers

Implement server-side extraction of marriage profile data from cookies
to seed the React Query cache during initial application load. This
reduces client-side loading states by providing immediate access to
profile information.

- Extract and parse marriage data in `RootLayout`
- Pass initial profile data to `Providers` component
- Seed `QueryClient` with `initialProfile` using `setQueryData`
- Update `getInitialMarriageProfile` to support data overrides
- Refine loading conditional in `NewMatchClient` to prevent flickering
  when summary data is already present
---
 src/app/layout.tsx                     | 11 ++++++++---
 src/app/new-match/new-match-client.tsx |  2 +-
 src/app/providers.tsx                  | 17 +++++++++++++----
 src/hooks/marriage/use-profile-main.ts |  6 ++++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index bbeb056..fbcc616 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -10,6 +10,8 @@ import {
   isLocale,
   localeDirections,
 } from "@/translations/config";
+import { getInitialMarriageProfile } from "@/hooks/marriage/use-profile-main";
+import type { MarriageProfileResponse } from "@/hooks/marriage/types";
 
 const faminela = localFont({
   src: "../../public/fonts/Faminela/Faminela.otf",
@@ -90,15 +92,18 @@ export default async function RootLayout({
     cookieStore.get("habib_marriage_data")?.value;
 
   let initialMarriageJson: string | null = null;
+  let initialProfile: MarriageProfileResponse | undefined;
   if (rawMarriageCookie) {
     try {
       const decoded = decodeURIComponent(rawMarriageCookie);
-      JSON.parse(decoded);
+      const parsed = JSON.parse(decoded);
       initialMarriageJson = decoded;
+      initialProfile = getInitialMarriageProfile(parsed);
     } catch {
       try {
-        JSON.parse(rawMarriageCookie);
+        const parsed = JSON.parse(rawMarriageCookie);
         initialMarriageJson = rawMarriageCookie;
+        initialProfile = getInitialMarriageProfile(parsed);
       } catch {}
     }
   }
@@ -405,7 +410,7 @@ export default async function RootLayout({
         className={`${faminela.variable} ${amiri.variable}`}
         suppressHydrationWarning
       >
-        <Providers>
+        <Providers initialProfile={initialProfile}>
           {isDevelopment ? <TokenSwitcher /> : null}
           <div className="app-shell">{children}</div>
         </Providers>
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 12f0044..921fcda 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -734,7 +734,7 @@ export default function NewMatchClient() {
 
           {/* 2. Match Summary Card Section */}
           <div className="w-full shrink-0">
-            {isLoading ? (
+            {isLoading && !matchSummary ? (
               <section className="relative overflow-hidden rounded-[24px] bg-[#FAFBFD] border border-[#F2E5E8] shadow-[0_4px_24px_rgba(0,0,0,0.04)] text-start">
                 <div className="relative h-[74px] w-full bg-[linear-gradient(180deg,#FCE2E6_0%,#FFD6DC_100%)]" />
 
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
index 689d5b0..e5a8d84 100644
--- a/src/app/providers.tsx
+++ b/src/app/providers.tsx
@@ -11,16 +11,20 @@ import HardwareBackBridge from "@/components/Componentes/hardware-back-bridge";
 import SilentReloader from "@/components/Componentes/silent-reloader";
 import { ViewPaddingsProvider } from "@/components/Componentes/view-paddings-provider";
 
+import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
+import type { MarriageProfileResponse } from "@/hooks/marriage/types";
+
 // AppFocusReloader was extracted to SilentReloader in silent-reloader.tsx
 
 type ProvidersProps = {
   children: ReactNode;
+  initialProfile?: MarriageProfileResponse;
 };
 
-export default function Providers({ children }: ProvidersProps) {
+export default function Providers({ children, initialProfile }: ProvidersProps) {
   const [queryClient] = useState(
-    () =>
-      new QueryClient({
+    () => {
+      const qc = new QueryClient({
         defaultOptions: {
           queries: {
             // Keep the last successful response available while a fresh
@@ -38,7 +42,12 @@ export default function Providers({ children }: ProvidersProps) {
             structuralSharing: true,
           },
         },
-      }),
+      });
+      if (initialProfile) {
+        qc.setQueryData(marriageQueryKeys.profile(), initialProfile);
+      }
+      return qc;
+    },
   );
 
   return (
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index 3e846fc..abf433b 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -13,8 +13,10 @@ import type { QueryOptions } from "./options";
 import { marriageQueryKeys } from "./query-keys";
 import type { MarriageProfileResponse } from "./types";
 
-export function getInitialMarriageProfile(): MarriageProfileResponse | undefined {
-  const data = authBridge.getMarriageData();
+export function getInitialMarriageProfile(
+  dataOverride?: any,
+): MarriageProfileResponse | undefined {
+  const data = dataOverride ?? authBridge.getMarriageData();
   if (!data) return undefined;
 
   return {

From aa4214613ca42c0f2ee3b5d2d5d1a24630c884b9 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 07:14:09 +0330
Subject: [PATCH 18/21] refactor(ui): synchronize profile redirection with
 fetch status

Update client-side redirection logic across multiple routes to ensure
routing decisions are only made after the profile data has been
successfully fetched from the server. This prevents premature or
incorrect redirects based on stale or incomplete hydrated data.

- Add `isFetched` check to `useEffect` guards in candidate-contact,
  finding-match, new-match, request-accepted, and request-sent clients
- Update `QuestionsListClient` to wait for `isProfileFetched` before
  triggering redirects
- Clean up dependency arrays to include new fetch status variables
---
 src/app/candidate-contact/candidate-contact-client.tsx | 4 ++--
 src/app/finding-match/finding-match-client.tsx         | 7 +------
 src/app/new-match/new-match-client.tsx                 | 9 ++-------
 src/app/questions-list/questions-list-client.tsx       | 4 ++--
 src/app/request-accepted/request-accepted-client.tsx   | 5 +----
 src/app/request-sent/request-sent-client.tsx           | 5 +----
 6 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/app/candidate-contact/candidate-contact-client.tsx b/src/app/candidate-contact/candidate-contact-client.tsx
index 16f1961..fa0d9e2 100644
--- a/src/app/candidate-contact/candidate-contact-client.tsx
+++ b/src/app/candidate-contact/candidate-contact-client.tsx
@@ -54,14 +54,14 @@ export default function CandidateContactClient() {
   });
 
   useEffect(() => {
-    if (!profile) {
+    if (!profile || !isFetched) {
       return;
     }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/candidate-contact") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, router, locale]);
+  }, [profile, isFetched, router, locale]);
 
   // Signal Flutter to lift its loading cover immediately on mount
   useHabibWebReady(true);
diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index d330b89..2d7b85f 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -47,12 +47,7 @@ export default function FindingMatchClient() {
   });
 
   useEffect(() => {
-    if (!profile) {
-      return;
-    }
-    // Don't bounce away from finding-match if we only have preliminary initialData
-    // with pending_info before the fresh server query finishes
-    if (!isFetched && profile.status === "pending_info") {
+    if (!profile || !isFetched) {
       return;
     }
     const targetPath = getSubmitPath(profile);
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 921fcda..4db945e 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -597,19 +597,14 @@ export default function NewMatchClient() {
       fullProfileObject: profile,
     });
 
-    if (!profile) {
-      return;
-    }
-    // Don't redirect based on stale native-injected initialData that may be
-    // missing active_case; wait for the first real server response.
-    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+    if (!profile || !isFetched) {
       return;
     }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/new-match") {
       router.replace(localizePath(targetPath, locale));
     }
-  }, [profile, locale, router, isLoading, isFetched, isError]);
+  }, [profile, locale, router, isFetched]);
 
   // Signal Flutter to lift its loading cover immediately on mount
   useHabibWebReady(true);
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index d49ab79..fc2ef79 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -126,10 +126,10 @@ export default function QuestionsListClient() {
   }, [profile, profileTargetPath]);
 
   useEffect(() => {
-    if (isProfileRedirecting && profileTargetPath) {
+    if (isProfileFetched && isProfileRedirecting && profileTargetPath) {
       router.replace(localizePath(profileTargetPath, locale));
     }
-  }, [isProfileRedirecting, locale, profileTargetPath, router]);
+  }, [isProfileFetched, isProfileRedirecting, locale, profileTargetPath, router]);
 
   // Background prefetch user's geo country code so phone question is pre-warmed
   useEffect(() => {
diff --git a/src/app/request-accepted/request-accepted-client.tsx b/src/app/request-accepted/request-accepted-client.tsx
index 1e43a19..a345e85 100644
--- a/src/app/request-accepted/request-accepted-client.tsx
+++ b/src/app/request-accepted/request-accepted-client.tsx
@@ -255,10 +255,7 @@ export default function RequestAcceptedClient() {
   const contactSharedAtStr = profile?.active_case?.contact_shared_at;
 
   useEffect(() => {
-    if (!profile || noContactReportedSuccess) {
-      return;
-    }
-    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+    if (!profile || !isFetched || noContactReportedSuccess) {
       return;
     }
     const targetPath = getSubmitPath(profile);
diff --git a/src/app/request-sent/request-sent-client.tsx b/src/app/request-sent/request-sent-client.tsx
index d3e80b8..797714d 100644
--- a/src/app/request-sent/request-sent-client.tsx
+++ b/src/app/request-sent/request-sent-client.tsx
@@ -45,10 +45,7 @@ export default function RequestSentClient() {
   });
 
   useEffect(() => {
-    if (!profile) {
-      return;
-    }
-    if (!isFetched && profile.status === "in_case" && !profile.active_case) {
+    if (!profile || !isFetched) {
       return;
     }
     const targetPath = getSubmitPath(profile);

From 8708d0dc36658887ba7a4b4bc835723ef9cc8836 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 07:24:34 +0330
Subject: [PATCH 19/21] feat: add debug logging to profile redirection and
 initial data synchronization flows

---
 src/app/finding-match/finding-match-client.tsx | 9 +++++++++
 src/app/new-match/new-match-client.tsx         | 2 ++
 src/hooks/marriage/use-profile-main.ts         | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index 2d7b85f..4b44acb 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -47,11 +47,20 @@ export default function FindingMatchClient() {
   });
 
   useEffect(() => {
+    console.log("🔍 [FindingMatchClient] State Evaluation:", {
+      hasProfile: Boolean(profile),
+      isFetched,
+      status: profile?.status,
+      active_case: profile?.active_case,
+      calculatedPath: profile ? getSubmitPath(profile) : null,
+    });
     if (!profile || !isFetched) {
+      console.log("⏳ [FindingMatchClient] Skipping redirect because !profile or !isFetched (isFetched=", isFetched, ")");
       return;
     }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/finding-match") {
+      console.log("🚀 [FindingMatchClient] Redirecting to:", targetPath);
       router.replace(localizePath(targetPath, locale));
     }
   }, [profile, isFetched, locale, router]);
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 4db945e..dc11c76 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -598,10 +598,12 @@ export default function NewMatchClient() {
     });
 
     if (!profile || !isFetched) {
+      console.log("⏳ [NewMatchClient] Skipping redirect because !profile or !isFetched (isFetched=", isFetched, ")");
       return;
     }
     const targetPath = getSubmitPath(profile);
     if (targetPath !== "/new-match") {
+      console.log("🚀 [NewMatchClient] Redirecting to:", targetPath);
       router.replace(localizePath(targetPath, locale));
     }
   }, [profile, locale, router, isFetched]);
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index abf433b..0c5725c 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -75,8 +75,13 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
     const handleInitialData = (e: Event) => {
       const customEvent = e as CustomEvent;
       const initial = getInitialMarriageProfile();
+      console.log("📥 [Profile Query] Received habib:marriage-initial-data event:", {
+        detail: customEvent.detail,
+        parsedInitial: initial,
+      });
       if (initial) {
         queryClient.setQueryData(marriageQueryKeys.profile(), (old: any) => {
+          console.log("🔄 [Profile Query] Merging initialData into QueryCache. Old:", old, "New Initial:", initial);
           if (!old) return initial;
           return {
             ...initial,

From 5ba6a39d03dabfeb43f34144c7fe00afe6dd4b0a Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 08:56:29 +0330
Subject: [PATCH 20/21] fix(lifecycle): eliminate stale initialData cache
 mutation and ensure 0ms web_ready delivery

---
 src/hooks/marriage/use-profile-main.ts | 35 ++++----------------------
 src/hooks/use-habib-web-ready.ts       | 17 +------------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index 0c5725c..d433562 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -69,36 +69,8 @@ export async function getMarriageProfile() {
 export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
   options?: QueryOptions<MarriageProfileResponse, TData>,
 ) {
-  const queryClient = useQueryClient();
-
-  useEffect(() => {
-    const handleInitialData = (e: Event) => {
-      const customEvent = e as CustomEvent;
-      const initial = getInitialMarriageProfile();
-      console.log("📥 [Profile Query] Received habib:marriage-initial-data event:", {
-        detail: customEvent.detail,
-        parsedInitial: initial,
-      });
-      if (initial) {
-        queryClient.setQueryData(marriageQueryKeys.profile(), (old: any) => {
-          console.log("🔄 [Profile Query] Merging initialData into QueryCache. Old:", old, "New Initial:", initial);
-          if (!old) return initial;
-          return {
-            ...initial,
-            ...old,
-          };
-        });
-      }
-    };
-
-    window.addEventListener("habib:marriage-initial-data", handleInitialData);
-    return () => {
-      window.removeEventListener("habib:marriage-initial-data", handleInitialData);
-    };
-  }, [queryClient]);
-
   const query = useQuery({
-    staleTime: 0, // Prioritize fresh server data from /api/marriage/profile/main/ on mount
+    staleTime: 30 * 1000,
     refetchOnWindowFocus: false,
     initialData: getInitialMarriageProfile as any,
     initialDataUpdatedAt: 0,
@@ -107,5 +79,8 @@ export function useMarriageProfileQuery<TData = MarriageProfileResponse>(
     queryKey: marriageQueryKeys.profile(),
   });
 
-  return query;
+  return {
+    ...query,
+    isLiveServerFetched: query.dataUpdatedAt > 0,
+  };
 }
diff --git a/src/hooks/use-habib-web-ready.ts b/src/hooks/use-habib-web-ready.ts
index ea5ac5e..c6df617 100644
--- a/src/hooks/use-habib-web-ready.ts
+++ b/src/hooks/use-habib-web-ready.ts
@@ -20,17 +20,7 @@ import { setCachedMarriageEntryPath } from "@/lib/entry-route-cache";
 export function useHabibWebReady(ready: boolean) {
   useEffect(() => {
     if (ready && typeof window !== "undefined") {
-      let cancelled = false;
-
-      // Double requestAnimationFrame guarantees the browser has executed layout & paint
-      // of the ready DOM state to the GPU compositor before Flutter lifts the native cover.
-      const raf1 = requestAnimationFrame(() => {
-        const raf2 = requestAnimationFrame(() => {
-          if (!cancelled) {
-            window.__announceHabibWebReady?.();
-          }
-        });
-      });
+      window.__announceHabibWebReady?.();
 
       const pathname = window.location.pathname;
       if (pathname) {
@@ -45,11 +35,6 @@ export function useHabibWebReady(ready: boolean) {
           setCachedMarriageEntryPath(route);
         }
       }
-
-      return () => {
-        cancelled = true;
-        cancelAnimationFrame(raf1);
-      };
     }
   }, [ready]);
 }

From 62696680d68a370b6065889bff91c1a6d8d92499 Mon Sep 17 00:00:00 2001
From: mortezaei <mortezaei2324@gmail.com>
Date: Sun, 30 Aug 2026 09:24:23 +0330
Subject: [PATCH 21/21] feat(storage): implement user-scoped profile
 persistence with instant 0ms hydration

---
 .../Componentes/auth-data-boundary.tsx        |  4 +
 src/hooks/marriage/use-profile-main.ts        | 35 +++++++-
 src/lib/user-scoped-storage.test.ts           | 50 +++++++++++
 src/lib/user-scoped-storage.ts                | 82 +++++++++++++++++++
 4 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/src/components/Componentes/auth-data-boundary.tsx b/src/components/Componentes/auth-data-boundary.tsx
index c6f8087..038c398 100644
--- a/src/components/Componentes/auth-data-boundary.tsx
+++ b/src/components/Componentes/auth-data-boundary.tsx
@@ -5,6 +5,7 @@ import { useEffect, useRef, type ReactNode } from "react";
 import { marriageQueryKeys } from "@/hooks/marriage/query-keys";
 import { HABIB_AUTH_TOKEN_CHANGED_EVENT } from "@/lib/auth-bridge";
 import {
+  clearScopedMarriageProfiles,
   isLegacyMigrationDone,
   migrateLegacyStorageKeys,
 } from "@/lib/user-scoped-storage";
@@ -83,6 +84,9 @@ export default function AuthDataBoundary({
           return kind !== "config";
         },
       });
+
+      // 3. Clear persisted local profile cache
+      clearScopedMarriageProfiles();
     };
 
     window.addEventListener(HABIB_AUTH_TOKEN_CHANGED_EVENT, handleAuthChange);
diff --git a/src/hooks/marriage/use-profile-main.ts b/src/hooks/marriage/use-profile-main.ts
index d433562..84e8fa5 100644
--- a/src/hooks/marriage/use-profile-main.ts
+++ b/src/hooks/marriage/use-profile-main.ts
@@ -9,6 +9,10 @@ import {
   hasCompletedMarriageProfileBasics,
 } from "@/lib/get-submit-path";
 import { http } from "@/lib/http";
+import {
+  getScopedMarriageProfile,
+  saveScopedMarriageProfile,
+} from "@/lib/user-scoped-storage";
 import type { QueryOptions } from "./options";
 import { marriageQueryKeys } from "./query-keys";
 import type { MarriageProfileResponse } from "./types";
@@ -16,7 +20,33 @@ import type { MarriageProfileResponse } from "./types";
 export function getInitialMarriageProfile(
   dataOverride?: any,
 ): MarriageProfileResponse | undefined {
-  const data = dataOverride ?? authBridge.getMarriageData();
+  if (dataOverride) {
+    const data = dataOverride;
+    return {
+      id: data.id ?? 0,
+      status: data.status,
+      gender: data.gender,
+      age: data.age ?? null,
+      is_registering_for_self: data.is_registering_for_self ?? null,
+      can_edit_profile: data.can_edit_profile ?? true,
+      can_message_expert: data.can_message_expert ?? true,
+      active_subscription: data.active_subscription ?? null,
+      is_ready_for_match: data.is_ready_for_match ?? true,
+      active_case: data.active_case ?? null,
+      needs_subscription: data.needs_subscription ?? false,
+      recommended_plan: data.recommended_plan ?? null,
+      match_summary: data.match_summary ?? null,
+    } as MarriageProfileResponse;
+  }
+
+  // Priority 2: Use locally persisted profile from previous successful server response
+  const persisted = getScopedMarriageProfile();
+  if (persisted) {
+    return persisted;
+  }
+
+  // Priority 3: Fallback to Flutter native bridge data
+  const data = authBridge.getMarriageData();
   if (!data) return undefined;
 
   return {
@@ -55,6 +85,9 @@ export async function getMarriageProfile() {
       raw_match_summary: data?.match_summary,
     });
 
+    // Persist latest verified profile response locally for instant 0ms hydration
+    saveScopedMarriageProfile(data);
+
     setCachedMarriageEntryPath(
       hasCompletedMarriageProfileBasics(data) ? getSubmitPath(data) : "/intro",
     );
diff --git a/src/lib/user-scoped-storage.test.ts b/src/lib/user-scoped-storage.test.ts
index e90004b..6e4b005 100644
--- a/src/lib/user-scoped-storage.test.ts
+++ b/src/lib/user-scoped-storage.test.ts
@@ -14,6 +14,9 @@ import {
   isDraftOwnedBy,
   getAllScopedSectionDraftKeys,
   extractSlugFromScopedKey,
+  saveScopedMarriageProfile,
+  getScopedMarriageProfile,
+  clearScopedMarriageProfiles,
 } from "./user-scoped-storage";
 
 describe("user-scoped-storage", () => {
@@ -160,4 +163,51 @@ describe("user-scoped-storage", () => {
       expect(isDraftOwnedBy(undefined, 99)).toBe(false);
     });
   });
+
+  describe("Scoped marriage profile caching", () => {
+    const mockProfile = {
+      id: 241,
+      status: "in_case",
+      gender: "male",
+      age: 30,
+      is_registering_for_self: true,
+      can_edit_profile: true,
+      can_message_expert: true,
+      active_subscription: { is_active: true, plan: "gold" },
+      is_ready_for_match: true,
+      active_case: null,
+      needs_subscription: false,
+      recommended_plan: null,
+      match_summary: null,
+    } as any;
+
+    it("saves and retrieves scoped marriage profile correctly", () => {
+      saveScopedMarriageProfile(mockProfile);
+
+      // Read latest
+      const latest = getScopedMarriageProfile();
+      expect(latest).not.toBeNull();
+      expect(latest?.id).toBe(241);
+      expect(latest?.status).toBe("in_case");
+      expect(latest?.active_subscription?.plan).toBe("gold");
+
+      // Read by expected profile ID
+      const byId = getScopedMarriageProfile(241);
+      expect(byId?.id).toBe(241);
+
+      // Read by wrong profile ID returns null
+      const wrongId = getScopedMarriageProfile(999);
+      expect(wrongId).toBeNull();
+    });
+
+    it("clears persisted profiles on auth/token change", () => {
+      saveScopedMarriageProfile(mockProfile);
+      expect(getScopedMarriageProfile()).not.toBeNull();
+
+      clearScopedMarriageProfiles();
+      expect(getScopedMarriageProfile()).toBeNull();
+      expect(getScopedMarriageProfile(241)).toBeNull();
+    });
+  });
 });
+
diff --git a/src/lib/user-scoped-storage.ts b/src/lib/user-scoped-storage.ts
index 1754649..0b7eeb8 100644
--- a/src/lib/user-scoped-storage.ts
+++ b/src/lib/user-scoped-storage.ts
@@ -8,6 +8,8 @@
  * The raw auth token is NEVER used as a key component.
  */
 
+import type { MarriageProfileResponse } from "@/hooks/marriage/types";
+
 export const SCOPED_STORAGE_VERSION = 3;
 
 // ─── Types ───────────────────────────────────────────────────────────
@@ -283,3 +285,83 @@ export function extractSlugFromScopedKey(key: string): string | null {
   const match = key.match(/^marriage:user:\d+:sections:([^:]+):draft:v\d+$/);
   return match ? match[1] : null;
 }
+
+// ─── Scoped Marriage Profile Cache ─────────────────────────────────────
+
+export interface ScopedMarriageProfileData {
+  version: typeof SCOPED_STORAGE_VERSION;
+  ownerProfileId: number;
+  profile: MarriageProfileResponse;
+  savedAt: number;
+}
+
+export function getScopedMarriageProfileKey(profileId: number): string {
+  return `marriage:user:${profileId}:profile:v${SCOPED_STORAGE_VERSION}`;
+}
+
+export const LATEST_PROFILE_STORAGE_KEY = `marriage:profile:latest:v${SCOPED_STORAGE_VERSION}`;
+
+/**
+ * Persist the latest full MarriageProfileResponse from the server.
+ */
+export function saveScopedMarriageProfile(profile: MarriageProfileResponse): void {
+  if (typeof window === "undefined" || !profile?.id) return;
+  try {
+    const payload: ScopedMarriageProfileData = {
+      version: SCOPED_STORAGE_VERSION,
+      ownerProfileId: profile.id,
+      profile,
+      savedAt: Date.now(),
+    };
+    const serialized = JSON.stringify(payload);
+    window.localStorage.setItem(getScopedMarriageProfileKey(profile.id), serialized);
+    window.localStorage.setItem(LATEST_PROFILE_STORAGE_KEY, serialized);
+  } catch {}
+}
+
+/**
+ * Retrieve the persisted MarriageProfileResponse if valid.
+ */
+export function getScopedMarriageProfile(
+  expectedProfileId?: number,
+): MarriageProfileResponse | null {
+  if (typeof window === "undefined") return null;
+  try {
+    const key = expectedProfileId
+      ? getScopedMarriageProfileKey(expectedProfileId)
+      : LATEST_PROFILE_STORAGE_KEY;
+    const raw = window.localStorage.getItem(key);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as ScopedMarriageProfileData;
+    if (!parsed || parsed.version !== SCOPED_STORAGE_VERSION || !parsed.profile) {
+      return null;
+    }
+    if (expectedProfileId && parsed.ownerProfileId !== expectedProfileId) {
+      return null;
+    }
+    return parsed.profile;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Clear all persisted marriage profile caches (used on auth token/account change).
+ */
+export function clearScopedMarriageProfiles(): void {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.removeItem(LATEST_PROFILE_STORAGE_KEY);
+    const keysToRemove: string[] = [];
+    for (let i = 0; i < window.localStorage.length; i++) {
+      const key = window.localStorage.key(i);
+      if (key && key.startsWith("marriage:user:") && key.includes(":profile:")) {
+        keysToRemove.push(key);
+      }
+    }
+    for (const key of keysToRemove) {
+      window.localStorage.removeItem(key);
+    }
+  } catch {}
+}
+