From cae0280ff7244d70453a494e2647320611d9bde5 Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Tue, 5 Nov 2024 16:41:33 -0800
Subject: [PATCH] Rename string items for SurveyDialog

---
 .../java/org/wikipedia/views/SurveyDialog.kt  | 10 +++----
 .../res/layout/dialog_feedback_options.xml    | 20 +++++++-------
 app/src/main/res/values-ar/strings.xml        |  6 ++---
 app/src/main/res/values-az/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-b+sr+Latn/strings.xml | 14 +++++-----
 app/src/main/res/values-b+tt+Cyrl/strings.xml | 12 ++++-----
 app/src/main/res/values-ba/strings.xml        | 14 +++++-----
 app/src/main/res/values-be/strings.xml        | 20 +++++++-------
 app/src/main/res/values-bg/strings.xml        | 20 +++++++-------
 app/src/main/res/values-bn/strings.xml        | 16 ++++++------
 app/src/main/res/values-br/strings.xml        |  4 +--
 app/src/main/res/values-ca/strings.xml        | 16 ++++++------
 app/src/main/res/values-cs/strings.xml        | 12 ++++-----
 app/src/main/res/values-cy/strings.xml        |  2 +-
 app/src/main/res/values-da/strings.xml        | 20 +++++++-------
 app/src/main/res/values-dag/strings.xml       | 18 ++++++-------
 app/src/main/res/values-de/strings.xml        | 20 +++++++-------
 app/src/main/res/values-dga/strings.xml       | 14 +++++-----
 app/src/main/res/values-es/strings.xml        |  4 +--
 app/src/main/res/values-fa/strings.xml        | 14 +++++-----
 app/src/main/res/values-fi/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-fr/strings.xml        | 20 +++++++-------
 app/src/main/res/values-ha/strings.xml        | 14 +++++-----
 app/src/main/res/values-hi/strings.xml        | 16 ++++++------
 app/src/main/res/values-hu/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-ia/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-in/strings.xml        | 20 +++++++-------
 app/src/main/res/values-it/strings.xml        | 20 +++++++-------
 app/src/main/res/values-iw/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-ja/strings.xml        | 20 +++++++-------
 app/src/main/res/values-ko/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-krc/strings.xml       | 20 +++++++-------
 app/src/main/res/values-ks/strings.xml        |  2 +-
 app/src/main/res/values-lb/strings.xml        | 20 +++++++-------
 app/src/main/res/values-mk/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-ms/strings.xml        | 12 ++++-----
 app/src/main/res/values-my/strings.xml        |  6 ++---
 app/src/main/res/values-nb/strings.xml        | 20 +++++++-------
 app/src/main/res/values-ne/strings.xml        |  4 +--
 app/src/main/res/values-nl/strings.xml        | 20 +++++++-------
 app/src/main/res/values-nqo/strings.xml       |  6 ++---
 app/src/main/res/values-pa/strings.xml        |  6 ++---
 app/src/main/res/values-pl/strings.xml        | 12 ++++-----
 app/src/main/res/values-pt-rBR/strings.xml    | 16 ++++++------
 app/src/main/res/values-pt/strings.xml        | 18 ++++++-------
 app/src/main/res/values-qq/strings.xml        | 25 ++++++++----------
 app/src/main/res/values-ro/strings.xml        | 12 ++++-----
 app/src/main/res/values-ru/strings.xml        | 18 ++++++-------
 app/src/main/res/values-sd/strings.xml        | 20 +++++++-------
 app/src/main/res/values-se/strings.xml        | 20 +++++++-------
 app/src/main/res/values-skr/strings.xml       |  6 ++---
 app/src/main/res/values-sl/strings.xml        | 20 +++++++-------
 app/src/main/res/values-sr/strings.xml        | 20 +++++++-------
 app/src/main/res/values-sv/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-tr/strings.xml        | 20 +++++++-------
 app/src/main/res/values-uk/strings.xml        | 22 ++++++++--------
 app/src/main/res/values-ur/strings.xml        | 14 +++++-----
 app/src/main/res/values-uz/strings.xml        | 20 +++++++-------
 app/src/main/res/values-zh-rTW/strings.xml    | 22 ++++++++--------
 app/src/main/res/values-zh/strings.xml        | 22 ++++++++--------
 app/src/main/res/values/strings.xml           | 26 +++++++++----------
 61 files changed, 493 insertions(+), 498 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/views/SurveyDialog.kt b/app/src/main/java/org/wikipedia/views/SurveyDialog.kt
index 1dfc8833e93..06c9478bfff 100644
--- a/app/src/main/java/org/wikipedia/views/SurveyDialog.kt
+++ b/app/src/main/java/org/wikipedia/views/SurveyDialog.kt
@@ -22,9 +22,9 @@ import org.wikipedia.util.FeedbackUtil
 object SurveyDialog {
 
     fun showFeedbackOptionsDialog(activity: Activity,
-                                  titleId: Int = R.string.patroller_diff_feedback_dialog_title,
-                                  messageId: Int = R.string.patroller_diff_feedback_dialog_message,
-                                  snackbarMessageId: Int = R.string.patroller_diff_feedback_submitted_snackbar,
+                                  titleId: Int = R.string.survey_dialog_title,
+                                  messageId: Int = R.string.survey_dialog_message,
+                                  snackbarMessageId: Int = R.string.survey_dialog_submitted_snackbar,
                                   invokeSource: Constants.InvokeSource,
                                   historyEntry: HistoryEntry? = null) {
         var dialog: AlertDialog? = null
@@ -43,7 +43,7 @@ object SurveyDialog {
             val clickListener = View.OnClickListener {
                 val feedbackOption = (it as TextView).text.toString()
                 dialog?.dismiss()
-                if (feedbackOption == activity.getString(R.string.patroller_diff_feedback_dialog_option_satisfied)) {
+                if (feedbackOption == activity.getString(R.string.survey_dialog_option_satisfied)) {
                     showFeedbackSnackbarAndTooltip(activity, snackbarMessageId, invokeSource)
                 } else {
                     showFeedbackInputDialog(activity, snackbarMessageId, invokeSource)
@@ -100,7 +100,7 @@ object SurveyDialog {
         MaterialAlertDialogBuilder(activity)
             .setTitle(R.string.patroller_diff_feedback_dialog_feedback_title)
             .setView(feedbackView)
-            .setPositiveButton(R.string.patroller_diff_feedback_dialog_submit) { _, _ ->
+            .setPositiveButton(R.string.survey_dialog_submit) { _, _ ->
                val feedbackInput = feedbackView.findViewById<TextInputEditText>(R.id.feedbackInput).text.toString()
                 PatrollerExperienceEvent.logAction("feedback_input_submit", "feedback_input_form",
                     PatrollerExperienceEvent.getActionDataString(feedbackText = feedbackInput))
diff --git a/app/src/main/res/layout/dialog_feedback_options.xml b/app/src/main/res/layout/dialog_feedback_options.xml
index f62ad4ed799..ca09b70d069 100644
--- a/app/src/main/res/layout/dialog_feedback_options.xml
+++ b/app/src/main/res/layout/dialog_feedback_options.xml
@@ -22,7 +22,7 @@
             android:layout_marginTop="24dp"
             android:paddingHorizontal="24dp"
             android:textColor="?attr/primary_color"
-            android:text="@string/patroller_diff_feedback_dialog_title" />
+            android:text="@string/survey_dialog_title" />
 
         <TextView
             android:id="@+id/messageText"
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="6dp"
             android:paddingHorizontal="24dp"
-            android:text="@string/patroller_diff_feedback_dialog_message" />
+            android:text="@string/survey_dialog_message" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:text="@string/places_survey_very_satisfied_option"
+                    android:text="@string/survey_dialog_option_very_satisfied"
                     android:visibility="gone"
                     android:buttonTint="?attr/progressive_color"
                     app:buttonTint="?attr/progressive_color"/>
@@ -61,7 +61,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:text="@string/patroller_diff_feedback_dialog_option_satisfied"
+                    android:text="@string/survey_dialog_option_satisfied"
                     app:buttonTint="?attr/progressive_color"/>
 
                 <RadioButton
@@ -70,7 +70,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:text="@string/patroller_diff_feedback_dialog_option_neutral"
+                    android:text="@string/survey_dialog_option_neutral"
                     app:buttonTint="?attr/progressive_color"/>
 
                 <RadioButton
@@ -79,7 +79,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:text="@string/patroller_diff_feedback_dialog_option_unsatisfied"
+                    android:text="@string/survey_dialog_option_unsatisfied"
                     app:buttonTint="?attr/progressive_color"/>
 
                 <RadioButton
@@ -88,7 +88,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
-                    android:text="@string/places_survey_very_unsatisfied_option"
+                    android:text="@string/survey_dialog_option_very_unsatisfied"
                     android:visibility="gone"
                     app:buttonTint="?attr/progressive_color"/>
             </RadioGroup>
@@ -98,7 +98,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                android:hint="@string/recommended_content_survey_dialog_input_hint"
+                android:hint="@string/survey_dialog_input_hint"
                 app:hintTextColor="?attr/secondary_color">
 
                 <org.wikipedia.views.PlainPasteEditText
@@ -124,14 +124,14 @@
                 style="@style/App.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/places_survey_dialog_cancel" />
+                android:text="@string/survey_dialog_cancel" />
 
             <Button
                 android:id="@+id/submitButton"
                 style="@style/App.Button.Text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/patroller_diff_feedback_dialog_submit" />
+                android:text="@string/survey_dialog_submit" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e3335ee106f..51e7cc55be2 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1583,11 +1583,11 @@
   <string name="places_filter_title">فلترة حسب اللغة</string>
   <string name="places_toggle_buttons_map">خريطة</string>
   <string name="places_toggle_buttons_list">قائمة</string>
-  <string name="places_survey_very_satisfied_option">راض جدا</string>
-  <string name="places_survey_very_unsatisfied_option">غير راض جدا</string>
+  <string name="survey_dialog_option_very_satisfied">راض جدا</string>
+  <string name="survey_dialog_option_very_unsatisfied">غير راض جدا</string>
   <string name="places_survey_dialog_title">ساعد في تحسين \"الأماكن\"</string>
   <string name="places_survey_feedback_dialog_title">كيف يمكن تحسين \"المناطق\"</string>
-  <string name="places_survey_dialog_cancel">إلغاء</string>
+  <string name="survey_dialog_cancel">إلغاء</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">ما الذي تود منا تغييره أو تحسينه؟</string>
   <string name="places_empty_list">هذه المنطقة فارغة. قم بتكبير &lt;a href\n=\"#\"&gt; الخريطة.</string>
   <string name="recommended_content_survey_dialog_submitted_message">أرسلت التعليقات. شكرا لك!</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index a853013d097..103860e7355 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -1588,16 +1588,16 @@
   <string name="patroller_onboarding_two_undo_content">Potensial dağıdıcı redaktəni geri qaytarmaq \"Geri qaytar\"ı seçin.</string>
   <string name="patroller_diff_tooltip_one">Zərər, redaktənin vikiyə ziyan vurub-vurmadığını proqnozlaşdırır.</string>
   <string name="patroller_diff_tooltip_two">Niyyət redaktənin yaxşı niyyətlə edildiyi ehtimalını proqnozlaşdırır.</string>
-  <string name="patroller_diff_feedback_dialog_title">Bu funksiyanı təkmilləşdirməkdə bizə kömək edin</string>
-  <string name="patroller_diff_feedback_dialog_message">Bu funksiya sizi qane edirmi?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Razıyam</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neytral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Razı deyiləm</string>
+  <string name="survey_dialog_title">Bu funksiyanı təkmilləşdirməkdə bizə kömək edin</string>
+  <string name="survey_dialog_message">Bu funksiya sizi qane edirmi?</string>
+  <string name="survey_dialog_option_satisfied">Razıyam</string>
+  <string name="survey_dialog_option_neutral">Neytral</string>
+  <string name="survey_dialog_option_unsatisfied">Razı deyiləm</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Bu xüsusiyyəti necə inkişaf etdirə bilərik?</string>
   <string name="patroller_diff_menu_edit_history_title">Məqalənin redaktə tarixçəsi</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Rəy</string>
-  <string name="patroller_diff_feedback_dialog_submit">Göndər</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Rəy təqdim edildi.</string>
+  <string name="survey_dialog_submit">Göndər</string>
+  <string name="survey_dialog_submitted_snackbar">Rəy təqdim edildi.</string>
   <string name="patroller_diff_feedback_tooltip">İstənilən vaxt \"Xüsusiyyətlə bağlı problem\" altında rəy bildirmək üçün menyuya toxunun.</string>
   <string name="patroller_saved_message_title_vandalism">Vandalizm xəbərdarlığı</string>
   <string name="patroller_saved_message_title_editing_tests">Test redaktələri</string>
@@ -1655,11 +1655,11 @@
   <string name="places_filter_title">Dilə görə filtrlə</string>
   <string name="places_toggle_buttons_map">Xəritə</string>
   <string name="places_toggle_buttons_list">Siyahı</string>
-  <string name="places_survey_very_satisfied_option">Çox razıyam</string>
-  <string name="places_survey_very_unsatisfied_option">Çox narazıyam</string>
+  <string name="survey_dialog_option_very_satisfied">Çox razıyam</string>
+  <string name="survey_dialog_option_very_unsatisfied">Çox narazıyam</string>
   <string name="places_survey_dialog_title">\"Yerləri\" təkmilləşdirməyə kömək edin</string>
   <string name="places_survey_feedback_dialog_title">\"Yerləri\" necə yaxşılaşdırmaq olar?</string>
-  <string name="places_survey_dialog_cancel">İmtina</string>
+  <string name="survey_dialog_cancel">İmtina</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Nəyi dəyişdirməyimizi və ya təkmilləşdirməmizi istərdiniz?</string>
   <string name="places_empty_list">Bu sahə boşdur. &lt;a href=\"#\"&gt;Xəritədə&lt;/a&gt; böyüdün.</string>
   <string name="places_card_title">Yaxınlıqdakı yerlər</string>
@@ -1672,7 +1672,7 @@
   <string name="recommended_content_section_you_might_like">Xoşunuza gələ bilər</string>
   <string name="recommended_content_survey_dialog_title">Tövsiyə olunan məzmunu təkmilləşdirməyə kömək edin.</string>
   <string name="recommended_content_survey_dialog_message">Bu tövsiyə olunan axtarış nəticəsi sizi qane edirmi?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Əlavə rəy</string>
+  <string name="survey_dialog_input_hint">Əlavə rəy</string>
   <string name="recommended_content_survey_dialog_submitted_message">Rəy təqdim edildi. Təşəkkürlər!</string>
   <string name="donor_history_title">Donor tarixi</string>
   <string name="donor_history_save_button">Yadda saxla</string>
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index 7845d3262b5..c94e35921b0 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -1487,15 +1487,15 @@
   <string name="patroller_onboarding_two_watch_content">Da li želite da pratite izmene članka? Dodajte ga na svoj spisak nadgledanja. Pogledajte ga pod \'Više\'.</string>
   <string name="patroller_onboarding_two_undo_title">Poništi/vrati</string>
   <string name="patroller_onboarding_two_undo_content">Odaberite \'Poništi\' da bi ste poništili ili vratili potencionalnu destruktivnu izmenu.</string>
-  <string name="patroller_diff_feedback_dialog_title">Pomozite nam da unapredimo ovu mogućnost</string>
-  <string name="patroller_diff_feedback_dialog_message">Da li ste zadovoljni sa ovom mogućnošću?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Zadovoljavajuće</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutralno</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Nezadovoljavajuće</string>
+  <string name="survey_dialog_title">Pomozite nam da unapredimo ovu mogućnost</string>
+  <string name="survey_dialog_message">Da li ste zadovoljni sa ovom mogućnošću?</string>
+  <string name="survey_dialog_option_satisfied">Zadovoljavajuće</string>
+  <string name="survey_dialog_option_neutral">Neutralno</string>
+  <string name="survey_dialog_option_unsatisfied">Nezadovoljavajuće</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Kako možemo da unapredimo mogućnost?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Povratne informacije</string>
-  <string name="patroller_diff_feedback_dialog_submit">Pošalji</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Povratne informacije poslate.</string>
+  <string name="survey_dialog_submit">Pošalji</string>
+  <string name="survey_dialog_submitted_snackbar">Povratne informacije poslate.</string>
   <string name="data_opt_in_accept">Prihvatam</string>
   <string name="data_opt_in_reject">Odbaci</string>
   <string name="page_issues_title">Problemi stranice</string>
diff --git a/app/src/main/res/values-b+tt+Cyrl/strings.xml b/app/src/main/res/values-b+tt+Cyrl/strings.xml
index 5c65bf82703..9a05c83360b 100644
--- a/app/src/main/res/values-b+tt+Cyrl/strings.xml
+++ b/app/src/main/res/values-b+tt+Cyrl/strings.xml
@@ -1548,13 +1548,13 @@
   <string name="patroller_onboarding_two_talk_title">Фикер алыш</string>
   <string name="patroller_onboarding_two_talk_content">Башка төзәтүчеләр белән аралашыгыз. Еш кулланылган битләрне фикер алышу битендә саклагыз яки калыпны кулланыгыз.</string>
   <string name="patroller_onboarding_two_undo_title">Кире кагу/Кире кайтару</string>
-  <string name="patroller_diff_feedback_dialog_title">Бу функцияне яхшыртырга ярдәм итегез</string>
-  <string name="patroller_diff_feedback_dialog_message">Сезне бу функция канәгатьләндерәме?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Канәгатьләндерелгән</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Нейтраль</string>
+  <string name="survey_dialog_title">Бу функцияне яхшыртырга ярдәм итегез</string>
+  <string name="survey_dialog_message">Сезне бу функция канәгатьләндерәме?</string>
+  <string name="survey_dialog_option_satisfied">Канәгатьләндерелгән</string>
+  <string name="survey_dialog_option_neutral">Нейтраль</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Кире элемтә</string>
-  <string name="patroller_diff_feedback_dialog_submit">Җибәрү</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Бәяләмә җибәрелде.</string>
+  <string name="survey_dialog_submit">Җибәрү</string>
+  <string name="survey_dialog_submitted_snackbar">Бәяләмә җибәрелде.</string>
   <string name="patroller_diff_feedback_tooltip">«Функциясе белән проблема» бүлегендә бәяләмәләрне теләсә кайсы вакытта җибәрү өчен өстәмә менюга басыгыз.</string>
   <string name="patroller_saved_message_title_auto_trans">Автоматик тәрҗемә</string>
   <string name="patroller_saved_message_title_final_warning">Соңгы кисәтү</string>
diff --git a/app/src/main/res/values-ba/strings.xml b/app/src/main/res/values-ba/strings.xml
index 64d757ea331..0a98a640005 100644
--- a/app/src/main/res/values-ba/strings.xml
+++ b/app/src/main/res/values-ba/strings.xml
@@ -1584,16 +1584,16 @@
   <string name="patroller_onboarding_two_undo_content">Зыянлы үҙгәртеүҙе кире алыу өсөн \"Кире алырға\" ғәмәлен һайлағыҙ.</string>
   <string name="patroller_diff_tooltip_one">Мөхәррирләү викиҙың боҙолоуына килтерәме икәнен күҙаллай.</string>
   <string name="patroller_diff_tooltip_two">Был алым мөхәррирләү изге ниәт менән һаҡланыу ихтималлығын күҙаллай.</string>
-  <string name="patroller_diff_feedback_dialog_title">Был функцияны яҡшыртырға ярҙам итегеҙ</string>
-  <string name="patroller_diff_feedback_dialog_message">Был функция менән ҡәнәғәтһегеҙме?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Ҡәнәғәт</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Нейтраль</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Ҡәнәғәт түгел</string>
+  <string name="survey_dialog_title">Был функцияны яҡшыртырға ярҙам итегеҙ</string>
+  <string name="survey_dialog_message">Был функция менән ҡәнәғәтһегеҙме?</string>
+  <string name="survey_dialog_option_satisfied">Ҡәнәғәт</string>
+  <string name="survey_dialog_option_neutral">Нейтраль</string>
+  <string name="survey_dialog_option_unsatisfied">Ҡәнәғәт түгел</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Был функцияны нисек яҡшырта алабыҙ?</string>
   <string name="patroller_diff_menu_edit_history_title">Мәҡәләне мөхәррирләү тарихы</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Бәйләнеш</string>
-  <string name="patroller_diff_feedback_dialog_submit">Тәҡдим итергә</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Фекер ебәрелде.</string>
+  <string name="survey_dialog_submit">Тәҡдим итергә</string>
+  <string name="survey_dialog_submitted_snackbar">Фекер ебәрелде.</string>
   <string name="patroller_diff_feedback_tooltip">«Функция проблемалары» бүлегендә теләгән ваҡытта баһалама яҙыу өсөн өҫтәмә менюға баҫығыҙ.</string>
   <string name="patroller_saved_message_title_vandalism">Вандализм тураһында иҫкәртеү</string>
   <string name="patroller_saved_message_title_npov">Нейтраль ҡараш</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index ca2a830c625..2e88b4ed871 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -1693,16 +1693,16 @@
   <string name="patroller_onboarding_two_undo_content">Выберыце \"Адкаціць\" для скасавання або адкату патэнцыйна разбуральнай праўкі.</string>
   <string name="patroller_diff_tooltip_one">\"Пашкоджанне\" прадказвае, калі праўка прычыняе шкоду ў вікі.</string>
   <string name="patroller_diff_tooltip_two">Намер прадказвае верагоднасць добрасумленнага захавання праўкі.</string>
-  <string name="patroller_diff_feedback_dialog_title">Дапамажыце нам палепшыць гэту функцыю</string>
-  <string name="patroller_diff_feedback_dialog_message">Вы задаволены гэтай функцыяй?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Задаволены</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Абыякавы</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Незадаволены</string>
+  <string name="survey_dialog_title">Дапамажыце нам палепшыць гэту функцыю</string>
+  <string name="survey_dialog_message">Вы задаволены гэтай функцыяй?</string>
+  <string name="survey_dialog_option_satisfied">Задаволены</string>
+  <string name="survey_dialog_option_neutral">Абыякавы</string>
+  <string name="survey_dialog_option_unsatisfied">Незадаволены</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Як мы можам палепшыць функцыю?</string>
   <string name="patroller_diff_menu_edit_history_title">Гісторыя праўкі артыкула</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Зваротная сувязь</string>
-  <string name="patroller_diff_feedback_dialog_submit">Адправіць</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Водгук адпраўлены.</string>
+  <string name="survey_dialog_submit">Адправіць</string>
+  <string name="survey_dialog_submitted_snackbar">Водгук адпраўлены.</string>
   <string name="patroller_diff_feedback_tooltip">Націсніце на дадатковае меню, каб у любы час адправіць водгук у раздзеле \"Праблема з функцыяй\".</string>
   <string name="patroller_saved_message_title_vandalism">Папярэджанне аб вандалізме</string>
   <string name="patroller_saved_message_title_editing_tests">Праўленне тэстаў</string>
@@ -1760,11 +1760,11 @@
   <string name="places_filter_title">Фільтраваць па мовам</string>
   <string name="places_toggle_buttons_map">Мапа</string>
   <string name="places_toggle_buttons_list">Спіс</string>
-  <string name="places_survey_very_satisfied_option">Вельмі задаволены</string>
-  <string name="places_survey_very_unsatisfied_option">Вельмі незадаволены</string>
+  <string name="survey_dialog_option_very_satisfied">Вельмі задаволены</string>
+  <string name="survey_dialog_option_very_unsatisfied">Вельмі незадаволены</string>
   <string name="places_survey_dialog_title">Дапамажыце палепшыць \"Месцы\"</string>
   <string name="places_survey_feedback_dialog_title">Як можна палепшыць \"Месцы\"?</string>
-  <string name="places_survey_dialog_cancel">Скасаваць</string>
+  <string name="survey_dialog_cancel">Скасаваць</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Што б вы хацелі змяніць або палепшыць?</string>
   <string name="places_empty_list">Гэтая зона пустая. Паменшыць &lt;a href=\"#\"&gt;маштаб мапы&lt;/a&gt; .</string>
   <string name="places_card_title">Месцы побач</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cf9cd3a0c7c..610e42af3d2 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -1402,15 +1402,15 @@
   <string name="patroller_onboarding_two_thank_title">Благодарност</string>
   <string name="patroller_onboarding_two_watch_title">Наблюдение</string>
   <string name="patroller_onboarding_two_talk_title">Беседа</string>
-  <string name="patroller_diff_feedback_dialog_title">Помогнете ни да подобрим тази възможност</string>
-  <string name="patroller_diff_feedback_dialog_message">Доволни ли сте от тази възможност?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Задоволителна</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Неутрална</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Незадоволителна</string>
+  <string name="survey_dialog_title">Помогнете ни да подобрим тази възможност</string>
+  <string name="survey_dialog_message">Доволни ли сте от тази възможност?</string>
+  <string name="survey_dialog_option_satisfied">Задоволителна</string>
+  <string name="survey_dialog_option_neutral">Неутрална</string>
+  <string name="survey_dialog_option_unsatisfied">Незадоволителна</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Как можем да подобрим тази възможност?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Обратна връзка</string>
-  <string name="patroller_diff_feedback_dialog_submit">Изпращане</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Обратната връзка е изпратена.</string>
+  <string name="survey_dialog_submit">Изпращане</string>
+  <string name="survey_dialog_submitted_snackbar">Обратната връзка е изпратена.</string>
   <string name="data_opt_in_accept">Приемане</string>
   <string name="data_opt_in_reject">Отхвърляне</string>
   <string name="page_issues_title">Проблеми със страницата</string>
@@ -1426,9 +1426,9 @@
   <string name="places_filter_title">Филтриране по език</string>
   <string name="places_toggle_buttons_map">Карта</string>
   <string name="places_toggle_buttons_list">Списък</string>
-  <string name="places_survey_very_satisfied_option">Много доволен</string>
-  <string name="places_survey_very_unsatisfied_option">Много недоволен</string>
-  <string name="places_survey_dialog_cancel">Отказ</string>
+  <string name="survey_dialog_option_very_satisfied">Много доволен</string>
+  <string name="survey_dialog_option_very_unsatisfied">Много недоволен</string>
+  <string name="survey_dialog_cancel">Отказ</string>
   <string name="places_empty_list">Тази зона е празна. Намалете мащаба &lt;a href=\"#\"&gt;на картата&lt;/a&gt;.</string>
   <string name="places_card_title">Места наблизо</string>
   <string name="places_card_action">Повече места наблизо</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 131c6acf25c..71d0da98499 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1183,14 +1183,14 @@
   <string name="patroller_tasks_filters_wiki_filter_header">উইকি</string>
   <string name="patroller_tasks_patrol_edit_snackbar_view">দেখুন</string>
   <string name="patroller_onboarding_two_talk_title">আলাপ</string>
-  <string name="patroller_diff_feedback_dialog_message">আপনি এই বৈশিষ্ট্যের সঙ্গে সন্তুষ্ট?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">সন্তুষ্ট</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">নিরপেক্ষ</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">অসন্তুষ্ট</string>
+  <string name="survey_dialog_message">আপনি এই বৈশিষ্ট্যের সঙ্গে সন্তুষ্ট?</string>
+  <string name="survey_dialog_option_satisfied">সন্তুষ্ট</string>
+  <string name="survey_dialog_option_neutral">নিরপেক্ষ</string>
+  <string name="survey_dialog_option_unsatisfied">অসন্তুষ্ট</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">আমরা কীভাবে এই বৈশিষ্ট্যটি উন্নত করতে পারি?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">প্রতিক্রিয়া</string>
-  <string name="patroller_diff_feedback_dialog_submit">জমা দিন</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">প্রতিক্রিয়া জমা দেওয়া হয়েছে। ধন্যবাদ!</string>
+  <string name="survey_dialog_submit">জমা দিন</string>
+  <string name="survey_dialog_submitted_snackbar">প্রতিক্রিয়া জমা দেওয়া হয়েছে। ধন্যবাদ!</string>
   <string name="patroller_saved_message_title_auto_trans">স্বয়ংক্রিয় অনুবাদ</string>
   <string name="patroller_saved_message_title_coi_rem">স্বার্থের সংঘাত সম্পর্কে</string>
   <string name="patroller_saved_message_title_final_warning">সর্বশেষ সতর্কবার্তা</string>
@@ -1208,8 +1208,8 @@
   <string name="places_filter_title">ভাষা ফিল্টার করুন</string>
   <string name="places_toggle_buttons_map">মানচিত্র</string>
   <string name="places_toggle_buttons_list">তালিকা</string>
-  <string name="places_survey_very_satisfied_option">খুবই সন্তুষ্ট</string>
-  <string name="places_survey_very_unsatisfied_option">খুবই অসন্তুষ্ট</string>
+  <string name="survey_dialog_option_very_satisfied">খুবই সন্তুষ্ট</string>
+  <string name="survey_dialog_option_very_unsatisfied">খুবই অসন্তুষ্ট</string>
   <string name="places_survey_dialog_title" fuzzy="true">\'স্থানগুলি\' উন্নত করতে সাহায্য করুন</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">আপনি আমাদের কী পরিবর্তন বাউন্নতি চান?</string>
   <string name="places_empty_list">এই এলাকাটি ফাঁকা। মানচিত্রে জুমআউট করুন।</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index dafc1de7272..73848390fb5 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -1302,7 +1302,7 @@
   <string name="patroller_onboarding_two_watch_title">Evezhiañ</string>
   <string name="patroller_onboarding_two_talk_title">Kaozeadenn</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Roit hoc\'h ali</string>
-  <string name="patroller_diff_feedback_dialog_submit">Kas</string>
+  <string name="survey_dialog_submit">Kas</string>
   <string name="patroller_saved_message_title_npov">Sav-boent neptu</string>
   <string name="patroller_saved_message_title_auto_trans">Troidigezh emgefreek</string>
   <string name="talk_templates_menu_edit_title">Kemmañ</string>
@@ -1318,5 +1318,5 @@
   <string name="places_filter_title">Silañ dre yezh</string>
   <string name="places_toggle_buttons_map">Kartenn</string>
   <string name="places_toggle_buttons_list">Roll</string>
-  <string name="places_survey_dialog_cancel">Nullañ</string>
+  <string name="survey_dialog_cancel">Nullañ</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 3b738e57be8..2a23c79b86d 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1554,15 +1554,15 @@
   <string name="patroller_onboarding_one_title">Contribuïu a la supervisió i aprovació de les edicions de la Viquipèdia.</string>
   <string name="patroller_onboarding_two_thank_title">Agraeix</string>
   <string name="patroller_onboarding_two_watch_title">Vigila</string>
-  <string name="patroller_diff_feedback_dialog_title">Ajudeu-nos a millorar aquesta funcionalitat</string>
-  <string name="patroller_diff_feedback_dialog_message">Esteu satisfet amb aquesta funcionalitat?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfet</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Insatisfet</string>
+  <string name="survey_dialog_title">Ajudeu-nos a millorar aquesta funcionalitat</string>
+  <string name="survey_dialog_message">Esteu satisfet amb aquesta funcionalitat?</string>
+  <string name="survey_dialog_option_satisfied">Satisfet</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Insatisfet</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Com podem millorar la funcionalitat?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Comentaris</string>
-  <string name="patroller_diff_feedback_dialog_submit">Tramet</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">S\'han tramès els comentaris.</string>
+  <string name="survey_dialog_submit">Tramet</string>
+  <string name="survey_dialog_submitted_snackbar">S\'han tramès els comentaris.</string>
   <string name="talk_templates_menu_edit_title">Edita</string>
   <string name="data_opt_in_accept">Accepta</string>
   <string name="data_opt_in_reject">Rebutja</string>
@@ -1586,5 +1586,5 @@
   <string name="places_filter_title">Filtra per llengua</string>
   <string name="places_toggle_buttons_map">Mapa</string>
   <string name="places_toggle_buttons_list">Llista</string>
-  <string name="places_survey_dialog_cancel">Cancel·la</string>
+  <string name="survey_dialog_cancel">Cancel·la</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d83b52ad3d4..70057f0e47b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1353,10 +1353,10 @@
   <string name="patroller_tasks_edits_list_user_information_dialog_edit_count_text">&lt;b&gt;Počet úprav: &lt;/b&gt; %s</string>
   <string name="patroller_tasks_edits_list_user_information_dialog_close">Zavřít</string>
   <string name="patroller_tasks_overflow_report">Problém s funkcí</string>
-  <string name="patroller_diff_feedback_dialog_message">Jste s touto funkcí spokojen(a)?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Spokojen(a)</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutrální</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Nespokojen(a)</string>
+  <string name="survey_dialog_message">Jste s touto funkcí spokojen(a)?</string>
+  <string name="survey_dialog_option_satisfied">Spokojen(a)</string>
+  <string name="survey_dialog_option_neutral">Neutrální</string>
+  <string name="survey_dialog_option_unsatisfied">Nespokojen(a)</string>
   <string name="patroller_saved_message_title_vandalism">Varování před vandalismem</string>
   <string name="patroller_saved_message_body_vandalism">Dobrý den, {{{username}}}, chci vám oznámit, že jsem vrátil jeden nebo více vašich [{{{diffLink}}}|nedávných příspěvků], protože se nezdají být konstruktivní. Pokud si myslíte, že jsem udělal chybu nebo máte otázky, můžete zanechat zprávu na [[User talk:{{{senderUserName}}}|mé diskusní stránce]]. Vezměte prosím na vědomí, že pokračující vandalismus může vést k omezením.</string>
   <string name="talk_warn_saved_messages_usage_instruction">Použijte vzorovou zprávu níže, kterou můžete přizpůsobit, zaslat a uložit do svých zpráv.</string>
@@ -1370,8 +1370,8 @@
   <string name="places_filter_title">Filtrovat jazyk</string>
   <string name="places_toggle_buttons_map">Mapa</string>
   <string name="places_toggle_buttons_list">Seznam</string>
-  <string name="places_survey_very_satisfied_option">Velmi spokojen(a)</string>
-  <string name="places_survey_very_unsatisfied_option">Velmi nespokojen(a)</string>
+  <string name="survey_dialog_option_very_satisfied">Velmi spokojen(a)</string>
+  <string name="survey_dialog_option_very_unsatisfied">Velmi nespokojen(a)</string>
   <string name="places_survey_dialog_title">Pomozte vylepšit „Místa“</string>
   <string name="places_card_title">Místa v okolí</string>
   <string name="places_card_action">Další místa v okolí</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 74dad624998..28c14abc2f6 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -384,5 +384,5 @@
   <string name="patroller_tasks_filters_all_text">Popeth</string>
   <string name="data_opt_in_accept">Cytuno</string>
   <string name="data_opt_in_reject">Gwrthod</string>
-  <string name="places_survey_dialog_cancel">Canslo</string>
+  <string name="survey_dialog_cancel">Canslo</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 18f8c0b8130..6f45d54cb11 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1593,16 +1593,16 @@
   <string name="patroller_onboarding_two_undo_title">Fortryd/Rul tilbage</string>
   <string name="patroller_onboarding_two_undo_content">Vælg \'Fortryd\' for at fortryde eller rulle en potentielt ødelæggende redigering tilbage.</string>
   <string name="patroller_diff_tooltip_one">Skader forudsiger, om en redigering forårsager skade på en wiki.</string>
-  <string name="patroller_diff_feedback_dialog_title">Hjælp os med at forbedre denne funktion</string>
-  <string name="patroller_diff_feedback_dialog_message">Er du tilfreds med denne funktion?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Tilfreds</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Utilfreds</string>
+  <string name="survey_dialog_title">Hjælp os med at forbedre denne funktion</string>
+  <string name="survey_dialog_message">Er du tilfreds med denne funktion?</string>
+  <string name="survey_dialog_option_satisfied">Tilfreds</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Utilfreds</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Hvordan kan vi forbedre funktionen?</string>
   <string name="patroller_diff_menu_edit_history_title">Artiklens redigeringshistorik</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Feedback</string>
-  <string name="patroller_diff_feedback_dialog_submit">Indsend</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Feedback indsendt.</string>
+  <string name="survey_dialog_submit">Indsend</string>
+  <string name="survey_dialog_submitted_snackbar">Feedback indsendt.</string>
   <string name="patroller_saved_message_title_vandalism">Advarsel om muligt hærværk</string>
   <string name="patroller_saved_message_title_npov">Neutral synvinkel</string>
   <string name="patroller_saved_message_title_auto_trans">Automatisk oversættelse</string>
@@ -1648,11 +1648,11 @@
   <string name="places_filter_title">Filtrér efter sprog</string>
   <string name="places_toggle_buttons_map">Kort</string>
   <string name="places_toggle_buttons_list">Liste</string>
-  <string name="places_survey_very_satisfied_option">Meget tilfreds</string>
-  <string name="places_survey_very_unsatisfied_option">Meget utilfreds</string>
+  <string name="survey_dialog_option_very_satisfied">Meget tilfreds</string>
+  <string name="survey_dialog_option_very_unsatisfied">Meget utilfreds</string>
   <string name="places_survey_dialog_title">Hjælp med at forbedre \'Steder\'</string>
   <string name="places_survey_feedback_dialog_title">Hvordan kan \"Steder\" forbedres?</string>
-  <string name="places_survey_dialog_cancel">Annullér</string>
+  <string name="survey_dialog_cancel">Annullér</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Hvad vil du gerne have, at vi ændrer eller forbedrer?</string>
   <string name="places_empty_list">Dette område er tomt. Zoom ud &lt;a href=\"#\"&gt;på kortet&lt;/a&gt;.</string>
   <string name="places_card_title">Steder i nærheden</string>
diff --git a/app/src/main/res/values-dag/strings.xml b/app/src/main/res/values-dag/strings.xml
index 0502aabc2c9..e918eee877f 100644
--- a/app/src/main/res/values-dag/strings.xml
+++ b/app/src/main/res/values-dag/strings.xml
@@ -1548,16 +1548,16 @@
   <string name="patroller_onboarding_two_undo_content">Piimi \'m bi lanniŋ\' n yihi niŋsim bee n labisi yihi maliniŋ din ni tooi ti lahabali barina.</string>
   <string name="patroller_diff_tooltip_one">Barina buɣisi ti lahabali di yi niŋ ka maliniŋ ni too tahi barina na Wiki puuni.</string>
   <string name="patroller_diff_tooltip_two">Buɣisi ti lahabali shɛli din wuhiri ni maliniŋ niŋmi ni zaɣisuŋtali</string>
-  <string name="patroller_diff_feedback_dialog_title">Sɔŋmi ka ti mali lala yaɣili ŋɔ niŋ</string>
-  <string name="patroller_diff_feedback_dialog_message">A nini tiɣi li?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">N-nini tiɣiya</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">M bi piigi yaɣili</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">N-nini bi tiɣi</string>
+  <string name="survey_dialog_title">Sɔŋmi ka ti mali lala yaɣili ŋɔ niŋ</string>
+  <string name="survey_dialog_message">A nini tiɣi li?</string>
+  <string name="survey_dialog_option_satisfied">N-nini tiɣiya</string>
+  <string name="survey_dialog_option_neutral">M bi piigi yaɣili</string>
+  <string name="survey_dialog_option_unsatisfied">N-nini bi tiɣi</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Wula ka ti tooi bo bɛrisuŋ n-tili?</string>
   <string name="patroller_diff_menu_edit_history_title">Gbanbiɛlinli maliniŋ taarihi</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Labisigu</string>
-  <string name="patroller_diff_feedback_dialog_submit">Zaŋ ti</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Labisigi zaŋya ti</string>
+  <string name="survey_dialog_submit">Zaŋ ti</string>
+  <string name="survey_dialog_submitted_snackbar">Labisigi zaŋya ti</string>
   <string name="patroller_diff_feedback_tooltip">Dihimi ovafuloo mɛnu maa zuɣu n-zaŋ alabisigu ti sahakam luɣuli din nyɛ \'A yɛlmuɣi ni dina\'.</string>
   <string name="patroller_saved_message_title_editing_tests">Maliniŋdi zahimbunima</string>
   <string name="patroller_saved_message_title_coi_rem">Nangban kpeeni zaŋ n-ti suhiyubu teebu</string>
@@ -1582,8 +1582,8 @@
   <string name="places_filter_title">Filter balli</string>
   <string name="places_toggle_buttons_map">nahingbaŋ</string>
   <string name="places_toggle_buttons_list">Yuya</string>
-  <string name="places_survey_very_satisfied_option">Tiɣi viɛnyɛla</string>
-  <string name="places_survey_very_unsatisfied_option">Bi\'tiɣi viɛnyɛla</string>
+  <string name="survey_dialog_option_very_satisfied">Tiɣi viɛnyɛla</string>
+  <string name="survey_dialog_option_very_unsatisfied">Bi\'tiɣi viɛnyɛla</string>
   <string name="places_survey_dialog_title" fuzzy="true">Sɔŋmi lɛbigi tiŋsi</string>
   <string name="places_survey_feedback_dialog_title">Wula ka tiŋsi (\"Places\") ni tooi lɛbigi?</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Bo ka a yu ni ti taɣi bee m-pahi?</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c755d6a6c40..5629d789dd5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1626,16 +1626,16 @@
   <string name="patroller_onboarding_two_undo_content">Wähle \'Rückgängig\', um eine möglicherweise schädliche Bearbeitung rückgängig zu machen oder zurückzusetzen.</string>
   <string name="patroller_diff_tooltip_one">Schaden sagt voraus, ob eine Bearbeitung einem Wiki Schaden zufügt.</string>
   <string name="patroller_diff_tooltip_two">Absicht sagt die Wahrscheinlichkeit voraus, dass eine Bearbeitung in guter Absicht getätigt wird.</string>
-  <string name="patroller_diff_feedback_dialog_title">Hilf uns, diese Funktion zu verbessern</string>
-  <string name="patroller_diff_feedback_dialog_message">Bist du mit dieser Funktion zufrieden?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Zufrieden</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Unzufrieden</string>
+  <string name="survey_dialog_title">Hilf uns, diese Funktion zu verbessern</string>
+  <string name="survey_dialog_message">Bist du mit dieser Funktion zufrieden?</string>
+  <string name="survey_dialog_option_satisfied">Zufrieden</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Unzufrieden</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Wie können wir die Funktion verbessern?</string>
   <string name="patroller_diff_menu_edit_history_title">Versionsgeschichte des Artikels</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Feedback</string>
-  <string name="patroller_diff_feedback_dialog_submit">Speichern</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Feedback gesendet.</string>
+  <string name="survey_dialog_submit">Speichern</string>
+  <string name="survey_dialog_submitted_snackbar">Feedback gesendet.</string>
   <string name="patroller_saved_message_title_vandalism">Warnung vor Vandalismus</string>
   <string name="patroller_saved_message_title_editing_tests">Testbearbeitungen</string>
   <string name="patroller_saved_message_title_npov">Neutraler Standpunkt</string>
@@ -1672,11 +1672,11 @@
   <string name="places_filter_title">Sprache filtern</string>
   <string name="places_toggle_buttons_map">Karte</string>
   <string name="places_toggle_buttons_list">Liste</string>
-  <string name="places_survey_very_satisfied_option">Sehr zufrieden</string>
-  <string name="places_survey_very_unsatisfied_option">Sehr unzufrieden</string>
+  <string name="survey_dialog_option_very_satisfied">Sehr zufrieden</string>
+  <string name="survey_dialog_option_very_unsatisfied">Sehr unzufrieden</string>
   <string name="places_survey_dialog_title">Hilf mit, „Orte“ zu verbessern</string>
   <string name="places_survey_feedback_dialog_title">Wie kann „Orte“ verbessert werden?</string>
-  <string name="places_survey_dialog_cancel">Abbrechen</string>
+  <string name="survey_dialog_cancel">Abbrechen</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Was sollen wir ändern oder verbessern?</string>
   <string name="places_empty_list">Dieser Bereich ist leer. Verkleinere &lt;a href=\"#\"&gt;die Karte&lt;/a&gt;.</string>
 </resources>
diff --git a/app/src/main/res/values-dga/strings.xml b/app/src/main/res/values-dga/strings.xml
index 2b28fff3af8..7605d6e35be 100644
--- a/app/src/main/res/values-dga/strings.xml
+++ b/app/src/main/res/values-dga/strings.xml
@@ -1453,15 +1453,15 @@
   <string name="patroller_onboarding_two_talk_title">Yeli</string>
   <string name="patroller_onboarding_two_talk_content">Yeli yɛlɛ ne fo maale eŋ taaba. Biŋ tontona yelyeli peegyi tonaa naŋ pore duoro bee toŋ ne tɛmplɛte.</string>
   <string name="patroller_onboarding_two_undo_title">Leɛ e/leɛ puori</string>
-  <string name="patroller_diff_feedback_dialog_title">Soŋ te baa nandaa ŋa</string>
-  <string name="patroller_diff_feedback_dialog_message">A nandaa ŋa sege fo laa?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Sege la</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Ba be a kaŋazaa</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Ba sege</string>
+  <string name="survey_dialog_title">Soŋ te baa nandaa ŋa</string>
+  <string name="survey_dialog_message">A nandaa ŋa sege fo laa?</string>
+  <string name="survey_dialog_option_satisfied">Sege la</string>
+  <string name="survey_dialog_option_neutral">Ba be a kaŋazaa</string>
+  <string name="survey_dialog_option_unsatisfied">Ba sege</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Wola te ma baŋ e baa a nandaa?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">leɛ teroo</string>
-  <string name="patroller_diff_feedback_dialog_submit">Tere</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Leɛ teroo toɔlɛɛ la.</string>
+  <string name="survey_dialog_submit">Tere</string>
+  <string name="survey_dialog_submitted_snackbar">Leɛ teroo toɔlɛɛ la.</string>
   <string name="patroller_diff_feedback_tooltip">Tɔ ɔvafuloo menu eŋɛ na toɔle leɛ teroo wagere zaa a puli kyɛ \'Yelwonee ne nandaare\'.</string>
   <string name="data_opt_in_accept">Sage</string>
   <string name="data_opt_in_reject">zagere</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fa8e7447752..e138515e39f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1538,7 +1538,7 @@
   <string name="patroller_onboarding_two_talk_title">Discusión</string>
   <string name="patroller_onboarding_two_talk_content">Comunicarse con otros editores. Guarde los mensajes de la página de discusión de uso común o use una plantilla.</string>
   <string name="patroller_diff_menu_edit_history_title">Historial de edición del artículo</string>
-  <string name="patroller_diff_feedback_dialog_submit">Enviar</string>
+  <string name="survey_dialog_submit">Enviar</string>
   <string name="patroller_saved_message_title_vandalism">Advertencia de vandalismo</string>
   <string name="patroller_saved_message_title_editing_tests">Pestañas de edición</string>
   <string name="patroller_saved_message_title_npov">Punto de vista neutral</string>
@@ -1588,7 +1588,7 @@
   <string name="places_permissions_denied">Se requiere permiso de Ubicación para ver tu ubicación en el mapa.  Por favor, inténtalo de nuevo.</string>
   <string name="places_toggle_buttons_map">Mapa</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_dialog_cancel">Cancelar</string>
+  <string name="survey_dialog_cancel">Cancelar</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">¿Qué quieres que cambiemos o mejoremos?</string>
   <string name="places_empty_list">Esta área está vacía. Alejar &lt;a href=\"#\"&gt;el mapa&lt;/a&gt; .</string>
   <string name="places_card_action">Más lugares cercanos</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e9d63497784..552441af644 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1539,15 +1539,15 @@
   <string name="patroller_onboarding_two_watch_title">پیگیری</string>
   <string name="patroller_onboarding_two_talk_title">بحث</string>
   <string name="patroller_onboarding_two_undo_title">خنثی‌سازی/واگردانی</string>
-  <string name="patroller_diff_feedback_dialog_message">آیا از این ویژگی راضی هستید؟</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">راضی</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">خنثی</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">ناراضی</string>
+  <string name="survey_dialog_message">آیا از این ویژگی راضی هستید؟</string>
+  <string name="survey_dialog_option_satisfied">راضی</string>
+  <string name="survey_dialog_option_neutral">خنثی</string>
+  <string name="survey_dialog_option_unsatisfied">ناراضی</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">چگونه می‌توانیم ویژگی را بهبود ببخشیم؟</string>
   <string name="patroller_diff_menu_edit_history_title">تاریخچهٔ ویرایش مقاله</string>
   <string name="patroller_diff_feedback_dialog_input_hint">بازخورد</string>
-  <string name="patroller_diff_feedback_dialog_submit">ارسال</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">بازخورد ارسال شد.</string>
+  <string name="survey_dialog_submit">ارسال</string>
+  <string name="survey_dialog_submitted_snackbar">بازخورد ارسال شد.</string>
   <string name="patroller_saved_message_title_vandalism">هشدار خرابکاری</string>
   <string name="patroller_saved_message_title_editing_tests">ویرایش‌های آزمایشی</string>
   <string name="patroller_saved_message_title_npov">دیدگاه بی‌طرفانه</string>
@@ -1568,7 +1568,7 @@
   <string name="data_opt_in_reject">رد</string>
   <string name="places_toggle_buttons_map">نقشه</string>
   <string name="places_toggle_buttons_list">فهرست</string>
-  <string name="places_survey_dialog_cancel">لغو</string>
+  <string name="survey_dialog_cancel">لغو</string>
   <string name="places_card_title">مکان‌های نزدیک</string>
   <string name="places_card_action">مکان‌های نزدیک بیشتر</string>
   <string name="places_card_enable_location_card_message">مکان‌ها یک روش مبتنی بر نقشه برای گشت و گذار در ویکی‌پدیا است</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index fa3bd08b278..017abdc0a9f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1617,16 +1617,16 @@
   <string name="patroller_onboarding_two_undo_content">Valitse \"Kumoa\" kumotaksesi mahdollisesti haitallisen muokkauksen.</string>
   <string name="patroller_diff_tooltip_one">Vahinko ennustaa mikäli muokkaus aiheuttaa vahinkoa wikille.</string>
   <string name="patroller_diff_tooltip_two">Aikomus ennustaa todennäköisyyttä sille, että muokkaus on tehty hyvässä aikomuksessa.</string>
-  <string name="patroller_diff_feedback_dialog_title">Auta meitä parantamaan tätä ominaisuutta</string>
-  <string name="patroller_diff_feedback_dialog_message">Oletko tyytyväinen tähän ominaisuuteen?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Tyytyväinen</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutraali</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Tyytymätön</string>
+  <string name="survey_dialog_title">Auta meitä parantamaan tätä ominaisuutta</string>
+  <string name="survey_dialog_message">Oletko tyytyväinen tähän ominaisuuteen?</string>
+  <string name="survey_dialog_option_satisfied">Tyytyväinen</string>
+  <string name="survey_dialog_option_neutral">Neutraali</string>
+  <string name="survey_dialog_option_unsatisfied">Tyytymätön</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Kuinka voimme parantaa ominaisuutta?</string>
   <string name="patroller_diff_menu_edit_history_title">Artikkelin muokkaushistoria</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Palaute</string>
-  <string name="patroller_diff_feedback_dialog_submit">Lähetä</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Palaute lähetetty.</string>
+  <string name="survey_dialog_submit">Lähetä</string>
+  <string name="survey_dialog_submitted_snackbar">Palaute lähetetty.</string>
   <string name="patroller_saved_message_title_vandalism">Varoitus vandalismista</string>
   <string name="patroller_saved_message_title_editing_tests">Muokkaustestit</string>
   <string name="patroller_saved_message_title_npov">Neutraali näkökulma</string>
@@ -1666,11 +1666,11 @@
   <string name="places_filter_title">Suodata kielen perusteella</string>
   <string name="places_toggle_buttons_map">Kartta</string>
   <string name="places_toggle_buttons_list">Luettelo</string>
-  <string name="places_survey_very_satisfied_option">Erittäin tyytyväinen</string>
-  <string name="places_survey_very_unsatisfied_option">Erittäin tyytymätön</string>
+  <string name="survey_dialog_option_very_satisfied">Erittäin tyytyväinen</string>
+  <string name="survey_dialog_option_very_unsatisfied">Erittäin tyytymätön</string>
   <string name="places_survey_dialog_title">Auta parantamaan \'Paikat\'-toimintoa</string>
   <string name="places_survey_feedback_dialog_title">Miten \"Paikat\"-toimintoa voidaan parantaa?</string>
-  <string name="places_survey_dialog_cancel">Peruuta</string>
+  <string name="survey_dialog_cancel">Peruuta</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Mitä haluaisit meidän muuttavan tai parantavan?</string>
   <string name="places_empty_list">Tämä alue on tyhjä. Loitonna &lt;a href=\"#\"&gt;karttaa&lt;/a&gt;.</string>
   <string name="places_card_title">Paikkoja lähistöllä</string>
@@ -1683,7 +1683,7 @@
   <string name="recommended_content_section_you_might_like">Saatat pitää</string>
   <string name="recommended_content_survey_dialog_title">Auta parantamaan suositeltua sisältöä.</string>
   <string name="recommended_content_survey_dialog_message">Oletko tyytyväinen tähän suositeltuun hakutulokseen?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Lisää palautetta</string>
+  <string name="survey_dialog_input_hint">Lisää palautetta</string>
   <string name="recommended_content_survey_dialog_submitted_message">Palaute lähetetty. Kiitos!</string>
   <string name="donor_history_save_button">Tallenna</string>
   <string name="donor_history_last_donated_date_picker_title">Valitse päivämäärä</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 093a211ebb5..c8701d464f4 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1650,16 +1650,16 @@
   <string name="patroller_onboarding_two_undo_content">Choisissez « Annuler » pour révoquer ou annuler une modification potentiellement problématique.</string>
   <string name="patroller_diff_tooltip_one">Dommage prédit si une modification cause des dommages à un wiki.</string>
   <string name="patroller_diff_tooltip_two">L’intention prédit la probabilité qu’une modification soit enregistrée de bonne foi.</string>
-  <string name="patroller_diff_feedback_dialog_title">Aidez-nous à améliorer cette fonctionnalité</string>
-  <string name="patroller_diff_feedback_dialog_message">Etes-vous satisfait de cette fonctionnalité ?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfait</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutre</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Insatisfait</string>
+  <string name="survey_dialog_title">Aidez-nous à améliorer cette fonctionnalité</string>
+  <string name="survey_dialog_message">Etes-vous satisfait de cette fonctionnalité ?</string>
+  <string name="survey_dialog_option_satisfied">Satisfait</string>
+  <string name="survey_dialog_option_neutral">Neutre</string>
+  <string name="survey_dialog_option_unsatisfied">Insatisfait</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Comment pouvons-nous améliorer la fonctionnalité ?</string>
   <string name="patroller_diff_menu_edit_history_title">Historique des modifications de l’article</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Commentaire</string>
-  <string name="patroller_diff_feedback_dialog_submit">Soumettre</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Commentaire envoyé.</string>
+  <string name="survey_dialog_submit">Soumettre</string>
+  <string name="survey_dialog_submitted_snackbar">Commentaire envoyé.</string>
   <string name="patroller_diff_feedback_tooltip">Appuyez sur le menu de débordement pour soumettre des commentaires à tout moment sous « Problème avec la fonctionnalité ».</string>
   <string name="patroller_saved_message_title_vandalism">Avertissement de vandalisme</string>
   <string name="patroller_saved_message_title_editing_tests">Tests d\'édition</string>
@@ -1717,11 +1717,11 @@
   <string name="places_filter_title">Filtrer par langue</string>
   <string name="places_toggle_buttons_map">Carte</string>
   <string name="places_toggle_buttons_list">Liste</string>
-  <string name="places_survey_very_satisfied_option">Très satisfait</string>
-  <string name="places_survey_very_unsatisfied_option">Très insatisfait</string>
+  <string name="survey_dialog_option_very_satisfied">Très satisfait</string>
+  <string name="survey_dialog_option_very_unsatisfied">Très insatisfait</string>
   <string name="places_survey_dialog_title">Aider à améliorer les \'Lieux\'</string>
   <string name="places_survey_feedback_dialog_title">Comment améliorer les « Lieux » ?</string>
-  <string name="places_survey_dialog_cancel">Annuler</string>
+  <string name="survey_dialog_cancel">Annuler</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Que voudriez-vous que nous changions ou améliorions ?</string>
   <string name="places_empty_list">Cette zone est vide. Effectuez un zoom arrière &lt;a href=\"#\"&gt;sur la carte&lt;/a&gt;.</string>
   <string name="donor_history_update_donor_status_not_a_donor">Pas un donateur</string>
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index 94e1f95f0e8..2181319ebf3 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -1531,15 +1531,15 @@
   <string name="patroller_onboarding_two_undo_content">Zaɓi \'Undo\' don warwarewa ko juyawa wani gyare-gyare mai lalacewa.</string>
   <string name="patroller_diff_tooltip_one">Lalacewar tana hasashen idan gyare-gyare yana haifar da lalacewa ga wiki.</string>
   <string name="patroller_diff_tooltip_two">Manufar ta yi hasashen yiwuwar gyara da za a adana cikin aminci.</string>
-  <string name="patroller_diff_feedback_dialog_title">Taimaka mana inganta wannan fasalin</string>
-  <string name="patroller_diff_feedback_dialog_message">Shin kun gamsu da wannan fasalin?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">An gamsu da su</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Ba tare da la\'akari ba</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Ba a gamsu ba</string>
+  <string name="survey_dialog_title">Taimaka mana inganta wannan fasalin</string>
+  <string name="survey_dialog_message">Shin kun gamsu da wannan fasalin?</string>
+  <string name="survey_dialog_option_satisfied">An gamsu da su</string>
+  <string name="survey_dialog_option_neutral">Ba tare da la\'akari ba</string>
+  <string name="survey_dialog_option_unsatisfied">Ba a gamsu ba</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Ta yaya za mu iya inganta fasalin?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Bayani</string>
-  <string name="patroller_diff_feedback_dialog_submit">Miƙa</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Ra\'ayoyin da aka gabatar.</string>
+  <string name="survey_dialog_submit">Miƙa</string>
+  <string name="survey_dialog_submitted_snackbar">Ra\'ayoyin da aka gabatar.</string>
   <string name="patroller_diff_feedback_tooltip">Sanya menu mai yawa don gabatar da ra\'ayoyi a kowane lokaci a ƙarƙashin \'Matsala tare da fasalin\'.</string>
   <string name="data_opt_in_accept">Karba</string>
   <string name="data_opt_in_reject">Mayar</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 0b89e8f717b..45b6caea737 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1436,13 +1436,13 @@
   <string name="talk_templates_menu_remove_message">संदेश हटाएँ</string>
   <string name="patroller_tasks_edits_list_card_tags_text_none">कोई नहीं</string>
   <string name="patroller_onboarding_two_talk_title">वार्ता</string>
-  <string name="patroller_diff_feedback_dialog_message">क्या आप इस सुविधा से संतुष्ट हैं?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">संतुष्ट</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">ना संतुष्ट ना असंतुष्ट</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">असंतुष्ट</string>
+  <string name="survey_dialog_message">क्या आप इस सुविधा से संतुष्ट हैं?</string>
+  <string name="survey_dialog_option_satisfied">संतुष्ट</string>
+  <string name="survey_dialog_option_neutral">ना संतुष्ट ना असंतुष्ट</string>
+  <string name="survey_dialog_option_unsatisfied">असंतुष्ट</string>
   <string name="patroller_diff_feedback_dialog_input_hint">फीडबैक</string>
-  <string name="patroller_diff_feedback_dialog_submit">जमा करें</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">फीडबैक जमा किया गया. धन्यवाद!</string>
+  <string name="survey_dialog_submit">जमा करें</string>
+  <string name="survey_dialog_submitted_snackbar">फीडबैक जमा किया गया. धन्यवाद!</string>
   <string name="talk_templates_menu_edit_title">सम्पादन</string>
   <string name="data_opt_in_accept">स्वीकार करें</string>
   <string name="data_opt_in_reject">अस्वीकार करें</string>
@@ -1455,8 +1455,8 @@
   <string name="places_filter_title">भाषा फ़िल्टर करें</string>
   <string name="places_toggle_buttons_map">नक्शा</string>
   <string name="places_toggle_buttons_list">लिस्ट</string>
-  <string name="places_survey_very_satisfied_option">बहुत संतुष्ट</string>
-  <string name="places_survey_very_unsatisfied_option">बहुत असंतुष्ट</string>
+  <string name="survey_dialog_option_very_satisfied">बहुत संतुष्ट</string>
+  <string name="survey_dialog_option_very_unsatisfied">बहुत असंतुष्ट</string>
   <string name="places_survey_dialog_title" fuzzy="true">\'स्थानों\' को बेहतर बनाने में सहायता करें</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">हमें क्या परिवर्तन या सुधार करने चाहिए?</string>
   <string name="places_empty_list">यह एरिया खाली है. मैप पर ज़ूम आउटकरें.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1e33029b41e..295b0703f02 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1595,16 +1595,16 @@
   <string name="patroller_onboarding_two_undo_title">Visszavonás/visszaállítás</string>
   <string name="patroller_onboarding_two_undo_content">A potenciálisan romboló hatású szerkesztés visszavonásához vagy visszaállításához válassza a „Visszavonás” lehetőséget.</string>
   <string name="patroller_diff_tooltip_one">A sérülés előrejelzi, ha egy szerkesztés kárt okoz a wikin.</string>
-  <string name="patroller_diff_feedback_dialog_title">Segíts a funkció fejlesztésében!</string>
-  <string name="patroller_diff_feedback_dialog_message">Elégedett vagy ezzel a funkcióval?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Elégedett</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Semleges</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Elégedetlen</string>
+  <string name="survey_dialog_title">Segíts a funkció fejlesztésében!</string>
+  <string name="survey_dialog_message">Elégedett vagy ezzel a funkcióval?</string>
+  <string name="survey_dialog_option_satisfied">Elégedett</string>
+  <string name="survey_dialog_option_neutral">Semleges</string>
+  <string name="survey_dialog_option_unsatisfied">Elégedetlen</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Hogyan javíthatjuk a funkciót?</string>
   <string name="patroller_diff_menu_edit_history_title">Szócikk szerkesztési laptörténet</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Visszajelzés</string>
-  <string name="patroller_diff_feedback_dialog_submit">Elküldés</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Visszajelzés elküldve.</string>
+  <string name="survey_dialog_submit">Elküldés</string>
+  <string name="survey_dialog_submitted_snackbar">Visszajelzés elküldve.</string>
   <string name="patroller_diff_feedback_tooltip">Érintse meg a túlcsordulás menüt, hogy bármikor visszajelzést küldhessél a „Probléma a funkcióval” alatt.</string>
   <string name="patroller_saved_message_title_vandalism">Vandalizmus figyelmeztetés</string>
   <string name="patroller_saved_message_title_editing_tests">Tesztszerkesztések</string>
@@ -1650,11 +1650,11 @@
   <string name="places_filter_title">Nyelvi szűrés</string>
   <string name="places_toggle_buttons_map">Térkép</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_very_satisfied_option">Nagyon elégedett</string>
-  <string name="places_survey_very_unsatisfied_option">Nagyon elégedetlen</string>
+  <string name="survey_dialog_option_very_satisfied">Nagyon elégedett</string>
+  <string name="survey_dialog_option_very_unsatisfied">Nagyon elégedetlen</string>
   <string name="places_survey_dialog_title">Segítsen a „Helyek” fejlesztésében</string>
   <string name="places_survey_feedback_dialog_title">Hogyan javítható a „Helyek”?</string>
-  <string name="places_survey_dialog_cancel">Mégse</string>
+  <string name="survey_dialog_cancel">Mégse</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Mit lenne az, amin változtatnánk vagy javítanánk?</string>
   <string name="places_empty_list">Ez a terület üres. Kicsinyítés &lt;a href=\"#\"&gt;a térképen&lt;/a&gt;.</string>
   <string name="places_card_title">Helyek a közelben</string>
@@ -1665,6 +1665,6 @@
   <string name="recommended_content_section_you_might_like">Lehet, hogy tetszik</string>
   <string name="recommended_content_survey_dialog_title">Segítsen javítani az ajánlott tartalmat.</string>
   <string name="recommended_content_survey_dialog_message">Elégedett ezzel az ajánlott keresési eredménnyel?</string>
-  <string name="recommended_content_survey_dialog_input_hint">További visszajelzés</string>
+  <string name="survey_dialog_input_hint">További visszajelzés</string>
   <string name="recommended_content_survey_dialog_submitted_message">Visszajelzés elküldve. Köszönjük!</string>
 </resources>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index e88a18010af..ac68060cacc 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -1591,16 +1591,16 @@
   <string name="patroller_onboarding_two_undo_content">Elige ‘Disfacer’ pro disfacer o revocar un modification potentialmente destructive.</string>
   <string name="patroller_diff_tooltip_one">‘Damnos’ previde si un modification causa damnos a un wiki.</string>
   <string name="patroller_diff_tooltip_two">‘Intention’ previde le probabilitate que un modification es facite in bon fide.</string>
-  <string name="patroller_diff_feedback_dialog_title">Adjuta nos a meliorar iste function</string>
-  <string name="patroller_diff_feedback_dialog_message">Es tu satisfacite de iste function?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfacite</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Non satisfacite</string>
+  <string name="survey_dialog_title">Adjuta nos a meliorar iste function</string>
+  <string name="survey_dialog_message">Es tu satisfacite de iste function?</string>
+  <string name="survey_dialog_option_satisfied">Satisfacite</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Non satisfacite</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Como pote nos meliorar le function?</string>
   <string name="patroller_diff_menu_edit_history_title">Historia de modificationes del articulo</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Commentario</string>
-  <string name="patroller_diff_feedback_dialog_submit">Submitter</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Commentario submittite.</string>
+  <string name="survey_dialog_submit">Submitter</string>
+  <string name="survey_dialog_submitted_snackbar">Commentario submittite.</string>
   <string name="patroller_diff_feedback_tooltip">Pro inviar commentarios, tocca sur le menu de disbordamento sub ‘Problema con function’.</string>
   <string name="patroller_saved_message_title_vandalism">Advertimento de vandalismo</string>
   <string name="patroller_saved_message_title_editing_tests">Tests de modification</string>
@@ -1658,11 +1658,11 @@
   <string name="places_filter_title">Filtrar per lingua</string>
   <string name="places_toggle_buttons_map">Carta</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_very_satisfied_option">Multo satisfacite</string>
-  <string name="places_survey_very_unsatisfied_option">Multo insatisfacite</string>
+  <string name="survey_dialog_option_very_satisfied">Multo satisfacite</string>
+  <string name="survey_dialog_option_very_unsatisfied">Multo insatisfacite</string>
   <string name="places_survey_dialog_title">Adjuta a meliorar ‘Locos’</string>
   <string name="places_survey_feedback_dialog_title">Como pote ‘Locos’ esser meliorate?</string>
-  <string name="places_survey_dialog_cancel">Cancellar</string>
+  <string name="survey_dialog_cancel">Cancellar</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Que vole tu que nos cambia o meliora?</string>
   <string name="places_empty_list">Iste area es vacue. Face zoom retro sur &lt;a href=\"#\"&gt;le carta&lt;/a&gt;.</string>
   <string name="places_card_title">Locos a proximitate</string>
@@ -1675,7 +1675,7 @@
   <string name="recommended_content_section_you_might_like">Poterea placer te</string>
   <string name="recommended_content_survey_dialog_title">Adjuta a meliorar le contento recommendate.</string>
   <string name="recommended_content_survey_dialog_message">Es tu satisfacite con iste resultato de recerca recommendate?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Retroaction additional</string>
+  <string name="survey_dialog_input_hint">Retroaction additional</string>
   <string name="recommended_content_survey_dialog_submitted_message">Retroaction inviate. Gratias!</string>
   <string name="donor_history_title">Historia del donator</string>
   <string name="donor_history_save_button">Salveguardar</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 05d34292863..7d47cd3725a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1520,15 +1520,15 @@
   <string name="patroller_onboarding_two_undo_content">Pilih \'Batalkan\' untuk membatalkan atau mengembalikan penyuntingan yang berpotensi merusak.</string>
   <string name="patroller_diff_tooltip_one">Kerusakan memperkirakan jika suatu suntingan menyebabkan kerusakan pada wiki.</string>
   <string name="patroller_diff_tooltip_two">Niat memprediksi kemungkinan suntingan disimpan dengan itikad baik</string>
-  <string name="patroller_diff_feedback_dialog_title">Bantu kami meningkatkan fitur ini</string>
-  <string name="patroller_diff_feedback_dialog_message">Apakah Anda puas dengan fitur ini?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Puas</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Netral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Tidak puas</string>
+  <string name="survey_dialog_title">Bantu kami meningkatkan fitur ini</string>
+  <string name="survey_dialog_message">Apakah Anda puas dengan fitur ini?</string>
+  <string name="survey_dialog_option_satisfied">Puas</string>
+  <string name="survey_dialog_option_neutral">Netral</string>
+  <string name="survey_dialog_option_unsatisfied">Tidak puas</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Bagaimana kami dapat meningkatkan fitur ini?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Umpan balik</string>
-  <string name="patroller_diff_feedback_dialog_submit">Kirim</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Umpan balik dikirimkan.</string>
+  <string name="survey_dialog_submit">Kirim</string>
+  <string name="survey_dialog_submitted_snackbar">Umpan balik dikirimkan.</string>
   <string name="patroller_diff_feedback_tooltip">Ketuk menu luapan untuk mengirimkan masukan kapan saja di \'Masalah dengan fitur\'.</string>
   <string name="patroller_saved_message_title_vandalism">Peringatan vandalisme</string>
   <string name="patroller_saved_message_title_editing_tests">Ujicoba penyuntingan</string>
@@ -1568,11 +1568,11 @@
   <string name="places_filter_title">Saring bahasa</string>
   <string name="places_toggle_buttons_map">Peta</string>
   <string name="places_toggle_buttons_list">Daftar</string>
-  <string name="places_survey_very_satisfied_option">Sangat puas</string>
-  <string name="places_survey_very_unsatisfied_option">Sangat tidak puas</string>
+  <string name="survey_dialog_option_very_satisfied">Sangat puas</string>
+  <string name="survey_dialog_option_very_unsatisfied">Sangat tidak puas</string>
   <string name="places_survey_dialog_title">Bantu memperbaiki \'Tempat\'</string>
   <string name="places_survey_feedback_dialog_title">Bagaimana \"Tempat\" sebaiknya diperbaiki?</string>
-  <string name="places_survey_dialog_cancel">Batal</string>
+  <string name="survey_dialog_cancel">Batal</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Apa yang Anda ingin kami ubah atau tingkatkan?</string>
   <string name="places_empty_list">Daerah ini kosong. Perkecil &lt;a href=\"#\"&gt;peta&lt;/a&gt; .</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d249417ca71..805e7771384 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1562,15 +1562,15 @@
   <string name="patroller_onboarding_two_talk_title">Discussione</string>
   <string name="patroller_onboarding_two_undo_title">Annulla/Ripristina</string>
   <string name="patroller_onboarding_two_undo_content">Scegli \"Annulla\" per annullare o ripristinare una modifica potenzialmente distruttiva.</string>
-  <string name="patroller_diff_feedback_dialog_title">Aiutaci a migliorare questa funzionalità</string>
-  <string name="patroller_diff_feedback_dialog_message">Sei soddisfatto di questa funzionalità?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Soddisfatto</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutrale</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Non soddisfatto</string>
+  <string name="survey_dialog_title">Aiutaci a migliorare questa funzionalità</string>
+  <string name="survey_dialog_message">Sei soddisfatto di questa funzionalità?</string>
+  <string name="survey_dialog_option_satisfied">Soddisfatto</string>
+  <string name="survey_dialog_option_neutral">Neutrale</string>
+  <string name="survey_dialog_option_unsatisfied">Non soddisfatto</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Come possiamo migliorare la funzionalità?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Commenti</string>
-  <string name="patroller_diff_feedback_dialog_submit">Invia</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Commento inviato</string>
+  <string name="survey_dialog_submit">Invia</string>
+  <string name="survey_dialog_submitted_snackbar">Commento inviato</string>
   <string name="patroller_saved_message_title_npov">Punto di vista neutrale</string>
   <string name="patroller_saved_message_title_auto_trans">Traduzione automatica</string>
   <string name="patroller_saved_message_title_final_warning">Avviso finale</string>
@@ -1602,11 +1602,11 @@
   <string name="donate_gpay_help_tax">Informazioni di deducibilità fiscale</string>
   <string name="places_title">Luoghi</string>
   <string name="places_toggle_buttons_map">Mappa</string>
-  <string name="places_survey_very_satisfied_option">Molto soddisfatto</string>
-  <string name="places_survey_very_unsatisfied_option">Molto insoddisfatto</string>
+  <string name="survey_dialog_option_very_satisfied">Molto soddisfatto</string>
+  <string name="survey_dialog_option_very_unsatisfied">Molto insoddisfatto</string>
   <string name="places_survey_dialog_title">Aiuta a migliorare \'Luoghi\'</string>
   <string name="places_survey_feedback_dialog_title">Come possiamo migliorare \"Luoghi\"?</string>
-  <string name="places_survey_dialog_cancel">Annulla</string>
+  <string name="survey_dialog_cancel">Annulla</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Cosa vorresti che cambiassimo o migliorassimo?</string>
   <string name="places_card_enable_location_card_button">Abilita la posizione</string>
   <string name="places_card_distance_unknown">Distanza sconosciuta</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a7123110bf3..c4502581f06 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1712,16 +1712,16 @@
   <string name="patroller_onboarding_two_undo_content">יש לבחור \"ביטול\" כדי לבטל או לשחזור עריכה שעשויה להיות הרסנית.</string>
   <string name="patroller_diff_tooltip_one">מדד \"נזק\" מנבא אם עריכה גורמת נזק לוויקי.</string>
   <string name="patroller_diff_tooltip_two">מדד \"כוונה\" מנבא את הסבירות שעריכה תישמר מתוך כוונה טובה.</string>
-  <string name="patroller_diff_feedback_dialog_title">באפשרותך לעזור לנו לשפר התכונה הזאת</string>
-  <string name="patroller_diff_feedback_dialog_message">מרוצה מהתכונה הזאת?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">מרוצה</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">אין דעה</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">לא מרוצה</string>
+  <string name="survey_dialog_title">באפשרותך לעזור לנו לשפר התכונה הזאת</string>
+  <string name="survey_dialog_message">מרוצה מהתכונה הזאת?</string>
+  <string name="survey_dialog_option_satisfied">מרוצה</string>
+  <string name="survey_dialog_option_neutral">אין דעה</string>
+  <string name="survey_dialog_option_unsatisfied">לא מרוצה</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">איך נוכל לשפר את התכונה?</string>
   <string name="patroller_diff_menu_edit_history_title">היסטוריית העריכה של הערך</string>
   <string name="patroller_diff_feedback_dialog_input_hint">משוב</string>
-  <string name="patroller_diff_feedback_dialog_submit">שליחה</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">המשוב נשלח.</string>
+  <string name="survey_dialog_submit">שליחה</string>
+  <string name="survey_dialog_submitted_snackbar">המשוב נשלח.</string>
   <string name="patroller_diff_feedback_tooltip">יש להקיש על התפריט הצף כדי לשלוח משוב בכל עת תחת \"בעיה עם תכונה\".</string>
   <string name="patroller_saved_message_title_vandalism">אזהרת השחתה</string>
   <string name="patroller_saved_message_title_editing_tests">ניסויי עריכה</string>
@@ -1779,11 +1779,11 @@
   <string name="places_filter_title">סינון לפי שפה</string>
   <string name="places_toggle_buttons_map">מפה</string>
   <string name="places_toggle_buttons_list">רשימה</string>
-  <string name="places_survey_very_satisfied_option">מרוצה מאוד</string>
-  <string name="places_survey_very_unsatisfied_option">מאוד לא מרוצה</string>
+  <string name="survey_dialog_option_very_satisfied">מרוצה מאוד</string>
+  <string name="survey_dialog_option_very_unsatisfied">מאוד לא מרוצה</string>
   <string name="places_survey_dialog_title">עזרו לנו לשפר את \"מקומות\"</string>
   <string name="places_survey_feedback_dialog_title">איך אפשר לשפר את \"מקומות\"?</string>
-  <string name="places_survey_dialog_cancel">ביטול</string>
+  <string name="survey_dialog_cancel">ביטול</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">מה היית רוצה שנשנה או נשפר?</string>
   <string name="places_empty_list">האזור הזה ריק. נא להתרחק &lt;a href=\"#\"&gt;על המפה&lt;/a&gt; .</string>
   <string name="places_card_title">מקומות בסביבה</string>
@@ -1796,7 +1796,7 @@
   <string name="recommended_content_section_you_might_like">אולי יעניין אותך</string>
   <string name="recommended_content_survey_dialog_title">סיוע בשיפור התוכן המומלץ.</string>
   <string name="recommended_content_survey_dialog_message">תוצאת החיפוש המומלצת נושאת חן בעיניך?</string>
-  <string name="recommended_content_survey_dialog_input_hint">משוב נוסף</string>
+  <string name="survey_dialog_input_hint">משוב נוסף</string>
   <string name="recommended_content_survey_dialog_submitted_message">המשוב הוגש. תודה רבה!</string>
   <string name="donor_history_title">היסטוריית התרומות</string>
   <string name="donor_history_save_button">שמירה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 90c545a0e78..58c313a0c3b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1588,16 +1588,16 @@
   <string name="patroller_onboarding_two_watch_title">ウォッチ</string>
   <string name="patroller_onboarding_two_talk_title">トーク</string>
   <string name="patroller_onboarding_two_undo_title">取り消し/巻き戻し</string>
-  <string name="patroller_diff_feedback_dialog_title">この機能の改善にご協力ください</string>
-  <string name="patroller_diff_feedback_dialog_message">この機能に満足していますか?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">満足した</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">中立</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">満足していない</string>
+  <string name="survey_dialog_title">この機能の改善にご協力ください</string>
+  <string name="survey_dialog_message">この機能に満足していますか?</string>
+  <string name="survey_dialog_option_satisfied">満足した</string>
+  <string name="survey_dialog_option_neutral">中立</string>
+  <string name="survey_dialog_option_unsatisfied">満足していない</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">どうすれば機能を改善できるでしょうか?</string>
   <string name="patroller_diff_menu_edit_history_title">記事の編集履歴</string>
   <string name="patroller_diff_feedback_dialog_input_hint">フィードバック</string>
-  <string name="patroller_diff_feedback_dialog_submit">送信</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">フィードバックが送信されました。</string>
+  <string name="survey_dialog_submit">送信</string>
+  <string name="survey_dialog_submitted_snackbar">フィードバックが送信されました。</string>
   <string name="patroller_saved_message_title_auto_trans">自動翻訳</string>
   <string name="patroller_saved_message_title_final_warning">最終警告</string>
   <string name="talk_templates_menu_edit_title">編集</string>
@@ -1630,11 +1630,11 @@
   <string name="places_filter_title">言語を絞り込む</string>
   <string name="places_toggle_buttons_map">地図</string>
   <string name="places_toggle_buttons_list">一覧</string>
-  <string name="places_survey_very_satisfied_option">非常に満足</string>
-  <string name="places_survey_very_unsatisfied_option">非常に不満</string>
+  <string name="survey_dialog_option_very_satisfied">非常に満足</string>
+  <string name="survey_dialog_option_very_unsatisfied">非常に不満</string>
   <string name="places_survey_dialog_title">「場所」の改善にご協力ください</string>
   <string name="places_survey_feedback_dialog_title">「場所」をどのように改善できますか？</string>
-  <string name="places_survey_dialog_cancel">キャンセル</string>
+  <string name="survey_dialog_cancel">キャンセル</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">何を変更または改善してほしいですか？</string>
   <string name="places_empty_list">このエリアには何もありません。&lt;a href=\"#\"&gt;地図上&lt;/a&gt;でズームアウトしてください。</string>
   <string name="contributions_dashboard_entry_dialog_cancel">いいえ、結構です</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a316b73c911..9c00e2cd319 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1548,16 +1548,16 @@
   <string name="patroller_onboarding_two_undo_title">편집 취소/일괄 되돌리기</string>
   <string name="patroller_onboarding_two_undo_content">문서 훼손 가능성이 있는 편집을 실행 취소하거나 되돌리려면 \'실행 취소\'를 선택하세요.</string>
   <string name="patroller_diff_tooltip_one">손해는 이 편집으로 위키가 훼손될 것인지 예측합니다.</string>
-  <string name="patroller_diff_feedback_dialog_title">이 기능을 개선할 수 있도록 도와주세요</string>
-  <string name="patroller_diff_feedback_dialog_message">이 기능에 만족하시나요?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">만족</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">보통</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">불만족</string>
+  <string name="survey_dialog_title">이 기능을 개선할 수 있도록 도와주세요</string>
+  <string name="survey_dialog_message">이 기능에 만족하시나요?</string>
+  <string name="survey_dialog_option_satisfied">만족</string>
+  <string name="survey_dialog_option_neutral">보통</string>
+  <string name="survey_dialog_option_unsatisfied">불만족</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">기능을 어떻게 개선할 수 있나요?</string>
   <string name="patroller_diff_menu_edit_history_title">문서 편집 역사</string>
   <string name="patroller_diff_feedback_dialog_input_hint">피드백</string>
-  <string name="patroller_diff_feedback_dialog_submit">제출</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">의견이 제출되었습니다.</string>
+  <string name="survey_dialog_submit">제출</string>
+  <string name="survey_dialog_submitted_snackbar">의견이 제출되었습니다.</string>
   <string name="patroller_saved_message_title_vandalism">문서 훼손 경고</string>
   <string name="patroller_saved_message_title_npov">중립적 시각</string>
   <string name="patroller_saved_message_title_auto_trans">자동 번역</string>
@@ -1600,11 +1600,11 @@
   <string name="places_filter_title">언어 필터링</string>
   <string name="places_toggle_buttons_map">지도</string>
   <string name="places_toggle_buttons_list">목록</string>
-  <string name="places_survey_very_satisfied_option">매우 만족</string>
-  <string name="places_survey_very_unsatisfied_option">매우 불만족</string>
+  <string name="survey_dialog_option_very_satisfied">매우 만족</string>
+  <string name="survey_dialog_option_very_unsatisfied">매우 불만족</string>
   <string name="places_survey_dialog_title">\'장소\' 개선 지원하기</string>
   <string name="places_survey_feedback_dialog_title">\"장소\"를 어떻게 개선할 수 있나요?</string>
-  <string name="places_survey_dialog_cancel">취소</string>
+  <string name="survey_dialog_cancel">취소</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">무엇을 바꾸거나 개선하기를 원하시나요?</string>
   <string name="places_empty_list">이 지역은 비어 있습니다. &lt;a href=\"#\"&gt;지도를&lt;/a&gt; 확대해 보세요.</string>
   <string name="places_card_title">주변 장소</string>
@@ -1613,7 +1613,7 @@
   <string name="places_card_distance_unknown">알 수 없는 거리</string>
   <string name="places_empty_message_snackbar">주변 장소에 관한 문서가 없습니다. 지도를 확대해서 이동해 보세요.</string>
   <string name="recommended_content_survey_dialog_message">추천 검색 결과에 만족하시나요?</string>
-  <string name="recommended_content_survey_dialog_input_hint">추가 피드백</string>
+  <string name="survey_dialog_input_hint">추가 피드백</string>
   <string name="recommended_content_survey_dialog_submitted_message">피드백을 제출했습니다. 감사합니다!</string>
   <string name="donor_history_save_button">저장</string>
   <string name="donor_history_last_donated">마지막 기부</string>
diff --git a/app/src/main/res/values-krc/strings.xml b/app/src/main/res/values-krc/strings.xml
index 66e92078b65..f04c6722f9c 100644
--- a/app/src/main/res/values-krc/strings.xml
+++ b/app/src/main/res/values-krc/strings.xml
@@ -1575,16 +1575,16 @@
   <string name="patroller_onboarding_two_undo_content">Заранлы болургъа боллукъ тюзетиуню кери алыр неда кери къайтарыр ючюн \'Кери Ал\'ны сайлагъыз.</string>
   <string name="patroller_diff_tooltip_one">Бузулуу, тюзетиуню викиге заран берирге боллугъун белгилер.</string>
   <string name="patroller_diff_tooltip_two">Нюзюр, тюзетиуню иги нюзюр бла сакъландырыргъа боллугъун белгилер.</string>
-  <string name="patroller_diff_feedback_dialog_title">Бу функцияны маджаллашдырыр ючюн болушугъуз</string>
-  <string name="patroller_diff_feedback_dialog_message">Бу функциядан разымысы?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Разыма</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Къошулмайма</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Разы тюлме</string>
+  <string name="survey_dialog_title">Бу функцияны маджаллашдырыр ючюн болушугъуз</string>
+  <string name="survey_dialog_message">Бу функциядан разымысы?</string>
+  <string name="survey_dialog_option_satisfied">Разыма</string>
+  <string name="survey_dialog_option_neutral">Къошулмайма</string>
+  <string name="survey_dialog_option_unsatisfied">Разы тюлме</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Функцияны къалай маджаллашдырыргъа боллукъбуз?</string>
   <string name="patroller_diff_menu_edit_history_title">Статья тюзетиу тарих</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Кери билдириу</string>
-  <string name="patroller_diff_feedback_dialog_submit">Джибер</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Кери билдириу джиберилди.</string>
+  <string name="survey_dialog_submit">Джибер</string>
+  <string name="survey_dialog_submitted_snackbar">Кери билдириу джиберилди.</string>
   <string name="patroller_diff_feedback_tooltip">\'Функция бла байламлы проблема\' тюбюнде излеген заман кери билдириу джиберир ючюн къошакъ менюню басыгъыз.</string>
   <string name="patroller_saved_message_title_vandalism">Вандализм эсгертиу</string>
   <string name="patroller_saved_message_title_editing_tests">Тюзетиу тестле</string>
@@ -1627,11 +1627,11 @@
   <string name="places_filter_title">Фильтр тил</string>
   <string name="places_toggle_buttons_map">Карта</string>
   <string name="places_toggle_buttons_list">Тизме</string>
-  <string name="places_survey_very_satisfied_option">Бек разыма</string>
-  <string name="places_survey_very_unsatisfied_option">Бек разы тюлме</string>
+  <string name="survey_dialog_option_very_satisfied">Бек разыма</string>
+  <string name="survey_dialog_option_very_unsatisfied">Бек разы тюлме</string>
   <string name="places_survey_dialog_title">\'Джерле\'ни маджаллашдырыргъа болушлукъчу бол</string>
   <string name="places_survey_feedback_dialog_title">\"Джерле\" къалай маджаллашдырылыр?</string>
-  <string name="places_survey_dialog_cancel">Ызына ал</string>
+  <string name="survey_dialog_cancel">Ызына ал</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Нени тюрлендиририбизни неда маджаллашдырырыбзны излейсиз?</string>
   <string name="places_empty_list">Бу юс бошду. &lt;a href=\"#\"&gt;Картаны&lt;/a&gt; узакълашдырыгъыз.</string>
 </resources>
diff --git a/app/src/main/res/values-ks/strings.xml b/app/src/main/res/values-ks/strings.xml
index a930138e3d1..815e75ac972 100644
--- a/app/src/main/res/values-ks/strings.xml
+++ b/app/src/main/res/values-ks/strings.xml
@@ -803,5 +803,5 @@
   <string name="data_opt_in_accept">تسلیٖم کرُن</string>
   <string name="data_opt_in_reject">رد کرن</string>
   <string name="places_toggle_buttons_list">فِہرِست</string>
-  <string name="places_survey_dialog_cancel">مَنسوٗخ</string>
+  <string name="survey_dialog_cancel">مَنسوٗخ</string>
 </resources>
diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
index bfdec575741..e754309745a 100644
--- a/app/src/main/res/values-lb/strings.xml
+++ b/app/src/main/res/values-lb/strings.xml
@@ -1325,15 +1325,15 @@
   <string name="patroller_onboarding_two_thank_title">Merci</string>
   <string name="patroller_onboarding_two_thank_content">Dir gesitt eng produktiv Ännerung? Sot dem Benotzer Merci fir seng Kontributioun.</string>
   <string name="patroller_onboarding_two_watch_title">Iwwerwaachen</string>
-  <string name="patroller_diff_feedback_dialog_title">Hëlleft eis dës Funktioun ze verbesseren</string>
-  <string name="patroller_diff_feedback_dialog_message">Sidd Dir zefridde mat dëser Funktioun?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Zefridden</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Onzefridden</string>
+  <string name="survey_dialog_title">Hëlleft eis dës Funktioun ze verbesseren</string>
+  <string name="survey_dialog_message">Sidd Dir zefridde mat dëser Funktioun?</string>
+  <string name="survey_dialog_option_satisfied">Zefridden</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Onzefridden</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Wéi kënne mir d\'Funktioun verbesseren?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Feedback</string>
-  <string name="patroller_diff_feedback_dialog_submit">Schécken</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Feedback geschéckt.</string>
+  <string name="survey_dialog_submit">Schécken</string>
+  <string name="survey_dialog_submitted_snackbar">Feedback geschéckt.</string>
   <string name="patroller_saved_message_title_vandalism">Vandalismuswarnung</string>
   <string name="patroller_saved_message_title_auto_trans">Automatesch Iwwersetzung</string>
   <string name="patroller_saved_message_title_final_warning">Lescht Warnung</string>
@@ -1355,11 +1355,11 @@
   <string name="places_title">Plazen</string>
   <string name="places_toggle_buttons_map">Kaart</string>
   <string name="places_toggle_buttons_list">Lëscht</string>
-  <string name="places_survey_very_satisfied_option">Ganz zefridden</string>
-  <string name="places_survey_very_unsatisfied_option">Ganz onzefridden</string>
+  <string name="survey_dialog_option_very_satisfied">Ganz zefridden</string>
+  <string name="survey_dialog_option_very_unsatisfied">Ganz onzefridden</string>
   <string name="places_survey_dialog_title">Hëlleft fir „Plazen“ ze verbesseren</string>
   <string name="places_survey_feedback_dialog_title">Wéi ka „Plazen“ verbessert ginn?</string>
-  <string name="places_survey_dialog_cancel">Ofbriechen</string>
+  <string name="survey_dialog_cancel">Ofbriechen</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Wat solle mir änneren oder verbesseren?</string>
   <string name="places_card_title">Plazen an der Géigend</string>
   <string name="places_card_action">Méi Plazen an der Géigend</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 6ee07c51608..9573634bd58 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -1597,16 +1597,16 @@
   <string name="patroller_onboarding_two_undo_content">Изберете „Врати“ за да поништите или отповикате потенцијално штетно уредување.</string>
   <string name="patroller_diff_tooltip_one">Штетата предвидува дали едно уредување ќе причини штета на едно вики.</string>
   <string name="patroller_diff_tooltip_two">Намерата ја предвидува веројатноста едно уредување да биде зачувано како добронамерно.</string>
-  <string name="patroller_diff_feedback_dialog_title">Помогнете ни да ја подобриме оваа функција</string>
-  <string name="patroller_diff_feedback_dialog_message">Дали сте задоволни со оваа функција?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Задоволителна е</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Неутрално</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Незадоволителна е</string>
+  <string name="survey_dialog_title">Помогнете ни да ја подобриме оваа функција</string>
+  <string name="survey_dialog_message">Дали сте задоволни со оваа функција?</string>
+  <string name="survey_dialog_option_satisfied">Задоволителна е</string>
+  <string name="survey_dialog_option_neutral">Неутрално</string>
+  <string name="survey_dialog_option_unsatisfied">Незадоволителна е</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Како можеме да ја подобриме функцијата?</string>
   <string name="patroller_diff_menu_edit_history_title">Историја на уредување на статијата</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Мислење</string>
-  <string name="patroller_diff_feedback_dialog_submit">Поднеси</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Мислењето е поднесено.</string>
+  <string name="survey_dialog_submit">Поднеси</string>
+  <string name="survey_dialog_submitted_snackbar">Мислењето е поднесено.</string>
   <string name="patroller_diff_feedback_tooltip">Допрете на расклопното мени за да поднесете мислење во било кое време со „Проблем со функцијата“.</string>
   <string name="patroller_saved_message_title_vandalism">Предупредување за вандализам</string>
   <string name="patroller_saved_message_title_editing_tests">Пробни уредувања</string>
@@ -1664,11 +1664,11 @@
   <string name="places_filter_title">Филтрирај јазик</string>
   <string name="places_toggle_buttons_map">Карта</string>
   <string name="places_toggle_buttons_list">Список</string>
-  <string name="places_survey_very_satisfied_option">Многу задоволен</string>
-  <string name="places_survey_very_unsatisfied_option">Многу незадоволен</string>
+  <string name="survey_dialog_option_very_satisfied">Многу задоволен</string>
+  <string name="survey_dialog_option_very_unsatisfied">Многу незадоволен</string>
   <string name="places_survey_dialog_title">Помогнете ни да го подобриме „Места“</string>
   <string name="places_survey_feedback_dialog_title">Како можеме да го подобриме „Места“?</string>
-  <string name="places_survey_dialog_cancel">Откажи</string>
+  <string name="survey_dialog_cancel">Откажи</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Што би сакале да промениме или подобриме?</string>
   <string name="places_empty_list">Ова подрачје е празно. Оддалечете &lt;a href=\"#\"&gt;на картата&lt;/a&gt;.</string>
   <string name="places_card_title">Околни места</string>
@@ -1681,7 +1681,7 @@
   <string name="recommended_content_section_you_might_like">Можеби ќе ви се допадне</string>
   <string name="recommended_content_survey_dialog_title">Помогнете ни да ја подобриме препорачаната содржина.</string>
   <string name="recommended_content_survey_dialog_message">Дали сте задоволни со овој предлог во пребараното?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Дополнително мислење</string>
+  <string name="survey_dialog_input_hint">Дополнително мислење</string>
   <string name="recommended_content_survey_dialog_submitted_message">Мислењето е поднеснео. Ви благодариме!</string>
   <string name="donor_history_title">Историја на дарување</string>
   <string name="donor_history_save_button">Зачувај</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 783f99f9d03..54069ccc4a7 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1066,8 +1066,8 @@
   <string name="patroller_tasks_filters_automated_contributions_bot">Bot</string>
   <string name="patroller_tasks_filters_significance_minor">Suntingan kecil</string>
   <string name="patroller_onboarding_two_watch_title">Pantau</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Puas hati</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Tidak puas hati</string>
+  <string name="survey_dialog_option_satisfied">Puas hati</string>
+  <string name="survey_dialog_option_unsatisfied">Tidak puas hati</string>
   <string name="patroller_saved_message_title_vandalism">Amaran laku musnah</string>
   <string name="talk_templates_menu_edit_title">Sunting</string>
   <string name="data_opt_in_accept">Terima</string>
@@ -1075,9 +1075,9 @@
   <string name="places_title">Tempat</string>
   <string name="places_toggle_buttons_map">Peta</string>
   <string name="places_toggle_buttons_list">Senarai</string>
-  <string name="places_survey_very_satisfied_option">Sangat berpuas hati</string>
-  <string name="places_survey_very_unsatisfied_option">Sangat tidak berpuas hati</string>
-  <string name="places_survey_dialog_cancel">Batalkan</string>
+  <string name="survey_dialog_option_very_satisfied">Sangat berpuas hati</string>
+  <string name="survey_dialog_option_very_unsatisfied">Sangat tidak berpuas hati</string>
+  <string name="survey_dialog_cancel">Batalkan</string>
   <string name="recommended_content_section_you_might_like">Anda mungkin suka</string>
-  <string name="recommended_content_survey_dialog_input_hint">Maklum balas tambahan</string>
+  <string name="survey_dialog_input_hint">Maklum balas tambahan</string>
 </resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 2c475ff1b52..041c37e2fb1 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1054,10 +1054,10 @@
   <string name="patroller_tasks_patrol_edit_overflow_edit_history">ဆောင်းပါး တည်းဖြတ်မှုမှတ်တမ်း</string>
   <string name="patroller_tasks_overflow_learn">ပိုမို လေ့လာရန်</string>
   <string name="patroller_diff_feedback_dialog_input_hint">အကြံပေးရန်</string>
-  <string name="patroller_diff_feedback_dialog_submit">ထည့်သွင်းရန်</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">အကြံပြုချက် တင်သွင်းခဲ့သည်။</string>
+  <string name="survey_dialog_submit">ထည့်သွင်းရန်</string>
+  <string name="survey_dialog_submitted_snackbar">အကြံပြုချက် တင်သွင်းခဲ့သည်။</string>
   <string name="data_opt_in_accept">လက်ခံ</string>
   <string name="data_opt_in_reject">ပယ်ချရန်</string>
   <string name="donation_campaign_go_back_button">နောက်သို့ ပြန်သွားရန်</string>
-  <string name="places_survey_dialog_cancel">မလုပ်တော့ပါ</string>
+  <string name="survey_dialog_cancel">မလုပ်တော့ပါ</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 6801c7e3daf..e9702796835 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -1601,16 +1601,16 @@
   <string name="patroller_onboarding_two_undo_content">Velg «Gjør om» for å omgjøre eller tilbakestille en potensielt ødeleggende redigering.</string>
   <string name="patroller_diff_tooltip_one">Skade forutsier om en redigering forårsaker skade på en wiki.</string>
   <string name="patroller_diff_tooltip_two">Hensikt forutsier sannsynligheten for at en redigering lagres med gode hensikter.</string>
-  <string name="patroller_diff_feedback_dialog_title">Hjelp oss å forbedre denne funksjonen</string>
-  <string name="patroller_diff_feedback_dialog_message">Er du fornøyd med denne funksjonen?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Fornøyd</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Nøytral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Misfornøyd</string>
+  <string name="survey_dialog_title">Hjelp oss å forbedre denne funksjonen</string>
+  <string name="survey_dialog_message">Er du fornøyd med denne funksjonen?</string>
+  <string name="survey_dialog_option_satisfied">Fornøyd</string>
+  <string name="survey_dialog_option_neutral">Nøytral</string>
+  <string name="survey_dialog_option_unsatisfied">Misfornøyd</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Hvordan kan vi forbedre funksjonen?</string>
   <string name="patroller_diff_menu_edit_history_title">Redigeringshistorikk</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Tilbakemelding</string>
-  <string name="patroller_diff_feedback_dialog_submit">Send</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Tilbakemelding sendt.</string>
+  <string name="survey_dialog_submit">Send</string>
+  <string name="survey_dialog_submitted_snackbar">Tilbakemelding sendt.</string>
   <string name="patroller_diff_feedback_tooltip">Trykk på overflytsmenyen for å sende inn tilbakemeldinger når som helst under «Problem med funksjon».</string>
   <string name="patroller_saved_message_title_vandalism">Advarsel om vandalisme</string>
   <string name="patroller_saved_message_title_npov">Nøytralt synspunkt</string>
@@ -1656,11 +1656,11 @@
   <string name="places_filter_title">Filtrer etter språk</string>
   <string name="places_toggle_buttons_map">Kart</string>
   <string name="places_toggle_buttons_list">Liste</string>
-  <string name="places_survey_very_satisfied_option">Veldig fornøyd</string>
-  <string name="places_survey_very_unsatisfied_option">Veldig misfornøyd</string>
+  <string name="survey_dialog_option_very_satisfied">Veldig fornøyd</string>
+  <string name="survey_dialog_option_very_unsatisfied">Veldig misfornøyd</string>
   <string name="places_survey_dialog_title">Hjelp til med å forbedre «Steder»</string>
   <string name="places_survey_feedback_dialog_title">Hvordan kan «Steder» forbedres?</string>
-  <string name="places_survey_dialog_cancel">Avbryt</string>
+  <string name="survey_dialog_cancel">Avbryt</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Hva ønsker du at vi endrer eller forbedrer?</string>
   <string name="places_empty_list">Dette området er tomt. Zoom ut &lt;a href=\"#\"&gt;på kartet&lt;/a&gt;.</string>
 </resources>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index a98a8e5815d..788232465d3 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -787,9 +787,9 @@
   <string name="places_title">स्थानहरू</string>
   <string name="places_toggle_buttons_map">नक्सा</string>
   <string name="places_toggle_buttons_list">सूची</string>
-  <string name="places_survey_dialog_cancel">रद्द गर्नुहोस्</string>
+  <string name="survey_dialog_cancel">रद्द गर्नुहोस्</string>
   <string name="places_card_enable_location_card_button">स्थान सक्षम पार्नुहोस्</string>
-  <string name="recommended_content_survey_dialog_input_hint">अतिरिक्त प्रतिक्रिया</string>
+  <string name="survey_dialog_input_hint">अतिरिक्त प्रतिक्रिया</string>
   <string name="donor_history_donate_button">विकिमिडिया फाउन्डेसनलाई दान गर्नुहोस्</string>
   <string name="contributions_dashboard_entry_dialog_cancel">पर्दैन, धन्यवाद</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dd5ec915189..60accec5b5f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1632,16 +1632,16 @@
   <string name="patroller_onboarding_two_undo_content">Kies ‘Ongedaan maken’ om een mogelijk schadelijke bewerking ongedaan te maken of terug te draaien.</string>
   <string name="patroller_diff_tooltip_one">Schade voorspelt of een bewerking schade aan een wiki veroorzaakt.</string>
   <string name="patroller_diff_tooltip_two">Intentie voorspelt de waarschijnlijkheid dat een bewerking te goeder trouw wordt opgeslagen.</string>
-  <string name="patroller_diff_feedback_dialog_title">Help ons deze functie te verbeteren</string>
-  <string name="patroller_diff_feedback_dialog_message">Bent u tevreden over deze functie?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Tevreden</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutraal</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Niet tevreden</string>
+  <string name="survey_dialog_title">Help ons deze functie te verbeteren</string>
+  <string name="survey_dialog_message">Bent u tevreden over deze functie?</string>
+  <string name="survey_dialog_option_satisfied">Tevreden</string>
+  <string name="survey_dialog_option_neutral">Neutraal</string>
+  <string name="survey_dialog_option_unsatisfied">Niet tevreden</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Hoe kunnen we de functie verbeteren?</string>
   <string name="patroller_diff_menu_edit_history_title">Bewerkingsgeschiedenis artikel</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Terugkoppeling</string>
-  <string name="patroller_diff_feedback_dialog_submit">Opslaan</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Terugkoppeling ingediend.</string>
+  <string name="survey_dialog_submit">Opslaan</string>
+  <string name="survey_dialog_submitted_snackbar">Terugkoppeling ingediend.</string>
   <string name="patroller_diff_feedback_tooltip">Tik op het overloopmenu om op elk gewenst moment terugkoppeling te geven onder ‘Probleem met functie’.</string>
   <string name="patroller_saved_message_title_vandalism">Waarschuwing voor vandalisme</string>
   <string name="patroller_saved_message_title_editing_tests">Bewerktests</string>
@@ -1699,11 +1699,11 @@
   <string name="places_filter_title">Filteren op taal</string>
   <string name="places_toggle_buttons_map">Kaart</string>
   <string name="places_toggle_buttons_list">Lijst</string>
-  <string name="places_survey_very_satisfied_option">Erg tevreden</string>
-  <string name="places_survey_very_unsatisfied_option">Zeer ontevreden</string>
+  <string name="survey_dialog_option_very_satisfied">Erg tevreden</string>
+  <string name="survey_dialog_option_very_unsatisfied">Zeer ontevreden</string>
   <string name="places_survey_dialog_title">Help \'Plaatsen\' te verbeteren</string>
   <string name="places_survey_feedback_dialog_title">Hoe kunnen \'Plaatsen\' worden verbeterd?</string>
-  <string name="places_survey_dialog_cancel">Annuleren</string>
+  <string name="survey_dialog_cancel">Annuleren</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Wat wil je dat we veranderen of verbeteren?</string>
   <string name="places_empty_list">Dit gebied is leeg. Zoom uit &lt;a href=\"#\"&gt;op de kaart&lt;/a&gt;.</string>
   <string name="places_card_title">Plaatsen in de buurt</string>
diff --git a/app/src/main/res/values-nqo/strings.xml b/app/src/main/res/values-nqo/strings.xml
index bf64ade6288..55058457c55 100644
--- a/app/src/main/res/values-nqo/strings.xml
+++ b/app/src/main/res/values-nqo/strings.xml
@@ -1373,11 +1373,11 @@
   <string name="places_filter_title">ߞߊ߲ ߛߍ߲ߛߍ߲߫</string>
   <string name="places_toggle_buttons_map">ߔߊ߬ߔߘߊ</string>
   <string name="places_toggle_buttons_list">ߛߙߍߘߍ</string>
-  <string name="places_survey_very_satisfied_option">ߒ ߠߊߥߛߊ߬ߣߍ߲߫ ߞߏߛߓߍ߫</string>
-  <string name="places_survey_very_unsatisfied_option">ߒ ߡߊ߫ ߟߊߥߛߊ߬ ߝߋߝߋ߫</string>
+  <string name="survey_dialog_option_very_satisfied">ߒ ߠߊߥߛߊ߬ߣߍ߲߫ ߞߏߛߓߍ߫</string>
+  <string name="survey_dialog_option_very_unsatisfied">ߒ ߡߊ߫ ߟߊߥߛߊ߬ ߝߋߝߋ߫</string>
   <string name="places_survey_dialog_title">ߦߙߐ ߟߎ߬ ߟߊߓߘߍ߬ߦߊ ߘߍ߬ߡߍ߲߬ߠߌ߲</string>
   <string name="places_survey_feedback_dialog_title">\"ߦߙߐ ߟߎ߬\" ߦߋ߫ ߟߊߓߘߍ߬ߦߊ߬ ߟߊ߫ ߘߌ߬؟</string>
-  <string name="places_survey_dialog_cancel">ߊ߬ ߘߐߛߊ߬</string>
+  <string name="survey_dialog_cancel">ߊ߬ ߘߐߛߊ߬</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">ߌ ߦߴߊ߬ ߝߍ߬ ߊ߲ ߧߋ߫ ߡߎ߲߬ ߠߊߓߘߍ߬ߦߊ߫ ߥߟߊ߫ ߞߵߊ߬ ߡߊߝߊ߬ߟߋ߲߫؟</string>
   <string name="places_empty_list">ߘߌ߲߬ߞߌߙߊ ߣߌ߲߬ ߘߐߞߏߟߏ߲ ߠߋ߬ ߦߋ߫. ߊ߬ ߥߊ߲߫߫߯ߛߊ߲߫ &lt;a href=\"#\"&gt;&lt;a href=\"#\"&gt;ߔߊ߬ߔߘߊ ߞߊ߲߬&lt;/a&gt;&lt;/a&gt;.</string>
   <string name="places_card_title">ߕߙߐ߬ߝߍ߫ ߘߌ߲ߞߌߙߊ ߟߎ߬</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 49ec8fab698..8376e169c60 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -1081,11 +1081,11 @@
   <string name="places_filter_title">ਭਾਸ਼ਾ ਫਿਲਟਰ ਕਰੋ</string>
   <string name="places_toggle_buttons_map">ਨਕਸ਼ਾ</string>
   <string name="places_toggle_buttons_list">ਸੂਚੀ</string>
-  <string name="places_survey_very_satisfied_option">ਬਹੁਤ ਸੰਤੁਸ਼ਟ</string>
-  <string name="places_survey_very_unsatisfied_option">ਬਹੁਤ ਅਸੰਤੁਸ਼ਟ</string>
+  <string name="survey_dialog_option_very_satisfied">ਬਹੁਤ ਸੰਤੁਸ਼ਟ</string>
+  <string name="survey_dialog_option_very_unsatisfied">ਬਹੁਤ ਅਸੰਤੁਸ਼ਟ</string>
   <string name="places_survey_dialog_title">\'ਥਾਵਾਂ\' ਨੂੰ ਸੁਧਾਰਨ ਵਿੱਚ ਮਦਦ ਕਰੋ</string>
   <string name="places_survey_feedback_dialog_title">\"ਥਾਵਾਂ\" ਨੂੰ ਕਿਵੇਂ ਸੁਧਾਰਿਆ ਜਾ ਸਕਦਾ ਹੈ?</string>
-  <string name="places_survey_dialog_cancel">ਰੱਦ ਕਰੋ</string>
+  <string name="survey_dialog_cancel">ਰੱਦ ਕਰੋ</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">ਤੁਸੀਂ ਕੀ ਚਾਹੁੰਦੇ ਹੋ ਕਿ ਅਸੀਂ ਕੀ ਬਦਲੀਏ ਜਾਂ ਸੁਧਾਰ ਕਰੀਏ?</string>
   <string name="places_empty_list">ਇਹ ਖੇਤਰ ਖਾਲੀ ਹੈ। &lt;a href=\"#\"&gt;ਨਕਸ਼ੇ \'ਤੇ&lt;/a&gt; ਜ਼ੂਮ ਆਉਟ ਕਰੋ।</string>
   <string name="recommended_content_section_you_might_like">ਤੁਹਾਨੂੰ ਪਸੰਦ ਆ ਸਕਦਾ ਹੈ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1e31b159d6c..998174acfec 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1303,14 +1303,14 @@
   <string name="patroller_tasks_filters_reset">Zresetuj</string>
   <string name="patroller_tasks_filters_wiki_filter_header">Wiki</string>
   <string name="patroller_tasks_filters_all_text">Wszystkie</string>
-  <string name="patroller_diff_feedback_dialog_message">Czy jesteś zadowolony z tej funkcji?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Zadowolony</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutralny</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Niezadowolony</string>
+  <string name="survey_dialog_message">Czy jesteś zadowolony z tej funkcji?</string>
+  <string name="survey_dialog_option_satisfied">Zadowolony</string>
+  <string name="survey_dialog_option_neutral">Neutralny</string>
+  <string name="survey_dialog_option_unsatisfied">Niezadowolony</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Jak możemy ulepszyć tę funkcję?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Opinia</string>
-  <string name="patroller_diff_feedback_dialog_submit">Wyślij</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Opinia została przesłana.</string>
+  <string name="survey_dialog_submit">Wyślij</string>
+  <string name="survey_dialog_submitted_snackbar">Opinia została przesłana.</string>
   <string name="patroller_diff_feedback_tooltip">Kliknij rozszerzone menu, aby w dowolnym momencie przesłać opinię w sekcji „Problem z funkcją”.</string>
   <string name="data_opt_in_accept">Akceptuj</string>
   <string name="data_opt_in_reject">Odrzuć</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 75c22315d5e..213bd12169c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1578,13 +1578,13 @@
   <string name="patroller_onboarding_two_talk_title">Discussão</string>
   <string name="patroller_onboarding_two_undo_title">Desfazer/Reverter</string>
   <string name="patroller_onboarding_two_undo_content">Escolher \'Desfazer\' para desfazer ou reverter uma edição potencialmente destrutiva.</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfeito(a)</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutro(a)</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Insatisfeito(a)</string>
+  <string name="survey_dialog_option_satisfied">Satisfeito(a)</string>
+  <string name="survey_dialog_option_neutral">Neutro(a)</string>
+  <string name="survey_dialog_option_unsatisfied">Insatisfeito(a)</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Como podemos melhorar a funcionalidade?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Comentários</string>
-  <string name="patroller_diff_feedback_dialog_submit">Enviar</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Comentário enviado.</string>
+  <string name="survey_dialog_submit">Enviar</string>
+  <string name="survey_dialog_submitted_snackbar">Comentário enviado.</string>
   <string name="talk_warn_saved_messages_usage_instruction">Use uma mensagem exemplo abaixo para personalizar, enviar e salvar suas mensagens.</string>
   <string name="talk_templates_menu_edit_title">Editar</string>
   <string name="data_opt_in_accept">Aceitar</string>
@@ -1603,7 +1603,7 @@
   <string name="places_filter_title">Filtrar por idioma</string>
   <string name="places_toggle_buttons_map">Mapa</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_very_satisfied_option">Muito satisfeito</string>
-  <string name="places_survey_very_unsatisfied_option">Muito insatisfeito</string>
-  <string name="places_survey_dialog_cancel">Cancelar</string>
+  <string name="survey_dialog_option_very_satisfied">Muito satisfeito</string>
+  <string name="survey_dialog_option_very_unsatisfied">Muito insatisfeito</string>
+  <string name="survey_dialog_cancel">Cancelar</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6ce66906c57..a8f865ef328 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1563,15 +1563,15 @@
   <string name="patroller_onboarding_two_undo_content">Escolher \'Desfazer\' para desfazer ou reverter uma edição potencialmente destrutiva.</string>
   <string name="patroller_diff_tooltip_one">\"Danos\" prevê se uma edição causa dano a uma wiki.</string>
   <string name="patroller_diff_tooltip_two">\"Intenção\" prevê a probabilidade de uma edição ser gravada em boa-fé.</string>
-  <string name="patroller_diff_feedback_dialog_title">Ajude-nos a melhorar esta funcionalidade</string>
-  <string name="patroller_diff_feedback_dialog_message">Está satisfeito(a) com esta funcionalidade?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfeito(a)</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutro(a)</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Insatisfeito(a)</string>
+  <string name="survey_dialog_title">Ajude-nos a melhorar esta funcionalidade</string>
+  <string name="survey_dialog_message">Está satisfeito(a) com esta funcionalidade?</string>
+  <string name="survey_dialog_option_satisfied">Satisfeito(a)</string>
+  <string name="survey_dialog_option_neutral">Neutro(a)</string>
+  <string name="survey_dialog_option_unsatisfied">Insatisfeito(a)</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Como podemos melhorar a funcionalidade?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Comentários</string>
-  <string name="patroller_diff_feedback_dialog_submit">Enviar</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Comentário enviado.</string>
+  <string name="survey_dialog_submit">Enviar</string>
+  <string name="survey_dialog_submitted_snackbar">Comentário enviado.</string>
   <string name="patroller_diff_feedback_tooltip">Prima o menu de transbordamento para enviar comentários a qualquer altura em \"Problema com a funcionalidade\".</string>
   <string name="data_opt_in_accept">Aceitar</string>
   <string name="data_opt_in_reject">Rejeitar</string>
@@ -1591,8 +1591,8 @@
   <string name="places_filter_title">Filtrar por língua</string>
   <string name="places_toggle_buttons_map">Mapa</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_very_satisfied_option">Muito satisfeito</string>
-  <string name="places_survey_very_unsatisfied_option">Muito insatisfeito</string>
+  <string name="survey_dialog_option_very_satisfied">Muito satisfeito</string>
+  <string name="survey_dialog_option_very_unsatisfied">Muito insatisfeito</string>
   <string name="places_survey_dialog_title">Ajudar a melhorar «Lugares»</string>
   <string name="places_survey_feedback_dialog_title">Como pode a funcionalidade \"Lugares\" ser melhorada?</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">O que gostaria que mudássemos ou melhorássemos?</string>
diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml
index 5b61ac4d6fe..44a3f2cbff5 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -1626,16 +1626,16 @@
   <string name="patroller_onboarding_two_undo_content">Content of the undo/rollback section of the second patroller tasks onboarding screen.</string>
   <string name="patroller_diff_tooltip_one">Text of the first tooltip for edit diff screen.</string>
   <string name="patroller_diff_tooltip_two">Text of the second tooltip for edit diff screen.</string>
-  <string name="patroller_diff_feedback_dialog_title">Dialog title for the feedback form in the Edit Patrol screen.</string>
-  <string name="patroller_diff_feedback_dialog_message">Dialog message for the feedback form in the Edit Patrol screen.</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Option for the feedback form in the Edit Patrol screen that indicates satisfied.</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Option for the feedback form in the Edit Patrol screen that indicates neutral.</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Option for the feedback form in the Edit Patrol screen that indicates unsatisfied.</string>
+  <string name="survey_dialog_title">Dialog title for the feedback form in the Edit Patrol screen.</string>
+  <string name="survey_dialog_message">Dialog message for the feedback form in the Edit Patrol screen.</string>
+  <string name="survey_dialog_option_satisfied">Option for the feedback form in the Edit Patrol screen that indicates satisfied.</string>
+  <string name="survey_dialog_option_neutral">Option for the feedback form in the Edit Patrol screen that indicates neutral.</string>
+  <string name="survey_dialog_option_unsatisfied">Option for the feedback form in the Edit Patrol screen that indicates unsatisfied.</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Dialog title for the feedback input in the Edit Patrol screen.</string>
   <string name="patroller_diff_menu_edit_history_title">Label text for menu option to view the article\'s edit history.</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Hint text for input field for the feedback form in the patrol edit screen.</string>
-  <string name="patroller_diff_feedback_dialog_submit">Button label for input field for the feedback form in the patrol edit screen.</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Text for the snackbar message the feedback form in the patrol edit screen that indicates the feedback has been submitted.</string>
+  <string name="survey_dialog_submit">Button label for input field for the feedback form in the patrol edit screen.</string>
+  <string name="survey_dialog_submitted_snackbar">Text for the snackbar message the feedback form in the patrol edit screen that indicates the feedback has been submitted.</string>
   <string name="patroller_diff_feedback_tooltip">Text of the tooltip for the patrol edit screen indicates how to submit feedback for the feature.\n\n\"Problem with feature\" is {{msg-wm|Wikipedia-android-strings-suggested edits report feature}}</string>
   <string name="patroller_saved_message_title_vandalism">Title text for the ready-to-use user talk message offered to experienced editors to warn another editor about vandalism: {{msg-wm|Wikipedia-android-strings-patroller saved message body vandalism}}</string>
   <string name="patroller_saved_message_title_editing_tests">Title text for the ready-to-use user talk message offered to experienced editors to warn another editor about editing tests: {{msg-wm|Wikipedia-android-strings-patroller saved message body editing tests}}</string>
@@ -1694,12 +1694,9 @@
   <string name="places_filter_title">Title string for places language filter screen.</string>
   <string name="places_toggle_buttons_map">Button label for viewing the map view in the Places screen.</string>
   <string name="places_toggle_buttons_list">Button label for viewing the list view in the Places screen.</string>
-  <string name="places_survey_very_satisfied_option">Option text suggesting that user is very satisfied with the feature, shown in the survey</string>
-  <string name="places_survey_very_unsatisfied_option">Option text suggesting that user is very usatisfied with the feature, shown in the survey</string>
-  <string name="places_survey_dialog_title">Title text for the main feedback dialog for places feature. \"Places\" must be consistent with {{msg-wm|Wikipedia-android-strings-places title}}</string>
-  <string name="places_survey_feedback_dialog_title">Title text for the secondary dialog, which is shown as a result of an action on the main dialog for places feature. \"Places\" must be consistent with {{msg-wm|Wikipedia-android-strings-places title}}</string>
-  <string name="places_survey_dialog_cancel">Negative action button text for places survey dialog</string>
-  <string name="places_survey_feedback_low_satisfaction_dialog_title">Title text for the secondary dialog which is shown as a result of an action on the main dialog for places feature - shown only to users who are very unsatisfied with the feature</string>
+  <string name="survey_dialog_option_very_satisfied">Option text suggesting that user is very satisfied with the feature, shown in the survey</string>
+  <string name="survey_dialog_option_very_unsatisfied">Option text suggesting that user is very usatisfied with the feature, shown in the survey</string>
+  <string name="survey_dialog_cancel">Negative action button text for places survey dialog</string>
   <string name="places_empty_list">Empty message for the list in the current map area. Please keep the anchor link around the \"on the map\".</string>
   <string name="places_card_title">Title for the Places card on the explore feed.</string>
   <string name="places_card_action">Text for the Places card action on the explore feed</string>
@@ -1711,7 +1708,7 @@
   <string name="recommended_content_section_you_might_like">Section label for the Recommended Content.</string>
   <string name="recommended_content_survey_dialog_title">Title for the Recommended Content survey dialog.</string>
   <string name="recommended_content_survey_dialog_message">Message text for the Recommended Content survey dialog.</string>
-  <string name="recommended_content_survey_dialog_input_hint">Hint label for the Recommended Content survey dialog input field.</string>
+  <string name="survey_dialog_input_hint">Hint label for the Recommended Content survey dialog input field.</string>
   <string name="recommended_content_survey_dialog_submitted_message">Snackbar message for the Recommended Content survey after submitting it.</string>
   <string name="donor_history_title">Title for the Donor history screen.</string>
   <string name="donor_history_save_button">Button label for the Donor history screen to save the information.</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index e598fee19f9..57c33e81e75 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1348,10 +1348,10 @@
   <string name="patroller_tasks_filters_user_intent_bad">Foarte probabil cu rea-credință</string>
   <string name="patroller_tasks_filters_user_intent_bad_desc">Foarte precis în găsirea celor mai evidente editări de rea-credință.</string>
   <string name="patroller_tasks_patrol_edit_undo_success">Revenire finalizată</string>
-  <string name="patroller_diff_feedback_dialog_message">Sunteți mulțumit de această funcționalitate?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Mulțumit</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutru</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Nemulțumit</string>
+  <string name="survey_dialog_message">Sunteți mulțumit de această funcționalitate?</string>
+  <string name="survey_dialog_option_satisfied">Mulțumit</string>
+  <string name="survey_dialog_option_neutral">Neutru</string>
+  <string name="survey_dialog_option_unsatisfied">Nemulțumit</string>
   <string name="data_opt_in_accept">Accept</string>
   <string name="data_opt_in_reject">Refuz</string>
   <string name="email_report_image_recommendations_subject">Raport de problemă - Funcția Recomandări de imagini</string>
@@ -1364,8 +1364,8 @@
   <string name="places_filter_title">Filtrare după limbă</string>
   <string name="places_toggle_buttons_map">Hartă</string>
   <string name="places_toggle_buttons_list">Listă</string>
-  <string name="places_survey_very_satisfied_option">Foarte mulțumit</string>
-  <string name="places_survey_very_unsatisfied_option">Foarte nemulțumit</string>
+  <string name="survey_dialog_option_very_satisfied">Foarte mulțumit</string>
+  <string name="survey_dialog_option_very_unsatisfied">Foarte nemulțumit</string>
   <string name="places_survey_dialog_title">Ajută să îmbunătățim „Locuri”</string>
   <string name="places_survey_feedback_dialog_title">Cum se poate îmbunătăți „Locuri”?</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 26f5b9e20cd..d49b8af198d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1671,15 +1671,15 @@
   <string name="patroller_onboarding_two_talk_title">Обсуждение</string>
   <string name="patroller_onboarding_two_talk_content">Общайтесь с другими редакторами. Сохраняйте часто используемые сообщения на странице обсуждения или используйте шаблон.</string>
   <string name="patroller_onboarding_two_undo_title">Отменить/Откатить</string>
-  <string name="patroller_diff_feedback_dialog_message">Вы довольны этой функцией?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Доволен</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Воздержусь</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Недоволен</string>
+  <string name="survey_dialog_message">Вы довольны этой функцией?</string>
+  <string name="survey_dialog_option_satisfied">Доволен</string>
+  <string name="survey_dialog_option_neutral">Воздержусь</string>
+  <string name="survey_dialog_option_unsatisfied">Недоволен</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Как мы можем улучшить эту функцию?</string>
   <string name="patroller_diff_menu_edit_history_title">История редактирования статьи</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Обратная связь</string>
-  <string name="patroller_diff_feedback_dialog_submit">Отправить</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Обратная связь отправлена.</string>
+  <string name="survey_dialog_submit">Отправить</string>
+  <string name="survey_dialog_submitted_snackbar">Обратная связь отправлена.</string>
   <string name="patroller_saved_message_title_vandalism">Предупреждение о вандализме</string>
   <string name="patroller_saved_message_title_npov">Нейтральная точка зрения</string>
   <string name="patroller_saved_message_title_auto_trans">Автоматический перевод</string>
@@ -1714,9 +1714,9 @@
   <string name="places_filter_title">Фильтр по языку</string>
   <string name="places_toggle_buttons_map">Карта</string>
   <string name="places_toggle_buttons_list">Список</string>
-  <string name="places_survey_very_satisfied_option">Очень доволен</string>
-  <string name="places_survey_very_unsatisfied_option">Очень неудовлетворен</string>
-  <string name="places_survey_dialog_cancel">Отмена</string>
+  <string name="survey_dialog_option_very_satisfied">Очень доволен</string>
+  <string name="survey_dialog_option_very_unsatisfied">Очень неудовлетворен</string>
+  <string name="survey_dialog_cancel">Отмена</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Что бы вы хотели, чтобы мы изменили или улучшили?</string>
   <string name="places_card_enable_location_card_button">Включить определение местоположения</string>
   <string name="donor_history_title">История донора</string>
diff --git a/app/src/main/res/values-sd/strings.xml b/app/src/main/res/values-sd/strings.xml
index e51ce3b574e..cccba29c3b2 100644
--- a/app/src/main/res/values-sd/strings.xml
+++ b/app/src/main/res/values-sd/strings.xml
@@ -1452,16 +1452,16 @@
   <string name="patroller_onboarding_two_talk_title">بحث</string>
   <string name="patroller_onboarding_two_talk_content">ٻين سنواريندڙن سان لھ چڙھ ۾ اچو. عام طور تي استعمال ٿيندڙ بحث صفحي جا پيغام سانڍيو يا ڪو سانچو استعمال ڪريو.</string>
   <string name="patroller_onboarding_two_undo_title">اڻڪريو/واپس موٽايو</string>
-  <string name="patroller_diff_feedback_dialog_title">ھن خصوصيت کي بھتر ڪرڻ ۾ اسان جي مدد ڪريو</string>
-  <string name="patroller_diff_feedback_dialog_message">ڇا توھان ھن خصوصيت سان مطمئن آھيو؟</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">مطمئن</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">اڻڌريو</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">غير مطمئن</string>
+  <string name="survey_dialog_title">ھن خصوصيت کي بھتر ڪرڻ ۾ اسان جي مدد ڪريو</string>
+  <string name="survey_dialog_message">ڇا توھان ھن خصوصيت سان مطمئن آھيو؟</string>
+  <string name="survey_dialog_option_satisfied">مطمئن</string>
+  <string name="survey_dialog_option_neutral">اڻڌريو</string>
+  <string name="survey_dialog_option_unsatisfied">غير مطمئن</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">اسان خصوصيت کي ڪيئن بھتر ڪري سگهون ٿا؟</string>
   <string name="patroller_diff_menu_edit_history_title">مضمون جي سنوار سوانح</string>
   <string name="patroller_diff_feedback_dialog_input_hint">موٽ</string>
-  <string name="patroller_diff_feedback_dialog_submit">اماڻيو</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">موٽ اماڻجي وئي.</string>
+  <string name="survey_dialog_submit">اماڻيو</string>
+  <string name="survey_dialog_submitted_snackbar">موٽ اماڻجي وئي.</string>
   <string name="patroller_saved_message_title_vandalism">تخريبڪاري جو چِتاءُ</string>
   <string name="patroller_saved_message_title_editing_tests">سنوارڻ جون ٽيسٽون</string>
   <string name="patroller_saved_message_title_npov">اڻڌريو نقطۂ نظر</string>
@@ -1496,11 +1496,11 @@
   <string name="places_filter_title">ٻولي ڇاڻيو</string>
   <string name="places_toggle_buttons_map">نقشو</string>
   <string name="places_toggle_buttons_list">فھرست</string>
-  <string name="places_survey_very_satisfied_option">ڏاڍو مطمئن</string>
-  <string name="places_survey_very_unsatisfied_option">ڏاڍو غير مطمئن</string>
+  <string name="survey_dialog_option_very_satisfied">ڏاڍو مطمئن</string>
+  <string name="survey_dialog_option_very_unsatisfied">ڏاڍو غير مطمئن</string>
   <string name="places_survey_dialog_title">\'ماڳ\' کي بھتر ڪرڻ ۾ مدد ڪريو</string>
   <string name="places_survey_feedback_dialog_title">\"ماڳ\" کي ڪيئن بھتر ڪري سگهجي ٿو؟</string>
-  <string name="places_survey_dialog_cancel">رد ڪريو</string>
+  <string name="survey_dialog_cancel">رد ڪريو</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">توھان ڇا ٿا چاھيو جنھن کي اسان تبديل يا بھتر ڪريون؟</string>
   <string name="places_empty_list">هي علائقو خالي آهي. &lt;a href=\"#\"&gt;نقشي تي&lt;/a&gt; وڏو ڪريو.</string>
 </resources>
diff --git a/app/src/main/res/values-se/strings.xml b/app/src/main/res/values-se/strings.xml
index ae4647a8280..e33cd3201ff 100644
--- a/app/src/main/res/values-se/strings.xml
+++ b/app/src/main/res/values-se/strings.xml
@@ -1601,16 +1601,16 @@
   <string name="patroller_onboarding_two_undo_content">Vállje «Ráhkat ođđasit», ođđasit ráhkadit dahje ruovttoluotta rievdadit vejolaččat billisteaddji rievdadeami.</string>
   <string name="patroller_diff_tooltip_one">Vahát einnosta dan ahte vahágahttojuvvo go soames wiki rievdadeami dihte.</string>
   <string name="patroller_diff_tooltip_two">Ulbmil einnosta dan vejolašvuođa ahte rievdadeapmi vurkejuvvo buriid ulbmiliiguin.</string>
-  <string name="patroller_diff_feedback_dialog_title">Veahket min buoridit dán doaimma</string>
-  <string name="patroller_diff_feedback_dialog_message">Leat go duhtavaš dáinna doaimmain?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Duhtavaš</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutrála</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Duhtameahttun</string>
+  <string name="survey_dialog_title">Veahket min buoridit dán doaimma</string>
+  <string name="survey_dialog_message">Leat go duhtavaš dáinna doaimmain?</string>
+  <string name="survey_dialog_option_satisfied">Duhtavaš</string>
+  <string name="survey_dialog_option_neutral">Neutrála</string>
+  <string name="survey_dialog_option_unsatisfied">Duhtameahttun</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Movt sáhttit buoridit doaimma?</string>
   <string name="patroller_diff_menu_edit_history_title">Artihkalrievdadanhistorihkka</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Máhcahat</string>
-  <string name="patroller_diff_feedback_dialog_submit">Sádde</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Máhcahat sáddejuvvon.</string>
+  <string name="survey_dialog_submit">Sádde</string>
+  <string name="survey_dialog_submitted_snackbar">Máhcahat sáddejuvvon.</string>
   <string name="patroller_diff_feedback_tooltip">Coahkkal badjelgolganfálu sádden dihte máhcahagaid goas ihkinassii, «Váttisvuođat doaimmain» vuolde.</string>
   <string name="patroller_saved_message_title_vandalism">Várrehus billisteami ektui</string>
   <string name="patroller_saved_message_title_npov">Neutrála geahččanguovlu</string>
@@ -1654,11 +1654,11 @@
   <string name="places_filter_title">Sille gielaid mielde</string>
   <string name="places_toggle_buttons_map">Kárta</string>
   <string name="places_toggle_buttons_list">Listu</string>
-  <string name="places_survey_very_satisfied_option">Hui duhtavaš</string>
-  <string name="places_survey_very_unsatisfied_option">Hui duhtameahttun</string>
+  <string name="survey_dialog_option_very_satisfied">Hui duhtavaš</string>
+  <string name="survey_dialog_option_very_unsatisfied">Hui duhtameahttun</string>
   <string name="places_survey_dialog_title">Veahket min buoridit «Báikkiid»</string>
   <string name="places_survey_feedback_dialog_title">Movt sáhttá «Báikkit» buoriduvvot?</string>
-  <string name="places_survey_dialog_cancel">Gaskkalduhte</string>
+  <string name="survey_dialog_cancel">Gaskkalduhte</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Maid don háliidivččet mii rievdadivččiimet dahje buoridivččiimet?</string>
   <string name="places_empty_list">Dát guovlu lea guoros. Stuorit &lt;a href=\"#\"&gt;kártta&lt;/a&gt;.</string>
 </resources>
diff --git a/app/src/main/res/values-skr/strings.xml b/app/src/main/res/values-skr/strings.xml
index a85fa980a3b..abd5d6750d3 100644
--- a/app/src/main/res/values-skr/strings.xml
+++ b/app/src/main/res/values-skr/strings.xml
@@ -698,7 +698,7 @@
   <string name="patroller_tasks_overflow_learn">ٻیا سِکھو</string>
   <string name="patroller_onboarding_two_talk_title">ڳالھ مہاڑ</string>
   <string name="patroller_diff_feedback_dialog_input_hint">فیڈ بیک</string>
-  <string name="patroller_diff_feedback_dialog_submit">جمع کرواؤ</string>
+  <string name="survey_dialog_submit">جمع کرواؤ</string>
   <string name="talk_templates_menu_edit_title">لکھو</string>
   <string name="data_opt_in_accept">قبول کرو</string>
   <string name="data_opt_in_reject">مسترد کرو</string>
@@ -707,12 +707,12 @@
   <string name="places_title">جاہیں</string>
   <string name="places_toggle_buttons_map">نقشہ</string>
   <string name="places_toggle_buttons_list">تندیر</string>
-  <string name="places_survey_very_satisfied_option">ݙاڈھا تسلی بخش</string>
+  <string name="survey_dialog_option_very_satisfied">ݙاڈھا تسلی بخش</string>
   <string name="places_card_title">نیڑے جاہیں</string>
   <string name="places_card_action">نیڑے دیاں ٻیاں جاہیں</string>
   <string name="places_card_enable_location_card_button">لوکیشن فعال کرو</string>
   <string name="places_card_distance_unknown">نامعلوم فاصلہ</string>
-  <string name="recommended_content_survey_dialog_input_hint">وادھوں فیڈبیک</string>
+  <string name="survey_dialog_input_hint">وادھوں فیڈبیک</string>
   <string name="donor_history_save_button">محفوظ کرو</string>
   <string name="donor_history_last_donated_date_picker_title">تریخ چݨو</string>
   <string name="donor_history_last_donated_date_picker_label">تریخ درج کرو</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 3327de91a7d..ec6cf04268f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1652,16 +1652,16 @@
   <string name="patroller_onboarding_two_undo_content">Izberite »Razveljavi«, da razveljavite ali vrnete morebitno škodljivo urejanje.</string>
   <string name="patroller_diff_tooltip_one">Škoda napoveduje, ali urejanje škoduje vikiju.</string>
   <string name="patroller_diff_tooltip_two">Namen predvideva verjetnost, da bo urejanje shranjeno dobronamerno.</string>
-  <string name="patroller_diff_feedback_dialog_title">Pomagajte nam izboljšati to možnost</string>
-  <string name="patroller_diff_feedback_dialog_message">Ste zadovoljni s to možnostjo?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Možnost je ustrezna</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Nevtralno</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Ne ustreza mi</string>
+  <string name="survey_dialog_title">Pomagajte nam izboljšati to možnost</string>
+  <string name="survey_dialog_message">Ste zadovoljni s to možnostjo?</string>
+  <string name="survey_dialog_option_satisfied">Možnost je ustrezna</string>
+  <string name="survey_dialog_option_neutral">Nevtralno</string>
+  <string name="survey_dialog_option_unsatisfied">Ne ustreza mi</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Kako lahko izboljšamo to možnost?</string>
   <string name="patroller_diff_menu_edit_history_title">Zgodovina urejanja članka</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Povratne informacije</string>
-  <string name="patroller_diff_feedback_dialog_submit">Pošlji</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Povratne informacije so poslane.</string>
+  <string name="survey_dialog_submit">Pošlji</string>
+  <string name="survey_dialog_submitted_snackbar">Povratne informacije so poslane.</string>
   <string name="patroller_diff_feedback_tooltip">Kadsr koli lahko v razdelku »Težava z možnostjo« tapnete prekrivni meni, da pošljete povratne informacije.</string>
   <string name="patroller_saved_message_title_vandalism">Opozorilo o vandalizmu</string>
   <string name="patroller_saved_message_title_editing_tests">Peeizkušanja urejanja</string>
@@ -1695,11 +1695,11 @@
   <string name="places_filter_title">Filtriranje po jeziku</string>
   <string name="places_toggle_buttons_map">Zemljevid</string>
   <string name="places_toggle_buttons_list">Seznam</string>
-  <string name="places_survey_very_satisfied_option">Odlična izkušnja</string>
-  <string name="places_survey_very_unsatisfied_option">Zelo slaba izkušnja</string>
+  <string name="survey_dialog_option_very_satisfied">Odlična izkušnja</string>
+  <string name="survey_dialog_option_very_unsatisfied">Zelo slaba izkušnja</string>
   <string name="places_survey_dialog_title" fuzzy="true">Pomagajte izboljšati »Kraje«</string>
   <string name="places_survey_feedback_dialog_title">Kako lahko izboljšamo »Kraje«?</string>
-  <string name="places_survey_dialog_cancel">Prekliči</string>
+  <string name="survey_dialog_cancel">Prekliči</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Kaj bi želeli, da spremenimo ali izboljšamo?</string>
   <string name="places_empty_list">To območje je prazno. Pomanjšaj &lt;a href=\"#\"&gt;zemljevid&lt;/a&gt;.</string>
   <string name="donor_history_title">Zgodovina doniranja</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8ff6074a8e1..89e2ae6d05e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1565,16 +1565,16 @@
   <string name="patroller_onboarding_two_undo_content">Одаберите \'Поништи\' да би сте поништили или вратили потенционалну деструктивну измену.</string>
   <string name="patroller_diff_tooltip_one">Процена штетности измене.</string>
   <string name="patroller_diff_tooltip_two">Процена добронамерности измене.</string>
-  <string name="patroller_diff_feedback_dialog_title">Помозите нам да унапредимо ову могућност</string>
-  <string name="patroller_diff_feedback_dialog_message">Да ли сте задовољни са овом могућношћу?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Задовољавајуће</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Неутрално</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Незадовољавајуће</string>
+  <string name="survey_dialog_title">Помозите нам да унапредимо ову могућност</string>
+  <string name="survey_dialog_message">Да ли сте задовољни са овом могућношћу?</string>
+  <string name="survey_dialog_option_satisfied">Задовољавајуће</string>
+  <string name="survey_dialog_option_neutral">Неутрално</string>
+  <string name="survey_dialog_option_unsatisfied">Незадовољавајуће</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Како можемо да унапредимо могућност?</string>
   <string name="patroller_diff_menu_edit_history_title">Историја</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Повратне информације</string>
-  <string name="patroller_diff_feedback_dialog_submit">Пошаљи</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Повратне информације послате.</string>
+  <string name="survey_dialog_submit">Пошаљи</string>
+  <string name="survey_dialog_submitted_snackbar">Повратне информације послате.</string>
   <string name="patroller_saved_message_title_vandalism">Немојте вандализовати</string>
   <string name="patroller_saved_message_title_npov">Неутрална тачка гледишта</string>
   <string name="patroller_saved_message_title_auto_trans">Аутоматски превод</string>
@@ -1617,9 +1617,9 @@
   <string name="places_filter_title">Филтрирај по језику</string>
   <string name="places_toggle_buttons_map">Мапа</string>
   <string name="places_toggle_buttons_list">Списак</string>
-  <string name="places_survey_very_satisfied_option">Веома задовољан</string>
-  <string name="places_survey_very_unsatisfied_option">Веома незадовољан</string>
-  <string name="places_survey_dialog_cancel">Откажи</string>
+  <string name="survey_dialog_option_very_satisfied">Веома задовољан</string>
+  <string name="survey_dialog_option_very_unsatisfied">Веома незадовољан</string>
+  <string name="survey_dialog_cancel">Откажи</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Шта бисте желели да променимо или унапредимо?</string>
   <string name="places_card_title">Места у близини</string>
   <string name="places_card_action">Још места у близини</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d7423b49456..d4adedf923f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1610,16 +1610,16 @@
   <string name="patroller_onboarding_two_undo_content">Välj \"Gör ogjord\" för att återställa en potentiellt destruktiv redigering.</string>
   <string name="patroller_diff_tooltip_one">Skada förutsäger om en redigering orsakar skada på en wiki.</string>
   <string name="patroller_diff_tooltip_two">Avsikt förutsäger sannolikheten om en redigering sparas i god tro.</string>
-  <string name="patroller_diff_feedback_dialog_title">Hjälp oss att förbättra denna funktion</string>
-  <string name="patroller_diff_feedback_dialog_message">Är du nöjd med denna funktion?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Nöjd</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Inte nöjd</string>
+  <string name="survey_dialog_title">Hjälp oss att förbättra denna funktion</string>
+  <string name="survey_dialog_message">Är du nöjd med denna funktion?</string>
+  <string name="survey_dialog_option_satisfied">Nöjd</string>
+  <string name="survey_dialog_option_neutral">Neutral</string>
+  <string name="survey_dialog_option_unsatisfied">Inte nöjd</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Hur kan vi förbättra funktionen?</string>
   <string name="patroller_diff_menu_edit_history_title">Artikelns redigeringshistorik</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Återkoppling</string>
-  <string name="patroller_diff_feedback_dialog_submit">Skicka</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Återkoppling har skickats.</string>
+  <string name="survey_dialog_submit">Skicka</string>
+  <string name="survey_dialog_submitted_snackbar">Återkoppling har skickats.</string>
   <string name="patroller_diff_feedback_tooltip">Tryck på överflödesmenyn för att skicka återkoppling när som helst under \"Problem med funktion\".</string>
   <string name="patroller_saved_message_title_vandalism">Vandalismvarning</string>
   <string name="patroller_saved_message_title_editing_tests">Redigeringstester</string>
@@ -1677,11 +1677,11 @@
   <string name="places_filter_title">Filtrera språk</string>
   <string name="places_toggle_buttons_map">Karta</string>
   <string name="places_toggle_buttons_list">Lista</string>
-  <string name="places_survey_very_satisfied_option">Mycket nöjd</string>
-  <string name="places_survey_very_unsatisfied_option">Mycket missnöjd</string>
+  <string name="survey_dialog_option_very_satisfied">Mycket nöjd</string>
+  <string name="survey_dialog_option_very_unsatisfied">Mycket missnöjd</string>
   <string name="places_survey_dialog_title">Hjälp till att förbättra \"Platser\"</string>
   <string name="places_survey_feedback_dialog_title">Hur kan \"Platser\" förbättras?</string>
-  <string name="places_survey_dialog_cancel">Avbryt</string>
+  <string name="survey_dialog_cancel">Avbryt</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Vad vill du att vi ska förändra eller förbättra?</string>
   <string name="places_empty_list">Det här området är tomt. Zooma ut &lt;a href=\"#\"&gt;på kartan&lt;/a&gt;.</string>
   <string name="places_card_title">Närliggande platser</string>
@@ -1694,7 +1694,7 @@
   <string name="recommended_content_section_you_might_like">Du kanske gillar</string>
   <string name="recommended_content_survey_dialog_title">Hjälp till att förbättra rekommenderat innehåll.</string>
   <string name="recommended_content_survey_dialog_message">Är du nöjd med det rekommenderade sökresultatet?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Ytterligare återkoppling</string>
+  <string name="survey_dialog_input_hint">Ytterligare återkoppling</string>
   <string name="recommended_content_survey_dialog_submitted_message">Återkoppling inskickad. Tack!</string>
   <string name="donor_history_title">Donationshistorik</string>
   <string name="donor_history_save_button">Spara</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8358e635346..9538de9b33d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1594,16 +1594,16 @@
   <string name="patroller_onboarding_two_undo_content">Zararlı olabilecek bir düzenlemeyi geri almak ya da geri döndürmek için \'Geri Al\'ı seçin.</string>
   <string name="patroller_diff_tooltip_one">Hasar, bir düzenlemenin vikiye zarar verip vermeyeceğini kestirir.</string>
   <string name="patroller_diff_tooltip_two">Amaç, bir düzenlemenin iyi amaçla saklanma olasılığını kestirir.</string>
-  <string name="patroller_diff_feedback_dialog_title">Bu özelliği geliştirmemize yardımcı olun</string>
-  <string name="patroller_diff_feedback_dialog_message">Bu özellikten mutlu musunuz?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Mutlu</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Tarafsız</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Mutsuz</string>
+  <string name="survey_dialog_title">Bu özelliği geliştirmemize yardımcı olun</string>
+  <string name="survey_dialog_message">Bu özellikten mutlu musunuz?</string>
+  <string name="survey_dialog_option_satisfied">Mutlu</string>
+  <string name="survey_dialog_option_neutral">Tarafsız</string>
+  <string name="survey_dialog_option_unsatisfied">Mutsuz</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Özelliği nasıl geliştirebiliriz?</string>
   <string name="patroller_diff_menu_edit_history_title">Madde düzenleme geçmişi</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Geri bildirim</string>
-  <string name="patroller_diff_feedback_dialog_submit">Gönder</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Geri bildirim gönderildi.</string>
+  <string name="survey_dialog_submit">Gönder</string>
+  <string name="survey_dialog_submitted_snackbar">Geri bildirim gönderildi.</string>
   <string name="patroller_diff_feedback_tooltip">\'Özellikle ilgili sorun\' altında istediğiniz zaman geri bildirim göndermek için taşan menüye dokunun.</string>
   <string name="patroller_saved_message_title_npov">Tarafsız bakış açısı</string>
   <string name="patroller_saved_message_title_auto_trans">Otomatik çeviri</string>
@@ -1642,11 +1642,11 @@
   <string name="places_filter_title">Dile göre filtrele</string>
   <string name="places_toggle_buttons_map">Harita</string>
   <string name="places_toggle_buttons_list">Liste</string>
-  <string name="places_survey_very_satisfied_option">Çok mutlu</string>
-  <string name="places_survey_very_unsatisfied_option">Çok mutsuz</string>
+  <string name="survey_dialog_option_very_satisfied">Çok mutlu</string>
+  <string name="survey_dialog_option_very_unsatisfied">Çok mutsuz</string>
   <string name="places_survey_dialog_title">\'Yerler\'i iyileştirmeye yardımcı olun</string>
   <string name="places_survey_feedback_dialog_title">\"Yerler\" nasıl geliştirilebilir?</string>
-  <string name="places_survey_dialog_cancel">İptal</string>
+  <string name="survey_dialog_cancel">İptal</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Neyi değiştirmemizi ya da geliştirmemizi istersiniz?</string>
   <string name="places_empty_list">Bu alan boş. &lt;a href=\"#\"&gt;Haritayı&lt;/a&gt; uzaklaştırın.</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 76b6cc2a033..acb983de4cc 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1713,16 +1713,16 @@
   <string name="patroller_onboarding_two_undo_content">Виберіть «Скасувати», щоб скасувати або повернути потенційно деструктивні зміни.</string>
   <string name="patroller_diff_tooltip_one">«Шкода» передбачає, що редагування завдає шкоди вікі.</string>
   <string name="patroller_diff_tooltip_two">«Намір» передбачає ймовірність добропорядних намірів при збереженні редагування.</string>
-  <string name="patroller_diff_feedback_dialog_title">Допоможіть нам покращити цю функцію</string>
-  <string name="patroller_diff_feedback_dialog_message">Ви задоволені цією функцією?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Задоволений/а</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Нейтрально</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Незадоволений/а</string>
+  <string name="survey_dialog_title">Допоможіть нам покращити цю функцію</string>
+  <string name="survey_dialog_message">Ви задоволені цією функцією?</string>
+  <string name="survey_dialog_option_satisfied">Задоволений/а</string>
+  <string name="survey_dialog_option_neutral">Нейтрально</string>
+  <string name="survey_dialog_option_unsatisfied">Незадоволений/а</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Як ми можемо покращити функцію?</string>
   <string name="patroller_diff_menu_edit_history_title">Історія редагування статті</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Зворотний зв\'язок</string>
-  <string name="patroller_diff_feedback_dialog_submit">Надіслати</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Відгук надіслано.</string>
+  <string name="survey_dialog_submit">Надіслати</string>
+  <string name="survey_dialog_submitted_snackbar">Відгук надіслано.</string>
   <string name="patroller_diff_feedback_tooltip">Торкніться додаткового меню, щоб надіслати відгук будь-коли у розділі «Проблема з функцією».</string>
   <string name="patroller_saved_message_title_vandalism">Попередження про вандалізм</string>
   <string name="patroller_saved_message_title_editing_tests">Тестові редагування</string>
@@ -1780,11 +1780,11 @@
   <string name="places_filter_title">Фільтр за мовою</string>
   <string name="places_toggle_buttons_map">Мапа</string>
   <string name="places_toggle_buttons_list">Список</string>
-  <string name="places_survey_very_satisfied_option">Дуже задоволений/а</string>
-  <string name="places_survey_very_unsatisfied_option">Дуже незадоволений/а</string>
+  <string name="survey_dialog_option_very_satisfied">Дуже задоволений/а</string>
+  <string name="survey_dialog_option_very_unsatisfied">Дуже незадоволений/а</string>
   <string name="places_survey_dialog_title">Допоможіть покращити «Місця»</string>
   <string name="places_survey_feedback_dialog_title">Як можна покращити «Місця»?</string>
-  <string name="places_survey_dialog_cancel">Скасувати</string>
+  <string name="survey_dialog_cancel">Скасувати</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Що ви хотіли б, щоб ми змінили або покращили?</string>
   <string name="places_empty_list">Ця місцевість порожня. Зменшіть &lt;a href=\"#\"&gt;масштаб карти&lt;/a&gt;.</string>
   <string name="places_card_title">Місця поблизу</string>
@@ -1797,7 +1797,7 @@
   <string name="recommended_content_section_you_might_like">Вам може сподобатися</string>
   <string name="recommended_content_survey_dialog_title">Допоможіть покращити рекомендований вміст.</string>
   <string name="recommended_content_survey_dialog_message">Ви задоволені цим рекомендованим результатом пошуку?</string>
-  <string name="recommended_content_survey_dialog_input_hint">Додатковий відгук</string>
+  <string name="survey_dialog_input_hint">Додатковий відгук</string>
   <string name="recommended_content_survey_dialog_submitted_message">Відгук надіслано. Дякуємо!</string>
   <string name="donor_history_title">Історія пожертв</string>
   <string name="donor_history_save_button">Зберегти</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 4585c9f8b49..ebf5578729a 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -690,20 +690,20 @@
   <string name="reading_list_share_menu_label">شیئر کریں...</string>
   <string name="reading_list_share_menu_tooltip">اس مطالعہ کی فہرست \n کو دوسروں کے ساتھ شیئر کریں</string>
   <string name="reading_list_share_message_v2">آداب! میں آپ کے ساتھ اپنی ویکیپیڈیا کی مطالعہ کی فہرست شیئر کرنا چاہتا/چاہتی ہوں:</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">مطمئن</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">غیر جانبدار</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">غیر مطمئن</string>
+  <string name="survey_dialog_option_satisfied">مطمئن</string>
+  <string name="survey_dialog_option_neutral">غیر جانبدار</string>
+  <string name="survey_dialog_option_unsatisfied">غیر مطمئن</string>
   <string name="patroller_diff_feedback_dialog_input_hint">رائے</string>
-  <string name="patroller_diff_feedback_dialog_submit">جمع کریں</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">رائے دی گئ۔ شکریہ!</string>
+  <string name="survey_dialog_submit">جمع کریں</string>
+  <string name="survey_dialog_submitted_snackbar">رائے دی گئ۔ شکریہ!</string>
   <string name="places_title">مقامات</string>
   <string name="places_permissions_denied">نقشے پر آپ کا مقام دیکھنے کے لیے مقام کی اجازت درکار ہے۔ دوبارہ کوشش کریں.</string>
   <string name="places_search_hint">مقامات تلاش کریں</string>
   <string name="places_filter_title">زبان کو فلٹر کریں</string>
   <string name="places_toggle_buttons_map">نقشہ</string>
   <string name="places_toggle_buttons_list">فہرست</string>
-  <string name="places_survey_very_satisfied_option">بہت مطمئن</string>
-  <string name="places_survey_very_unsatisfied_option">بہت غیر مطمئن</string>
+  <string name="survey_dialog_option_very_satisfied">بہت مطمئن</string>
+  <string name="survey_dialog_option_very_unsatisfied">بہت غیر مطمئن</string>
   <string name="places_survey_dialog_title">مقامات\' کو بہتر بنانے میں مدد کریں</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">ہمیں کیا بدلنا یا بہتر کرنا چاہیے؟</string>
   <string name="places_empty_list">یہ علاقہ خالی ہے۔ نقشے پر زوم آؤٹ کریں۔</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 913d46e7c21..5d3ce9bc5f9 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -1539,15 +1539,15 @@
   <string name="patroller_onboarding_two_undo_content">Ehtimoliy notoʻgʻri tahrirni bekor qilish yoki orqaga qaytarish uchun “Bekor qilish” bandini tanlang.</string>
   <string name="patroller_diff_tooltip_one">Zarar, tahrir vikiga zarar yetkazish yoki yo‘qligini bashorat qiladi.</string>
   <string name="patroller_diff_tooltip_two">Niyat tahrirning ishonchli tarzda saqlanish ehtimolini bashorat qiladi.</string>
-  <string name="patroller_diff_feedback_dialog_title">Ushbu xususiyatni yaxshilashga yordam bering</string>
-  <string name="patroller_diff_feedback_dialog_message">Bu xususiyat sizni qoniqtirdimi?</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">Qoniqarli</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">Neytral</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">Qoniqarsiz</string>
+  <string name="survey_dialog_title">Ushbu xususiyatni yaxshilashga yordam bering</string>
+  <string name="survey_dialog_message">Bu xususiyat sizni qoniqtirdimi?</string>
+  <string name="survey_dialog_option_satisfied">Qoniqarli</string>
+  <string name="survey_dialog_option_neutral">Neytral</string>
+  <string name="survey_dialog_option_unsatisfied">Qoniqarsiz</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">Funksiyani qanday yaxshilashimiz mumkin?</string>
   <string name="patroller_diff_feedback_dialog_input_hint">Fikr-mulohaza</string>
-  <string name="patroller_diff_feedback_dialog_submit">Joʻnatish</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">Fikr-mulohaza yuborildi.</string>
+  <string name="survey_dialog_submit">Joʻnatish</string>
+  <string name="survey_dialog_submitted_snackbar">Fikr-mulohaza yuborildi.</string>
   <string name="patroller_diff_feedback_tooltip">Istalgan vaqtda “Xususiyatlar bilan bog‘liq muammo” bo‘limida fikr-mulohaza yuborish uchun menyuni bosing.</string>
   <string name="data_opt_in_accept">Qabul qilish</string>
   <string name="data_opt_in_reject">Rad etish</string>
@@ -1567,11 +1567,11 @@
   <string name="places_filter_title">Til filtri</string>
   <string name="places_toggle_buttons_map">Xarita</string>
   <string name="places_toggle_buttons_list">Roʻyxat</string>
-  <string name="places_survey_very_satisfied_option">Qoniqarli</string>
-  <string name="places_survey_very_unsatisfied_option">Qoniqarsiz</string>
+  <string name="survey_dialog_option_very_satisfied">Qoniqarli</string>
+  <string name="survey_dialog_option_very_unsatisfied">Qoniqarsiz</string>
   <string name="places_survey_dialog_title">“Joylashuvlar”ni yaxshilashga yordam bering</string>
   <string name="places_survey_feedback_dialog_title">“Joylar”ni qanday yaxshilash mumkin?</string>
-  <string name="places_survey_dialog_cancel">Bekor qilish</string>
+  <string name="survey_dialog_cancel">Bekor qilish</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">Nimani oʻzgartirishimizni yoki yaxshilashimizni xohlaysiz?</string>
   <string name="places_empty_list">Maydon boʻsh. &lt;a href=\"#\"&gt;xaritadan&lt;/a&gt; kichraytiring.</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ce81ba460d9..08b58b7013d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1626,16 +1626,16 @@
   <string name="patroller_onboarding_two_undo_content">選擇「撤銷」以撤銷或回退可能帶有破壞性的編輯。</string>
   <string name="patroller_diff_tooltip_one">破壞預測編輯是否有對 wiki 造成破壞。</string>
   <string name="patroller_diff_tooltip_two">意圖預測保存的編輯是出自善意的可能性。</string>
-  <string name="patroller_diff_feedback_dialog_title">幫助我們改善這個功能</string>
-  <string name="patroller_diff_feedback_dialog_message">您滿意這個功能嗎？</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">滿意</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">普通</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">不滿意</string>
+  <string name="survey_dialog_title">幫助我們改善這個功能</string>
+  <string name="survey_dialog_message">您滿意這個功能嗎？</string>
+  <string name="survey_dialog_option_satisfied">滿意</string>
+  <string name="survey_dialog_option_neutral">普通</string>
+  <string name="survey_dialog_option_unsatisfied">不滿意</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">我們如何改進功能？</string>
   <string name="patroller_diff_menu_edit_history_title">條目編輯歷史</string>
   <string name="patroller_diff_feedback_dialog_input_hint">意見回饋</string>
-  <string name="patroller_diff_feedback_dialog_submit">提交</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">意見回饋提交成功。</string>
+  <string name="survey_dialog_submit">提交</string>
+  <string name="survey_dialog_submitted_snackbar">意見回饋提交成功。</string>
   <string name="patroller_diff_feedback_tooltip">點選溢出選單，在「功能問題」下方隨時提交回饋。</string>
   <string name="patroller_saved_message_title_vandalism">破壞警告</string>
   <string name="patroller_saved_message_title_editing_tests">編輯測試</string>
@@ -1693,11 +1693,11 @@
   <string name="places_filter_title">篩選語言</string>
   <string name="places_toggle_buttons_map">地圖</string>
   <string name="places_toggle_buttons_list">清單</string>
-  <string name="places_survey_very_satisfied_option">非常滿意</string>
-  <string name="places_survey_very_unsatisfied_option">非常不滿意</string>
+  <string name="survey_dialog_option_very_satisfied">非常滿意</string>
+  <string name="survey_dialog_option_very_unsatisfied">非常不滿意</string>
   <string name="places_survey_dialog_title">協助改善「地點」</string>
   <string name="places_survey_feedback_dialog_title">如何改善「地點」？</string>
-  <string name="places_survey_dialog_cancel">取消</string>
+  <string name="survey_dialog_cancel">取消</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">您希望我們改變或改善什麼？</string>
   <string name="places_empty_list">該區域是空的。請在&lt;a href=\"#\"&gt;在地圖上&lt;/a&gt;縮小。</string>
   <string name="places_card_title">附近地點</string>
@@ -1710,7 +1710,7 @@
   <string name="recommended_content_section_you_might_like">您可能會喜歡</string>
   <string name="recommended_content_survey_dialog_title">協助改善推薦內容。</string>
   <string name="recommended_content_survey_dialog_message">您對這個推薦搜尋結果滿意嗎？</string>
-  <string name="recommended_content_survey_dialog_input_hint">額外回饋</string>
+  <string name="survey_dialog_input_hint">額外回饋</string>
   <string name="recommended_content_survey_dialog_submitted_message">已提交回饋。感謝您！</string>
   <string name="donor_history_title">捐款者歷史</string>
   <string name="donor_history_save_button">儲存</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 3ae4f444746..24b27eea97d 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1652,16 +1652,16 @@
   <string name="patroller_onboarding_two_undo_content">选择“撤销”来撤销或回退可能的破坏性编辑。</string>
   <string name="patroller_diff_tooltip_one">“破坏”指标预估了一笔编辑是否对wiki造成了破坏。</string>
   <string name="patroller_diff_tooltip_two">“意图”指标预估了一笔编辑是出于善意的几率。</string>
-  <string name="patroller_diff_feedback_dialog_title">帮助我们改进此功能</string>
-  <string name="patroller_diff_feedback_dialog_message">您对该功能满意吗？</string>
-  <string name="patroller_diff_feedback_dialog_option_satisfied">满意</string>
-  <string name="patroller_diff_feedback_dialog_option_neutral">中立</string>
-  <string name="patroller_diff_feedback_dialog_option_unsatisfied">不满意</string>
+  <string name="survey_dialog_title">帮助我们改进此功能</string>
+  <string name="survey_dialog_message">您对该功能满意吗？</string>
+  <string name="survey_dialog_option_satisfied">满意</string>
+  <string name="survey_dialog_option_neutral">中立</string>
+  <string name="survey_dialog_option_unsatisfied">不满意</string>
   <string name="patroller_diff_feedback_dialog_feedback_title">我们如何改进此功能？</string>
   <string name="patroller_diff_menu_edit_history_title">条目编辑历史</string>
   <string name="patroller_diff_feedback_dialog_input_hint">反馈</string>
-  <string name="patroller_diff_feedback_dialog_submit">提交</string>
-  <string name="patroller_diff_feedback_submitted_snackbar">已提交反馈。</string>
+  <string name="survey_dialog_submit">提交</string>
+  <string name="survey_dialog_submitted_snackbar">已提交反馈。</string>
   <string name="patroller_diff_feedback_tooltip">点击溢出菜单中的“功能问题”以随时提交反馈</string>
   <string name="patroller_saved_message_title_vandalism">破坏警告</string>
   <string name="patroller_saved_message_title_editing_tests">测试编辑</string>
@@ -1719,11 +1719,11 @@
   <string name="places_filter_title">筛选语言</string>
   <string name="places_toggle_buttons_map">地图</string>
   <string name="places_toggle_buttons_list">列表</string>
-  <string name="places_survey_very_satisfied_option">非常满意</string>
-  <string name="places_survey_very_unsatisfied_option">非常不满意</string>
+  <string name="survey_dialog_option_very_satisfied">非常满意</string>
+  <string name="survey_dialog_option_very_unsatisfied">非常不满意</string>
   <string name="places_survey_dialog_title">帮助我们改进“地点”功能</string>
   <string name="places_survey_feedback_dialog_title">如何改善“地点”功能？</string>
-  <string name="places_survey_dialog_cancel">取消</string>
+  <string name="survey_dialog_cancel">取消</string>
   <string name="places_survey_feedback_low_satisfaction_dialog_title">您希望我们改变或优化什么？</string>
   <string name="places_empty_list">此区域无内容。请缩小&lt;a href=\"#\"&gt;地图&lt;/a&gt;。</string>
   <string name="places_card_title">附近地点</string>
@@ -1735,7 +1735,7 @@
   <string name="recommended_content_section_you_might_like">您可能会喜欢</string>
   <string name="recommended_content_survey_dialog_title">帮助改进推荐内容。</string>
   <string name="recommended_content_survey_dialog_message">您对这个推荐搜索结果满意吗？</string>
-  <string name="recommended_content_survey_dialog_input_hint">其他反馈</string>
+  <string name="survey_dialog_input_hint">其他反馈</string>
   <string name="recommended_content_survey_dialog_submitted_message">已提交反馈。感谢您！</string>
   <string name="donor_history_title">捐款者历史</string>
   <string name="donor_history_save_button">保存</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e80a921666..dcfff7401b4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1695,16 +1695,9 @@
     <string name="patroller_onboarding_two_undo_content">Choose \'Undo\' to undo or rollback a potentially destructive edit.</string>
     <string name="patroller_diff_tooltip_one">Damage predicts if an edit causes damage to a wiki.</string>
     <string name="patroller_diff_tooltip_two">Intent predicts likelihood of an edit being saved in good-faith.</string>
-    <string name="patroller_diff_feedback_dialog_title">Help us improve this feature</string>
-    <string name="patroller_diff_feedback_dialog_message">Are you satisfied with this feature?</string>
-    <string name="patroller_diff_feedback_dialog_option_satisfied">Satisfied</string>
-    <string name="patroller_diff_feedback_dialog_option_neutral">Neutral</string>
-    <string name="patroller_diff_feedback_dialog_option_unsatisfied">Unsatisfied</string>
     <string name="patroller_diff_feedback_dialog_feedback_title">How can we improve the feature?</string>
     <string name="patroller_diff_menu_edit_history_title">Article edit history</string>
     <string name="patroller_diff_feedback_dialog_input_hint">Feedback</string>
-    <string name="patroller_diff_feedback_dialog_submit">Submit</string>
-    <string name="patroller_diff_feedback_submitted_snackbar">Feedback submitted.</string>
     <string name="patroller_diff_feedback_tooltip">Tap on overflow menu to submit feedback anytime under \'Problem with feature\'.</string>
     <string name="patroller_saved_message_title_vandalism">Vandalism warning</string>
     <string name="patroller_saved_message_title_editing_tests">Editing tests</string>
@@ -1771,12 +1764,6 @@
     <string name="places_filter_title">Filter language</string>
     <string name="places_toggle_buttons_map">Map</string>
     <string name="places_toggle_buttons_list">List</string>
-    <string name="places_survey_very_satisfied_option">Very satisfied</string>
-    <string name="places_survey_very_unsatisfied_option">Very unsatisfied</string>
-    <string name="places_survey_dialog_title">Help improve \'Places\'</string>
-    <string name="places_survey_feedback_dialog_title">How can \"Places\" be improved?</string>
-    <string name="places_survey_dialog_cancel">Cancel</string>
-    <string name="places_survey_feedback_low_satisfaction_dialog_title">What would you like us to change or improve?</string>
     <string name="places_empty_list"><![CDATA[This area is empty. Zoom out <a href="#">on the map</a>.]]></string>
     <string name="places_card_title">Places nearby</string>
     <string name="places_card_action">More places nearby</string>
@@ -1791,7 +1778,6 @@
     <string name="recommended_content_section_you_might_like">You might like</string>
     <string name="recommended_content_survey_dialog_title">Help improve recommended content.</string>
     <string name="recommended_content_survey_dialog_message">Are you satisfied with this recommended search result?</string>
-    <string name="recommended_content_survey_dialog_input_hint">Additional feedback</string>
     <string name="recommended_content_survey_dialog_submitted_message">Feedback submitted. Thank you!</string>
     <!-- /Recommended Content -->
 
@@ -1836,4 +1822,16 @@
     <string name="contributions_dashboard_app_icon_updated">App icon updated</string>
     <!-- /Contributions Dashboard -->
 
+    <!-- Survey dialog -->
+    <string name="survey_dialog_title">Help us improve this feature</string>
+    <string name="survey_dialog_message">Are you satisfied with this feature?</string>
+    <string name="survey_dialog_option_satisfied">Satisfied</string>
+    <string name="survey_dialog_option_neutral">Neutral</string>
+    <string name="survey_dialog_option_unsatisfied">Unsatisfied</string>
+    <string name="survey_dialog_option_very_satisfied">Very satisfied</string>
+    <string name="survey_dialog_option_very_unsatisfied">Very unsatisfied</string>
+    <string name="survey_dialog_cancel">Cancel</string>
+    <string name="survey_dialog_submit">Submit</string>
+    <string name="survey_dialog_input_hint">Additional feedback</string>
+    <string name="survey_dialog_submitted_snackbar">Feedback submitted.</string>
 </resources>