chore: patch release 4.1.2 (#6815 )

Co-authored-by: Johannes <72809645+jobenjada@users.noreply.github.com>
fix: welcome card text inputs not saving due to shared firstRender state (Backport) (#6780 )
2025-12-22 14:10:45 -06:00 · 2025-11-13 15:51:57 +01:00 · 2025-11-05 16:02:49 +01:00 · 2025-11-05 15:58:10 +01:00 · 2025-10-30 08:39:21 +01:00 · 2025-10-29 09:29:32 +01:00
37 changed files with 3585 additions and 358 deletions
--- a/.github/workflows/formbricks-release.yml
+++ b/.github/workflows/formbricks-release.yml
@@ -89,7 +89,7 @@ jobs:
      - check-latest-release
    with:
      IS_PRERELEASE: ${{ github.event.release.prerelease }}
-      MAKE_LATEST: ${{ needs.check-latest-release.outputs.is_latest }}
+      MAKE_LATEST: ${{ needs.check-latest-release.outputs.is_latest == 'true' }}

  docker-build-cloud:
    name: Build & push Formbricks Cloud to ECR
@@ -101,7 +101,7 @@ jobs:
    with:
      image_tag: ${{ needs.docker-build-community.outputs.VERSION }}
      IS_PRERELEASE: ${{ github.event.release.prerelease }}
-      MAKE_LATEST: ${{ needs.check-latest-release.outputs.is_latest }}
+      MAKE_LATEST: ${{ needs.check-latest-release.outputs.is_latest == 'true' }}
    needs:
      - check-latest-release
      - docker-build-community
@@ -154,4 +154,4 @@ jobs:
      release_tag: ${{ github.event.release.tag_name }}
      commit_sha: ${{ github.sha }}
      is_prerelease: ${{ github.event.release.prerelease }}
-      make_latest: ${{ needs.check-latest-release.outputs.is_latest }}
+      make_latest: ${{ needs.check-latest-release.outputs.is_latest == 'true' }}
--- a/apps/web/app/(app)/environments/[environmentId]/project/integrations/notion/components/AddIntegrationModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/project/integrations/notion/components/AddIntegrationModal.tsx
@@ -13,6 +13,7 @@ import {
  TIntegrationNotionDatabase,
 } from "@formbricks/types/integration/notion";
 import { TSurvey, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+import { getTextContent } from "@formbricks/types/surveys/validation";
 import { createOrUpdateIntegrationAction } from "@/app/(app)/environments/[environmentId]/project/integrations/actions";
 import {
  ERRORS,
@@ -122,7 +123,7 @@ export const AddIntegrationModal = ({
    const questions = selectedSurvey
      ? replaceHeadlineRecall(selectedSurvey, "default")?.questions.map((q) => ({
          id: q.id,
-          name: getLocalizedValue(q.headline, "default"),
+          name: getTextContent(getLocalizedValue(q.headline, "default")),
          type: q.type,
        }))
      : [];
--- a/apps/web/app/s/[surveyId]/loading.tsx
+++ b/apps/web/app/s/[surveyId]/loading.tsx
@@ -1,3 +0,0 @@
-import { LinkSurveyLoading } from "@/modules/survey/link/loading";
-
-export default LinkSurveyLoading;
--- a/apps/web/i18n.json
+++ b/apps/web/i18n.json
@@ -7,7 +7,7 @@
  },
  "locale": {
    "source": "en-US",
-    "targets": ["de-DE", "fr-FR", "ja-JP", "pt-BR", "pt-PT", "ro-RO", "zh-Hans-CN", "zh-Hant-TW"]
+    "targets": ["de-DE", "fr-FR", "ja-JP", "pt-BR", "pt-PT", "ro-RO", "zh-Hans-CN", "zh-Hant-TW", "es-ES"]
  },
  "version": 1.8
 }
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -398,6 +398,7 @@ checksums:
    common/user_id: 37f5ba37f71cb50607af32a6a203b1d4
    common/user_not_found: 5903581136ac6c1c1351a482a6d8fdf7
    common/variable: c13db5775ba9791b1522cc55c9c7acce
+    common/variable_ids: 44bf93b70703b7699fa9f21bc6c8eed4
    common/variables: ffd3eec5497af36d7b4e4185bad1313a
    common/verified_email: d4a9e5e47d622c6ef2fede44233076c7
    common/video: 8050c90e4289b105a0780f0fdda6ff66
@@ -745,7 +746,7 @@ checksums:
    environments/project/general/project_deleted_successfully: dbedf0f0739b822f3951de4aeb2fc26f
    environments/project/general/project_name_settings_description: 079c6380ad539543a9aa8772bc1b0fa2
    environments/project/general/project_name_updated_successfully: f95f70f4a49d451dc0441a51d05a3aa3
-    environments/project/general/recontact_waiting_time: 9c5ebb18960dec73def053de89e63272
+    environments/project/general/recontact_waiting_time: 0566dc710b4b9644e276e311b419c4c0
    environments/project/general/recontact_waiting_time_settings_description: 8922cde1f95777f9a2747fb4bed57ab5
    environments/project/general/this_action_cannot_be_undone: 3d8b13374ffd3cefc0f3f7ce077bd9c9
    environments/project/general/wait_x_days_before_showing_next_survey: d96228788d32ec23dc0d8c8ba77150a6
@@ -915,15 +916,12 @@ checksums:
    environments/settings/billing/manage_subscription: 31cafd367fc70d656d8dd979d537dc96
    environments/settings/billing/monthly: 818f1192e32bb855597f930d3e78806e
    environments/settings/billing/monthly_identified_users: 0795735f6b241d31edac576a77dd7e55
-    environments/settings/billing/per_month: 64e96490ee2d7811496cf04adae30aa4
-    environments/settings/billing/per_year: bf02408d157486e53c15a521a5645617
    environments/settings/billing/plan_upgraded_successfully: 52e2a258cc9ca8a512c288bf6f18cf37
    environments/settings/billing/premium_support_with_slas: 2e33d4442c16bfececa6cae7b2081e5d
    environments/settings/billing/remove_branding: 88b6b818750e478bfa153b33dd658280
    environments/settings/billing/startup: 4c4ac5a0b9dc62100bca6c6465f31c4c
    environments/settings/billing/startup_description: 964fcb2c77f49b80266c94606e3f4506
    environments/settings/billing/switch_plan: fb3e1941051a4273ca29224803570f4b
-    environments/settings/billing/switch_plan_confirmation_text: 910a6df56964619975c6ed5651a55db7
    environments/settings/billing/team_access_roles: 1cc4af14e589f6c09ab92a4f21958049
    environments/settings/billing/unable_to_upgrade_plan: 50fc725609411d139e534c85eeb2879e
    environments/settings/billing/unlimited_miu: 29c3f5bd01c2a09fdf1d3601665ce90f
@@ -1144,7 +1142,6 @@ checksums:
    environments/surveys/edit/allow_multi_select: 7b4b83f7a0205e2a0a8971671a69a174
    environments/surveys/edit/allow_multiple_files: dbd99f9d1026e4f7c5a5d03f71ba379d
    environments/surveys/edit/allow_users_to_select_more_than_one_image: d683e0b538d1366400292a771f3fbd08
-    environments/surveys/edit/always_show_survey: b0ae6a873ce2eeb0aea2e6d4cb04c540
    environments/surveys/edit/and_launch_surveys_in_your_website_or_app: a3edcdb4aea792a27d90aad1930f001a
    environments/surveys/edit/animation: 66a18eacfb92fc9fc9db188d2dde4f81
    environments/surveys/edit/app_survey_description: bdfacfce478e97f70b700a1382dfa687
@@ -1227,8 +1224,7 @@ checksums:
    environments/surveys/edit/custom_hostname: bc2b1c8de3f9b8ef145b45aeba6ab429
    environments/surveys/edit/darken_or_lighten_background_of_your_choice: 304a64a8050ebf501d195e948cd25b6f
    environments/surveys/edit/date_format: e95dfc41ac944874868487457ddc057a
-    environments/surveys/edit/days_before_showing_this_survey_again: 8b4623eab862615fa60064400008eb23
-    environments/surveys/edit/decide_how_often_people_can_answer_this_survey: 58427b0f0a7a258c24fa2acd9913e95e
+    environments/surveys/edit/days_before_showing_this_survey_again: 354fb28c5ff076f022d82a20c749ee46
    environments/surveys/edit/delete_choice: fd750208d414b9ad8c980c161a0199e1
    environments/surveys/edit/disable_the_visibility_of_survey_progress: 2af631010114307ac2a91612559c9618
    environments/surveys/edit/display_an_estimate_of_completion_time_for_survey: 03f0a816569399c1c61d08dbc913de06
@@ -1256,7 +1252,7 @@ checksums:
    environments/surveys/edit/equals_one_of: 369a451add4b79bc003f952f0e1bfcc9
    environments/surveys/edit/error_publishing_survey: bf9fab1d8ea7132a2e9b4b7b09f18b1f
    environments/surveys/edit/error_saving_changes: b75aa9e4e42e1d43c8f9c33c2b7dc9a7
-    environments/surveys/edit/even_after_they_submitted_a_response_e_g_feedback_box: c6668f9cf127fd922bec695dc548fe12
+    environments/surveys/edit/even_after_they_submitted_a_response_e_g_feedback_box: 7b99f30397dcde76f65e1ab64bdbd113
    environments/surveys/edit/everyone: 2112aa71b568773e8e8a792c63f4d413
    environments/surveys/edit/external_urls_paywall_tooltip: 0dbb62557e8a6fa817f0e74709eeb3d2
    environments/surveys/edit/fallback_missing: 43dbedbe1a178d455e5f80783a7b6722
@@ -1327,8 +1323,9 @@ checksums:
    environments/surveys/edit/hostname: 9bdaa7692869999df51bb60d58d9ef62
    environments/surveys/edit/how_funky_do_you_want_your_cards_in_survey_type_derived_surveys: 3cb16b37510c01af20a80f51b598346e
    environments/surveys/edit/if_you_need_more_please: a7d208c283caf6b93800b809fca80768
-    environments/surveys/edit/if_you_really_want_that_answer_ask_until_you_get_it: 33f0320ec85067a06198a841348e9fc6
-    environments/surveys/edit/ignore_waiting_time_between_surveys: 8145b6aef535fde5ee54dea63e66f64a
+    environments/surveys/edit/if_you_really_want_that_answer_ask_until_you_get_it: 31c18a8c7c578db2ba49eed663d1739f
+    environments/surveys/edit/ignore_global_waiting_time: 1e7f1465aeb6d26c325ad7f135b207a8
+    environments/surveys/edit/ignore_global_waiting_time_description: 37d173a4d537622de40677389238d859
    environments/surveys/edit/image: 048ba7a239de0fbd883ade8558415830
    environments/surveys/edit/includes_all_of: ec72f90c0839d4c3bb518deb03894031
    environments/surveys/edit/includes_one_of: 6d5be5d7c2494179e88bd7302b247884
@@ -1395,9 +1392,10 @@ checksums:
    environments/surveys/edit/optional: 396fb9a0472daf401c392bdc3e248943
    environments/surveys/edit/options: 59156082418d80acb211f973b1218f11
    environments/surveys/edit/override_theme_with_individual_styles_for_this_survey: edffc97f5d3372419fe0444de0a5aa3f
+    environments/surveys/edit/overwrite_global_waiting_time: 7bc23bd502b6bd048356b67acd956d9d
+    environments/surveys/edit/overwrite_global_waiting_time_description: 795cf6e93d4c01d2e43aa0ebab601c6e
    environments/surveys/edit/overwrite_placement: d7278be243e52c5091974e0fc4a7c342
    environments/surveys/edit/overwrite_the_global_placement_of_the_survey: 874075712254b1ce92e099d89f675a48
-    environments/surveys/edit/overwrites_waiting_period_between_surveys_to_x_days: 8d5596b024cbe8c82b021dcf6c73ba05
    environments/surveys/edit/pick_a_background_from_our_library_or_upload_your_own: b83bcbdc8131fc9524d272ff5dede754
    environments/surveys/edit/picture_idx: 55e053ad1ade5d17c582406706036028
    environments/surveys/edit/pin_can_only_contain_numbers: 417c854d44620a7229ebd9ab8cbb3613
@@ -1454,7 +1452,8 @@ checksums:
    environments/surveys/edit/range: 1fad969ecf3de1c21df046b93053c422
    environments/surveys/edit/recall_data: 39beabd626c0af15316885cff5d5d9b8
    environments/surveys/edit/recall_information_from: 884cfd143456fab1a91f0744cc92f0c8
-    environments/surveys/edit/recontact_options: 0f570378a531da60448fde37abd50214
+    environments/surveys/edit/recontact_options_section: 57a23e1bcab6baa484b27b615e6c906a
+    environments/surveys/edit/recontact_options_section_description: 1e04011440c339a3b5cfff12d55b7f12
    environments/surveys/edit/redirect_thank_you_card: 09f721c4b62e2584e40a53507092ea83
    environments/surveys/edit/redirect_to_url: f17d726bbc3391561447b3f4010635cf
    environments/surveys/edit/remove_description: b52de820b4bbcb354eb62246c4112a9a
@@ -1463,6 +1462,8 @@ checksums:
    environments/surveys/edit/required: 04d7fb6f37ffe0a6ca97d49e2a8b6eb5
    environments/surveys/edit/reset_to_theme_styles: f9edc3970ec23d6c4d2d7accc292ef3a
    environments/surveys/edit/reset_to_theme_styles_main_text: d86fb2213d3b2efbd0361526dc6cb27b
+    environments/surveys/edit/respect_global_waiting_time: 850e7e64ec890c591b2d07741ef26e11
+    environments/surveys/edit/respect_global_waiting_time_description: 5235fee102d619cb391c5aa2c75b61be
    environments/surveys/edit/response_limit_can_t_be_set_to_0: 278664873ee3b1046dbcb58848efc12a
    environments/surveys/edit/response_limit_needs_to_exceed_number_of_received_responses: 9a9c223c0918ded716ddfaa84fbaa8d9
    environments/surveys/edit/response_limits_redirections_and_more: e4f1cf94e56ad0e1b08701158d688802
@@ -1487,7 +1488,7 @@ checksums:
    environments/surveys/edit/show_advanced_settings: b6f5bbbb84f34e51cd72ccd332e9613e
    environments/surveys/edit/show_button: 6b364aac9d7ac71f34a438607c9693bc
    environments/surveys/edit/show_language_switch: b6915a7f26d7079f2d4d844d74440413
-    environments/surveys/edit/show_multiple_times: 5e6e0244c20feca78723c79aa1ddcf62
+    environments/surveys/edit/show_multiple_times: 05239c532c9c05ef5d2990ba6ce12f60
    environments/surveys/edit/show_only_once: 31858baf60ebcf193c7e35d9084af0af
    environments/surveys/edit/show_survey_maximum_of: 721ed61b01a9fc8ce4becb72823bb72e
    environments/surveys/edit/show_survey_to_users: d5e90fd17babfea978fce826e9df89b0
@@ -1517,13 +1518,12 @@ checksums:
    environments/surveys/edit/switch_multi_lanugage_on_to_get_started: d2ca06684af26bd6b5121a4656bb6458
    environments/surveys/edit/targeted: ca615f1fc3b490d5a2187b27fb4a2073
    environments/surveys/edit/ten_points: a1317b82003859f77fb3138c55450d63
-    environments/surveys/edit/the_survey_will_be_shown_multiple_times_until_they_respond: 219b15081cbafaa391e266bd2cc4c9d4
-    environments/surveys/edit/the_survey_will_be_shown_once_even_if_person_doesnt_respond: c145b7be481ae1fe6f66298d9a5cf838
+    environments/surveys/edit/the_survey_will_be_shown_multiple_times_until_they_respond: 2d8d7d2351bd7533eb3788cce228c654
+    environments/surveys/edit/the_survey_will_be_shown_once_even_if_person_doesnt_respond: 6062aaa5cf8e58e79b75b6b588ae9598
    environments/surveys/edit/then: 5e941fb7dd51a18651fcfb865edd5ba6
    environments/surveys/edit/this_action_will_remove_all_the_translations_from_this_survey: 3340c89696f10bdc01b9a1047ff0b987
    environments/surveys/edit/this_extension_is_already_added: 201d636539836c95958e28cecd8f3240
    environments/surveys/edit/this_file_type_is_not_supported: f365b9a2e05aa062ab0bc1af61f642e2
-    environments/surveys/edit/this_setting_overwrites_your: 6f980149a5a4adc2cfe3dac4f367e7e5
    environments/surveys/edit/three_points: d7f299aec752d7d690ef0ab6373327ae
    environments/surveys/edit/times: 5ab156c13df6bfd75c0b17ad0a92c78a
    environments/surveys/edit/to_keep_the_placement_over_all_surveys_consistent_you_can: 7a078e6a39d4c30b465137d2b6ef3e67
@@ -1534,7 +1534,7 @@ checksums:
    environments/surveys/edit/unlock_targeting_description: 8e315dc41c2849754839a1460643c5fb
    environments/surveys/edit/unlock_targeting_title: 6098caf969cac64cd54e217471ae42d4
    environments/surveys/edit/unsaved_changes_warning: a164f276c9f7344022aa4640b32abcf9
-    environments/surveys/edit/until_they_submit_a_response: c980c520f5b5883ed46f2e1c006082b5
+    environments/surveys/edit/until_they_submit_a_response: 2a0fd5dcc6cc40a72ed9b974f22eaf68
    environments/surveys/edit/upgrade_notice_description: 32b66a4f257ad8d38bc38dcc95fe23c4
    environments/surveys/edit/upgrade_notice_title: 40866066ebc558ad0c92a4f19f12090c
    environments/surveys/edit/upload: 4a6c84aa16db0f4e5697f49b45257bc7
@@ -1542,7 +1542,6 @@ checksums:
    environments/surveys/edit/upper_label: 1fa48bce3fade6ffc1a52d9fdddf9e17
    environments/surveys/edit/url_filters: e524879d2eb74463d7fd06a7e0f53421
    environments/surveys/edit/url_not_supported: af8a753467c617b596aadef1aaaed664
-    environments/surveys/edit/use_with_caution: 7c35d3ad68dd001e53cbd9d57c96af91
    environments/surveys/edit/variable_is_used_in_logic_of_question_please_remove_it_from_logic_first: bd9d9c7cf0be671c4e8cf67e2ae6659e
    environments/surveys/edit/variable_is_used_in_quota_please_remove_it_from_quota_first: 0d36e5b2713f5450fe346e0af0aaa29c
    environments/surveys/edit/variable_name_is_already_taken_please_choose_another: 6da42fe8733c6379158bce9a176f76d7
@@ -1552,11 +1551,13 @@ checksums:
    environments/surveys/edit/variable_used_in_recall_welcome: 60321b2f40ae01cd10f99ed77bb986ba
    environments/surveys/edit/verify_email_before_submission: c05d345dc35f2d33839e4cfd72d11eb2
    environments/surveys/edit/verify_email_before_submission_description: 434ab3ee6134367513b633a9d4f7d772
+    environments/surveys/edit/visibility_and_recontact: c27cb4ff3a4262266902a335c3ad5d84
+    environments/surveys/edit/visibility_and_recontact_description: 2969ab679e1f6111dd96e95cee26e219
    environments/surveys/edit/wait: 014d18ade977bf08d75b995076596708
    environments/surveys/edit/wait_a_few_seconds_after_the_trigger_before_showing_the_survey: 13d5521cf73be5afeba71f5db5847919
-    environments/surveys/edit/waiting_period: 21775d12b2cb831134b1f47450eaf1f3
+    environments/surveys/edit/waiting_time_across_surveys: 5c5a7653d797c86c4008f13a40434ad8
+    environments/surveys/edit/waiting_time_across_surveys_description: 1bbee2fee49f842056547c336f8fd788
    environments/surveys/edit/welcome_message: 986a434e3895c8ee0b267df95cc40051
-    environments/surveys/edit/when_conditions_match_waiting_time_will_be_ignored_and_survey_shown: e7fe9c56664da4670e52e38656d8705d
    environments/surveys/edit/without_a_filter_all_of_your_users_can_be_surveyed: 451990569c61f25d01044cc45b1ce122
    environments/surveys/edit/you_have_not_created_a_segment_yet: c6658bd1cee9c5c957c675db044708dd
    environments/surveys/edit/you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations: b12b28699e02ff9ba69bcbae838ba5da
--- a/apps/web/lib/constants.ts
+++ b/apps/web/lib/constants.ts
@@ -19,8 +19,7 @@ export const ENCRYPTION_KEY = env.ENCRYPTION_KEY;
 // Other
 export const CRON_SECRET = env.CRON_SECRET;
 export const DEFAULT_BRAND_COLOR = "#64748b";
-export const FB_LOGO_URL =
-  "https://s3.eu-central-1.amazonaws.com/listmonk-formbricks/Formbricks-Light-transparent.png";
+export const FB_LOGO_URL = `${WEBAPP_URL}/logo-transparent.png`;

 export const PRIVACY_URL = env.PRIVACY_URL;
 export const TERMS_URL = env.TERMS_URL;
@@ -175,6 +174,7 @@ export const AVAILABLE_LOCALES: TUserLocale[] = [
  "ro-RO",
  "ja-JP",
  "zh-Hans-CN",
+  "es-ES",
 ];

 // Billing constants
--- a/apps/web/lib/i18n/utils.ts
+++ b/apps/web/lib/i18n/utils.ts
@@ -137,6 +137,7 @@ export const appLanguages = [
      "ro-RO": "Engleză (SUA)",
      "ja-JP": "英語（米国）",
      "zh-Hans-CN": "英语（美国）",
+      "es-ES": "Inglés (EE.UU.)",
    },
  },
  {
@@ -151,6 +152,7 @@ export const appLanguages = [
      "ro-RO": "Germană",
      "ja-JP": "ドイツ語",
      "zh-Hans-CN": "德语",
+      "es-ES": "Alemán",
    },
  },
  {
@@ -165,6 +167,7 @@ export const appLanguages = [
      "ro-RO": "Portugheză (Brazilia)",
      "ja-JP": "ポルトガル語（ブラジル）",
      "zh-Hans-CN": "葡萄牙语（巴西）",
+      "es-ES": "Portugués (Brasil)",
    },
  },
  {
@@ -179,6 +182,7 @@ export const appLanguages = [
      "ro-RO": "Franceză",
      "ja-JP": "フランス語",
      "zh-Hans-CN": "法语",
+      "es-ES": "Francés",
    },
  },
  {
@@ -193,6 +197,7 @@ export const appLanguages = [
      "ro-RO": "Chineză (Tradicională)",
      "ja-JP": "中国語（繁体字）",
      "zh-Hans-CN": "繁体中文",
+      "es-ES": "Chino (Tradicional)",
    },
  },
  {
@@ -207,6 +212,7 @@ export const appLanguages = [
      "ro-RO": "Portugheză (Portugalia)",
      "ja-JP": "ポルトガル語（ポルトガル）",
      "zh-Hans-CN": "葡萄牙语（葡萄牙）",
+      "es-ES": "Portugués (Portugal)",
    },
  },
  {
@@ -221,6 +227,7 @@ export const appLanguages = [
      "ro-RO": "Română",
      "ja-JP": "ルーマニア語",
      "zh-Hans-CN": "罗马尼亚语",
+      "es-ES": "Rumano",
    },
  },
  {
@@ -235,6 +242,7 @@ export const appLanguages = [
      "ro-RO": "Japoneză",
      "ja-JP": "日本語",
      "zh-Hans-CN": "日语",
+      "es-ES": "Japonés",
    },
  },
  {
@@ -249,6 +257,22 @@ export const appLanguages = [
      "ro-RO": "Chineză (Simplificată)",
      "ja-JP": "中国語（簡体字）",
      "zh-Hans-CN": "简体中文",
+      "es-ES": "Chino (Simplificado)",
+    },
+  },
+  {
+    code: "es-ES",
+    label: {
+      "en-US": "Spanish",
+      "de-DE": "Spanisch",
+      "pt-BR": "Espanhol",
+      "fr-FR": "Espagnol",
+      "zh-Hant-TW": "西班牙語",
+      "pt-PT": "Espanhol",
+      "ro-RO": "Spaniol",
+      "ja-JP": "スペイン語",
+      "zh-Hans-CN": "西班牙语",
+      "es-ES": "Español",
    },
  },
 ];
--- a/apps/web/lib/time.ts
+++ b/apps/web/lib/time.ts
@@ -1,5 +1,5 @@
 import { formatDistance, intlFormat } from "date-fns";
-import { de, enUS, fr, ja, pt, ptBR, ro, zhCN, zhTW } from "date-fns/locale";
+import { de, enUS, es, fr, ja, pt, ptBR, ro, zhCN, zhTW } from "date-fns/locale";
 import { TUserLocale } from "@formbricks/types/user";

 export const convertDateString = (dateString: string | null) => {
@@ -101,6 +101,8 @@ const getLocaleForTimeSince = (locale: TUserLocale) => {
      return ja;
    case "zh-Hans-CN":
      return zhCN;
+    case "es-ES":
+      return es;
  }
 };

--- a/apps/web/lingodotdev/client.tsx
+++ b/apps/web/lingodotdev/client.tsx
@@ -53,9 +53,9 @@ export const I18nProvider = ({ children, language, defaultLanguage }: I18nProvid
    initializeI18n();
  }, [locale, defaultLanguage]);

-  // Don't render children until i18n is ready to prevent hydration issues
+  // Don't render children until i18n is ready to prevent race conditions
  if (!isReady) {
-    return <div style={{ visibility: "hidden" }}>{children}</div>;
+    return null;
  }

  return (
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -425,6 +425,7 @@
    "user_id": "Benutzer-ID",
    "user_not_found": "Benutzer nicht gefunden",
    "variable": "Variable",
+    "variable_ids": "Variablen-IDs",
    "variables": "Variablen",
    "verified_email": "Verifizierte E-Mail",
    "video": "Video",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Projekt erfolgreich gelöscht",
        "project_name_settings_description": "Ändere den Namen deines Projekts.",
        "project_name_updated_successfully": "Projektname erfolgreich aktualisiert",
-        "recontact_waiting_time": "Wartezeit für erneuten Kontakt",
+        "recontact_waiting_time": "Projektweite Wartezeit zwischen Umfragen",
        "recontact_waiting_time_settings_description": "Steuere, wie oft Nutzer in allen App-Umfragen eine Umfrage angezeigt bekommen können.",
        "this_action_cannot_be_undone": "Diese Aktion kann nicht rückgängig gemacht werden.",
        "wait_x_days_before_showing_next_survey": "Warte X Tage, bevor die nächste Umfrage angezeigt wird:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Mehrfachauswahl erlauben",
        "allow_multiple_files": "Mehrere Dateien zulassen",
        "allow_users_to_select_more_than_one_image": "Erlaube Nutzern, mehr als ein Bild auszuwählen",
-        "always_show_survey": "Umfrage immer anzeigen",
        "and_launch_surveys_in_your_website_or_app": "und Umfragen auf deiner Website oder App starten.",
        "animation": "Animation",
        "app_survey_description": "Bette eine Umfrage in deine Web-App oder Website ein, um Antworten zu sammeln.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Benutzerdefinierter Hostname",
        "darken_or_lighten_background_of_your_choice": "Hintergrund deiner Wahl abdunkeln oder aufhellen.",
        "date_format": "Datumsformat",
-        "days_before_showing_this_survey_again": "Tage, bevor diese Umfrage erneut angezeigt wird.",
-        "decide_how_often_people_can_answer_this_survey": "Entscheide, wie oft Leute diese Umfrage beantworten können.",
+        "days_before_showing_this_survey_again": "Tage nachdem eine beliebige Umfrage angezeigt wurde, bevor diese Umfrage erscheinen kann.",
        "delete_choice": "Auswahl löschen",
        "disable_the_visibility_of_survey_progress": "Deaktiviere die Sichtbarkeit des Umfragefortschritts.",
        "display_an_estimate_of_completion_time_for_survey": "Zeige eine Schätzung der Fertigstellungszeit für die Umfrage an",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "Entspricht einem von",
        "error_publishing_survey": "Beim Veröffentlichen der Umfrage ist ein Fehler aufgetreten.",
        "error_saving_changes": "Fehler beim Speichern der Änderungen",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Sogar nachdem sie eine Antwort eingereicht haben (z.B. Feedback-Box)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Mehrfachantworten erlauben; weiterhin anzeigen, auch nach einer Antwort (z.B. Feedback-Box).",
        "everyone": "Jeder",
        "external_urls_paywall_tooltip": "Bitte aktualisieren, um die externe URL anzupassen. Phishing-Prävention.",
        "fallback_missing": "Fehlender Fallback",
@@ -1409,8 +1408,9 @@
        "hostname": "Hostname",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "Wie funky sollen deine Karten in {surveyTypeDerived} Umfragen sein",
        "if_you_need_more_please": "Wenn Du mehr brauchst, bitte",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "Wenn Du diese Antwort brauchst, frag so lange, bis Du sie bekommst.",
-        "ignore_waiting_time_between_surveys": "Wartezeit zwischen Umfragen ignorieren",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Weiterhin anzeigen, wenn ausgelöst, bis eine Antwort abgegeben wird.",
+        "ignore_global_waiting_time": "Projektweite Wartezeit ignorieren",
+        "ignore_global_waiting_time_description": "Diese Umfrage kann angezeigt werden, wenn ihre Bedingungen erfüllt sind, auch wenn kürzlich eine andere Umfrage angezeigt wurde.",
        "image": "Bild",
        "includes_all_of": "Enthält alles von",
        "includes_one_of": "Enthält eines von",
@@ -1477,9 +1477,10 @@
        "optional": "Optional",
        "options": "Optionen",
        "override_theme_with_individual_styles_for_this_survey": "Styling für diese Umfrage überschreiben.",
+        "overwrite_global_waiting_time": "Benutzerdefinierte Wartezeit festlegen",
+        "overwrite_global_waiting_time_description": "Die Projektkonfiguration nur für diese Umfrage überschreiben.",
        "overwrite_placement": "Platzierung überschreiben",
        "overwrite_the_global_placement_of_the_survey": "Platzierung für diese Umfrage überschreiben",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Überschreibt die Wartezeit zwischen Umfragen auf {days} Tag(e).",
        "pick_a_background_from_our_library_or_upload_your_own": "Wähle einen Hintergrund aus oder lade deinen eigenen hoch.",
        "picture_idx": "Bild {idx}",
        "pin_can_only_contain_numbers": "PIN darf nur Zahlen enthalten.",
@@ -1538,7 +1539,8 @@
        "range": "Reichweite",
        "recall_data": "Daten abrufen",
        "recall_information_from": "Information abrufen von ...",
-        "recontact_options": "Optionen zur erneuten Kontaktaufnahme",
+        "recontact_options_section": "Optionen zur erneuten Kontaktaufnahme",
+        "recontact_options_section_description": "Wenn die Wartezeit es erlaubt, wählen Sie aus, wie oft diese Umfrage einer Person angezeigt werden kann.",
        "redirect_thank_you_card": "Weiterleitung anlegen",
        "redirect_to_url": "Zu URL weiterleiten",
        "remove_description": "Beschreibung entfernen",
@@ -1547,6 +1549,8 @@
        "required": "Erforderlich",
        "reset_to_theme_styles": "Styling zurücksetzen",
        "reset_to_theme_styles_main_text": "Bist Du sicher, dass Du das Styling auf die Themenstile zurücksetzen möchtest? Dadurch wird jegliches benutzerdefinierte Styling entfernt.",
+        "respect_global_waiting_time": "Projektweite Wartezeit verwenden",
+        "respect_global_waiting_time_description": "Diese Umfrage folgt der in der Projektkonfiguration festgelegten Wartezeit. Sie wird nur angezeigt, wenn in diesem Zeitraum keine andere Umfrage erschienen ist.",
        "response_limit_can_t_be_set_to_0": "Das Antwortlimit kann nicht auf 0 gesetzt werden",
        "response_limit_needs_to_exceed_number_of_received_responses": "Antwortlimit muss die Anzahl der erhaltenen Antworten ({responseCount}) überschreiten.",
        "response_limits_redirections_and_more": "Antwort Limits, Weiterleitungen und mehr.",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "Erweiterte Einstellungen anzeigen",
        "show_button": "Button anzeigen",
        "show_language_switch": "Sprachwechsel anzeigen",
-        "show_multiple_times": "Mehrfach anzeigen",
+        "show_multiple_times": "Begrenzte Anzahl von Malen anzeigen",
        "show_only_once": "Nur einmal anzeigen",
        "show_survey_maximum_of": "Umfrage maximal anzeigen von",
        "show_survey_to_users": "Umfrage % der Nutzer anzeigen",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Schalte Mehrsprachigkeit ein, um loszulegen 👉",
        "targeted": "Gezielt",
        "ten_points": "10 Punkte",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "Die Umfrage wird mehrmals angezeigt, bis Du antwortest",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Die Umfrage wird einmal angezeigt, auch wenn die Person nicht antwortet.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Höchstens die angegebene Anzahl von Malen anzeigen oder bis sie antworten (je nachdem, was zuerst eintritt).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Einmal anzeigen, auch wenn sie nicht antworten.",
        "then": "dann",
        "this_action_will_remove_all_the_translations_from_this_survey": "Diese Aktion entfernt alle Übersetzungen aus dieser Umfrage.",
        "this_extension_is_already_added": "Diese Erweiterung ist bereits hinzugefügt.",
        "this_file_type_is_not_supported": "Dieser Dateityp wird nicht unterstützt.",
-        "this_setting_overwrites_your": "Diese Einstellung überschreibt deine",
        "three_points": "3 Punkte",
        "times": "Zeiten",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "Um die Platzierung über alle Umfragen hinweg konsistent zu halten, kannst du",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Spezifische Nutzergruppen basierend auf Attributen oder Geräteinformationen ansprechen",
        "unlock_targeting_title": "Targeting mit einem höheren Plan freischalten",
        "unsaved_changes_warning": "Du hast ungespeicherte Änderungen in deiner Umfrage. Möchtest Du sie speichern, bevor Du gehst?",
-        "until_they_submit_a_response": "Bis sie eine Antwort einreichen",
+        "until_they_submit_a_response": "Fragen, bis sie eine Antwort abgeben",
        "upgrade_notice_description": "Erstelle mehrsprachige Umfragen und entdecke viele weitere Funktionen",
        "upgrade_notice_title": "Schalte mehrsprachige Umfragen mit einem höheren Plan frei",
        "upload": "Hochladen",
@@ -1626,7 +1629,6 @@
        "upper_label": "Oberes Label",
        "url_filters": "URL-Filter",
        "url_not_supported": "URL nicht unterstützt",
-        "use_with_caution": "Mit Vorsicht verwenden",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne es zuerst aus der Logik.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "Variable \"{variableName}\" wird in der \"{quotaName}\" Quote verwendet",
        "variable_name_is_already_taken_please_choose_another": "Variablenname ist bereits vergeben, bitte wähle einen anderen.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "Variable \"{variable}\" wird in der Willkommenskarte abgerufen.",
        "verify_email_before_submission": "E-Mail vor dem Absenden überprüfen",
        "verify_email_before_submission_description": "Lass nur Leute mit einer echten E-Mail antworten.",
+        "visibility_and_recontact": "Sichtbarkeit & erneute Kontaktaufnahme",
+        "visibility_and_recontact_description": "Steuern Sie, wann diese Umfrage erscheinen kann und wie oft sie erneut erscheinen kann.",
        "wait": "Warte",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Warte ein paar Sekunden nach dem Auslöser, bevor Du die Umfrage anzeigst",
-        "waiting_period": "Wartezeit",
+        "waiting_time_across_surveys": "Projektweite Wartezeit",
+        "waiting_time_across_surveys_description": "Um Umfragemüdigkeit zu vermeiden, wählen Sie aus, wie diese Umfrage mit der projektweiten Wartezeit interagiert.",
        "welcome_message": "Willkommensnachricht",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "Wenn die Bedingungen übereinstimmen, wird die Wartezeit ignoriert und die Umfrage angezeigt.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Ohne Filter können alle deine Nutzer befragt werden.",
        "you_have_not_created_a_segment_yet": "Du hast noch keinen Segment erstellt.",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "Du musst zwei oder mehr Sprachen in deinem Projekt einrichten, um mit Übersetzungen zu arbeiten.",
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -425,6 +425,7 @@
    "user_id": "User ID",
    "user_not_found": "User not found",
    "variable": "Variable",
+    "variable_ids": "Variable IDs",
    "variables": "Variables",
    "verified_email": "Verified Email",
    "video": "Video",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Project deleted successfully",
        "project_name_settings_description": "Change your projects name.",
        "project_name_updated_successfully": "Project name updated successfully",
-        "recontact_waiting_time": "Recontact Waiting Time",
+        "recontact_waiting_time": "Project-wide Waiting Time Between Surveys",
        "recontact_waiting_time_settings_description": "Control how frequently users can be surveyed across all app surveys.",
        "this_action_cannot_be_undone": "This action cannot be undone.",
        "wait_x_days_before_showing_next_survey": "Wait X days before showing next survey:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Allow multi-select",
        "allow_multiple_files": "Allow multiple files",
        "allow_users_to_select_more_than_one_image": "Allow users to select more than one image",
-        "always_show_survey": "Always show survey",
        "and_launch_surveys_in_your_website_or_app": "and launch surveys in your website or app.",
        "animation": "Animation",
        "app_survey_description": "Embed a survey in your web app or website to collect responses.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Custom hostname",
        "darken_or_lighten_background_of_your_choice": "Darken or lighten background of your choice.",
        "date_format": "Date format",
-        "days_before_showing_this_survey_again": "days before showing this survey again.",
-        "decide_how_often_people_can_answer_this_survey": "Decide how often people can answer this survey.",
+        "days_before_showing_this_survey_again": "days after any survey is shown before this survey can appear.",
        "delete_choice": "Delete choice",
        "disable_the_visibility_of_survey_progress": "Disable the visibility of survey progress.",
        "display_an_estimate_of_completion_time_for_survey": "Display an estimate of completion time for survey",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "Equals one of",
        "error_publishing_survey": "An error occured while publishing the survey.",
        "error_saving_changes": "Error saving changes",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Even after they submitted a response (e.g. Feedback Box)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Allow multiple responses; continue showing even after a response (e.g., Feedback Box).",
        "everyone": "Everyone",
        "external_urls_paywall_tooltip": "Please upgrade to customize external URL. Phishing prevention.",
        "fallback_missing": "Fallback missing",
@@ -1409,8 +1408,9 @@
        "hostname": "Hostname",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "How funky do you want your cards in {surveyTypeDerived} Surveys",
        "if_you_need_more_please": "If you need more, please",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "If you really want that answer, ask until you get it.",
-        "ignore_waiting_time_between_surveys": "Ignore waiting time between surveys",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Keep showing whenever triggered until a response is submitted.",
+        "ignore_global_waiting_time": "Ignore project-wide waiting time",
+        "ignore_global_waiting_time_description": "This survey can show whenever its conditions are met, even if another survey was shown recently.",
        "image": "Image",
        "includes_all_of": "Includes all of",
        "includes_one_of": "Includes one of",
@@ -1477,9 +1477,10 @@
        "optional": "Optional",
        "options": "Options",
        "override_theme_with_individual_styles_for_this_survey": "Override the theme with individual styles for this survey.",
+        "overwrite_global_waiting_time": "Set custom waiting time",
+        "overwrite_global_waiting_time_description": "Override the project configuration for this survey only.",
        "overwrite_placement": "Overwrite placement",
        "overwrite_the_global_placement_of_the_survey": "Overwrite the global placement of the survey",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Overwrites waiting period between surveys to {days} day(s).",
        "pick_a_background_from_our_library_or_upload_your_own": "Pick a background from our library or upload your own.",
        "picture_idx": "Picture {idx}",
        "pin_can_only_contain_numbers": "PIN can only contain numbers.",
@@ -1538,7 +1539,8 @@
        "range": "Range",
        "recall_data": "Recall data",
        "recall_information_from": "Recall information from ...",
-        "recontact_options": "Recontact Options",
+        "recontact_options_section": "Recontact options",
+        "recontact_options_section_description": "If the waiting time allows, choose how often this survey can be shown to a person.",
        "redirect_thank_you_card": "Redirect thank you card",
        "redirect_to_url": "Redirect to Url",
        "remove_description": "Remove description",
@@ -1547,6 +1549,8 @@
        "required": "Required",
        "reset_to_theme_styles": "Reset to theme styles",
        "reset_to_theme_styles_main_text": "Are you sure you want to reset the styling to the theme styles? This will remove all custom styling.",
+        "respect_global_waiting_time": "Use project-wide waiting time",
+        "respect_global_waiting_time_description": "This survey follows the waiting time set in project configuration. It only shows if no other survey has appeared during that period.",
        "response_limit_can_t_be_set_to_0": "Response limit can't be set to 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "Response limit needs to exceed number of received responses ({responseCount}).",
        "response_limits_redirections_and_more": "Response limits, redirections and more.",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "Show Advanced settings",
        "show_button": "Show Button",
        "show_language_switch": "Show language switch",
-        "show_multiple_times": "Show multiple times",
+        "show_multiple_times": "Show a limited number of times",
        "show_only_once": "Show only once",
        "show_survey_maximum_of": "Show survey maximum of",
        "show_survey_to_users": "Show survey to % of users",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Switch multi-lanugage on to get started \uD83D\uDC49",
        "targeted": "Targeted",
        "ten_points": "10 points",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "The survey will be shown multiple times until they respond",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "The survey will be shown once, even if person doesn't respond.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Show at most the specified number of times, or until they respond (whichever comes first).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Show a single time, even if they don't respond.",
        "then": "Then",
        "this_action_will_remove_all_the_translations_from_this_survey": "This action will remove all the translations from this survey.",
        "this_extension_is_already_added": "This extension is already added.",
        "this_file_type_is_not_supported": "This file type is not supported.",
-        "this_setting_overwrites_your": "This setting overwrites your",
        "three_points": "3 points",
        "times": "times",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "To keep the placement over all surveys consistent, you can",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Target specific user groups based on attributes or device information",
        "unlock_targeting_title": "Unlock targeting with a higher plan",
        "unsaved_changes_warning": "You have unsaved changes in your survey. Would you like to save them before leaving?",
-        "until_they_submit_a_response": "Until they submit a response",
+        "until_they_submit_a_response": "Ask until they submit a response",
        "upgrade_notice_description": "Create multilingual surveys and unlock many more features",
        "upgrade_notice_title": "Unlock multi-language surveys with a higher plan",
        "upload": "Upload",
@@ -1626,7 +1629,6 @@
        "upper_label": "Upper Label",
        "url_filters": "URL Filters",
        "url_not_supported": "URL not supported",
-        "use_with_caution": "Use with caution",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} is used in logic of question {questionIndex}. Please remove it from logic first.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "Variable \"{variableName}\" is being used in \"{quotaName}\" quota",
        "variable_name_is_already_taken_please_choose_another": "Variable name is already taken, please choose another.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "Variable \"{variable}\" is being recalled in Welcome Card.",
        "verify_email_before_submission": "Verify email before submission",
        "verify_email_before_submission_description": "Only let people with a real email respond.",
+        "visibility_and_recontact": "Visibility & Recontact",
+        "visibility_and_recontact_description": "Control when this survey can appear and how often it can reappear.",
        "wait": "Wait",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Wait a few seconds after the trigger before showing the survey",
-        "waiting_period": "waiting period",
+        "waiting_time_across_surveys": "Project-wide waiting time",
+        "waiting_time_across_surveys_description": "To prevent survey fatigue, choose how this survey interacts with the project-wide waiting time.",
        "welcome_message": "Welcome message",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "When conditions match, waiting time will be ignored and survey shown.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Without a filter, all of your users can be surveyed.",
        "you_have_not_created_a_segment_yet": "You have not created a segment yet",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "You need to have two or more languages set up in your project to work with translations.",
--- a/apps/web/locales/es-ES.json
+++ b/apps/web/locales/es-ES.json
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -425,6 +425,7 @@
    "user_id": "Identifiant d'utilisateur",
    "user_not_found": "Utilisateur non trouvé",
    "variable": "Variable",
+    "variable_ids": "Identifiants variables",
    "variables": "Variables",
    "verified_email": "Email vérifié",
    "video": "Vidéo",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Projet supprimé avec succès",
        "project_name_settings_description": "Vous pouvez modifier le nom de votre projet.",
        "project_name_updated_successfully": "Le nom du projet a été mis à jour avec succès.",
-        "recontact_waiting_time": "Délai avant nouveau contact",
+        "recontact_waiting_time": "Temps d'attente entre les enquêtes à l'échelle du projet",
        "recontact_waiting_time_settings_description": "Vous pouvez contrôler la fréquence à laquelle les utilisateurs sont sollicités pour répondre aux enquêtes.",
        "this_action_cannot_be_undone": "Cette action ne peut pas être annulée.",
        "wait_x_days_before_showing_next_survey": "Nombre de jours devant s'écouler avant une nouvelle sollicitation :",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Autoriser la sélection multiple",
        "allow_multiple_files": "Autoriser plusieurs fichiers",
        "allow_users_to_select_more_than_one_image": "Permettre aux utilisateurs de sélectionner plusieurs images",
-        "always_show_survey": "Afficher toujours l'enquête",
        "and_launch_surveys_in_your_website_or_app": "et lancez des enquêtes sur votre site web ou votre application.",
        "animation": "Animation",
        "app_survey_description": "Intégrez une enquête dans votre application web ou votre site web pour collecter des réponses.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Nom d'hôte personnalisé",
        "darken_or_lighten_background_of_your_choice": "Assombrir ou éclaircir l'arrière-plan de votre choix.",
        "date_format": "Format de date",
-        "days_before_showing_this_survey_again": "jours avant de montrer à nouveau cette enquête.",
-        "decide_how_often_people_can_answer_this_survey": "Décidez à quelle fréquence les gens peuvent répondre à cette enquête.",
+        "days_before_showing_this_survey_again": "jours après qu'une enquête soit affichée avant que cette enquête puisse apparaître.",
        "delete_choice": "Supprimer l'option",
        "disable_the_visibility_of_survey_progress": "Désactiver la visibilité de la progression du sondage.",
        "display_an_estimate_of_completion_time_for_survey": "Afficher une estimation du temps de complétion pour l'enquête.",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "Égal à l'un de",
        "error_publishing_survey": "Une erreur est survenue lors de la publication de l'enquête.",
        "error_saving_changes": "Erreur lors de l'enregistrement des modifications",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Même après avoir soumis une réponse (par exemple, la boîte de feedback)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Autoriser plusieurs réponses ; continuer à afficher même après une réponse (par exemple, boîte de commentaires).",
        "everyone": "Tout le monde",
        "external_urls_paywall_tooltip": "Veuillez passer à la version supérieure pour personnaliser l'URL externe. Prévention contre l'hameçonnage.",
        "fallback_missing": "Fallback manquant",
@@ -1409,8 +1408,9 @@
        "hostname": "Nom d'hôte",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "À quel point voulez-vous que vos cartes soient funky dans les enquêtes {surveyTypeDerived}",
        "if_you_need_more_please": "Si vous en avez besoin de plus, s'il vous plaît",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "Si tu veux vraiment cette réponse, demande jusqu'à ce que tu l'obtiennes.",
-        "ignore_waiting_time_between_surveys": "Ignorer le temps d'attente entre les enquêtes",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Continuer à afficher à chaque déclenchement jusqu'à ce qu'une réponse soit soumise.",
+        "ignore_global_waiting_time": "Ignorer le temps d'attente à l'échelle du projet",
+        "ignore_global_waiting_time_description": "Cette enquête peut s'afficher chaque fois que ses conditions sont remplies, même si une autre enquête a été affichée récemment.",
        "image": "Image",
        "includes_all_of": "Comprend tous les",
        "includes_one_of": "Comprend un de",
@@ -1477,9 +1477,10 @@
        "optional": "Optionnel",
        "options": "Options",
        "override_theme_with_individual_styles_for_this_survey": "Override the theme with individual styles for this survey.",
+        "overwrite_global_waiting_time": "Définir un temps d'attente personnalisé",
+        "overwrite_global_waiting_time_description": "Remplacer la configuration du projet pour cette enquête uniquement.",
        "overwrite_placement": "Surcharge de placement",
        "overwrite_the_global_placement_of_the_survey": "Surcharger le placement global de l'enquête",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Remplace la période d'attente entre les enquêtes par {days} jour(s).",
        "pick_a_background_from_our_library_or_upload_your_own": "Choisissez un arrière-plan dans notre bibliothèque ou téléchargez le vôtre.",
        "picture_idx": "Image {idx}",
        "pin_can_only_contain_numbers": "Le code PIN ne peut contenir que des chiffres.",
@@ -1538,7 +1539,8 @@
        "range": "Plage",
        "recall_data": "Rappel des données",
        "recall_information_from": "Rappeler les informations de ...",
-        "recontact_options": "Options de recontact",
+        "recontact_options_section": "Options de recontact",
+        "recontact_options_section_description": "Si le temps d'attente le permet, choisissez la fréquence à laquelle cette enquête peut être présentée à une personne.",
        "redirect_thank_you_card": "Carte de remerciement de redirection",
        "redirect_to_url": "Rediriger vers l'URL",
        "remove_description": "Supprimer la description",
@@ -1547,6 +1549,8 @@
        "required": "Requis",
        "reset_to_theme_styles": "Réinitialiser aux styles de thème",
        "reset_to_theme_styles_main_text": "Êtes-vous sûr de vouloir réinitialiser le style aux styles du thème ? Cela supprimera tous les styles personnalisés.",
+        "respect_global_waiting_time": "Utiliser le temps d'attente à l'échelle du projet",
+        "respect_global_waiting_time_description": "Cette enquête respecte le temps d'attente défini dans la configuration du projet. Elle ne s'affiche que si aucune autre enquête n'est apparue pendant cette période.",
        "response_limit_can_t_be_set_to_0": "La limite de réponse ne peut pas être fixée à 0.",
        "response_limit_needs_to_exceed_number_of_received_responses": "La limite de réponses doit dépasser le nombre de réponses reçues ({responseCount}).",
        "response_limits_redirections_and_more": "Limites de réponse, redirections et plus.",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "Afficher les paramètres avancés",
        "show_button": "Afficher le bouton",
        "show_language_switch": "Afficher le changement de langue",
-        "show_multiple_times": "Afficher plusieurs fois",
+        "show_multiple_times": "Afficher un nombre limité de fois",
        "show_only_once": "Afficher une seule fois",
        "show_survey_maximum_of": "Afficher le maximum du sondage de",
        "show_survey_to_users": "Afficher l'enquête à % des utilisateurs",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Activez le multilingue pour commencer 👉",
        "targeted": "Ciblé",
        "ten_points": "10 points",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "L'enquête sera affichée plusieurs fois jusqu'à ce qu'ils répondent.",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "L'enquête sera affichée une fois, même si la personne ne répond pas.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Afficher au maximum le nombre de fois spécifié, ou jusqu'à ce qu'ils répondent (selon la première éventualité).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Afficher une seule fois, même si la personne ne répond pas.",
        "then": "Alors",
        "this_action_will_remove_all_the_translations_from_this_survey": "Cette action supprimera toutes les traductions de cette enquête.",
        "this_extension_is_already_added": "Cette extension est déjà ajoutée.",
        "this_file_type_is_not_supported": "Ce type de fichier n'est pas pris en charge.",
-        "this_setting_overwrites_your": "Ce paramètre écrase votre",
        "three_points": "3 points",
        "times": "fois",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "Pour maintenir la cohérence du placement sur tous les sondages, vous pouvez",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Cibler des groupes d'utilisateurs spécifiques en fonction des attributs ou des informations sur l'appareil",
        "unlock_targeting_title": "Débloquez le ciblage avec un plan supérieur.",
        "unsaved_changes_warning": "Vous avez des modifications non enregistrées dans votre enquête. Souhaitez-vous les enregistrer avant de partir ?",
-        "until_they_submit_a_response": "Jusqu'à ce qu'ils soumettent une réponse",
+        "until_they_submit_a_response": "Demander jusqu'à ce qu'ils soumettent une réponse",
        "upgrade_notice_description": "Créez des sondages multilingues et débloquez de nombreuses autres fonctionnalités",
        "upgrade_notice_title": "Débloquez les sondages multilingues avec un plan supérieur",
        "upload": "Télécharger",
@@ -1626,7 +1629,6 @@
        "upper_label": "Étiquette supérieure",
        "url_filters": "Filtres d'URL",
        "url_not_supported": "URL non supportée",
-        "use_with_caution": "À utiliser avec précaution",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} est utilisé dans la logique de la question {questionIndex}. Veuillez d'abord le supprimer de la logique.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "La variable \"{variableName}\" est utilisée dans le quota \"{quotaName}\"",
        "variable_name_is_already_taken_please_choose_another": "Le nom de la variable est déjà pris, veuillez en choisir un autre.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "La variable \"{variable}\" est rappelée dans la carte de bienvenue.",
        "verify_email_before_submission": "Vérifiez l'email avant la soumission",
        "verify_email_before_submission_description": "Ne laissez répondre que les personnes ayant une véritable adresse e-mail.",
+        "visibility_and_recontact": "Visibilité et recontact",
+        "visibility_and_recontact_description": "Contrôlez quand cette enquête peut apparaître et à quelle fréquence elle peut réapparaître.",
        "wait": "Attendre",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Attendez quelques secondes après le déclencheur avant de montrer l'enquête.",
-        "waiting_period": "période d'attente",
+        "waiting_time_across_surveys": "Temps d'attente à l'échelle du projet",
+        "waiting_time_across_surveys_description": "Pour éviter la lassitude face aux enquêtes, choisissez comment cette enquête interagit avec le temps d'attente à l'échelle du projet.",
        "welcome_message": "Message de bienvenue",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "Lorsque les conditions correspondent, le temps d'attente sera ignoré et l'enquête sera affichée.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Sans filtre, tous vos utilisateurs peuvent être sondés.",
        "you_have_not_created_a_segment_yet": "Tu n'as pas encore créé de segment.",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "Vous devez avoir deux langues ou plus configurées dans votre projet pour travailler avec des traductions.",
--- a/apps/web/locales/ja-JP.json
+++ b/apps/web/locales/ja-JP.json
@@ -425,6 +425,7 @@
    "user_id": "ユーザーID",
    "user_not_found": "ユーザーが見つかりません",
    "variable": "変数",
+    "variable_ids": "変数ID",
    "variables": "変数",
    "verified_email": "認証済みメールアドレス",
    "video": "動画",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "プロジェクトを削除しました",
        "project_name_settings_description": "プロジェクト名を変更します。",
        "project_name_updated_successfully": "プロジェクト名を更新しました",
-        "recontact_waiting_time": "再接触の待機時間",
+        "recontact_waiting_time": "フォーム間のプロジェクト全体の待機時間",
        "recontact_waiting_time_settings_description": "アプリ内フォーム全体で、ユーザーにどの頻度で表示するかを制御します。",
        "this_action_cannot_be_undone": "この操作は取り消せません。",
        "wait_x_days_before_showing_next_survey": "次のフォームを表示するまでの待機日数:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "複数選択を許可",
        "allow_multiple_files": "複数のファイルを許可",
        "allow_users_to_select_more_than_one_image": "ユーザーが複数の画像を選択できるようにする",
-        "always_show_survey": "常にフォームを表示",
        "and_launch_surveys_in_your_website_or_app": "ウェブサイトやアプリでフォームを公開できます。",
        "animation": "アニメーション",
        "app_survey_description": "回答を収集するために、ウェブアプリまたはウェブサイトにフォームを埋め込みます。",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "カスタムホスト名",
        "darken_or_lighten_background_of_your_choice": "お好みの背景を暗くしたり明るくしたりします。",
        "date_format": "日付形式",
-        "days_before_showing_this_survey_again": "日後にこのフォームを再度表示します。",
-        "decide_how_often_people_can_answer_this_survey": "このフォームに人々が何回回答できるかを決定します。",
+        "days_before_showing_this_survey_again": "任意のフォームが表示された後、このフォームが再表示されるまでの日数。",
        "delete_choice": "選択肢を削除",
        "disable_the_visibility_of_survey_progress": "フォームの進捗状況の表示を無効にする。",
        "display_an_estimate_of_completion_time_for_survey": "フォームの完了時間の目安を表示",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "のいずれかと等しい",
        "error_publishing_survey": "フォームの公開中にエラーが発生しました。",
        "error_saving_changes": "変更の保存中にエラーが発生しました",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "回答を送信した後でも（例：フィードバックボックス）",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "複数の回答を許可；回答後も表示を継続（例：フィードボックス）。",
        "everyone": "全員",
        "external_urls_paywall_tooltip": "外部 URL をカスタマイズするにはアップグレードしてください 。 フィッシング防止 。",
        "fallback_missing": "フォールバックがありません",
@@ -1409,8 +1408,9 @@
        "hostname": "ホスト名",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "{surveyTypeDerived} フォームのカードをどれくらいユニークにしますか",
        "if_you_need_more_please": "さらに必要な場合は、",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "本当にその回答が欲しいなら、それを得るまで尋ねてください。",
-        "ignore_waiting_time_between_surveys": "フォーム間の待機時間を無視する",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "回答が提出されるまで、トリガーされるたびに表示し続けます。",
+        "ignore_global_waiting_time": "プロジェクト全体の待機時間を無視する",
+        "ignore_global_waiting_time_description": "このフォームは、最近別のフォームが表示されていても、条件が満たされればいつでも表示できます。",
        "image": "画像",
        "includes_all_of": "のすべてを含む",
        "includes_one_of": "のいずれかを含む",
@@ -1477,9 +1477,10 @@
        "optional": "オプション",
        "options": "オプション",
        "override_theme_with_individual_styles_for_this_survey": "このフォームの個別のスタイルでテーマを上書きします。",
+        "overwrite_global_waiting_time": "カスタム待機時間を設定する",
+        "overwrite_global_waiting_time_description": "このフォームのみプロジェクト設定を上書きします。",
        "overwrite_placement": "配置を上書き",
        "overwrite_the_global_placement_of_the_survey": "フォームのグローバルな配置を上書き",
-        "overwrites_waiting_period_between_surveys_to_x_days": "フォーム間の待機期間を {days} 日に上書きします。",
        "pick_a_background_from_our_library_or_upload_your_own": "ライブラリから背景を選択するか、独自にアップロードしてください。",
        "picture_idx": "写真 {idx}",
        "pin_can_only_contain_numbers": "PINは数字のみでなければなりません。",
@@ -1538,7 +1539,8 @@
        "range": "範囲",
        "recall_data": "データを呼び出す",
        "recall_information_from": "... からの情報を呼び戻す",
-        "recontact_options": "再接触オプション",
+        "recontact_options_section": "再接触オプション",
+        "recontact_options_section_description": "待機時間が許可する場合、このフォームを一人の人にどれくらいの頻度で表示できるかを選択します。",
        "redirect_thank_you_card": "サンクスクカードをリダイレクト",
        "redirect_to_url": "URLにリダイレクト",
        "remove_description": "説明を削除",
@@ -1547,6 +1549,8 @@
        "required": "必須",
        "reset_to_theme_styles": "テーマのスタイルにリセット",
        "reset_to_theme_styles_main_text": "スタイルをテーマのスタイルにリセットしてもよろしいですか？これにより、すべてのカスタムスタイルが削除されます。",
+        "respect_global_waiting_time": "プロジェクト全体の待機時間を使用する",
+        "respect_global_waiting_time_description": "このフォームはプロジェクト設定で設定された待機時間に従います。その期間中に他のフォームが表示されていない場合にのみ表示されます。",
        "response_limit_can_t_be_set_to_0": "回答数の上限を0に設定することはできません",
        "response_limit_needs_to_exceed_number_of_received_responses": "回答数の上限は、受信済みの回答数 ({responseCount}) を超える必要があります。",
        "response_limits_redirections_and_more": "回答数の上限、リダイレクトなど。",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "詳細設定を表示",
        "show_button": "ボタンを表示",
        "show_language_switch": "言語切り替えを表示",
-        "show_multiple_times": "複数回表示",
+        "show_multiple_times": "限られた回数表示する",
        "show_only_once": "一度だけ表示",
        "show_survey_maximum_of": "フォームの最大表示回数",
        "show_survey_to_users": "ユーザーの {percentage}% にフォームを表示",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "始めるには多言語をオンにしてください 👉",
        "targeted": "ターゲット",
        "ten_points": "10点",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "回答するまで複数回フォームが表示されます",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "回答しなくても、一度だけフォームが表示されます。",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "指定された回数まで、または回答があるまで表示します（どちらか先に達した方）。",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "回答がなくても1回だけ表示します。",
        "then": "その後",
        "this_action_will_remove_all_the_translations_from_this_survey": "このアクションは、このフォームからすべての翻訳を削除します。",
        "this_extension_is_already_added": "この拡張機能はすでに追加されています。",
        "this_file_type_is_not_supported": "このファイルタイプはサポートされていません。",
-        "this_setting_overwrites_your": "この設定はあなたの",
        "three_points": "3点",
        "times": "回",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "すべてのフォームの配置を一貫させるために、",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "属性またはデバイス情報に基づいて、特定のユーザーグループをターゲットにします",
        "unlock_targeting_title": "上位プランでターゲティングをアンロック",
        "unsaved_changes_warning": "フォームに未保存の変更があります。離れる前に保存しますか？",
-        "until_they_submit_a_response": "回答を送信するまで",
+        "until_they_submit_a_response": "回答が提出されるまで質問する",
        "upgrade_notice_description": "多言語フォームを作成し、さらに多くの機能をアンロック",
        "upgrade_notice_title": "上位プランで多言語フォームをアンロック",
        "upload": "アップロード",
@@ -1626,7 +1629,6 @@
        "upper_label": "上限ラベル",
        "url_filters": "URLフィルター",
        "url_not_supported": "URLはサポートされていません",
-        "use_with_caution": "注意して使用",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} は質問 {questionIndex} のロジックで使用されています。まず、ロジックから削除してください。",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "変数 \"{variableName}\" は \"{quotaName}\" クォータ で使用されています",
        "variable_name_is_already_taken_please_choose_another": "変数名はすでに使用されています。別の名前を選択してください。",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "変数 \"{variable}\" が ウェルカム カード で 呼び出され て います。",
        "verify_email_before_submission": "送信前にメールアドレスを認証",
        "verify_email_before_submission_description": "有効なメールアドレスを持つ人のみが回答できるようにする",
+        "visibility_and_recontact": "表示と再接触",
+        "visibility_and_recontact_description": "このフォームがいつ表示され、どのくらいの頻度で再表示できるかをコントロールします。",
        "wait": "待つ",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "トリガーから数秒待ってからフォームを表示します",
-        "waiting_period": "待機期間",
+        "waiting_time_across_surveys": "プロジェクト全体の待機時間",
+        "waiting_time_across_surveys_description": "フォーム疲れを防ぐため、このフォームがプロジェクト全体の待機時間とどのように相互作用するかを選択します。",
        "welcome_message": "ウェルカムメッセージ",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "条件が一致すると、待機時間は無視され、フォームが表示されます。",
        "without_a_filter_all_of_your_users_can_be_surveyed": "フィルターがなければ、すべてのユーザーがフォームに回答できます。",
        "you_have_not_created_a_segment_yet": "まだセグメントを作成していません",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "翻訳を操作するには、プロジェクトで2つ以上の言語を設定する必要があります。",
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -425,6 +425,7 @@
    "user_id": "ID do usuário",
    "user_not_found": "Usuário não encontrado",
    "variable": "variável",
+    "variable_ids": "IDs de variáveis",
    "variables": "Variáveis",
    "verified_email": "Email Verificado",
    "video": "vídeo",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Projeto deletado com sucesso",
        "project_name_settings_description": "Mude o nome do seu projeto.",
        "project_name_updated_successfully": "Nome do projeto atualizado com sucesso",
-        "recontact_waiting_time": "Tempo de Espera para Recontato",
+        "recontact_waiting_time": "Tempo de espera entre pesquisas em todo o projeto",
        "recontact_waiting_time_settings_description": "Controle com que frequência os usuários podem ser pesquisados em todas as pesquisas do app.",
        "this_action_cannot_be_undone": "Essa ação não pode ser desfeita.",
        "wait_x_days_before_showing_next_survey": "Espere X dias antes de mostrar a próxima pesquisa:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Permitir seleção múltipla",
        "allow_multiple_files": "Permitir vários arquivos",
        "allow_users_to_select_more_than_one_image": "Permitir que os usuários selecionem mais de uma imagem",
-        "always_show_survey": "Mostrar pesquisa sempre",
        "and_launch_surveys_in_your_website_or_app": "e lançar pesquisas no seu site ou app.",
        "animation": "animação",
        "app_survey_description": "Embuta uma pesquisa no seu app ou site para coletar respostas.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Hostname personalizado",
        "darken_or_lighten_background_of_your_choice": "Escureça ou clareie o fundo da sua escolha.",
        "date_format": "Formato de data",
-        "days_before_showing_this_survey_again": "dias antes de mostrar essa pesquisa de novo.",
-        "decide_how_often_people_can_answer_this_survey": "Decida com que frequência as pessoas podem responder a essa pesquisa.",
+        "days_before_showing_this_survey_again": "dias após qualquer pesquisa ser mostrada antes que esta pesquisa possa aparecer.",
        "delete_choice": "Deletar opção",
        "disable_the_visibility_of_survey_progress": "Desativar a visibilidade do progresso da pesquisa.",
        "display_an_estimate_of_completion_time_for_survey": "Mostrar uma estimativa de tempo de conclusão da pesquisa",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "É igual a um de",
        "error_publishing_survey": "Ocorreu um erro ao publicar a pesquisa.",
        "error_saving_changes": "Erro ao salvar alterações",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Mesmo depois de eles enviarem uma resposta (por exemplo, Caixa de Feedback)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir múltiplas respostas; continuar mostrando mesmo após uma resposta (ex.: caixa de feedback).",
        "everyone": "Todo mundo",
        "external_urls_paywall_tooltip": "Por favor, faça upgrade para personalizar o URL externo. Prevenção de phishing.",
        "fallback_missing": "Faltando alternativa",
@@ -1409,8 +1408,9 @@
        "hostname": "nome do host",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "Quão descoladas você quer suas cartas em Pesquisas {surveyTypeDerived}",
        "if_you_need_more_please": "Se você precisar de mais, por favor",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "Se você realmente quer essa resposta, pergunte até conseguir.",
-        "ignore_waiting_time_between_surveys": "Ignorar tempo de espera entre pesquisas",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Continuar mostrando sempre que acionada até que uma resposta seja enviada.",
+        "ignore_global_waiting_time": "Ignorar tempo de espera do projeto",
+        "ignore_global_waiting_time_description": "Esta pesquisa pode ser mostrada sempre que suas condições forem atendidas, mesmo que outra pesquisa tenha sido mostrada recentemente.",
        "image": "imagem",
        "includes_all_of": "Inclui tudo de",
        "includes_one_of": "Inclui um de",
@@ -1477,9 +1477,10 @@
        "optional": "Opcional",
        "options": "Opções",
        "override_theme_with_individual_styles_for_this_survey": "Substitua o tema com estilos individuais para essa pesquisa.",
+        "overwrite_global_waiting_time": "Definir tempo de espera personalizado",
+        "overwrite_global_waiting_time_description": "Substituir a configuração do projeto apenas para esta pesquisa.",
        "overwrite_placement": "Substituir posicionamento",
        "overwrite_the_global_placement_of_the_survey": "Substituir a posição global da pesquisa",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Substitui o período de espera entre as pesquisas para {days} dia(s).",
        "pick_a_background_from_our_library_or_upload_your_own": "Escolha um fundo da nossa biblioteca ou faça upload do seu próprio.",
        "picture_idx": "Imagem {idx}",
        "pin_can_only_contain_numbers": "O PIN só pode conter números.",
@@ -1538,7 +1539,8 @@
        "range": "alcance",
        "recall_data": "Lembrar dados",
        "recall_information_from": "Recuperar informações de ...",
-        "recontact_options": "Opções de Recontato",
+        "recontact_options_section": "Opções de recontato",
+        "recontact_options_section_description": "Se o tempo de espera permitir, escolha com que frequência esta pesquisa pode ser mostrada a uma pessoa.",
        "redirect_thank_you_card": "Redirecionar cartão de agradecimento",
        "redirect_to_url": "Redirecionar para URL",
        "remove_description": "Remover descrição",
@@ -1547,6 +1549,8 @@
        "required": "Obrigatório",
        "reset_to_theme_styles": "Redefinir para estilos do tema",
        "reset_to_theme_styles_main_text": "Tem certeza de que quer redefinir o estilo para o tema padrão? Isso vai remover todas as personalizações.",
+        "respect_global_waiting_time": "Usar tempo de espera do projeto",
+        "respect_global_waiting_time_description": "Esta pesquisa segue o tempo de espera definido na configuração do projeto. Ela só é mostrada se nenhuma outra pesquisa tiver aparecido durante esse período.",
        "response_limit_can_t_be_set_to_0": "Limite de resposta não pode ser 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
        "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "Mostrar configurações avançadas",
        "show_button": "Mostrar Botão",
        "show_language_switch": "Mostrar troca de idioma",
-        "show_multiple_times": "Mostrar várias vezes",
+        "show_multiple_times": "Mostrar um número limitado de vezes",
        "show_only_once": "Mostrar só uma vez",
        "show_survey_maximum_of": "Mostrar no máximo",
        "show_survey_to_users": "Mostrar pesquisa para % dos usuários",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Ative o modo multilíngue para começar 👉",
        "targeted": "direcionado",
        "ten_points": "10 pontos",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "A pesquisa vai ser mostrada várias vezes até eles responderem",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "A pesquisa será mostrada uma vez, mesmo se a pessoa não responder.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Mostrar no máximo o número especificado de vezes, ou até que respondam (o que ocorrer primeiro).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Mostrar uma única vez, mesmo que não respondam.",
        "then": "Então",
        "this_action_will_remove_all_the_translations_from_this_survey": "Essa ação vai remover todas as traduções dessa pesquisa.",
        "this_extension_is_already_added": "Essa extensão já foi adicionada.",
        "this_file_type_is_not_supported": "Esse tipo de arquivo não é suportado.",
-        "this_setting_overwrites_your": "Essa configuração sobrescreve seu",
        "three_points": "3 pontos",
        "times": "times",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "Para manter a colocação consistente em todas as pesquisas, você pode",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Direcione grupos específicos de usuários com base em atributos ou informações do dispositivo",
        "unlock_targeting_title": "Desbloqueie o direcionamento com um plano superior",
        "unsaved_changes_warning": "Você tem alterações não salvas na sua pesquisa. Quer salvar antes de sair?",
-        "until_they_submit_a_response": "Até eles enviarem uma resposta",
+        "until_they_submit_a_response": "Perguntar até que enviem uma resposta",
        "upgrade_notice_description": "Crie pesquisas multilíngues e desbloqueie muitas outras funcionalidades",
        "upgrade_notice_title": "Desbloqueie pesquisas multilíngues com um plano superior",
        "upload": "Enviar",
@@ -1626,7 +1629,6 @@
        "upper_label": "Etiqueta Superior",
        "url_filters": "Filtros de URL",
        "url_not_supported": "URL não suportada",
-        "use_with_caution": "Use com cuidado",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} está sendo usado na lógica da pergunta {questionIndex}. Por favor, remova-o da lógica primeiro.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "Variável \"{variableName}\" está sendo usada na cota \"{quotaName}\"",
        "variable_name_is_already_taken_please_choose_another": "O nome da variável já está em uso, por favor escolha outro.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "Variável \"{variable}\" está sendo recordada no Card de Boas-Vindas.",
        "verify_email_before_submission": "Verifique o e-mail antes de enviar",
        "verify_email_before_submission_description": "Deixe só quem tem um email real responder.",
+        "visibility_and_recontact": "Visibilidade e recontato",
+        "visibility_and_recontact_description": "Controle quando esta pesquisa pode aparecer e com que frequência pode reaparecer.",
        "wait": "Espera",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Espera alguns segundos depois do gatilho antes de mostrar a pesquisa",
-        "waiting_period": "período de espera",
+        "waiting_time_across_surveys": "Tempo de espera em todo o projeto",
+        "waiting_time_across_surveys_description": "Para evitar fadiga de pesquisas, escolha como esta pesquisa interage com o tempo de espera em todo o projeto.",
        "welcome_message": "Mensagem de boas-vindas",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "Quando as condições forem atendidas, o tempo de espera será ignorado e a pesquisa será exibida.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Sem um filtro, todos os seus usuários podem ser pesquisados.",
        "you_have_not_created_a_segment_yet": "Você ainda não criou um segmento.",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "Você precisa ter dois ou mais idiomas configurados no seu projeto para trabalhar com traduções.",
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -425,6 +425,7 @@
    "user_id": "ID do Utilizador",
    "user_not_found": "Utilizador não encontrado",
    "variable": "Variável",
+    "variable_ids": "IDs de variáveis",
    "variables": "Variáveis",
    "verified_email": "Email verificado",
    "video": "Vídeo",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Projeto eliminado com sucesso",
        "project_name_settings_description": "Altere o nome dos seus projetos.",
        "project_name_updated_successfully": "Nome do projeto atualizado com sucesso",
-        "recontact_waiting_time": "Tempo de espera de recontacto",
+        "recontact_waiting_time": "Tempo de Espera Entre Inquéritos em Todo o Projeto",
        "recontact_waiting_time_settings_description": "Controle a regularidade com que os utilizadores podem ser inquiridos em todos os inquéritos da aplicação.",
        "this_action_cannot_be_undone": "Esta ação não pode ser desfeita.",
        "wait_x_days_before_showing_next_survey": "Dias de espera:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Permitir seleção múltipla",
        "allow_multiple_files": "Permitir vários ficheiros",
        "allow_users_to_select_more_than_one_image": "Permitir aos utilizadores selecionar mais do que uma imagem",
-        "always_show_survey": "Mostrar sempre o inquérito",
        "and_launch_surveys_in_your_website_or_app": "e lance inquéritos no seu site ou aplicação.",
        "animation": "Animação",
        "app_survey_description": "Incorpore um inquérito na sua aplicação web ou site para recolher respostas.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Nome do host personalizado",
        "darken_or_lighten_background_of_your_choice": "Escurecer ou clarear o fundo da sua escolha.",
        "date_format": "Formato da data",
-        "days_before_showing_this_survey_again": "dias antes de mostrar este inquérito novamente.",
-        "decide_how_often_people_can_answer_this_survey": "Decida com que frequência as pessoas podem responder a este inquérito.",
+        "days_before_showing_this_survey_again": "dias após qualquer inquérito ser mostrado antes que este inquérito possa aparecer.",
        "delete_choice": "Eliminar escolha",
        "disable_the_visibility_of_survey_progress": "Desativar a visibilidade do progresso da pesquisa.",
        "display_an_estimate_of_completion_time_for_survey": "Mostrar uma estimativa do tempo de conclusão do inquérito",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "Igual a um de",
        "error_publishing_survey": "Ocorreu um erro ao publicar o questionário.",
        "error_saving_changes": "Erro ao guardar alterações",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Mesmo depois de terem enviado uma resposta (por exemplo, Caixa de Feedback)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Permitir múltiplas respostas; continuar a mostrar mesmo após uma resposta (por exemplo, Caixa de Feedback).",
        "everyone": "Todos",
        "external_urls_paywall_tooltip": "Por favor, atualize para personalizar o URL externo. Prevenção contra phishing.",
        "fallback_missing": "Substituição em falta",
@@ -1409,8 +1408,9 @@
        "hostname": "Nome do host",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "Quão extravagantes quer os seus cartões em Inquéritos {surveyTypeDerived}",
        "if_you_need_more_please": "Se precisar de mais, por favor",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "Se realmente quiser essa resposta, pergunte até obtê-la.",
-        "ignore_waiting_time_between_surveys": "Ignorar tempo de espera entre inquéritos",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Continuar a mostrar sempre que acionado até que uma resposta seja submetida.",
+        "ignore_global_waiting_time": "Ignorar tempo de espera de todo o projeto",
+        "ignore_global_waiting_time_description": "Este inquérito pode ser mostrado sempre que as suas condições forem cumpridas, mesmo que outro inquérito tenha sido mostrado recentemente.",
        "image": "Imagem",
        "includes_all_of": "Inclui todos de",
        "includes_one_of": "Inclui um de",
@@ -1477,9 +1477,10 @@
        "optional": "Opcional",
        "options": "Opções",
        "override_theme_with_individual_styles_for_this_survey": "Substituir o tema com estilos individuais para este inquérito.",
+        "overwrite_global_waiting_time": "Definir tempo de espera personalizado",
+        "overwrite_global_waiting_time_description": "Substituir a configuração do projeto apenas para este inquérito.",
        "overwrite_placement": "Substituir colocação",
        "overwrite_the_global_placement_of_the_survey": "Substituir a colocação global do inquérito",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Substitui o período de espera entre inquéritos para {days} dia(s).",
        "pick_a_background_from_our_library_or_upload_your_own": "Escolha um fundo da nossa biblioteca ou carregue o seu próprio.",
        "picture_idx": "Imagem {idx}",
        "pin_can_only_contain_numbers": "O PIN só pode conter números.",
@@ -1538,7 +1539,8 @@
        "range": "Intervalo",
        "recall_data": "Recuperar dados",
        "recall_information_from": "Recordar informação de ...",
-        "recontact_options": "Opções de Recontacto",
+        "recontact_options_section": "Opções de recontacto",
+        "recontact_options_section_description": "Se o tempo de espera permitir, escolha com que frequência este inquérito pode ser mostrado a uma pessoa.",
        "redirect_thank_you_card": "Redirecionar cartão de agradecimento",
        "redirect_to_url": "Redirecionar para Url",
        "remove_description": "Remover descrição",
@@ -1547,6 +1549,8 @@
        "required": "Obrigatório",
        "reset_to_theme_styles": "Repor para estilos do tema",
        "reset_to_theme_styles_main_text": "Tem a certeza de que deseja repor o estilo para os estilos do tema? Isto irá remover todos os estilos personalizados.",
+        "respect_global_waiting_time": "Usar tempo de espera de todo o projeto",
+        "respect_global_waiting_time_description": "Este inquérito segue o tempo de espera definido na configuração do projeto. Só é mostrado se nenhum outro inquérito tiver aparecido durante esse período.",
        "response_limit_can_t_be_set_to_0": "O limite de respostas não pode ser definido como 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
        "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "Mostrar definições avançadas",
        "show_button": "Mostrar Botão",
        "show_language_switch": "Mostrar alternador de idioma",
-        "show_multiple_times": "Mostrar várias vezes",
+        "show_multiple_times": "Mostrar um número limitado de vezes",
        "show_only_once": "Mostrar apenas uma vez",
        "show_survey_maximum_of": "Mostrar inquérito máximo de",
        "show_survey_to_users": "Mostrar inquérito a % dos utilizadores",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Ative o modo multilingue para começar 👉",
        "targeted": "Alvo",
        "ten_points": "10 pontos",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "O inquérito será mostrado várias vezes até que respondam",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "O inquérito será mostrado uma vez, mesmo que a pessoa não responda.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Mostrar no máximo o número especificado de vezes, ou até que respondam (o que ocorrer primeiro).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Mostrar uma única vez, mesmo que não respondam.",
        "then": "Então",
        "this_action_will_remove_all_the_translations_from_this_survey": "Esta ação irá remover todas as traduções deste inquérito.",
        "this_extension_is_already_added": "Esta extensão já está adicionada.",
        "this_file_type_is_not_supported": "Este tipo de ficheiro não é suportado.",
-        "this_setting_overwrites_your": "Esta configuração substitui o seu",
        "three_points": "3 pontos",
        "times": "tempos",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "Para manter a colocação consistente em todos os questionários, pode",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Alvo de grupos de utilizadores específicos com base em atributos ou informações do dispositivo",
        "unlock_targeting_title": "Desbloqueie a segmentação com um plano superior",
        "unsaved_changes_warning": "Tem alterações não guardadas no seu inquérito. Gostaria de as guardar antes de sair?",
-        "until_they_submit_a_response": "Até que enviem uma resposta",
+        "until_they_submit_a_response": "Perguntar até que submetam uma resposta",
        "upgrade_notice_description": "Crie inquéritos multilingues e desbloqueie muitas mais funcionalidades",
        "upgrade_notice_title": "Desbloqueie inquéritos multilingues com um plano superior",
        "upload": "Carregar",
@@ -1626,7 +1629,6 @@
        "upper_label": "Etiqueta Superior",
        "url_filters": "Filtros de URL",
        "url_not_supported": "URL não suportado",
-        "use_with_caution": "Usar com cautela",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "Variável \"{variableName}\" está a ser utilizada na quota \"{quotaName}\"",
        "variable_name_is_already_taken_please_choose_another": "O nome da variável já está em uso, por favor escolha outro.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "Variável \"{variable}\" está a ser recordada no cartão de boas-vindas.",
        "verify_email_before_submission": "Verificar email antes da submissão",
        "verify_email_before_submission_description": "Permitir apenas que pessoas com um email real respondam.",
+        "visibility_and_recontact": "Visibilidade e Recontacto",
+        "visibility_and_recontact_description": "Controlar quando este inquérito pode aparecer e com que frequência pode reaparecer.",
        "wait": "Aguardar",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Aguarde alguns segundos após o gatilho antes de mostrar o inquérito",
-        "waiting_period": "período de espera",
+        "waiting_time_across_surveys": "Tempo de espera em todo o projeto",
+        "waiting_time_across_surveys_description": "Para evitar a fadiga de inquéritos, escolha como este inquérito interage com o tempo de espera em todo o projeto.",
        "welcome_message": "Mensagem de boas-vindas",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "Quando as condições corresponderem, o tempo de espera será ignorado e o inquérito será mostrado.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Sem um filtro, todos os seus utilizadores podem ser pesquisados.",
        "you_have_not_created_a_segment_yet": "Ainda não criou um segmento",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "Precisa de ter duas ou mais línguas configuradas no seu projeto para trabalhar com traduções.",
--- a/apps/web/locales/ro-RO.json
+++ b/apps/web/locales/ro-RO.json
@@ -425,6 +425,7 @@
    "user_id": "ID Utilizator",
    "user_not_found": "Utilizatorul nu a fost găsit",
    "variable": "Variabilă",
+    "variable_ids": "ID-uri variabile",
    "variables": "Variante",
    "verified_email": "Email verificat",
    "video": "Video",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "Proiect șters cu succes!",
        "project_name_settings_description": "Schimbați numele proiectului.",
        "project_name_updated_successfully": "Numele proiectului actualizat cu succes",
-        "recontact_waiting_time": "Timp de așteptare până la recontactare",
+        "recontact_waiting_time": "Timp de așteptare la nivel de proiect între sondaje",
        "recontact_waiting_time_settings_description": "Controlează cât de des pot fi utilizatorii chestionați în toate sondajele din aplicație.",
        "this_action_cannot_be_undone": "Această acțiune nu poate fi anulată.",
        "wait_x_days_before_showing_next_survey": "Așteaptă X zile înainte de a afișa următorul sondaj:",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "Permite selectare multiplă",
        "allow_multiple_files": "Permite fișiere multiple",
        "allow_users_to_select_more_than_one_image": "Permite utilizatorilor să selecteze mai mult de o imagine",
-        "always_show_survey": "Arată întotdeauna sondajul",
        "and_launch_surveys_in_your_website_or_app": "și lansați chestionare pe site-ul sau în aplicația dvs.",
        "animation": "Animație",
        "app_survey_description": "Incorporați un chestionar în aplicația web sau pe site-ul dvs. pentru a colecta răspunsuri.",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "Gazdă personalizată",
        "darken_or_lighten_background_of_your_choice": "Întunecați sau luminați fundalul după preferințe.",
        "date_format": "Format dată",
-        "days_before_showing_this_survey_again": "zile înainte de a afișa din nou acest sondaj.",
-        "decide_how_often_people_can_answer_this_survey": "Decide cât de des pot răspunde oamenii la acest sondaj",
+        "days_before_showing_this_survey_again": "zile după afișarea oricărui sondaj înainte ca acest sondaj să poată apărea din nou.",
        "delete_choice": "Șterge alegerea",
        "disable_the_visibility_of_survey_progress": "Dezactivați vizibilitatea progresului sondajului",
        "display_an_estimate_of_completion_time_for_survey": "Afișează o estimare a timpului de finalizare pentru sondaj",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "Egal unu dintre",
        "error_publishing_survey": "A apărut o eroare în timpul publicării sondajului.",
        "error_saving_changes": "Eroare la salvarea modificărilor",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "Chiar și după ce au furnizat un răspuns (de ex. Cutia de Feedback)",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "Permite răspunsuri multiple; continuă afișarea chiar și după un răspuns (de exemplu, Caseta de Feedback).",
        "everyone": "Toată lumea",
        "external_urls_paywall_tooltip": "Vă rugăm să faceți upgrade pentru a personaliza URL-ul extern. Prevenire phishing.",
        "fallback_missing": "Rezerva lipsă",
@@ -1409,8 +1408,9 @@
        "hostname": "Nume gazdă",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "Cât de funky doriți să fie cardurile dumneavoastră în sondajele de tip {surveyTypeDerived}",
        "if_you_need_more_please": "Dacă aveți nevoie de mai multe, vă rugăm să",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "Dacă într-adevăr îți dorești acel răspuns, întreabă până îl primești.",
-        "ignore_waiting_time_between_surveys": "Ignoră perioada de așteptare între sondaje",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "Continuă afișarea ori de câte ori este declanșat până când se trimite un răspuns.",
+        "ignore_global_waiting_time": "Ignoră timpul de așteptare la nivel de proiect",
+        "ignore_global_waiting_time_description": "Acest sondaj poate fi afișat ori de câte ori condițiile sale sunt îndeplinite, chiar dacă un alt sondaj a fost afișat recent.",
        "image": "Imagine",
        "includes_all_of": "Include toate\",\"contextDescription\":\"Part of a survey completion screen referencing conditions met when all items are included\"}",
        "includes_one_of": "Include una dintre",
@@ -1477,9 +1477,10 @@
        "optional": "Opțional",
        "options": "Opțiuni",
        "override_theme_with_individual_styles_for_this_survey": "Suprascrie tema cu stiluri individuale pentru acest sondaj.",
+        "overwrite_global_waiting_time": "Setează un timp de așteptare personalizat",
+        "overwrite_global_waiting_time_description": "Suprascrie configurația proiectului doar pentru acest sondaj.",
        "overwrite_placement": "Suprascriere amplasare",
        "overwrite_the_global_placement_of_the_survey": "Suprascrie amplasarea globală a sondajului",
-        "overwrites_waiting_period_between_surveys_to_x_days": "Suprascrie perioada de așteptare dintre sondaje la {days} zi(le).",
        "pick_a_background_from_our_library_or_upload_your_own": "Alege un fundal din biblioteca noastră sau încarcă unul propriu.",
        "picture_idx": "Poză {idx}",
        "pin_can_only_contain_numbers": "PIN-ul poate conține doar numere.",
@@ -1538,7 +1539,8 @@
        "range": "Interval",
        "recall_data": "Reamintiți datele",
        "recall_information_from": "Reamintiți informațiile din ...",
-        "recontact_options": "Opțiuni de recontactare",
+        "recontact_options_section": "Opțiuni de recontactare",
+        "recontact_options_section_description": "Dacă timpul de așteptare permite, alege cât de des poate fi afișat acest sondaj unei persoane.",
        "redirect_thank_you_card": "Redirecționează cardul de mulțumire",
        "redirect_to_url": "Redirecționează către URL",
        "remove_description": "Eliminați descrierea",
@@ -1547,6 +1549,8 @@
        "required": "Obligatoriu",
        "reset_to_theme_styles": "Resetare la stilurile temei",
        "reset_to_theme_styles_main_text": "Sigur doriți să resetați stilul la stilurile de temă? Acest lucru va elimina toate stilizările personalizate.",
+        "respect_global_waiting_time": "Folosește timpul de așteptare la nivel de proiect",
+        "respect_global_waiting_time_description": "Acest sondaj respectă timpul de așteptare setat în configurația proiectului. Este afișat doar dacă niciun alt sondaj nu a apărut în acea perioadă.",
        "response_limit_can_t_be_set_to_0": "Limitul de răspunsuri nu poate fi setat la 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "Limita răspunsurilor trebuie să depășească numărul de răspunsuri primite ({responseCount}).",
        "response_limits_redirections_and_more": "Limite de răspunsuri, redirecționări și altele.",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "Comutați pe modul multilingv pentru a începe 👉",
        "targeted": "Ţintite",
        "ten_points": "10 puncte",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "Sondajul va fi afișat de mai multe ori până când vor răspunde",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Sondajul va fi afișat o singură dată, chiar dacă persoana nu răspunde.",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "Afișează de cel mult numărul specificat de ori sau până când răspund (oricare dintre acestea survine prima).",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "Afișează o singură dată, chiar dacă persoana nu răspunde.",
        "then": "Apoi",
        "this_action_will_remove_all_the_translations_from_this_survey": "Această acțiune va elimina toate traducerile din acest sondaj.",
        "this_extension_is_already_added": "Această extensie este deja adăugată.",
        "this_file_type_is_not_supported": "Acest tip de fișier nu este acceptat.",
-        "this_setting_overwrites_your": "Această setare suprascrie",
        "three_points": "3 puncte",
        "times": "ori",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "Pentru a menține amplasarea consecventă pentru toate sondajele, puteți",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "Vizează grupuri specifice de utilizatori pe baza atributelor sau a informațiilor despre dispozitiv",
        "unlock_targeting_title": "Deblocați țintirea cu un plan superior",
        "unsaved_changes_warning": "Aveți modificări nesalvate în sondajul dumneavoastră. Doriți să le salvați înainte de a pleca?",
-        "until_they_submit_a_response": "Până când vor furniza un răspuns",
+        "until_they_submit_a_response": "Întreabă până când trimit un răspuns",
        "upgrade_notice_description": "Creați sondaje multilingve și deblocați multe alte caracteristici",
        "upgrade_notice_title": "Deblocați sondajele multilingve cu un plan superior",
        "upload": "Încărcați",
@@ -1626,7 +1629,6 @@
        "upper_label": "Etichetă superioară",
        "url_filters": "Filtre URL",
        "url_not_supported": "URL nesuportat",
-        "use_with_caution": "Folosește cu precauție",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "{variable} este folosit în logica întrebării {questionIndex}. Vă rugăm să-l eliminați din logică mai întâi.",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "Variabila \"{variableName}\" este folosită în cota \"{quotaName}\"",
        "variable_name_is_already_taken_please_choose_another": "Numele variabilei este deja utilizat, vă rugăm să alegeți altul.",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "Variabila \"{variable}\" este reamintită în cardul de bun venit.",
        "verify_email_before_submission": "Verifică emailul înainte de trimitere",
        "verify_email_before_submission_description": "Permite doar persoanelor cu un email real să răspundă.",
+        "visibility_and_recontact": "Vizibilitate și recontactare",
+        "visibility_and_recontact_description": "Controlează când poate apărea acest sondaj și cât de des poate reapărea.",
        "wait": "Așteptați",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "Așteptați câteva secunde după declanșare înainte de a afișa sondajul",
-        "waiting_period": "perioada de așteptare",
+        "waiting_time_across_surveys": "Timp de așteptare la nivel de proiect",
+        "waiting_time_across_surveys_description": "Pentru a preveni oboseala cauzată de sondaje, alege cum interacționează acest sondaj cu timpul de așteptare la nivel de proiect.",
        "welcome_message": "Mesaj de bun venit",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "Când condițiile se potrivesc, timpul de așteptare va fi ignorat și sondajul va fi afișat.",
        "without_a_filter_all_of_your_users_can_be_surveyed": "Fără un filtru, toți utilizatorii pot fi chestionați.",
        "you_have_not_created_a_segment_yet": "Nu ai creat încă un segment",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "Trebuie să aveți două sau mai multe limbi configurate în proiectul dvs. pentru a lucra cu traducerile.",
--- a/apps/web/locales/zh-Hans-CN.json
+++ b/apps/web/locales/zh-Hans-CN.json
@@ -425,6 +425,7 @@
    "user_id": "用户 ID",
    "user_not_found": "用户 不存在",
    "variable": "变量",
+    "variable_ids": "变量 ID",
    "variables": "变量",
    "verified_email": "已验证 电子邮件",
    "video": "视频",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "项目 删除 成功",
        "project_name_settings_description": "更改 您 的 项目 名称。",
        "project_name_updated_successfully": "项目 名称 更新 成功",
-        "recontact_waiting_time": "再联系 等待 时间",
+        "recontact_waiting_time": "项目范围内的调查等待时间",
        "recontact_waiting_time_settings_description": "控制用户可以通过所有应用程序 调查 的 频率。",
        "this_action_cannot_be_undone": "此 操作 无法 撤消。",
        "wait_x_days_before_showing_next_survey": "等待 X 天后再显示下一个 调查：",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "允许 多选",
        "allow_multiple_files": "允许 多 个 文件",
        "allow_users_to_select_more_than_one_image": "允许 用户 选择 多于 一个 图片",
-        "always_show_survey": "始终 显示 调查",
        "and_launch_surveys_in_your_website_or_app": "并 在 你 的 网站 或 应用 中 启动 问卷 。",
        "animation": "动画",
        "app_survey_description": "在 你的 网络 应用 或 网站 中 嵌入 问卷 收集 反馈 。",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "自 定 义 主 机 名",
        "darken_or_lighten_background_of_your_choice": "根据 您 的 选择 暗化 或 亮化 背景。",
        "date_format": "日期格式",
-        "days_before_showing_this_survey_again": "显示 此 调查 之前 的 天数。",
-        "decide_how_often_people_can_answer_this_survey": "决定 人 可以 回答 这份 调查 的 频率 。",
+        "days_before_showing_this_survey_again": "在显示此调查之前，需等待的天数。",
        "delete_choice": "删除 选择",
        "disable_the_visibility_of_survey_progress": "禁用问卷 进度 的可见性。",
        "display_an_estimate_of_completion_time_for_survey": "显示 调查 预计 完成 时间",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "等于 其中 一个",
        "error_publishing_survey": "发布调查时发生了错误",
        "error_saving_changes": "保存 更改 时 出错",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "即使 他们 提交 了 回复（例如 反馈框）",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "允许多次回应；即使已提交回应，仍会继续显示（例如，反馈框）。",
        "everyone": "所有 人",
        "external_urls_paywall_tooltip": "请升级 以自定义 外部 URL 。 网络钓鱼 预防 。",
        "fallback_missing": "备用 缺失",
@@ -1409,8 +1408,9 @@
        "hostname": "主 机 名",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "在 {surveyTypeDerived} 调查 中，您 想要 卡片 多么 有趣",
        "if_you_need_more_please": "如果你需要更多，请",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "如果 你 真想 要 那个 答案，就 不断 询问 直到 得到。",
-        "ignore_waiting_time_between_surveys": "忽略 调查 之间 的 等待 时间",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "每次触发时都会显示，直到提交回应为止。",
+        "ignore_global_waiting_time": "忽略项目范围内的等待时间",
+        "ignore_global_waiting_time_description": "只要满足条件，此调查即可显示，即使最近刚显示过其他调查。",
        "image": "图片",
        "includes_all_of": "包括所有 ",
        "includes_one_of": "包括一 个",
@@ -1477,9 +1477,10 @@
        "optional": "可选",
        "options": "选项",
        "override_theme_with_individual_styles_for_this_survey": "使用 个性化 样式 替代 这份 问卷 的 主题。",
+        "overwrite_global_waiting_time": "设置自定义等待时间",
+        "overwrite_global_waiting_time_description": "仅为此调查覆盖项目配置。",
        "overwrite_placement": "覆盖 放置",
        "overwrite_the_global_placement_of_the_survey": "覆盖 全局 调查 放置",
-        "overwrites_waiting_period_between_surveys_to_x_days": "将 调查 之间 的 等待期 覆盖 为 {days} 天。",
        "pick_a_background_from_our_library_or_upload_your_own": "从我们的库中选择一种 背景 或 上传您自己的。",
        "picture_idx": "图片 {idx}",
        "pin_can_only_contain_numbers": "PIN 只能包含数字。",
@@ -1538,7 +1539,8 @@
        "range": "范围",
        "recall_data": "调用 数据",
        "recall_information_from": "从 ... 召回信息",
-        "recontact_options": "重新 联系 选项",
+        "recontact_options_section": "重新联系选项",
+        "recontact_options_section_description": "如果等待时间允许，请选择此调查可以向某人显示的频率。",
        "redirect_thank_you_card": "重定向感谢卡",
        "redirect_to_url": "重定向到 URL",
        "remove_description": "移除 描述",
@@ -1547,6 +1549,8 @@
        "required": "必需的",
        "reset_to_theme_styles": "重置 为 主题 风格",
        "reset_to_theme_styles_main_text": "您 确定 要 将 样式 重置 为 主题 样式吗？这 将 删除 所有 自定义 样式。",
+        "respect_global_waiting_time": "使用项目范围内的等待时间",
+        "respect_global_waiting_time_description": "此调查遵循项目配置中设置的等待时间。仅在该期间未显示其他调查时才会显示。",
        "response_limit_can_t_be_set_to_0": "不 能 将 响应 限制 设置 为 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "限制 响应 需要 超过 收到 的 响应 数量 （{responseCount}）。",
        "response_limits_redirections_and_more": "响应 限制 、 重定向 和 更多 。",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "显示 高级设置",
        "show_button": "显示 按钮",
        "show_language_switch": "显示 语言 切换",
-        "show_multiple_times": "显示 多次",
+        "show_multiple_times": "显示有限次数",
        "show_only_once": "仅 显示 一次",
        "show_survey_maximum_of": "显示 调查 最大 一次",
        "show_survey_to_users": "显示 问卷 给 % 的 用户",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "打开多语言以开始 👉",
        "targeted": "定位",
        "ten_points": "10 分",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "调查 将 显示 多次 直到 他们 回复",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "调查 将 显示 一次，即使 你 不 回复。",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "最多显示指定次数，或直到他们回应（以先到者为准）。",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "仅显示一次，即使他们未回应。",
        "then": "然后",
        "this_action_will_remove_all_the_translations_from_this_survey": "此操作将删除该调查中的所有翻译。",
        "this_extension_is_already_added": "此扩展已经添加。",
        "this_file_type_is_not_supported": "此 文件 类型 不 支持。",
-        "this_setting_overwrites_your": "此 设置 覆盖 你的",
        "three_points": "3 分",
        "times": "次数",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "为了 保持 所有 调查 的 放置 一致，您 可以",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "根据 属性 或 设备信息 定位 特定 用户组",
        "unlock_targeting_title": "通过 更 高级 划解锁 定位",
        "unsaved_changes_warning": "您在调查中有未保存的更改。离开前是否要保存？",
-        "until_they_submit_a_response": "直到 他们 提交 回复",
+        "until_they_submit_a_response": "持续显示直到提交回应",
        "upgrade_notice_description": "创建 多语言 调查 并 解锁 更多 功能",
        "upgrade_notice_title": "解锁 更高 计划 中 的 多语言 调查",
        "upload": "上传",
@@ -1626,7 +1629,6 @@
        "upper_label": "上限标签",
        "url_filters": "URL 过滤器",
        "url_not_supported": "URL 不支持",
-        "use_with_caution": "谨慎 使用",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "\"{variable} 在 问题 {questionIndex} 的 逻辑 中 使用。请 先 从 逻辑 中 删除 它。\"",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "变量 \"{variableName}\" 正在 被 \"{quotaName}\" 配额 使用",
        "variable_name_is_already_taken_please_choose_another": "变量名已被占用，请选择其他。",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "变量 \"{variable}\" 正在召回于欢迎 卡 。",
        "verify_email_before_submission": "提交 之前 验证电子邮件",
        "verify_email_before_submission_description": "仅允许 拥有 有效 电子邮件 的 人 回应。",
+        "visibility_and_recontact": "可见性与重新联系",
+        "visibility_and_recontact_description": "控制此调查何时可以显示以及可以重新显示的频率。",
        "wait": "等待",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "触发后等待几秒再显示问卷",
-        "waiting_period": "等待期",
+        "waiting_time_across_surveys": "项目范围内的等待时间",
+        "waiting_time_across_surveys_description": "为防止调查疲劳，请选择此调查如何与项目范围内的等待时间交互。",
        "welcome_message": "欢迎 信息",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "当 条件 匹配 时，等待 时间 将 被 忽略 并 显示 调查。",
        "without_a_filter_all_of_your_users_can_be_surveyed": "没有 过滤器 时 ，所有 用户 都可以 被 调查 。",
        "you_have_not_created_a_segment_yet": "您 还没有 创建 段落",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "您 需要在您的项目中设置两种或更多语言才能进行翻译。",
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -425,6 +425,7 @@
    "user_id": "使用者 ID",
    "user_not_found": "找不到使用者",
    "variable": "變數",
+    "variable_ids": "變數 ID",
    "variables": "變數",
    "verified_email": "已驗證的電子郵件",
    "video": "影片",
@@ -800,7 +801,7 @@
        "project_deleted_successfully": "專案已成功刪除",
        "project_name_settings_description": "變更您的專案名稱。",
        "project_name_updated_successfully": "專案名稱已成功更新",
-        "recontact_waiting_time": "重新聯絡等待時間",
+        "recontact_waiting_time": "專案範圍內的問卷等待時間",
        "recontact_waiting_time_settings_description": "控制使用者在所有應用程式問卷中可以被調查的頻率。",
        "this_action_cannot_be_undone": "此操作無法復原。",
        "wait_x_days_before_showing_next_survey": "在顯示下一個問卷之前等待 X 天：",
@@ -1226,7 +1227,6 @@
        "allow_multi_select": "允許多重選取",
        "allow_multiple_files": "允許上傳多個檔案",
        "allow_users_to_select_more_than_one_image": "允許使用者選取多張圖片",
-        "always_show_survey": "始終顯示問卷",
        "and_launch_surveys_in_your_website_or_app": "並在您的網站或應用程式中啟動問卷。",
        "animation": "動畫",
        "app_survey_description": "將問卷嵌入您的 Web 應用程式或網站中以收集回應。",
@@ -1309,8 +1309,7 @@
        "custom_hostname": "自訂主機名稱",
        "darken_or_lighten_background_of_your_choice": "變暗或變亮您選擇的背景。",
        "date_format": "日期格式",
-        "days_before_showing_this_survey_again": "天後再次顯示此問卷。",
-        "decide_how_often_people_can_answer_this_survey": "決定人們可以回答此問卷的頻率。",
+        "days_before_showing_this_survey_again": "在顯示此問卷之前，需等待其他問卷顯示後的天數。",
        "delete_choice": "刪除選項",
        "disable_the_visibility_of_survey_progress": "停用問卷進度的可見性。",
        "display_an_estimate_of_completion_time_for_survey": "顯示問卷的估計完成時間",
@@ -1338,7 +1337,7 @@
        "equals_one_of": "等於其中之一",
        "error_publishing_survey": "發布問卷時發生錯誤。",
        "error_saving_changes": "儲存變更時發生錯誤",
-        "even_after_they_submitted_a_response_e_g_feedback_box": "即使他們提交回應之後（例如，意見反應方塊）",
+        "even_after_they_submitted_a_response_e_g_feedback_box": "允許多次回應；即使已提交回應仍繼續顯示（例如：意見回饋框）。",
        "everyone": "所有人",
        "external_urls_paywall_tooltip": "請升級以自訂 external URL 。 Phishing 預防。",
        "fallback_missing": "遺失的回退",
@@ -1409,8 +1408,9 @@
        "hostname": "主機名稱",
        "how_funky_do_you_want_your_cards_in_survey_type_derived_surveys": "您希望 '{'surveyTypeDerived'}' 問卷中的卡片有多酷炫",
        "if_you_need_more_please": "如果您需要更多，請",
-        "if_you_really_want_that_answer_ask_until_you_get_it": "如果您真的想要該答案，請詢問直到您獲得它。",
-        "ignore_waiting_time_between_surveys": "忽略問卷之間的等待時間",
+        "if_you_really_want_that_answer_ask_until_you_get_it": "每次觸發時都顯示，直到提交回應為止。",
+        "ignore_global_waiting_time": "忽略專案範圍內的等待時間",
+        "ignore_global_waiting_time_description": "此問卷在符合條件時即可顯示，即使最近已顯示過其他問卷。",
        "image": "圖片",
        "includes_all_of": "包含全部",
        "includes_one_of": "包含其中之一",
@@ -1477,9 +1477,10 @@
        "optional": "選填",
        "options": "選項",
        "override_theme_with_individual_styles_for_this_survey": "使用此問卷的個別樣式覆寫主題。",
+        "overwrite_global_waiting_time": "設定自訂等待時間",
+        "overwrite_global_waiting_time_description": "僅覆蓋此問卷的專案設定。",
        "overwrite_placement": "覆寫位置",
        "overwrite_the_global_placement_of_the_survey": "覆寫問卷的整體位置",
-        "overwrites_waiting_period_between_surveys_to_x_days": "將問卷之間的等待時間覆寫為 '{'days'}' 天。",
        "pick_a_background_from_our_library_or_upload_your_own": "從我們的媒體庫中選取背景或上傳您自己的背景。",
        "picture_idx": "圖片 '{'idx'}'",
        "pin_can_only_contain_numbers": "PIN 碼只能包含數字。",
@@ -1538,7 +1539,8 @@
        "range": "範圍",
        "recall_data": "回憶數據",
        "recall_information_from": "從 ... 獲取 信息",
-        "recontact_options": "重新聯絡選項",
+        "recontact_options_section": "重新聯絡選項",
+        "recontact_options_section_description": "如果等待時間允許，選擇此問卷可以向同一人顯示的頻率。",
        "redirect_thank_you_card": "重新導向感謝卡片",
        "redirect_to_url": "重新導向至網址",
        "remove_description": "移除描述",
@@ -1547,6 +1549,8 @@
        "required": "必填",
        "reset_to_theme_styles": "重設為主題樣式",
        "reset_to_theme_styles_main_text": "您確定要將樣式重設為主題樣式嗎？這將移除所有自訂樣式。",
+        "respect_global_waiting_time": "使用專案範圍內的等待時間",
+        "respect_global_waiting_time_description": "此問卷遵循專案設定的等待時間。僅在該期間內未顯示其他問卷時才會顯示。",
        "response_limit_can_t_be_set_to_0": "回應限制不能設定為 0",
        "response_limit_needs_to_exceed_number_of_received_responses": "回應限制必須超過收到的回應數 ('{'responseCount'}')。",
        "response_limits_redirections_and_more": "回應限制、重新導向等。",
@@ -1571,7 +1575,7 @@
        "show_advanced_settings": "顯示進階設定",
        "show_button": "顯示按鈕",
        "show_language_switch": "顯示語言切換",
-        "show_multiple_times": "多次顯示",
+        "show_multiple_times": "顯示有限次數",
        "show_only_once": "僅顯示一次",
        "show_survey_maximum_of": "最多顯示問卷",
        "show_survey_to_users": "將問卷顯示給 % 的使用者",
@@ -1601,13 +1605,12 @@
        "switch_multi_lanugage_on_to_get_started": "開啟多語言以開始使用 👉",
        "targeted": "目標",
        "ten_points": "10 分",
-        "the_survey_will_be_shown_multiple_times_until_they_respond": "將多次顯示問卷，直到他們回應",
-        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "即使使用者沒有回應，也只會顯示一次問卷。",
+        "the_survey_will_be_shown_multiple_times_until_they_respond": "最多顯示指定次數，或直到他們回應（以先達成者為準）。",
+        "the_survey_will_be_shown_once_even_if_person_doesnt_respond": "僅顯示一次，即使他們未回應。",
        "then": "然後",
        "this_action_will_remove_all_the_translations_from_this_survey": "此操作將從此問卷中移除所有翻譯。",
        "this_extension_is_already_added": "已新增此擴充功能。",
        "this_file_type_is_not_supported": "不支援此檔案類型。",
-        "this_setting_overwrites_your": "此設定會覆寫您的",
        "three_points": "3 分",
        "times": "次",
        "to_keep_the_placement_over_all_surveys_consistent_you_can": "若要保持所有問卷的位置一致，您可以",
@@ -1618,7 +1621,7 @@
        "unlock_targeting_description": "根據屬性或裝置資訊鎖定特定使用者群組",
        "unlock_targeting_title": "使用更高等級的方案解鎖目標設定",
        "unsaved_changes_warning": "您的問卷中有未儲存的變更。您要先儲存它們再離開嗎？",
-        "until_they_submit_a_response": "直到他們提交回應",
+        "until_they_submit_a_response": "持續詢問直到提交回應",
        "upgrade_notice_description": "建立多語言問卷並解鎖更多功能",
        "upgrade_notice_title": "使用更高等級的方案解鎖多語言問卷",
        "upload": "上傳",
@@ -1626,7 +1629,6 @@
        "upper_label": "上標籤",
        "url_filters": "網址篩選器",
        "url_not_supported": "不支援網址",
-        "use_with_caution": "謹慎使用",
        "variable_is_used_in_logic_of_question_please_remove_it_from_logic_first": "'{'variable'}' 用於問題 '{'questionIndex'}' 的邏輯中。請先從邏輯中移除。",
        "variable_is_used_in_quota_please_remove_it_from_quota_first": "變數 \"{variableName}\" 正被使用於 \"{quotaName}\" 配額中",
        "variable_name_is_already_taken_please_choose_another": "已使用此變數名稱，請選擇另一個名稱。",
@@ -1636,11 +1638,13 @@
        "variable_used_in_recall_welcome": "變數 \"{variable}\" 於 歡迎 Card 中被召回。",
        "verify_email_before_submission": "提交前驗證電子郵件",
        "verify_email_before_submission_description": "僅允許擁有真實電子郵件的人員回應。",
+        "visibility_and_recontact": "可見性與重新聯絡",
+        "visibility_and_recontact_description": "控制此問卷何時可以顯示以及可以重新顯示的頻率。",
        "wait": "等待",
        "wait_a_few_seconds_after_the_trigger_before_showing_the_survey": "在觸發後等待幾秒鐘再顯示問卷",
-        "waiting_period": "等待時間",
+        "waiting_time_across_surveys": "專案範圍內的等待時間",
+        "waiting_time_across_surveys_description": "為避免問卷疲勞，選擇此問卷如何與專案範圍內的等待時間互動。",
        "welcome_message": "歡迎訊息",
-        "when_conditions_match_waiting_time_will_be_ignored_and_survey_shown": "當條件符合時，等待時間將被忽略且顯示問卷。",
        "without_a_filter_all_of_your_users_can_be_surveyed": "如果沒有篩選器，則可以調查您的所有使用者。",
        "you_have_not_created_a_segment_yet": "您尚未建立區隔",
        "you_need_to_have_two_or_more_languages_set_up_in_your_project_to_work_with_translations": "您需要在您的專案中設定兩個或更多語言，才能使用翻譯。",
--- a/apps/web/modules/ee/quotas/components/ending-card-selector.tsx
+++ b/apps/web/modules/ee/quotas/components/ending-card-selector.tsx
@@ -3,6 +3,7 @@
 import { HandshakeIcon, Undo2Icon } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { TSurveyEndings } from "@formbricks/types/surveys/types";
+import { getTextContent } from "@formbricks/types/surveys/validation";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import {
  Select,
@@ -41,7 +42,7 @@ export const EndingCardSelector = ({ endings, value, onChange }: EndingCardSelec
              {/* Custom endings */}
              {endingCards.map((ending) => (
                <SelectItem key={ending.id} value={ending.id}>
-                  {getLocalizedValue(ending.headline, "default")}
+                  {getTextContent(getLocalizedValue(ending.headline, "default"))}
                </SelectItem>
              ))}
            </SelectGroup>
--- a/apps/web/modules/survey/editor/components/advanced-settings.tsx
+++ b/apps/web/modules/survey/editor/components/advanced-settings.tsx
@@ -40,7 +40,9 @@ export const AdvancedSettings = ({
        updateQuestion={updateQuestion}
      />

-      {showOptionIds && <OptionIds question={question} selectedLanguageCode={selectedLanguageCode} />}
+      {showOptionIds && (
+        <OptionIds type="question" question={question} selectedLanguageCode={selectedLanguageCode} />
+      )}
    </div>
  );
 };
--- a/apps/web/modules/survey/editor/components/edit-welcome-card.tsx
+++ b/apps/web/modules/survey/editor/components/edit-welcome-card.tsx
@@ -3,7 +3,6 @@
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { Hand } from "lucide-react";
 import { usePathname } from "next/navigation";
-import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TSurvey, TSurveyQuestionId, TSurveyWelcomeCard } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
@@ -38,8 +37,6 @@ export const EditWelcomeCard = ({
 }: EditWelcomeCardProps) => {
  const { t } = useTranslation();

-  const [firstRender, setFirstRender] = useState(true);
-
  const path = usePathname();
  const environmentId = path?.split("/environments/")[1]?.split("/")[0];

@@ -138,8 +135,6 @@ export const EditWelcomeCard = ({
                setSelectedLanguageCode={setSelectedLanguageCode}
                locale={locale}
                isStorageConfigured={isStorageConfigured}
-                firstRender={firstRender}
-                setFirstRender={setFirstRender}
              />
            </div>
            <div className="mt-3">
@@ -155,8 +150,6 @@ export const EditWelcomeCard = ({
                setSelectedLanguageCode={setSelectedLanguageCode}
                locale={locale}
                isStorageConfigured={isStorageConfigured}
-                firstRender={firstRender}
-                setFirstRender={setFirstRender}
              />
            </div>

@@ -177,8 +170,6 @@ export const EditWelcomeCard = ({
                    label={t("environments.surveys.edit.next_button_label")}
                    locale={locale}
                    isStorageConfigured={isStorageConfigured}
-                    firstRender={firstRender}
-                    setFirstRender={setFirstRender}
                  />
                </div>
              </div>
--- a/apps/web/modules/survey/editor/components/logic-editor.tsx
+++ b/apps/web/modules/survey/editor/components/logic-editor.tsx
@@ -4,6 +4,7 @@ import { ArrowRightIcon } from "lucide-react";
 import { ReactElement, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { TSurvey, TSurveyLogic, TSurveyQuestion } from "@formbricks/types/surveys/types";
+import { getTextContent } from "@formbricks/types/surveys/validation";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { LogicEditorActions } from "@/modules/survey/editor/components/logic-editor-actions";
 import { LogicEditorConditions } from "@/modules/survey/editor/components/logic-editor-conditions";
@@ -48,7 +49,7 @@ export function LogicEditor({
      const ques = localSurvey.questions[i];
      options.push({
        icon: QUESTIONS_ICON_MAP[ques.type],
-        label: getLocalizedValue(ques.headline, "default"),
+        label: getTextContent(getLocalizedValue(ques.headline, "default")),
        value: ques.id,
      });
    }
@@ -57,7 +58,8 @@ export function LogicEditor({
      options.push({
        label:
          ending.type === "endScreen"
-            ? getLocalizedValue(ending.headline, "default") || t("environments.surveys.edit.end_screen_card")
+            ? getTextContent(getLocalizedValue(ending.headline, "default")) ||
+              t("environments.surveys.edit.end_screen_card")
            : ending.label || t("environments.surveys.edit.redirect_thank_you_card"),
        value: ending.id,
      });
--- a/apps/web/modules/survey/editor/components/option-ids.tsx
+++ b/apps/web/modules/survey/editor/components/option-ids.tsx
@@ -1,19 +1,27 @@
 import Image from "next/image";
 import { useTranslation } from "react-i18next";
-import { TSurveyQuestion, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+import { TSurveyQuestion, TSurveyQuestionTypeEnum, TSurveyVariable } from "@formbricks/types/surveys/types";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { IdBadge } from "@/modules/ui/components/id-badge";
 import { Label } from "@/modules/ui/components/label";

-interface OptionIdsProps {
+interface OptionIdsQuestionProps {
+  type: "question";
  question: TSurveyQuestion;
  selectedLanguageCode: string;
 }

-export const OptionIds = ({ question, selectedLanguageCode }: OptionIdsProps) => {
+interface OptionIdsVariablesProps {
+  type: "variables";
+  variables: TSurveyVariable[];
+}
+
+type OptionIdsProps = OptionIdsQuestionProps | OptionIdsVariablesProps;
+
+export const OptionIds = (props: OptionIdsProps) => {
  const { t } = useTranslation();

-  const renderChoiceIds = () => {
+  const renderChoiceIds = (question: TSurveyQuestion, selectedLanguageCode: string) => {
    switch (question.type) {
      case TSurveyQuestionTypeEnum.MultipleChoiceSingle:
      case TSurveyQuestionTypeEnum.MultipleChoiceMulti:
@@ -59,10 +67,31 @@ export const OptionIds = ({ question, selectedLanguageCode }: OptionIdsProps) =>
    }
  };

+  const renderVariableIds = (variables: TSurveyVariable[]) => {
+    return (
+      <div className="flex flex-col gap-2">
+        {variables.map((variable) => (
+          <div key={variable.id}>
+            <IdBadge id={variable.id} label={variable.name} />
+          </div>
+        ))}
+      </div>
+    );
+  };
+
+  if (props.type === "variables") {
+    return (
+      <div className="space-y-3">
+        <Label className="text-sm font-medium text-gray-700">{t("common.variable_ids")}</Label>
+        <div className="w-full">{renderVariableIds(props.variables)}</div>
+      </div>
+    );
+  }
+
  return (
    <div className="space-y-3">
      <Label className="text-sm font-medium text-gray-700">{t("common.option_ids")}</Label>
-      <div className="w-full">{renderChoiceIds()}</div>
+      <div className="w-full">{renderChoiceIds(props.question, props.selectedLanguageCode)}</div>
    </div>
  );
 };
--- a/apps/web/modules/survey/editor/components/recontact-options-card.tsx
+++ b/apps/web/modules/survey/editor/components/recontact-options-card.tsx
@@ -3,11 +3,9 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { CheckIcon } from "lucide-react";
-import Link from "next/link";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TSurvey } from "@formbricks/types/surveys/types";
-import { AdvancedOptionToggle } from "@/modules/ui/components/advanced-option-toggle";
 import { Input } from "@/modules/ui/components/input";
 import { Label } from "@/modules/ui/components/label";
 import { RadioGroup, RadioGroupItem } from "@/modules/ui/components/radio-group";
@@ -18,19 +16,45 @@ interface DisplayOption {
  description: string;
 }

+interface WaitingTimeOption {
+  id: "respect" | "ignore" | "overwrite";
+  value: number | null;
+  name: string;
+  description: string;
+}
+
 interface RecontactOptionsCardProps {
  localSurvey: TSurvey;
  setLocalSurvey: (survey: TSurvey) => void;
-  environmentId: string;
 }

-export const RecontactOptionsCard = ({
-  localSurvey,
-  setLocalSurvey,
-  environmentId,
-}: RecontactOptionsCardProps) => {
+export const RecontactOptionsCard = ({ localSurvey, setLocalSurvey }: RecontactOptionsCardProps) => {
  const { t } = useTranslation();

+  const waitingTimeOptions: WaitingTimeOption[] = useMemo(
+    () => [
+      {
+        id: "respect",
+        value: null,
+        name: t("environments.surveys.edit.respect_global_waiting_time"),
+        description: t("environments.surveys.edit.respect_global_waiting_time_description"),
+      },
+      {
+        id: "ignore",
+        value: 0,
+        name: t("environments.surveys.edit.ignore_global_waiting_time"),
+        description: t("environments.surveys.edit.ignore_global_waiting_time_description"),
+      },
+      {
+        id: "overwrite",
+        value: 1,
+        name: t("environments.surveys.edit.overwrite_global_waiting_time"),
+        description: t("environments.surveys.edit.overwrite_global_waiting_time_description"),
+      },
+    ],
+    [t]
+  );
+
  const displayOptions: DisplayOption[] = useMemo(
    () => [
      {
@@ -62,26 +86,34 @@ export const RecontactOptionsCard = ({
  );

  const [open, setOpen] = useState(false);
-  const ignoreWaiting = localSurvey.recontactDays !== null;
  const [inputDays, setInputDays] = useState(
-    localSurvey.recontactDays !== null ? localSurvey.recontactDays : 1
+    localSurvey.recontactDays !== null && localSurvey.recontactDays > 0 ? localSurvey.recontactDays : 1
  );
  const [displayLimit, setDisplayLimit] = useState(localSurvey.displayLimit ?? 1);

+  // Determine current waiting time option
+  const getWaitingTimeOption = (): "respect" | "ignore" | "overwrite" => {
+    if (localSurvey.recontactDays === null) return "respect";
+    if (localSurvey.recontactDays === 0) return "ignore";
+    return "overwrite";
+  };
+
  // Auto animate
  const [parent] = useAutoAnimate();

-  const handleCheckMark = () => {
-    if (ignoreWaiting) {
-      const updatedSurvey = { ...localSurvey, recontactDays: null };
-      setLocalSurvey(updatedSurvey);
-    } else {
-      const updatedSurvey = { ...localSurvey, recontactDays: 0 };
+  const handleWaitingTimeChange = (optionId: string) => {
+    const option = waitingTimeOptions.find((opt) => opt.id === optionId);
+    if (option) {
+      let newRecontactDays = option.value;
+      if (optionId === "overwrite") {
+        newRecontactDays = inputDays;
+      }
+      const updatedSurvey = { ...localSurvey, recontactDays: newRecontactDays };
      setLocalSurvey(updatedSurvey);
    }
  };

-  const handleRecontactDaysChange = (event) => {
+  const handleOverwriteDaysChange = (event) => {
    const value = Number(event.target.value);
    setInputDays(value);

@@ -89,7 +121,7 @@ export const RecontactOptionsCard = ({
    setLocalSurvey(updatedSurvey);
  };

-  const handleRecontactSessionDaysChange = (event) => {
+  const handleDisplayLimitChange = (event) => {
    const value = Number(event.target.value);
    setDisplayLimit(value);

@@ -128,9 +160,11 @@ export const RecontactOptionsCard = ({
            />
          </div>
          <div>
-            <p className="font-semibold text-slate-800">{t("environments.surveys.edit.recontact_options")}</p>
+            <p className="font-semibold text-slate-800">
+              {t("environments.surveys.edit.visibility_and_recontact")}
+            </p>
            <p className="mt-1 text-sm text-slate-500">
-              {t("environments.surveys.edit.decide_how_often_people_can_answer_this_survey")}
+              {t("environments.surveys.edit.visibility_and_recontact_description")}
            </p>
          </div>
        </div>
@@ -138,6 +172,72 @@ export const RecontactOptionsCard = ({
      <Collapsible.CollapsibleContent className={`flex flex-col ${open && "pb-3"}`} ref={parent}>
        <hr className="py-1 text-slate-600" />
        <div className="p-3">
+          {/* Waiting Time Section */}
+          <div className="mb-4 space-y-1 px-1">
+            <h3 className="font-semibold text-slate-800">
+              {t("environments.surveys.edit.waiting_time_across_surveys")}
+            </h3>
+            <p className="text-sm text-slate-500">
+              {t("environments.surveys.edit.waiting_time_across_surveys_description")}
+            </p>
+          </div>
+
+          <RadioGroup
+            value={getWaitingTimeOption()}
+            className="flex flex-col space-y-3"
+            onValueChange={handleWaitingTimeChange}>
+            {waitingTimeOptions.map((option) => (
+              <div key={option.id}>
+                <Label
+                  htmlFor={`waiting-time-${option.id}`}
+                  className="flex w-full cursor-pointer items-center rounded-lg border bg-slate-50 p-4"
+                  data-testid={`waiting-time-option-${option.id}`}>
+                  <RadioGroupItem
+                    value={option.id}
+                    id={`waiting-time-${option.id}`}
+                    className="aria-checked:border-brand-dark mx-5 disabled:border-slate-400 aria-checked:border-2"
+                  />
+                  <div>
+                    <p className="font-semibold text-slate-700">{option.name}</p>
+                    <p className="mt-2 text-xs font-normal text-slate-600">{option.description}</p>
+                  </div>
+                </Label>
+                {option.id === "overwrite" && getWaitingTimeOption() === "overwrite" && (
+                  <div className="border-t-none -mt-1.5 w-full rounded-b-lg border bg-slate-50 p-4">
+                    <label htmlFor="overwriteDays">
+                      <p className="text-sm text-slate-700">
+                        {t("environments.surveys.edit.wait")}
+                        <Input
+                          type="number"
+                          min="1"
+                          id="overwriteDays"
+                          value={inputDays}
+                          onChange={handleOverwriteDaysChange}
+                          className="ml-2 mr-2 inline w-20 bg-white text-center text-sm"
+                        />
+                        {t("environments.surveys.edit.days_before_showing_this_survey_again")}
+                      </p>
+                    </label>
+                  </div>
+                )}
+              </div>
+            ))}
+          </RadioGroup>
+        </div>
+
+        <hr className="my-3 text-slate-600" />
+
+        <div className="p-3">
+          {/* Recontact Options Section */}
+          <div className="mb-4 space-y-1 px-1">
+            <h3 className="font-semibold text-slate-800">
+              {t("environments.surveys.edit.recontact_options_section")}
+            </h3>
+            <p className="text-sm text-slate-500">
+              {t("environments.surveys.edit.recontact_options_section_description")}
+            </p>
+          </div>
+
          <RadioGroup
            value={localSurvey.displayOption}
            className="flex flex-col space-y-3"
@@ -158,11 +258,12 @@ export const RecontactOptionsCard = ({
              <div key={option.id}>
                <Label
                  key={option.name}
-                  htmlFor={option.name}
-                  className="flex w-full cursor-pointer items-center rounded-lg border bg-slate-50 p-4">
+                  htmlFor={`recontact-option-${option.id}`}
+                  className="flex w-full cursor-pointer items-center rounded-lg border bg-slate-50 p-4"
+                  data-testid={`recontact-option-${option.id}`}>
                  <RadioGroupItem
                    value={option.id}
-                    id={option.name}
+                    id={`recontact-option-${option.id}`}
                    className="aria-checked:border-brand-dark mx-5 disabled:border-slate-400 aria-checked:border-2"
                  />
                  <div>
@@ -172,105 +273,27 @@ export const RecontactOptionsCard = ({
                  </div>
                </Label>
                {option.id === "displaySome" && localSurvey.displayOption === "displaySome" && (
-                  <label htmlFor="displayLimit" className="cursor-pointer p-4">
-                    <p className="text-sm font-semibold text-slate-700">
-                      {t("environments.surveys.edit.show_survey_maximum_of")}
-                      <Input
-                        type="number"
-                        min="1"
-                        id="displayLimit"
-                        value={displayLimit.toString()}
-                        onChange={(e) => handleRecontactSessionDaysChange(e)}
-                        className="mx-2 inline w-16 bg-white text-center text-sm"
-                      />
-                      {t("environments.surveys.edit.times")}.
-                    </p>
-                  </label>
+                  <div className="border-t-none -mt-1.5 w-full rounded-b-lg border bg-slate-50 p-4">
+                    <label htmlFor="displayLimit">
+                      <p className="text-sm text-slate-700">
+                        {t("environments.surveys.edit.show_survey_maximum_of")}
+                        <Input
+                          type="number"
+                          min="1"
+                          id="displayLimit"
+                          value={displayLimit.toString()}
+                          onChange={(e) => handleDisplayLimitChange(e)}
+                          className="ml-2 mr-2 inline w-20 bg-white text-center text-sm"
+                        />
+                        {t("environments.surveys.edit.times")}.
+                      </p>
+                    </label>
+                  </div>
                )}
              </div>
            ))}
          </RadioGroup>
        </div>
-
-        <AdvancedOptionToggle
-          htmlId="recontactDays"
-          isChecked={ignoreWaiting}
-          onToggle={handleCheckMark}
-          title={t("environments.surveys.edit.ignore_waiting_time_between_surveys")}
-          childBorder={false}
-          description={
-            <>
-              {t("environments.surveys.edit.this_setting_overwrites_your")}{" "}
-              <Link
-                className="decoration-brand-dark underline"
-                href={`/environments/${environmentId}/project/general`}
-                target="_blank">
-                {t("environments.surveys.edit.waiting_period")}
-              </Link>
-              . {t("environments.surveys.edit.use_with_caution")}
-            </>
-          }>
-          {localSurvey.recontactDays !== null && (
-            <RadioGroup
-              value={localSurvey.recontactDays.toString()}
-              className="flex w-full flex-col space-y-3 bg-white"
-              onValueChange={(v) => {
-                const updatedSurvey = { ...localSurvey, recontactDays: v === "null" ? null : Number(v) };
-                setLocalSurvey(updatedSurvey);
-              }}>
-              <Label
-                htmlFor="ignore"
-                className="flex w-full cursor-pointer items-center rounded-lg border bg-slate-50 p-4">
-                <RadioGroupItem
-                  value="0"
-                  id="ignore"
-                  className="aria-checked:border-brand-dark mx-4 text-sm disabled:border-slate-400 aria-checked:border-2"
-                />
-                <div>
-                  <p className="font-semibold text-slate-700">
-                    {t("environments.surveys.edit.always_show_survey")}
-                  </p>
-
-                  <p className="mt-2 text-xs font-normal text-slate-600">
-                    {t(
-                      "environments.surveys.edit.when_conditions_match_waiting_time_will_be_ignored_and_survey_shown"
-                    )}
-                  </p>
-                </div>
-              </Label>
-
-              <label
-                htmlFor="newDays"
-                className="flex w-full cursor-pointer items-center rounded-lg border bg-slate-50 p-4">
-                <RadioGroupItem
-                  value={inputDays === 0 ? "1" : inputDays.toString()} //Fixes that both radio buttons are checked when inputDays is 0
-                  id="newDays"
-                  className="aria-checked:border-brand-dark mx-4 disabled:border-slate-400 aria-checked:border-2"
-                />
-                <div>
-                  <p className="text-sm font-semibold text-slate-700">
-                    {t("environments.surveys.edit.wait")}
-                    <Input
-                      type="number"
-                      min="1"
-                      id="inputDays"
-                      value={inputDays === 0 ? 1 : inputDays}
-                      onChange={handleRecontactDaysChange}
-                      className="ml-2 mr-2 inline w-16 bg-white text-center text-sm"
-                    />
-                    {t("environments.surveys.edit.days_before_showing_this_survey_again")}.
-                  </p>
-
-                  <p className="mt-2 text-xs font-normal text-slate-600">
-                    {t("environments.surveys.edit.overwrites_waiting_period_between_surveys_to_x_days", {
-                      days: inputDays === 0 ? 1 : inputDays,
-                    })}
-                  </p>
-                </div>
-              </label>
-            </RadioGroup>
-          )}
-        </AdvancedOptionToggle>
      </Collapsible.CollapsibleContent>
    </Collapsible.Root>
  );
--- a/apps/web/modules/survey/editor/components/settings-view.tsx
+++ b/apps/web/modules/survey/editor/components/settings-view.tsx
@@ -97,11 +97,7 @@ export const SettingsView = ({
        isSpamProtectionAllowed={isSpamProtectionAllowed}
      />

-      <RecontactOptionsCard
-        localSurvey={localSurvey}
-        setLocalSurvey={setLocalSurvey}
-        environmentId={environment.id}
-      />
+      <RecontactOptionsCard localSurvey={localSurvey} setLocalSurvey={setLocalSurvey} />

      {isAppSurvey && (
        <SurveyPlacementCard
--- a/apps/web/modules/survey/editor/components/survey-variables-card.tsx
+++ b/apps/web/modules/survey/editor/components/survey-variables-card.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { TSurveyQuota } from "@formbricks/types/quota";
 import { TSurvey, TSurveyQuestionId } from "@formbricks/types/surveys/types";
 import { cn } from "@/lib/cn";
+import { OptionIds } from "@/modules/survey/editor/components/option-ids";
 import { SurveyVariablesCardItem } from "@/modules/survey/editor/components/survey-variables-card-item";

 interface SurveyVariablesCardProps {
@@ -91,6 +92,12 @@ export const SurveyVariablesCard = ({
            setLocalSurvey={setLocalSurvey}
            quotas={quotas}
          />
+
+          {localSurvey.variables.length > 0 && (
+            <div className="mt-6">
+              <OptionIds type="variables" variables={localSurvey.variables} />
+            </div>
+          )}
        </Collapsible.CollapsibleContent>
      </Collapsible.Root>
    </div>
--- a/apps/web/modules/survey/editor/lib/utils.tsx
+++ b/apps/web/modules/survey/editor/lib/utils.tsx
@@ -594,7 +594,7 @@ export const getMatchValueProps = (
      const questionOptions = openTextQuestions.map((question) => {
        return {
          icon: getQuestionIconMapping(t)[question.type],
-          label: getLocalizedValue(question.headline, "default"),
+          label: getTextContent(getLocalizedValue(question.headline, "default")),
          value: question.id,
          meta: {
            type: "question",
@@ -691,7 +691,7 @@ export const getMatchValueProps = (
      const questionOptions = allowedQuestions.map((question) => {
        return {
          icon: getQuestionIconMapping(t)[question.type],
-          label: getLocalizedValue(question.headline, "default"),
+          label: getTextContent(getLocalizedValue(question.headline, "default")),
          value: question.id,
          meta: {
            type: "question",
@@ -765,7 +765,7 @@ export const getMatchValueProps = (
      const questionOptions = allowedQuestions.map((question) => {
        return {
          icon: getQuestionIconMapping(t)[question.type],
-          label: getLocalizedValue(question.headline, "default"),
+          label: getTextContent(getLocalizedValue(question.headline, "default")),
          value: question.id,
          meta: {
            type: "question",
@@ -845,7 +845,7 @@ export const getMatchValueProps = (
    const questionOptions = allowedQuestions.map((question) => {
      return {
        icon: getQuestionIconMapping(t)[question.type],
-        label: getLocalizedValue(question.headline, "default"),
+        label: getTextContent(getLocalizedValue(question.headline, "default")),
        value: question.id,
        meta: {
          type: "question",
--- a/apps/web/modules/survey/follow-ups/components/follow-up-modal.tsx
+++ b/apps/web/modules/survey/follow-ups/components/follow-up-modal.tsx
@@ -18,6 +18,7 @@ import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TSurveyFollowUpAction, TSurveyFollowUpTrigger } from "@formbricks/database/types/survey-follow-up";
 import { TSurvey, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+import { getTextContent } from "@formbricks/types/surveys/validation";
 import { TUserLocale } from "@formbricks/types/user";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { recallToHeadline } from "@/lib/utils/recall";
@@ -140,9 +141,9 @@ export const FollowUpModal = ({

    return [
      ...openTextAndContactQuestions.map((question) => ({
-        label: recallToHeadline(question.headline, localSurvey, false, selectedLanguageCode)[
-          selectedLanguageCode
-        ],
+        label: getTextContent(
+          recallToHeadline(question.headline, localSurvey, false, selectedLanguageCode)[selectedLanguageCode]
+        ),
        id: question.id,
        type:
          question.type === TSurveyQuestionTypeEnum.OpenText
@@ -517,7 +518,9 @@ export const FollowUpModal = ({
                                  const getEndingLabel = (): string => {
                                    if (ending.type === "endScreen") {
                                      return (
-                                        getLocalizedValue(ending.headline, selectedLanguageCode) || "Ending"
+                                        getTextContent(
+                                          getLocalizedValue(ending.headline, selectedLanguageCode)
+                                        ) || "Ending"
                                      );
                                    }

--- a/apps/web/modules/survey/link/lib/metadata-utils.ts
+++ b/apps/web/modules/survey/link/lib/metadata-utils.ts
@@ -1,8 +1,10 @@
 import { Metadata } from "next";
+import { getTextContent } from "@formbricks/types/surveys/validation";
 import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { COLOR_DEFAULTS } from "@/lib/styling/constants";
+import { recallToHeadline } from "@/lib/utils/recall";
 import { getSurvey } from "@/modules/survey/lib/survey";

 type TBasicSurveyMetadata = {
@@ -48,7 +50,9 @@ export const getBasicSurveyMetadata = async (
  const titleFromMetadata = metadata?.title ? getLocalizedValue(metadata.title, langCode) || "" : undefined;
  const titleFromWelcome =
    welcomeCard?.enabled && welcomeCard.headline
-      ? getLocalizedValue(welcomeCard.headline, langCode) || ""
+      ? getTextContent(
+          getLocalizedValue(recallToHeadline(welcomeCard.headline, survey, false, langCode), langCode)
+        ) || ""
      : undefined;
  let title = titleFromMetadata || titleFromWelcome || survey.name;

--- a/apps/web/modules/survey/link/loading.tsx
+++ b/apps/web/modules/survey/link/loading.tsx
@@ -1,11 +0,0 @@
-"use client";
-export const LinkSurveyLoading = () => {
-  return (
-    <div className="flex h-full w-full items-center justify-center">
-      <div className="flex h-1/2 w-3/4 flex-col sm:w-1/2 lg:w-1/4">
-        <div className="ph-no-capture h-16 w-1/3 animate-pulse rounded-lg bg-slate-200 font-medium text-slate-900"></div>
-        <div className="ph-no-capture mt-4 h-full animate-pulse rounded-lg bg-slate-200 text-slate-900"></div>
-      </div>
-    </div>
-  );
-};
--- a/apps/web/modules/ui/components/editor/components/toolbar-plugin.tsx
+++ b/apps/web/modules/ui/components/editor/components/toolbar-plugin.tsx
@@ -262,22 +262,27 @@ export const ToolbarPlugin = (
        const root = $getRoot();
        root.clear();
        root.append(...nodes);
-
-        editor.registerUpdateListener(({ editorState }) => {
-          editorState.read(() => {
-            const textInHtml = $generateHtmlFromNodes(editor)
-              .replace(/&lt;/g, "<")
-              .replace(/&gt;/g, ">")
-              .replace(/white-space:\s*pre-wrap;?/g, "");
-            setText.current(textInHtml);
-          });
-        });
      });
    }

    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

+  // Register text-saving update listener - always active for each editor instance
+  useEffect(() => {
+    const unregister = editor.registerUpdateListener(({ editorState }) => {
+      editorState.read(() => {
+        const textInHtml = $generateHtmlFromNodes(editor)
+          .replace(/&lt;/g, "<")
+          .replace(/&gt;/g, ">")
+          .replace(/white-space:\s*pre-wrap;?/g, "");
+        setText.current(textInHtml);
+      });
+    });
+
+    return unregister;
+  }, [editor]);
+
  useEffect(() => {
    return mergeRegister(
      editor.registerUpdateListener(({ editorState }) => {
--- a/apps/web/playwright/js.spec.ts
+++ b/apps/web/playwright/js.spec.ts
@@ -87,8 +87,8 @@ test.describe("JS Package Test", async () => {
    await page.getByRole("button", { name: "Create action" }).click();

    await page.locator("#recontactOptionsCardTrigger").click();
-    await page.locator("label").filter({ hasText: "Keep showing while conditions" }).click();
-    await page.locator("#recontactDays").check();
+    await page.locator('[data-testid="recontact-option-respondMultiple"]').click();
+    await page.locator('[data-testid="waiting-time-option-ignore"]').click();

    await page.getByRole("button", { name: "Publish" }).click();

--- a/apps/web/public/logo-transparent.png
+++ b/apps/web/public/logo-transparent.png
--- a/apps/web/vitestSetup.ts
+++ b/apps/web/vitestSetup.ts
@@ -211,7 +211,18 @@ vi.mock("@/lib/constants", () => ({
  SESSION_MAX_AGE: 1000,
  MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT: 100,
  MAX_OTHER_OPTION_LENGTH: 250,
-  AVAILABLE_LOCALES: ["en-US", "de-DE", "pt-BR", "fr-FR", "zh-Hant-TW", "pt-PT"],
+  AVAILABLE_LOCALES: [
+    "en-US",
+    "de-DE",
+    "pt-BR",
+    "fr-FR",
+    "zh-Hant-TW",
+    "pt-PT",
+    "ro-RO",
+    "ja-JP",
+    "zh-Hans-CN",
+    "es-ES",
+  ],
  DEFAULT_LOCALE: "en-US",
  BREVO_API_KEY: "mock-brevo-api-key",
  ITEMS_PER_PAGE: 30,
--- a/packages/i18n-utils/src/utils.ts
+++ b/packages/i18n-utils/src/utils.ts
--- a/packages/types/user.ts
+++ b/packages/types/user.ts
@@ -10,6 +10,7 @@ export const ZUserLocale = z.enum([
  "ro-RO",
  "ja-JP",
  "zh-Hans-CN",
+  "es-ES",
 ]);

 export type TUserLocale = z.infer<typeof ZUserLocale>;
Author	SHA1	Message	Date
Dhruwang Jariwala	11921582c6	chore: patch release 4.1.2 (#6815 ) Co-authored-by: Johannes <72809645+jobenjada@users.noreply.github.com>	2025-11-13 15:51:57 +01:00
Dhruwang Jariwala	e61aef9873	fix: welcome card text inputs not saving due to shared firstRender state (Backport) (#6780 )	2025-11-05 16:02:49 +01:00
Matti Nannt	ad59b69c12	fix: serve logo from self-hosted instance instead of external S3 bucket (backport to 4.1) (#6782 )	2025-11-05 15:58:10 +01:00
Dhruwang Jariwala	40203d77ba	fix: (Backport) survey UI fix (#6757 )	2025-10-30 08:39:21 +01:00
Anshuman Pandey	44f5291e0e	fix: backports welcome card survey title fix (#6750 )	2025-10-29 09:29:32 +01:00
Matti Nannt	f9835dd5c1	fix: release pipeline failed to to misconfigured check	2025-10-28 11:52:16 +01:00