diff --git a/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt b/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt
index 720f070dd20..ab29a8644bd 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModel.kt
@@ -179,7 +179,7 @@ class FormMapViewModel(
             .getBoolean(ProtectedProjectKeys.KEY_EDIT_SAVED)
 
         return IconifiedText(
-            if (canEditSaved) R.drawable.ic_edit else R.drawable.ic_visibility,
+            if (canEditSaved) org.odk.collect.icons.R.drawable.ic_edit else R.drawable.ic_visibility,
             resources.getString(if (canEditSaved) org.odk.collect.strings.R.string.edit_data else org.odk.collect.strings.R.string.view_data)
         )
     }
diff --git a/collect_app/src/main/res/layout/quit_form_dialog_layout.xml b/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
index a16a47f1fe8..20f5410bda0 100644
--- a/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
+++ b/collect_app/src/main/res/layout/quit_form_dialog_layout.xml
@@ -24,7 +24,7 @@
             style="?materialButtonOutlinedIconStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/margin"
+            android:layout_marginTop="@dimen/margin_standard"
             android:text="@string/discard_changes"
             app:icon="@drawable/ic_delete"
             app:iconGravity="textStart"
diff --git a/collect_app/src/main/res/layout/server_auth_dialog.xml b/collect_app/src/main/res/layout/server_auth_dialog.xml
index 7276a13097d..c7102c93de4 100644
--- a/collect_app/src/main/res/layout/server_auth_dialog.xml
+++ b/collect_app/src/main/res/layout/server_auth_dialog.xml
@@ -35,7 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dip"
-        android:layout_marginTop="@dimen/margin"
+        android:layout_marginTop="@dimen/margin_standard"
         android:layout_marginRight="20dip"
         android:gravity="fill_horizontal"
         android:hint="@string/password"
diff --git a/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt b/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt
index 12324d344fb..039e6980075 100644
--- a/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/formmanagement/formmap/FormMapViewModelTest.kt
@@ -113,7 +113,7 @@ class FormMapViewModelTest {
             smallIcon = R.drawable.ic_room_form_state_incomplete_24dp,
             largeIcon = R.drawable.ic_room_form_state_incomplete_48dp,
             action = IconifiedText(
-                R.drawable.ic_edit,
+                org.odk.collect.icons.R.drawable.ic_edit,
                 application.getString(org.odk.collect.strings.R.string.edit_data)
             ),
             info = formatDate(
@@ -152,7 +152,7 @@ class FormMapViewModelTest {
             smallIcon = R.drawable.ic_room_form_state_incomplete_24dp,
             largeIcon = R.drawable.ic_room_form_state_incomplete_48dp,
             action = IconifiedText(
-                R.drawable.ic_edit,
+                org.odk.collect.icons.R.drawable.ic_edit,
                 application.getString(org.odk.collect.strings.R.string.edit_data)
             ),
             info = formatDate(
@@ -191,7 +191,7 @@ class FormMapViewModelTest {
             smallIcon = R.drawable.ic_room_form_state_incomplete_24dp,
             largeIcon = R.drawable.ic_room_form_state_incomplete_48dp,
             action = IconifiedText(
-                R.drawable.ic_edit,
+                org.odk.collect.icons.R.drawable.ic_edit,
                 application.getString(org.odk.collect.strings.R.string.edit_data)
             ),
             info = formatDate(
diff --git a/draw/build.gradle.kts b/draw/build.gradle.kts
index 0f59445feda..86bf5bd2491 100644
--- a/draw/build.gradle.kts
+++ b/draw/build.gradle.kts
@@ -36,6 +36,10 @@ android {
             isIncludeAndroidResources = true
         }
     }
+
+    buildFeatures {
+        viewBinding = true
+    }
 }
 
 dependencies {
diff --git a/draw/src/main/java/org/odk/collect/draw/DrawActivity.java b/draw/src/main/java/org/odk/collect/draw/DrawActivity.java
index a49e0537dec..06a95e0a079 100644
--- a/draw/src/main/java/org/odk/collect/draw/DrawActivity.java
+++ b/draw/src/main/java/org/odk/collect/draw/DrawActivity.java
@@ -18,7 +18,6 @@
 import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -29,18 +28,14 @@
 import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
 import android.view.animation.ScaleAnimation;
-import android.widget.AdapterView;
-import android.widget.ListView;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.cardview.widget.CardView;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.viewmodel.CreationExtras;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.odk.collect.androidshared.bitmap.ImageFileUtils;
@@ -52,8 +47,6 @@
 import org.odk.collect.strings.localization.LocalizedActivity;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
 
 import javax.inject.Inject;
 
@@ -82,8 +75,6 @@ public class DrawActivity extends LocalizedActivity {
     private File savepointImage;
 
     private DrawView drawView;
-    private String alertTitleString;
-    private AlertDialog alertDialog;
 
     private DrawViewModel drawViewModel;
 
@@ -210,17 +201,6 @@ public void onClick(View view) {
         // original)
         // output -- where the output should be written
 
-        if (OPTION_SIGNATURE.equals(loadOption)) {
-            alertTitleString = getString(org.odk.collect.strings.R.string.quit_application,
-                    getString(org.odk.collect.strings.R.string.sign_button));
-        } else if (OPTION_ANNOTATE.equals(loadOption)) {
-            alertTitleString = getString(org.odk.collect.strings.R.string.quit_application,
-                    getString(org.odk.collect.strings.R.string.markup_image));
-        } else {
-            alertTitleString = getString(org.odk.collect.strings.R.string.quit_application,
-                    getString(org.odk.collect.strings.R.string.draw_image));
-        }
-
         drawView.setupView(OPTION_SIGNATURE.equals(loadOption));
 
         viewModel.getPenColor().observe(this, penColor -> {
@@ -286,35 +266,11 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
      * saving
      */
     private void createQuitDrawDialog() {
-        int dividerHeight = getResources().getDimensionPixelSize(org.odk.collect.androidshared.R.dimen.margin_extra_small);
-        ListView actionListView = new ListView(this);
-        actionListView.setPadding(0, dividerHeight, 0, 0);
-        actionListView.setDivider(new ColorDrawable(Color.TRANSPARENT));
-        actionListView.setDividerHeight(dividerHeight);
-
-        List<IconMenuListAdapter.IconMenuItem> items;
-        items = Arrays.asList(new IconMenuListAdapter.IconMenuItem(org.odk.collect.icons.R.drawable.ic_save, org.odk.collect.strings.R.string.keep_changes),
-                new IconMenuListAdapter.IconMenuItem(org.odk.collect.icons.R.drawable.ic_delete, org.odk.collect.strings.R.string.discard_changes));
-
-        final IconMenuListAdapter adapter = new IconMenuListAdapter(this, items);
-        actionListView.setAdapter(adapter);
-        actionListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                IconMenuListAdapter.IconMenuItem item = (IconMenuListAdapter.IconMenuItem) adapter.getItem(position);
-                if (item.getTextResId() == org.odk.collect.strings.R.string.keep_changes) {
-                    drawViewModel.save(drawView);
-                } else {
-                    cancelAndClose();
-                }
-                alertDialog.dismiss();
-            }
-        });
-        alertDialog = new MaterialAlertDialogBuilder(this)
-                .setTitle(alertTitleString)
-                .setPositiveButton(getString(org.odk.collect.strings.R.string.do_not_exit), null)
-                .setView(actionListView).create();
-        alertDialog.show();
+        QuitDrawingDialog.show(
+                this,
+                this::cancelAndClose,
+                () -> drawViewModel.save(drawView)
+        );
     }
 
     private void clear(View view) {
diff --git a/draw/src/main/java/org/odk/collect/draw/IconMenuListAdapter.java b/draw/src/main/java/org/odk/collect/draw/IconMenuListAdapter.java
deleted file mode 100644
index 4e67a0de1e0..00000000000
--- a/draw/src/main/java/org/odk/collect/draw/IconMenuListAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2017 Yura Laguta
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.odk.collect.draw;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import java.util.List;
-
-/**
- * @deprecated This should be replaced with a basic
- * {@link androidx.constraintlayout.widget.ConstraintLayout} in the places it's used.
- */
-@Deprecated
-class IconMenuListAdapter extends BaseAdapter {
-
-    private final Context context;
-    private final List<IconMenuItem> items;
-
-    IconMenuListAdapter(Context context, List<IconMenuItem> items) {
-        this.context = context;
-        this.items = items;
-    }
-
-    @Override
-    public int getCount() {
-        return items.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return items.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (!(convertView instanceof TextView)) {
-            convertView = createView(parent);
-        }
-        refreshView((IconMenuItem) getItem(position), (TextView) convertView);
-        return convertView;
-    }
-
-    private View createView(ViewGroup parent) {
-        return LayoutInflater.from(context).inflate(R.layout.item_view_option, parent, false);
-    }
-
-    private void refreshView(IconMenuItem item, TextView convertView) {
-        convertView.setText(item.getTextResId());
-        convertView.setCompoundDrawablesRelativeWithIntrinsicBounds(item.getImageResId(), 0, 0, 0);
-    }
-
-    /**
-     * Icon Menu Item representation
-     */
-
-    static class IconMenuItem {
-
-        private final int imageResId;
-        private final int textResId;
-
-        IconMenuItem(int imageResId, int textResId) {
-            this.imageResId = imageResId;
-            this.textResId = textResId;
-        }
-
-        int getImageResId() {
-            return imageResId;
-        }
-
-        int getTextResId() {
-            return textResId;
-        }
-    }
-}
diff --git a/draw/src/main/java/org/odk/collect/draw/QuitDrawingDialog.kt b/draw/src/main/java/org/odk/collect/draw/QuitDrawingDialog.kt
new file mode 100644
index 00000000000..4dfedc83272
--- /dev/null
+++ b/draw/src/main/java/org/odk/collect/draw/QuitDrawingDialog.kt
@@ -0,0 +1,50 @@
+package org.odk.collect.draw
+
+import android.app.Activity
+import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.odk.collect.draw.databinding.QuitDrawingDialogLayoutBinding
+
+object QuitDrawingDialog {
+
+    @JvmStatic
+    fun show(
+        activity: Activity,
+        onDiscardChanges: Runnable?,
+        onSaveChanges: Runnable?
+    ): AlertDialog {
+        return create(
+            activity,
+            onDiscardChanges,
+            onSaveChanges
+        ).also {
+            it.show()
+        }
+    }
+
+    private fun create(
+        activity: Activity,
+        onDiscardChanges: Runnable?,
+        onSaveChanges: Runnable?
+    ): AlertDialog {
+        val binding = QuitDrawingDialogLayoutBinding.inflate(activity.layoutInflater)
+        val dialog = MaterialAlertDialogBuilder(activity)
+            .setTitle(org.odk.collect.strings.R.string.save_drawing_title)
+            .setView(binding.root)
+            .create()
+
+        binding.discardChanges.setOnClickListener {
+            onDiscardChanges?.run()
+        }
+
+        binding.keepEditing.setOnClickListener {
+            dialog.dismiss()
+        }
+
+        binding.saveChanges.setOnClickListener {
+            onSaveChanges?.run()
+        }
+
+        return dialog
+    }
+}
diff --git a/draw/src/main/res/layout/item_view_option.xml b/draw/src/main/res/layout/item_view_option.xml
deleted file mode 100644
index 751a721fd70..00000000000
--- a/draw/src/main/res/layout/item_view_option.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawablePadding="@dimen/margin_extra_small"
-    android:gravity="center_vertical"
-    android:minHeight="48dp"
-    android:paddingEnd="@dimen/margin_large"
-    android:paddingLeft="@dimen/margin_large"
-    android:paddingRight="@dimen/margin_large"
-    android:paddingStart="@dimen/margin_large"
-    android:textColor="?colorOnSurface"
-    tools:drawableLeft="@drawable/ic_save"
-    tools:drawableStart="@drawable/ic_save"
-    tools:text="Save changes" />
diff --git a/draw/src/main/res/layout/quit_drawing_dialog_layout.xml b/draw/src/main/res/layout/quit_drawing_dialog_layout.xml
new file mode 100644
index 00000000000..f4151650546
--- /dev/null
+++ b/draw/src/main/res/layout/quit_drawing_dialog_layout.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/margin_large">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/save_drawing_explanation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/save_drawing_explanation"
+            android:textAppearance="?textAppearanceBodyMedium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/discard_changes"
+            style="?materialButtonOutlinedIconStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_standard"
+            android:text="@string/discard_changes"
+            app:icon="@drawable/ic_delete"
+            app:iconGravity="textStart"
+            app:iconSize="18dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/save_drawing_explanation" />
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/keep_editing"
+            style="?materialButtonOutlinedIconStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_extra_small"
+            android:text="@string/keep_editing"
+            app:icon="@drawable/ic_edit"
+            app:iconGravity="textStart"
+            app:iconSize="18dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/discard_changes" />
+
+        <org.odk.collect.androidshared.ui.multiclicksafe.MultiClickSafeMaterialButton
+            android:id="@+id/saveChanges"
+            style="?materialButtonIconStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_extra_small"
+            android:text="@string/keep_changes"
+            app:icon="@drawable/ic_save"
+            app:iconGravity="textStart"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/discard_changes"
+            app:layout_constraintStart_toStartOf="@id/discard_changes"
+            app:layout_constraintTop_toBottomOf="@id/keep_editing" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/collect_app/src/main/res/drawable/ic_edit.xml b/icons/src/main/res/drawable/ic_edit.xml
similarity index 100%
rename from collect_app/src/main/res/drawable/ic_edit.xml
rename to icons/src/main/res/drawable/ic_edit.xml
diff --git a/strings/src/main/res/values-af/strings.xml b/strings/src/main/res/values-af/strings.xml
index b431faa7472..e9d2c3afd30 100644
--- a/strings/src/main/res/values-af/strings.xml
+++ b/strings/src/main/res/values-af/strings.xml
@@ -69,8 +69,6 @@
   <string name="data_saved_error">Jammer, stoor van vorm het misluk!</string>
   <string name="data_saved_ok">Vorm suksesvol gestoor!</string>
   <string name="save_point_error">Fout tydens stoor van herstel-punt: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Verlaat %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Stoor Veranderinge</string>
   <string name="saving_form">Besig om vorm te stoor</string>
@@ -361,7 +359,6 @@
   <string name="cancel_loading_form">Kanselleer</string>
   <string name="cancel_location">Kanselleer</string>
   <string name="do_not_change">Kanselleer</string>
-  <string name="do_not_exit">Kanselleer</string>
   <string name="success">Sukses</string>
   <string name="error_occured">Daar was \'n fout</string>
   <string name="please_wait">Wag asseblief \'n paar sekondes.</string>
diff --git a/strings/src/main/res/values-am/strings.xml b/strings/src/main/res/values-am/strings.xml
index f0d552d9239..dbe662866a6 100644
--- a/strings/src/main/res/values-am/strings.xml
+++ b/strings/src/main/res/values-am/strings.xml
@@ -73,8 +73,6 @@
   <string name="data_saved_error">ይቅርታ፣ ቅፁን ማስቀመጥ አልተሳካም!</string>
   <string name="data_saved_ok">ቅፁ በተሳካ ሁኔታ ተቀምጧል!</string>
   <string name="save_point_error">የመልሶ ማግኛ ነጥብ ማስቀመጥ አልተቻለም፡ 1 %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">ከ 1 %s ይውጡ</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">ለውጦችን አስቀምጥ</string>
   <string name="saving_form">ቅጽን በማስቀመጥ ላይ</string>
@@ -409,7 +407,6 @@
   <string name="cancel_loading_form">ሰርዝ</string>
   <string name="cancel_location">ሰርዝ</string>
   <string name="do_not_change">ሰርዝ</string>
-  <string name="do_not_exit">ሰርዝ</string>
   <string name="success">ስኬት</string>
   <string name="error_occured">ስህተት ተከስቷል</string>
   <string name="please_wait">እባክዎ ጥቂት ጊዜ ይጠብቁ</string>
diff --git a/strings/src/main/res/values-ar/strings.xml b/strings/src/main/res/values-ar/strings.xml
index 4d071ebce05..dcdbaa6949c 100644
--- a/strings/src/main/res/values-ar/strings.xml
+++ b/strings/src/main/res/values-ar/strings.xml
@@ -119,8 +119,6 @@
   <string name="data_saved_error">عذرًا، لم يتمّ حفظ الاستمارة!</string>
   <string name="data_saved_ok">تمّ حفظ الاستمارة بنجاح!</string>
   <string name="save_point_error">خطأ في حفظ نقطة الاسترداد %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">خروج %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">التخلص من النموذج</string>
   <string name="discard_changes">تجاهل التعديلات</string>
@@ -774,7 +772,6 @@
   <string name="cancel_loading_form">إلغاء</string>
   <string name="cancel_location">إلغاء</string>
   <string name="do_not_change">إلغاء</string>
-  <string name="do_not_exit">إلغاء</string>
   <string name="canceling">جاري الإلغاء</string>
   <string name="notification_channel_name">الإشعارات العامة</string>
   <string name="success">نجاح</string>
diff --git a/strings/src/main/res/values-bn/strings.xml b/strings/src/main/res/values-bn/strings.xml
index af7341ccbf9..4dddfdf5f24 100644
--- a/strings/src/main/res/values-bn/strings.xml
+++ b/strings/src/main/res/values-bn/strings.xml
@@ -61,8 +61,6 @@
   <string name="data_saved_error">দু:খিত, ফরম সংরক্ষিত হয়নি</string>
   <string name="data_saved_ok">ফরম সংরক্ষিত হয়েছে</string>
   <string name="save_point_error">ত্রুটি সংরক্ষণ উদ্ধার পয়েন্টঃ %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">%s প্রস্থান</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">পরিবর্তন সংরক্ষণকরুন</string>
   <string name="saving_form">ফরম সংরক্ষন করা হচ্ছে।</string>
@@ -327,7 +325,6 @@
   <string name="cancel_loading_form">বাতিল</string>
   <string name="cancel_location">বাতিল</string>
   <string name="do_not_change">বাতিল</string>
-  <string name="do_not_exit">প্রস্থান হবেন না?</string>
   <string name="success">সাফল্য </string>
   <string name="error_occured">ত্রুটি ঘটেছে</string>
   <string name="please_wait">দয়া করে কিছু সময় অপেক্ষা করুন।</string>
diff --git a/strings/src/main/res/values-ca/strings.xml b/strings/src/main/res/values-ca/strings.xml
index 3dd819d5e94..1e6cd66c4f8 100644
--- a/strings/src/main/res/values-ca/strings.xml
+++ b/strings/src/main/res/values-ca/strings.xml
@@ -75,8 +75,6 @@
   <string name="data_saved_error">Ho sentim, el formulari no s\'ha desat be!</string>
   <string name="data_saved_ok">Formulari desat correctament!</string>
   <string name="save_point_error">Error al guardar el punt de recuperació: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Sortida %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Desar els canvis</string>
   <string name="saving_form">Desant formulari</string>
@@ -428,7 +426,6 @@
   <string name="cancel_loading_form">Cancel·lar</string>
   <string name="cancel_location">Cancel·lar</string>
   <string name="do_not_change">Cancel·lar</string>
-  <string name="do_not_exit">Cancel·lar</string>
   <string name="success">Correcte</string>
   <string name="error_occured">S\'ha produït un error</string>
   <string name="please_wait">Un moment si us plau.</string>
diff --git a/strings/src/main/res/values-cs/strings.xml b/strings/src/main/res/values-cs/strings.xml
index 9a84d578eb4..668186bc2e2 100644
--- a/strings/src/main/res/values-cs/strings.xml
+++ b/strings/src/main/res/values-cs/strings.xml
@@ -122,8 +122,6 @@
   <string name="data_saved_error">Uložení dotazníku selhalo!</string>
   <string name="data_saved_ok">Dotazník úspěšně uložen!</string>
   <string name="save_point_error">Chyba při ukládání bodu obnovení: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Konec %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Zrušit formulář</string>
   <string name="discard_changes">Zrušit změny</string>
@@ -832,7 +830,6 @@
   <string name="cancel_loading_form">Zrušit</string>
   <string name="cancel_location">Zrušit</string>
   <string name="do_not_change">Zrušit</string>
-  <string name="do_not_exit">Zrušit</string>
   <string name="canceling">Zrušení</string>
   <string name="notification_channel_name">Obecná upozornění</string>
   <string name="success">Úspěch</string>
diff --git a/strings/src/main/res/values-da/strings.xml b/strings/src/main/res/values-da/strings.xml
index a8e31ed5ce1..0da748165d2 100644
--- a/strings/src/main/res/values-da/strings.xml
+++ b/strings/src/main/res/values-da/strings.xml
@@ -85,8 +85,6 @@
   <string name="data_saved_error">Formularen kunne ikke gemmes</string>
   <string name="data_saved_ok">Formular gemt </string>
   <string name="save_point_error">Kunne ikke gemme gendannelsespunkt: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Afslut 1%s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Gem ændringer</string>
   <string name="saving_form">Gemmer formular</string>
@@ -491,7 +489,6 @@
   <string name="cancel_loading_form">Afbryd</string>
   <string name="cancel_location">Afbryd</string>
   <string name="do_not_change">Afbryd</string>
-  <string name="do_not_exit">Afbryd</string>
   <string name="canceling">Afbryder</string>
   <string name="success">Voila!</string>
   <string name="error_occured">Der opstod en fejl</string>
diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
index 13ead97d34d..e101f9bec40 100644
--- a/strings/src/main/res/values-de/strings.xml
+++ b/strings/src/main/res/values-de/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Speichervorgang gescheitert!</string>
   <string name="data_saved_ok">Speichervorgang erfolgreich!</string>
   <string name="save_point_error">Fehler beim Speichern des Wiederherstellungspunkts: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">%s beenden</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Formular verwerfen</string>
   <string name="discard_changes">Änderungen verwerfen</string>
@@ -847,7 +845,6 @@
   <string name="cancel_loading_form">Abbrechen</string>
   <string name="cancel_location">Abbrechen</string>
   <string name="do_not_change">Abbrechen</string>
-  <string name="do_not_exit">Abbrechen</string>
   <string name="canceling">Abbrechen</string>
   <string name="notification_channel_name">Allgemeine Benachrichtigungen</string>
   <string name="success">Erfolg</string>
diff --git a/strings/src/main/res/values-es/strings.xml b/strings/src/main/res/values-es/strings.xml
index 48208073c7f..9e9ae96a0be 100644
--- a/strings/src/main/res/values-es/strings.xml
+++ b/strings/src/main/res/values-es/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">¡Atención, el formulario no se ha guardado correctamente!</string>
   <string name="data_saved_ok">Formulario guardado correctamente</string>
   <string name="save_point_error">Error al guardar punto de recuperación: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Salir %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Descartar formulario</string>
   <string name="discard_changes">Descartar los cambios</string>
@@ -833,7 +831,6 @@
   <string name="cancel_loading_form">Cancelar</string>
   <string name="cancel_location">Cancelar</string>
   <string name="do_not_change">Cancelar</string>
-  <string name="do_not_exit">Cancelar</string>
   <string name="canceling">Cancelando</string>
   <string name="notification_channel_name">Notificaciones generales</string>
   <string name="success">Correcto</string>
diff --git a/strings/src/main/res/values-et/strings.xml b/strings/src/main/res/values-et/strings.xml
index b0dca299163..40eb0f7956b 100644
--- a/strings/src/main/res/values-et/strings.xml
+++ b/strings/src/main/res/values-et/strings.xml
@@ -73,8 +73,6 @@
   <string name="data_saved_error">Kahjuks ebaõnnestus vormi salvestamine!</string>
   <string name="data_saved_ok">Vorm on edukalt salvestatud!</string>
   <string name="save_point_error">Vea parndamise taastuspunkt %s </string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Välju %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Muudatuste salvestamine</string>
   <string name="saving_form">Vormi salvestamine</string>
@@ -431,7 +429,6 @@
   <string name="cancel_loading_form">Tühista</string>
   <string name="cancel_location">Tühista</string>
   <string name="do_not_change">Tühista</string>
-  <string name="do_not_exit">Tühista</string>
   <string name="success">Õnnestus</string>
   <string name="error_occured">Esines viga</string>
   <string name="please_wait">Palun oodake.</string>
diff --git a/strings/src/main/res/values-fa-rAF/strings.xml b/strings/src/main/res/values-fa-rAF/strings.xml
index 26eb99f0b13..060b2d68c26 100644
--- a/strings/src/main/res/values-fa-rAF/strings.xml
+++ b/strings/src/main/res/values-fa-rAF/strings.xml
@@ -122,8 +122,6 @@
   <string name="data_saved_error">متاسفانه فرم ذخیره نشد!</string>
   <string name="data_saved_ok">فرم با موفقیت ذخیره شد!</string>
   <string name="save_point_error">خطا در ذخیره نقطه یابی: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">خروج %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">نادیده گرفتن فرم</string>
   <string name="discard_changes">نادیده گرفتن تغییرات</string>
@@ -792,7 +790,6 @@
   <string name="cancel_loading_form">لغو</string>
   <string name="cancel_location">لغو</string>
   <string name="do_not_change">انصراف</string>
-  <string name="do_not_exit">انصراف</string>
   <string name="canceling">لغو کردن</string>
   <string name="notification_channel_name">اطلاعیه های عمومی</string>
   <string name="success">موفقیت </string>
diff --git a/strings/src/main/res/values-fa/strings.xml b/strings/src/main/res/values-fa/strings.xml
index 26eb99f0b13..060b2d68c26 100644
--- a/strings/src/main/res/values-fa/strings.xml
+++ b/strings/src/main/res/values-fa/strings.xml
@@ -122,8 +122,6 @@
   <string name="data_saved_error">متاسفانه فرم ذخیره نشد!</string>
   <string name="data_saved_ok">فرم با موفقیت ذخیره شد!</string>
   <string name="save_point_error">خطا در ذخیره نقطه یابی: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">خروج %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">نادیده گرفتن فرم</string>
   <string name="discard_changes">نادیده گرفتن تغییرات</string>
@@ -792,7 +790,6 @@
   <string name="cancel_loading_form">لغو</string>
   <string name="cancel_location">لغو</string>
   <string name="do_not_change">انصراف</string>
-  <string name="do_not_exit">انصراف</string>
   <string name="canceling">لغو کردن</string>
   <string name="notification_channel_name">اطلاعیه های عمومی</string>
   <string name="success">موفقیت </string>
diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
index c2089c62d41..3c2ed6f52f0 100644
--- a/strings/src/main/res/values-fi/strings.xml
+++ b/strings/src/main/res/values-fi/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Pahoittelut, lomakkeen tallennus epäonnistui!</string>
   <string name="data_saved_ok">Lomake tallennettu!</string>
   <string name="save_point_error">Virhe tallentaessa palautuspistettä: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Poistu täältä: %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Hylkää lomake</string>
   <string name="discard_changes">Hylkää muutokset</string>
@@ -853,7 +851,6 @@
   <string name="cancel_loading_form">Peruuta</string>
   <string name="cancel_location">Peruuta</string>
   <string name="do_not_change">Peruuta</string>
-  <string name="do_not_exit">Peruuta</string>
   <string name="canceling">Perutaan</string>
   <string name="notification_channel_name">Yleiset ilmoitukset</string>
   <string name="success">Onnistui</string>
diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
index a6dcf337507..6be16c32e9b 100644
--- a/strings/src/main/res/values-fr/strings.xml
+++ b/strings/src/main/res/values-fr/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Désolé, l\'enregistrement du formulaire a échoué.</string>
   <string name="data_saved_ok">Le formulaire a été enregistré avec succès.</string>
   <string name="save_point_error">Erreur lors de l\'enregistrement du point de récupération: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Quitter %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Supprimer le formulaire</string>
   <string name="discard_changes">Supprimer les modifications</string>
@@ -857,7 +855,6 @@
   <string name="cancel_loading_form">Annuler</string>
   <string name="cancel_location">Annuler</string>
   <string name="do_not_change">Annuler</string>
-  <string name="do_not_exit">Annuler</string>
   <string name="canceling">En train d\'annuler</string>
   <string name="notification_channel_name">Notifications générales</string>
   <string name="success">Succès</string>
diff --git a/strings/src/main/res/values-hi/strings.xml b/strings/src/main/res/values-hi/strings.xml
index 8b95c4f7b7a..5843d76e40a 100644
--- a/strings/src/main/res/values-hi/strings.xml
+++ b/strings/src/main/res/values-hi/strings.xml
@@ -83,8 +83,6 @@
   <string name="data_saved_error">क्षमा करें, फॉर्म संरक्षण असफल!</string>
   <string name="data_saved_ok">फॉर्म सफलतापूर्वक संरक्षित!</string>
   <string name="save_point_error">रिकवरी बिंदु %sसंरक्षण में त्रुटि है  </string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">बाहर आयें %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">बदलाव संरक्षित करें</string>
   <string name="saving_form">फॉर्म संरक्षित हो रहा है </string>
@@ -493,7 +491,6 @@
   <string name="cancel_loading_form">रद्द करें</string>
   <string name="cancel_location">रद्द करें</string>
   <string name="do_not_change">रद्द करें</string>
-  <string name="do_not_exit">रद्द करें </string>
   <string name="success">सफल</string>
   <string name="error_occured">गलती हुई</string>
   <string name="please_wait">कृपया कुछ क्षण प्रतीक्षा करें</string>
diff --git a/strings/src/main/res/values-ht/strings.xml b/strings/src/main/res/values-ht/strings.xml
index ef17e6a4977..54b1f3a7243 100644
--- a/strings/src/main/res/values-ht/strings.xml
+++ b/strings/src/main/res/values-ht/strings.xml
@@ -104,8 +104,6 @@
   <string name="send">Voye ale</string>
   <string name="data_saved_error">Dezole, sovgad fomilè a echwe</string>
   <string name="data_saved_ok">Fòmilè sovgade ak siksè!</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Soti %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Sovgade chanjman yo</string>
   <string name="keep_editing">Kontinye modifye</string>
@@ -331,7 +329,6 @@
   <string name="cancel_loading_form">Anile</string>
   <string name="cancel_location">Anile</string>
   <string name="do_not_change">Anile</string>
-  <string name="do_not_exit">Anile</string>
   <!--##############################################
      # Projects
      ##############################################-->
diff --git a/strings/src/main/res/values-in/strings.xml b/strings/src/main/res/values-in/strings.xml
index 0faf37c1f7a..00fda8823da 100644
--- a/strings/src/main/res/values-in/strings.xml
+++ b/strings/src/main/res/values-in/strings.xml
@@ -122,8 +122,6 @@
   <string name="data_saved_error">Maaf, tidak berhasil menyimpan formulir.</string>
   <string name="data_saved_ok">Formulir berhasil disimpan.</string>
   <string name="save_point_error">Terjadi kesalahan saat menyimpan titik pemulihan: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Keluar dari %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Buang Formulir</string>
   <string name="discard_changes">Buang Perubahan</string>
@@ -822,7 +820,6 @@
   <string name="cancel_loading_form">Batal</string>
   <string name="cancel_location">Batal</string>
   <string name="do_not_change">Batal</string>
-  <string name="do_not_exit">Batal</string>
   <string name="canceling">Membatalkan</string>
   <string name="notification_channel_name">Pemberitahuan umum</string>
   <string name="success">Berhasil</string>
diff --git a/strings/src/main/res/values-it/strings.xml b/strings/src/main/res/values-it/strings.xml
index 104f21a9fbe..0ee294d6a62 100644
--- a/strings/src/main/res/values-it/strings.xml
+++ b/strings/src/main/res/values-it/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Spiacenti, salvataggio modulo fallito!</string>
   <string name="data_saved_ok">Modulo salvato correttamente!</string>
   <string name="save_point_error">Errore nel salvataggio del punto di ripristino: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Uscita %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Elimina formulario</string>
   <string name="discard_changes">Non salvare le modifiche</string>
@@ -834,7 +832,6 @@
   <string name="cancel_loading_form">Annulla</string>
   <string name="cancel_location">Annulla</string>
   <string name="do_not_change">Annulla</string>
-  <string name="do_not_exit">Annulla</string>
   <string name="canceling">Annullando</string>
   <string name="notification_channel_name">Impostazioni Generali</string>
   <string name="success">Successo</string>
diff --git a/strings/src/main/res/values-ja/strings.xml b/strings/src/main/res/values-ja/strings.xml
index c4de52919d4..89ffb828747 100644
--- a/strings/src/main/res/values-ja/strings.xml
+++ b/strings/src/main/res/values-ja/strings.xml
@@ -104,8 +104,6 @@
   <string name="data_saved_error">申し訳ありません、フォームが保存できませんでした!</string>
   <string name="data_saved_ok">フォームを保存しました!</string>
   <string name="save_point_error">リカバリーポイントの保存中にエラー: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">%s を終了</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">変更を保存する</string>
   <string name="saving_form">フォームを保存中</string>
@@ -722,7 +720,6 @@
   <string name="cancel_loading_form">キャンセル</string>
   <string name="cancel_location">キャンセル</string>
   <string name="do_not_change">キャンセル</string>
-  <string name="do_not_exit">キャンセル</string>
   <string name="canceling">キャンセル中</string>
   <string name="notification_channel_name">全般通知</string>
   <string name="success">成功しました</string>
diff --git a/strings/src/main/res/values-ka/strings.xml b/strings/src/main/res/values-ka/strings.xml
index de347aa2b78..2d13e46f595 100644
--- a/strings/src/main/res/values-ka/strings.xml
+++ b/strings/src/main/res/values-ka/strings.xml
@@ -102,8 +102,6 @@
   <string name="data_saved_error">უკაცრავად, ფორმა ვერ შეინახა!</string>
   <string name="data_saved_ok">ფორმა წარმატებით შეინახა!</string>
   <string name="save_point_error">შეცდომა აღდგენის წერტილის შენახვისას: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">%s-დან გამოსვლა</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">ფორმაში ცვლილებების გაუქმება</string>
   <string name="discard_changes">ცვლილებების გაუქმება</string>
@@ -406,7 +404,6 @@
   <string name="cancel_loading_form">გაუქმება</string>
   <string name="cancel_location">გაუქმება</string>
   <string name="do_not_change">გაუქმება</string>
-  <string name="do_not_exit">გაუქმება</string>
   <string name="canceling">მიმდინარეობს გაუქმება</string>
   <string name="success">წარმატება</string>
   <string name="error_occured">მოხდა შეცდომა</string>
diff --git a/strings/src/main/res/values-km/strings.xml b/strings/src/main/res/values-km/strings.xml
index cb54235ceeb..121e7ad650b 100644
--- a/strings/src/main/res/values-km/strings.xml
+++ b/strings/src/main/res/values-km/strings.xml
@@ -109,8 +109,6 @@
   <string name="data_saved_error">សុំទោស, រក្សា​ទុកសំណុំ​បែបបទ​មិន​បាន​សម្រេច!</string>
   <string name="data_saved_ok">បាន​រក្សាទុកសំណុំ​បែបបទ​ដោយ​ជោគជ័យ!</string>
   <string name="save_point_error">បញ្ហាក្នុងការរក្សាទុកនូវចំនុចស្តារឡើងវិញ: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">ចាកចេញ %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">បោះបង់ទម្រង់</string>
   <string name="discard_changes">បោះបង់ការផ្លាស់ប្តូរ</string>
@@ -649,7 +647,6 @@
   <string name="cancel_loading_form">បោះបង់</string>
   <string name="cancel_location">បោះបង់</string>
   <string name="do_not_change">បោះបង់</string>
-  <string name="do_not_exit">បោះបង់</string>
   <string name="canceling">កំពុង​បោះបង់</string>
   <string name="notification_channel_name">ការជូនដំណឹង​ជាទូទៅ</string>
   <string name="success">ជោគជ័យ</string>
diff --git a/strings/src/main/res/values-ln/strings.xml b/strings/src/main/res/values-ln/strings.xml
index cff2b9e4668..6f69168cd8d 100644
--- a/strings/src/main/res/values-ln/strings.xml
+++ b/strings/src/main/res/values-ln/strings.xml
@@ -222,7 +222,6 @@
   <string name="cancel_loading_form">longola</string>
   <string name="cancel_location">longola</string>
   <string name="do_not_change">longola</string>
-  <string name="do_not_exit">longola</string>
   <!--##############################################
      # Projects
      ##############################################-->
diff --git a/strings/src/main/res/values-lo-rLA/strings.xml b/strings/src/main/res/values-lo-rLA/strings.xml
index 90092983d6f..ea7a49becd4 100644
--- a/strings/src/main/res/values-lo-rLA/strings.xml
+++ b/strings/src/main/res/values-lo-rLA/strings.xml
@@ -68,8 +68,6 @@
   <string name="data_saved_error">ການບັກທຶກແບບຟອມລົ້ມເຫຼວ</string>
   <string name="data_saved_ok">ແບບຟອມໄດ້ຖືກບັນທຶກສຳເລັດແລ້ວ</string>
   <string name="save_point_error">ພໍ້​ບັນ​ຫາ​ໃນ​ລະ​ຫວ່າງບັນ​ທຶກຈຸດ​​ການ​ກູ້​ຄືນ: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">ອອກຈາກລະບົບ%s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">ບັນທຶກການປ່ຽນແປງ</string>
   <string name="saving_form">ກຳລັງບັນທຶກແບບຟອມ</string>
@@ -359,7 +357,6 @@
   <string name="cancel_loading_form">ຍົກເລີກ</string>
   <string name="cancel_location">ຍົກເລີກ</string>
   <string name="do_not_change">ຍົກເລີກ</string>
-  <string name="do_not_exit">ຍົກເລີກ</string>
   <string name="success">ສຳເລັດແລ້ວ</string>
   <string name="error_occured">ມີຄວາມຜິດພາດເກີດຂຶ້ນ</string>
   <string name="please_wait">ກະລຸນາລໍຖ້າຈັກໜ້ອຍ</string>
diff --git a/strings/src/main/res/values-lt/strings.xml b/strings/src/main/res/values-lt/strings.xml
index 05815052e0a..614b1c6c549 100644
--- a/strings/src/main/res/values-lt/strings.xml
+++ b/strings/src/main/res/values-lt/strings.xml
@@ -62,8 +62,6 @@
   <string name="save_enter_data_description">Jūs esate \"%s\" pabaigoje.</string>
   <string name="data_saved_error">Deja, formos išsaugoti nepavyko!</string>
   <string name="data_saved_ok">Forma sėkmingai išsaugota!</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Išeiti %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Išsaugoti pakeitimus</string>
   <string name="saving_form">Forma išsaugoma</string>
@@ -320,7 +318,6 @@
   <string name="cancel_loading_form">Atšaukti</string>
   <string name="cancel_location">Atšaukti</string>
   <string name="do_not_change">Atšaukti</string>
-  <string name="do_not_exit">Atšaukti</string>
   <string name="success">Sėkmingai</string>
   <string name="error_occured">Įvyko klaida</string>
   <string name="please_wait">Prašome šiek tiek palaukti.</string>
diff --git a/strings/src/main/res/values-ml/strings.xml b/strings/src/main/res/values-ml/strings.xml
index ca1bf76c131..4dc43605184 100644
--- a/strings/src/main/res/values-ml/strings.xml
+++ b/strings/src/main/res/values-ml/strings.xml
@@ -287,7 +287,6 @@
   <string name="cancel_loading_form">റദ്ദാക്കുക</string>
   <string name="cancel_location">റദ്ദാക്കുക</string>
   <string name="do_not_change">റദ്ദാക്കുക</string>
-  <string name="do_not_exit">റദ്ദാക്കുക</string>
   <!--##############################################
      # Projects
      ##############################################-->
diff --git a/strings/src/main/res/values-mr/strings.xml b/strings/src/main/res/values-mr/strings.xml
index 9e8c4a67185..a137c135b70 100644
--- a/strings/src/main/res/values-mr/strings.xml
+++ b/strings/src/main/res/values-mr/strings.xml
@@ -78,8 +78,6 @@
   <string name="data_saved_error">क्षमस्व, एक फॉर्म हटविणे क्रिया आधीच प्रगतीपथावर आहे!</string>
   <string name="data_saved_ok">फॉर्म यशस्वीरित्या जतन केला!</string>
   <string name="save_point_error">पुनर्प्राप्ती बिंदू जतन करताना त्रुटी: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">मधून निर्गमन करा %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">बदल जतन करा</string>
   <string name="saving_form">फॉर्म जतन केला जात आहे</string>
@@ -484,7 +482,6 @@
   <string name="cancel_loading_form">रद्द करा</string>
   <string name="cancel_location">रद्द करा</string>
   <string name="do_not_change">रद्द करा</string>
-  <string name="do_not_exit">रद्द करा</string>
   <string name="success">यश</string>
   <string name="error_occured">त्रुटी झाले</string>
   <string name="please_wait">कृपया काही क्षण प्रतीक्षा करा</string>
diff --git a/strings/src/main/res/values-ms/strings.xml b/strings/src/main/res/values-ms/strings.xml
index b0454b61024..485da7022ac 100644
--- a/strings/src/main/res/values-ms/strings.xml
+++ b/strings/src/main/res/values-ms/strings.xml
@@ -217,7 +217,6 @@
   <string name="cancel_loading_form">Batal</string>
   <string name="cancel_location">Batal</string>
   <string name="do_not_change">Batal</string>
-  <string name="do_not_exit">Batal</string>
   <!--##############################################
      # Projects
      ##############################################-->
diff --git a/strings/src/main/res/values-my/strings.xml b/strings/src/main/res/values-my/strings.xml
index fe6fb7199de..3d702a4ee1f 100644
--- a/strings/src/main/res/values-my/strings.xml
+++ b/strings/src/main/res/values-my/strings.xml
@@ -80,8 +80,6 @@
   <string name="data_saved_error">ပုံစံအား မသိမ်းဆည်းနိုင်ပါ</string>
   <string name="data_saved_ok">ပုံစံအားအောင်မြင်စွာ သိမ်းဆည်းနိုင်ပါသည်</string>
   <string name="save_point_error">ပြန်လည်ရယူသည့် နေရာ အမှားဖြစ်ပေါ်%s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">ထြက္ရန္ %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">ေျပာင္းလဲမွုမ်ားကို သိမ္းဆည္းရန္</string>
   <string name="saving_form">ပံုစံသိမ္းဆည္းေနပါသည္</string>
@@ -341,7 +339,6 @@
   <string name="cancel_loading_form">ပယ်ဖျက်ပါ</string>
   <string name="cancel_location">ပယ်ဖျက်ပါ</string>
   <string name="do_not_change">မလုပ်တော့ပါ</string>
-  <string name="do_not_exit">မလုပ်တော့ပါ</string>
   <string name="canceling">ပယ်ဖျက်နေသည်</string>
   <string name="success">ေအာင္ျမင္ပါၿပီ</string>
   <string name="error_occured">မွားယြင္းေနပါသည္</string>
diff --git a/strings/src/main/res/values-ne-rNP/strings.xml b/strings/src/main/res/values-ne-rNP/strings.xml
index 1cc6e73efe5..ae235971167 100644
--- a/strings/src/main/res/values-ne-rNP/strings.xml
+++ b/strings/src/main/res/values-ne-rNP/strings.xml
@@ -78,8 +78,6 @@
   <string name="data_saved_error">माफ गर्नुहोला , फारम संचित हुन सकेन !</string>
   <string name="data_saved_ok">फारम सफलतापूर्वक संचित भयो !</string>
   <string name="save_point_error">रिकभरी बिन्दु संचित गर्दा गल्ति भयो: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">बाहिर निस्कनुहोस् %s </string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">परिवर्तनहरु संचित गर्नुहोस् </string>
   <string name="saving_form">फारम संचित गरिदैछ |</string>
@@ -452,7 +450,6 @@
   <string name="cancel_loading_form">फिर्ता जानुहोस्</string>
   <string name="cancel_location">फिर्ता जानुहोस्</string>
   <string name="do_not_change">फिर्ता जानुहोस्</string>
-  <string name="do_not_exit">फिर्ता जानुहोस्</string>
   <string name="canceling">फिर्ता हुँदै</string>
   <string name="success">सफल</string>
   <string name="error_occured">गल्ती भयो </string>
diff --git a/strings/src/main/res/values-nl/strings.xml b/strings/src/main/res/values-nl/strings.xml
index d7ff23b5734..55553218bea 100644
--- a/strings/src/main/res/values-nl/strings.xml
+++ b/strings/src/main/res/values-nl/strings.xml
@@ -113,8 +113,6 @@
   <string name="data_saved_error">Sorry, formulier opslaan mislukt!</string>
   <string name="data_saved_ok">Formulier is opgeslagen!</string>
   <string name="save_point_error">Fout bij maken herstelpunt: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Sluit %s af</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Wijzigingen opslaan</string>
   <string name="keep_editing">Doorgaan met invullen</string>
@@ -526,7 +524,6 @@
   <string name="cancel_loading_form">Terug</string>
   <string name="cancel_location">Terug</string>
   <string name="do_not_change">Annuleer</string>
-  <string name="do_not_exit">Annuleer</string>
   <string name="canceling">Wordt geannuleerd</string>
   <string name="notification_channel_name">Algemene notificaties</string>
   <string name="success">Voltooid</string>
diff --git a/strings/src/main/res/values-no/strings.xml b/strings/src/main/res/values-no/strings.xml
index f6a77cf9d4b..8f09ab0f173 100644
--- a/strings/src/main/res/values-no/strings.xml
+++ b/strings/src/main/res/values-no/strings.xml
@@ -68,8 +68,6 @@
   <string name="data_saved_error">Beklager, skjemalagring mislyktes!</string>
   <string name="data_saved_ok">Skjema lagret!</string>
   <string name="save_point_error">Feil under lagring av gjenopprettingspunkt: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Avslutt %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Lagre endringer</string>
   <string name="saving_form">Lagrer skjema</string>
@@ -365,7 +363,6 @@
   <string name="cancel_loading_form">Avbryt</string>
   <string name="cancel_location">Avbryt</string>
   <string name="do_not_change">Avbryt</string>
-  <string name="do_not_exit">Avbryt</string>
   <string name="success">Suksess</string>
   <string name="error_occured">Det er oppstatt en feil</string>
   <string name="please_wait">Vennligst vent.</string>
diff --git a/strings/src/main/res/values-pl/strings.xml b/strings/src/main/res/values-pl/strings.xml
index ad36fd1d0ae..a1c8ee2253f 100644
--- a/strings/src/main/res/values-pl/strings.xml
+++ b/strings/src/main/res/values-pl/strings.xml
@@ -104,8 +104,6 @@
   <string name="data_saved_error">Przykro mi, zapis formularza się nie powiódł!</string>
   <string name="data_saved_ok">Formularz został zapisany pomyślnie!</string>
   <string name="save_point_error">Błąd przy zapisywaniu punktu odtwarzania: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Zakończ %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Zapisz Zmiany</string>
   <string name="saving_form">Zapisuję Formularz</string>
@@ -678,7 +676,6 @@
   <string name="cancel_loading_form">Anuluj</string>
   <string name="cancel_location">Anuluj</string>
   <string name="do_not_change">Anuluj</string>
-  <string name="do_not_exit">Anuluj</string>
   <string name="canceling">Anulowanie</string>
   <string name="notification_channel_name">Ogólne powiadomienia</string>
   <string name="success">Sukces</string>
diff --git a/strings/src/main/res/values-ps/strings.xml b/strings/src/main/res/values-ps/strings.xml
index 04489cab36c..a19b5df4b3a 100644
--- a/strings/src/main/res/values-ps/strings.xml
+++ b/strings/src/main/res/values-ps/strings.xml
@@ -53,8 +53,6 @@
   <string name="data_saved_error">اوبخښی، د فورمي ثبتول ناکامه شو!</string>
   <string name="data_saved_ok">فورمه په بریالی توکه ثبت شو!</string>
   <string name="save_point_error">د خطا ثبت بیا موندولو نښه: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">خارج شی %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="saving_form">فورمه د ثبت کیدو په حال کښی</string>
   <!--Displayed when form filling is attempted to be launched by intent but the intent URI is incorrect-->
@@ -299,7 +297,6 @@
   <string name="cancel_loading_form">فسخ کول</string>
   <string name="cancel_location">فسخ کول</string>
   <string name="do_not_change">فسخ کول</string>
-  <string name="do_not_exit">فسخ کول</string>
   <string name="canceling">فسخ کولو کی قرار لری</string>
   <string name="error_occured">خطا وشوله</string>
   <string name="please_wait">مهرباني وکړئ څو ځلې انتظار وکړئ.</string>
diff --git a/strings/src/main/res/values-pt/strings.xml b/strings/src/main/res/values-pt/strings.xml
index 2e1468ba133..8e0ff8645dd 100644
--- a/strings/src/main/res/values-pt/strings.xml
+++ b/strings/src/main/res/values-pt/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Desculpe, falha ao salvar formulário!</string>
   <string name="data_saved_ok">Formulário salvo com sucesso!</string>
   <string name="save_point_error">Erro ao salvar ponto de recuperação: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Saída %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Descartar Formulário</string>
   <string name="discard_changes">Descartar Mudanças</string>
@@ -843,7 +841,6 @@
   <string name="cancel_loading_form">Cancelar</string>
   <string name="cancel_location">Cancelar</string>
   <string name="do_not_change">Cancelar</string>
-  <string name="do_not_exit">Cancelar</string>
   <string name="canceling">Cancelando</string>
   <string name="notification_channel_name">Notificações gerais</string>
   <string name="success">Sucesso</string>
diff --git a/strings/src/main/res/values-ro/strings.xml b/strings/src/main/res/values-ro/strings.xml
index 0f9ecf84b54..19664c777dc 100644
--- a/strings/src/main/res/values-ro/strings.xml
+++ b/strings/src/main/res/values-ro/strings.xml
@@ -70,8 +70,6 @@
   <string name="data_saved_error">Ne pare rău, salvarea formularului nu a reușit!</string>
   <string name="data_saved_ok">Salvarea formularului a reușit!</string>
   <string name="save_point_error">Eroare la salvarea punctului de recuperare: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Ieșire %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Salvați modificările</string>
   <string name="saving_form">Salvare formular</string>
@@ -387,7 +385,6 @@
   <string name="cancel_loading_form">Anulează</string>
   <string name="cancel_location">Anulează</string>
   <string name="do_not_change">Anulați</string>
-  <string name="do_not_exit">Anulați</string>
   <string name="success">Succes</string>
   <string name="error_occured">Eroare</string>
   <string name="please_wait">Vă rugăm să așteptați câteva momente.</string>
diff --git a/strings/src/main/res/values-ru/strings.xml b/strings/src/main/res/values-ru/strings.xml
index 1af4075a5ee..0e0fec1fe43 100644
--- a/strings/src/main/res/values-ru/strings.xml
+++ b/strings/src/main/res/values-ru/strings.xml
@@ -121,8 +121,6 @@
   <string name="data_saved_error">Не удалось сохранить ответы</string>
   <string name="data_saved_ok">Ответы успешно сохранены</string>
   <string name="save_point_error">Ошибка сохранения точки восстановления: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Выйти из \"%s\"</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Отменить форму</string>
   <string name="discard_changes">Отменить изменения</string>
@@ -793,7 +791,6 @@
   <string name="cancel_loading_form">Отмена</string>
   <string name="cancel_location">Отмена</string>
   <string name="do_not_change">Отмена</string>
-  <string name="do_not_exit">Отмена</string>
   <string name="canceling">Отменяю</string>
   <string name="notification_channel_name">Общие уведомления</string>
   <string name="success">Успешно</string>
diff --git a/strings/src/main/res/values-rw/strings.xml b/strings/src/main/res/values-rw/strings.xml
index 6c9dbac1578..9855a73ea0a 100644
--- a/strings/src/main/res/values-rw/strings.xml
+++ b/strings/src/main/res/values-rw/strings.xml
@@ -104,8 +104,6 @@
   <string name="data_saved_error">Mwihangane, kubika amakuru byanze! </string>
   <string name="data_saved_ok">Amakuru yabitswe! </string>
   <string name="save_point_error">Ikosa mukwisevinga biragaruka: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Sohoka 1%s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Bika ibyo wahinduye</string>
   <string name="saving_form">Ibika ry\'amakuru yinyandiko shingiro.</string>
@@ -734,7 +732,6 @@ N\'ukomea guhura n\'iki kibazo, wakigeza kuwa gusabye gukusanya  amakuru.</strin
   <string name="cancel_loading_form">Bikuremo</string>
   <string name="cancel_location">Bikuremo</string>
   <string name="do_not_change">Bikuremo</string>
-  <string name="do_not_exit">Bikuremo</string>
   <string name="canceling">Birikuvamo</string>
   <string name="notification_channel_name">Ubutumwa bukwibutsa</string>
   <string name="success">Byakunze</string>
diff --git a/strings/src/main/res/values-sl/strings.xml b/strings/src/main/res/values-sl/strings.xml
index 20bcfd55e89..7de3f3f535b 100644
--- a/strings/src/main/res/values-sl/strings.xml
+++ b/strings/src/main/res/values-sl/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">Shranjevanje obrazca ni uspelo!</string>
   <string name="data_saved_ok">Obrazec uspešno shranjen!</string>
   <string name="save_point_error">Napaka pri shranjevanju obnovitvene točke %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Izhod %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Zavrzi obrazec</string>
   <string name="discard_changes">Zavrzi spremembe</string>
@@ -840,7 +838,6 @@
   <string name="cancel_loading_form">Prekini</string>
   <string name="cancel_location">Prekini</string>
   <string name="do_not_change">Prekini</string>
-  <string name="do_not_exit">Prekini</string>
   <string name="canceling">Prekinjam</string>
   <string name="notification_channel_name">Splošna obvestila</string>
   <string name="success">Uspešno</string>
diff --git a/strings/src/main/res/values-so/strings.xml b/strings/src/main/res/values-so/strings.xml
index c2670f63ef7..6febd8a0dee 100644
--- a/strings/src/main/res/values-so/strings.xml
+++ b/strings/src/main/res/values-so/strings.xml
@@ -225,7 +225,6 @@
   <string name="cancel_loading_form">Jooji</string>
   <string name="cancel_location">Jooji</string>
   <string name="do_not_change">Jooji</string>
-  <string name="do_not_exit">Jooji</string>
   <string name="error_occured">Cilad ku timi</string>
   <!--##############################################
      # Projects
diff --git a/strings/src/main/res/values-sq/strings.xml b/strings/src/main/res/values-sq/strings.xml
index e19a3d4145c..d0705c40ba5 100644
--- a/strings/src/main/res/values-sq/strings.xml
+++ b/strings/src/main/res/values-sq/strings.xml
@@ -88,8 +88,6 @@
   <string name="data_saved_error">Ndjesë, ruajtja e formualrit dështoi!</string>
   <string name="data_saved_ok">Formulari u ruajt me sukses!</string>
   <string name="save_point_error">Gabim në ruajtjen e pikës së shpëtimit: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Dil %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Ruaj ndryshimet</string>
   <string name="saving_form">Duke ruajtur formularin</string>
@@ -527,7 +525,6 @@
   <string name="cancel_loading_form">Anullo</string>
   <string name="cancel_location">Anullo</string>
   <string name="do_not_change">Anullo</string>
-  <string name="do_not_exit">Anullo</string>
   <string name="canceling">Duke anuluar</string>
   <string name="success">Sukses</string>
   <string name="error_occured">Ndodhi një gabim</string>
diff --git a/strings/src/main/res/values-sr/strings.xml b/strings/src/main/res/values-sr/strings.xml
index 883f1347720..b4433916453 100644
--- a/strings/src/main/res/values-sr/strings.xml
+++ b/strings/src/main/res/values-sr/strings.xml
@@ -101,8 +101,6 @@
   <string name="data_saved_error">Izvini, čuvanje formulara nije uspjelo!</string>
   <string name="data_saved_ok">Formular je uspješno sačuvan!</string>
   <string name="save_point_error">Greška u čuvanju tačke povratka: %s </string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Izlaz %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Sačuvaj izmjene</string>
   <string name="saving_form">Čuvam formular</string>
@@ -643,7 +641,6 @@
   <string name="cancel_loading_form">Odustani</string>
   <string name="cancel_location">Odustani</string>
   <string name="do_not_change">Odustani</string>
-  <string name="do_not_exit">Odustani</string>
   <string name="canceling">Odustajem</string>
   <string name="notification_channel_name">Opšta obavještenja</string>
   <string name="success">Uspjeh</string>
diff --git a/strings/src/main/res/values-sv-rSE/strings.xml b/strings/src/main/res/values-sv-rSE/strings.xml
index 1c715bdc605..921214eebfa 100644
--- a/strings/src/main/res/values-sv-rSE/strings.xml
+++ b/strings/src/main/res/values-sv-rSE/strings.xml
@@ -100,8 +100,6 @@
   <string name="data_saved_error">Tyvärr, formuläret kunde inte sparas!</string>
   <string name="data_saved_ok">Formuläret har sparats!</string>
   <string name="save_point_error">Fel vid sparande av återställningspunkt: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Avsluta %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Spara ändringar</string>
   <string name="saving_form">Sparar formulär</string>
@@ -622,7 +620,6 @@ Dela ODK Collect med dem.</string>
   <string name="cancel_loading_form">Avbryt</string>
   <string name="cancel_location">Avbryt</string>
   <string name="do_not_change">Avbryt</string>
-  <string name="do_not_exit">Avbryt</string>
   <string name="canceling">Avbryter</string>
   <string name="notification_channel_name">Allmäna notifieringar</string>
   <string name="success">Lyckades</string>
diff --git a/strings/src/main/res/values-sw-rKE/strings.xml b/strings/src/main/res/values-sw-rKE/strings.xml
index d80112cfae5..6a518ab4e37 100644
--- a/strings/src/main/res/values-sw-rKE/strings.xml
+++ b/strings/src/main/res/values-sw-rKE/strings.xml
@@ -74,8 +74,6 @@
   <string name="data_saved_error">Samahani, fomu haikuhifadhiwa!</string>
   <string name="data_saved_ok">Fomu imehifadhiwa!</string>
   <string name="save_point_error">Hitilafu imetokea kwa ncha ya urejesho: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Kutoka %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Hifadhi mabadiliko</string>
   <string name="saving_form">Hifadhi ya fomu</string>
@@ -358,7 +356,6 @@
   <string name="cancel_loading_form">Tamatisha</string>
   <string name="cancel_location">Tamatisha</string>
   <string name="do_not_change">Futa</string>
-  <string name="do_not_exit">Futa</string>
   <string name="success">Mafanikio</string>
   <string name="error_occured">Hitilifau ilitokea</string>
   <string name="please_wait">Tafadhali subiri dakika chache.</string>
diff --git a/strings/src/main/res/values-sw/strings.xml b/strings/src/main/res/values-sw/strings.xml
index 1e435c27dc5..5947f92aea5 100644
--- a/strings/src/main/res/values-sw/strings.xml
+++ b/strings/src/main/res/values-sw/strings.xml
@@ -115,8 +115,6 @@
   <string name="data_saved_error">Samahani, uhifadhi wa fomu umeshindikana!</string>
   <string name="data_saved_ok">Umefanikiwa kuhifadhi fomu!</string>
   <string name="save_point_error">Hitilafu katika kuhifadhi alama ya urejeshi \"recovery point\" :%s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Toka %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Futa fomu</string>
   <string name="discard_changes">Kataa mabadiliko</string>
@@ -665,7 +663,6 @@
   <string name="cancel_loading_form">Sitisha</string>
   <string name="cancel_location">Sitisha</string>
   <string name="do_not_change">Sitisha</string>
-  <string name="do_not_exit">Sitisha</string>
   <string name="canceling">Inasitishwa</string>
   <string name="success">Mafanikio</string>
   <string name="error_occured">Kosa limetokea</string>
diff --git a/strings/src/main/res/values-te/strings.xml b/strings/src/main/res/values-te/strings.xml
index e4a578a6cfa..a9d5590ba92 100644
--- a/strings/src/main/res/values-te/strings.xml
+++ b/strings/src/main/res/values-te/strings.xml
@@ -104,8 +104,6 @@
   <string name="data_saved_error">క్షమించండి, ఫారం సేవ్ అవ్వలేదు</string>
   <string name="data_saved_ok">ఫారం విజయవంతంగా సేవ్ చేయబడింది!</string>
   <string name="save_point_error">రికవరీ పాయింట్‌ను సేవ్ చేయడంలో లోపం ఉంది: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Exit %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">మార్పులను సేవ్ చెయ్యి</string>
   <string name="saving_form">ఫారం సేవ్ చేయబడుతుంది</string>
@@ -686,7 +684,6 @@
   <string name="cancel_loading_form">రద్దు చేయి</string>
   <string name="cancel_location">రద్దు చేయి</string>
   <string name="do_not_change">రద్దు చేయి</string>
-  <string name="do_not_exit">రద్దు చేయి</string>
   <string name="canceling">రద్దు చేయబడుతుంది </string>
   <string name="notification_channel_name">సాధారణ నోటిఫికేషన్‌లు</string>
   <string name="success">సక్సెస్ </string>
diff --git a/strings/src/main/res/values-th-rTH/strings.xml b/strings/src/main/res/values-th-rTH/strings.xml
index 08c9cea2de4..909f10f6510 100644
--- a/strings/src/main/res/values-th-rTH/strings.xml
+++ b/strings/src/main/res/values-th-rTH/strings.xml
@@ -72,8 +72,6 @@
   <string name="data_saved_error">ขออภัย ไม่สามารถบันทึกแบบสำรวจได้</string>
   <string name="data_saved_ok">บันทึกแบบสำรวจเรียบร้อยแล้ว</string>
   <string name="save_point_error">มีข้อผิดพลาดในการบันทึกจุดย้อนคืน : %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">ออกจาก %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">บันทึกการเปลี่ยนแปลง</string>
   <string name="saving_form">กำลังบันทึกแบบสำรวจ</string>
@@ -429,7 +427,6 @@
   <string name="cancel_loading_form">ยกเลิก</string>
   <string name="cancel_location">ยกเลิก</string>
   <string name="do_not_change">ยกเลิก</string>
-  <string name="do_not_exit">ยกเลิก</string>
   <string name="canceling">กำลังยกเลิก</string>
   <string name="success">สำเร็จ</string>
   <string name="error_occured">มีข้อผิดพลาดเกิดขึ้น</string>
diff --git a/strings/src/main/res/values-tl-rPH/strings.xml b/strings/src/main/res/values-tl-rPH/strings.xml
index 827333ca4a4..c7cb7f31517 100644
--- a/strings/src/main/res/values-tl-rPH/strings.xml
+++ b/strings/src/main/res/values-tl-rPH/strings.xml
@@ -31,7 +31,6 @@
   <string name="download">I-karga ang Pinili</string>
     <string name="downloading_data">Kumakabit sa Server</string>
   <string name="do_not_change">Urong</string>
-  <string name="do_not_exit">Urong</string>
   <string name="do_not_save">Balewalain ang mga binago</string>
   <string name="enter_data">Punan ang Blangkong Form</string>
   <string name="error_occured">May Maling Nangyari</string>
@@ -60,7 +59,6 @@
     <string name="play_video">I-play ang Bidyo</string>
   <string name="please_wait">Mag-hintay ng ilang sandali.</string>
   <string name="please_wait_long">Mag-hintay. Ito ay maaring tumagal ng ilang minuto.</string>
-  <string name="quit_application">Alisan %s</string>
   <string name="refresh">Sariwain</string>
   <string name="replace_barcode">Palitan ang Barcode</string>
   <string name="required_answer_error">Paumanhin, ang tugon na ito ay kailangan!</string>
diff --git a/strings/src/main/res/values-tl/strings.xml b/strings/src/main/res/values-tl/strings.xml
index 9a3a9f37e7f..7e99d33cbc3 100644
--- a/strings/src/main/res/values-tl/strings.xml
+++ b/strings/src/main/res/values-tl/strings.xml
@@ -63,8 +63,6 @@
   <string name="save_enter_data_description">Ikaw ay nasa dulo ng \"%s\".</string>
   <string name="data_saved_error">Paumanhin, nabigo ang pag-impok ng form!</string>
   <string name="data_saved_ok">Matagumpay na inimpok ang Form!</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Alisan %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Impukin ang mga binago</string>
   <string name="saving_form">Ini-impok ang Form</string>
@@ -321,7 +319,6 @@
   <string name="cancel_loading_form">Urong</string>
   <string name="cancel_location">Urong</string>
   <string name="do_not_change">Urong</string>
-  <string name="do_not_exit">Urong</string>
   <string name="success">Tagumpay</string>
   <string name="error_occured">May Maling Nangyari</string>
   <string name="please_wait">Mag-hintay ng ilang sandali.</string>
diff --git a/strings/src/main/res/values-tr/strings.xml b/strings/src/main/res/values-tr/strings.xml
index 9e2c1032fb8..d90d64f3f9d 100644
--- a/strings/src/main/res/values-tr/strings.xml
+++ b/strings/src/main/res/values-tr/strings.xml
@@ -97,8 +97,6 @@
   <string name="send">Gönder</string>
   <string name="data_saved_error">Form kaydedilirken hata oluştu</string>
   <string name="data_saved_ok">From başarılı bir şekilde saklandi</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Çıkış %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">Formu iptal et.</string>
   <string name="discard_changes">Değişiklikleri iptal et</string>
@@ -367,7 +365,6 @@
   <string name="cancel_loading_form">Vazgeç</string>
   <string name="cancel_location">Vazgeç</string>
   <string name="do_not_change">Vazgeç</string>
-  <string name="do_not_exit">Vazgeç</string>
   <string name="success">Başarılı</string>
   <string name="error_occured">Hata Oluştu</string>
   <string name="please_wait">Biraz Bekleyin..</string>
diff --git a/strings/src/main/res/values-uk/strings.xml b/strings/src/main/res/values-uk/strings.xml
index 47795830ffa..8a7fdfd2064 100644
--- a/strings/src/main/res/values-uk/strings.xml
+++ b/strings/src/main/res/values-uk/strings.xml
@@ -99,8 +99,6 @@
   <string name="data_saved_error">Вибачте, не вдалось зберегти анкету!</string>
   <string name="data_saved_ok">Анкету успішно збережено!</string>
   <string name="save_point_error">Помилка при збереженні точки відновлення: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Вийти з %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Зберегти зміни</string>
   <string name="saving_form">Зберігаю анкету</string>
@@ -642,7 +640,6 @@
   <string name="cancel_loading_form">Скасувати</string>
   <string name="cancel_location">Скасувати</string>
   <string name="do_not_change">Скасувати</string>
-  <string name="do_not_exit">Скасувати</string>
   <string name="canceling">Скасування</string>
   <string name="notification_channel_name">Загальні сповіщення</string>
   <string name="success">Успішно!</string>
diff --git a/strings/src/main/res/values-ur-rPK/strings.xml b/strings/src/main/res/values-ur-rPK/strings.xml
index 84c39969b78..5b872c6212b 100644
--- a/strings/src/main/res/values-ur-rPK/strings.xml
+++ b/strings/src/main/res/values-ur-rPK/strings.xml
@@ -69,8 +69,6 @@
   <string name="data_saved_error">معافی, فارم محفوظ نہیں ہوسکا</string>
   <string name="data_saved_ok">فارم کامیابی سے محفوظ کیا گیا</string>
   <string name="save_point_error">ریکوری پوانٹ سیو کرتے وقت خرابی: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">‎%s‏ سے نکل جائیں</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">تبدیلیوں کو محفوظ کریں</string>
   <string name="saving_form">فارم محفوظ ہو رہا ہے</string>
@@ -318,7 +316,6 @@
   <string name="cancel_loading_form">منسوخ</string>
   <string name="cancel_location">منسوخ</string>
   <string name="do_not_change">منسوخ</string>
-  <string name="do_not_exit">منسوخ</string>
   <string name="success">کامیابی</string>
   <string name="error_occured">غلطی ہوگئ</string>
   <string name="please_wait">براہ مہربانی۔ چند منٹ انتظار کرلیں</string>
diff --git a/strings/src/main/res/values-ur/strings.xml b/strings/src/main/res/values-ur/strings.xml
index f3b9be8c96c..e5b7b21d851 100644
--- a/strings/src/main/res/values-ur/strings.xml
+++ b/strings/src/main/res/values-ur/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">معذرت, فارم محفوظ نہیں ہوسکا</string>
   <string name="data_saved_ok">فارم کامیابی سے محفوظ ہو گیا</string>
   <string name="save_point_error">ریکوری پوانٹ سیو کرتے وقت خرابی: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">‎%s‏ سے نکل جائیں</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">فارم کو مسترد کر دیں</string>
   <string name="discard_changes">تبدیلیوں کو مسترد کر دیں</string>
@@ -839,7 +837,6 @@ Constraint processing</string>
   <string name="cancel_loading_form">منسوخ</string>
   <string name="cancel_location">منسوخ</string>
   <string name="do_not_change">منسوخ</string>
-  <string name="do_not_exit">منسوخ</string>
   <string name="canceling">مسنوخ کیا جا رہا ہے </string>
   <string name="notification_channel_name">عمومی نوٹس</string>
   <string name="success">کامیابی</string>
diff --git a/strings/src/main/res/values-vi/strings.xml b/strings/src/main/res/values-vi/strings.xml
index 6d82d6e0a6e..6d6c7fdd652 100644
--- a/strings/src/main/res/values-vi/strings.xml
+++ b/strings/src/main/res/values-vi/strings.xml
@@ -63,8 +63,6 @@
   <string name="data_saved_error">Xin lỗi, biểu mẫu không lưu được!</string>
   <string name="data_saved_ok">Biểu mẫu đã được lưu!</string>
   <string name="save_point_error">Lỗi lưu lại điểm khôi phục: %s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Thoát %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Lưu thay đổi</string>
   <string name="saving_form">Đang lưu biểu mẫu</string>
@@ -325,7 +323,6 @@
   <string name="cancel_loading_form">Huỷ</string>
   <string name="cancel_location">Huỷ</string>
   <string name="do_not_change">Huỷ</string>
-  <string name="do_not_exit">Huỷ</string>
   <string name="success">Thành công</string>
   <string name="error_occured">Lỗi xuất hiện</string>
   <string name="please_wait">Hãy đợi 1 lúc.</string>
diff --git a/strings/src/main/res/values-zh-rTW/strings.xml b/strings/src/main/res/values-zh-rTW/strings.xml
index 9cf1f6162cf..5889cc0ecc5 100644
--- a/strings/src/main/res/values-zh-rTW/strings.xml
+++ b/strings/src/main/res/values-zh-rTW/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">表格儲存失敗!</string>
   <string name="data_saved_ok">表格已成功儲存!</string>
   <string name="save_point_error">錯誤！儲存還原點文件：%s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">退出 %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">放棄表格</string>
   <string name="discard_changes">放棄變更</string>
@@ -849,7 +847,6 @@
   <string name="cancel_loading_form">取消</string>
   <string name="cancel_location">取消</string>
   <string name="do_not_change">取消</string>
-  <string name="do_not_exit">取消</string>
   <string name="canceling">正在取消</string>
   <string name="notification_channel_name">一般通知</string>
   <string name="success">成功</string>
diff --git a/strings/src/main/res/values-zh/strings.xml b/strings/src/main/res/values-zh/strings.xml
index 610158dfaf8..a208a114eac 100644
--- a/strings/src/main/res/values-zh/strings.xml
+++ b/strings/src/main/res/values-zh/strings.xml
@@ -125,8 +125,6 @@
   <string name="data_saved_error">表格保存失败!</string>
   <string name="data_saved_ok">表格已成功保存!</string>
   <string name="save_point_error">错误！保存还原点文件：%s</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">退出 %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="do_not_save">放弃表格</string>
   <string name="discard_changes">放弃变更</string>
@@ -849,7 +847,6 @@
   <string name="cancel_loading_form">取消</string>
   <string name="cancel_location">取消</string>
   <string name="do_not_change">取消</string>
-  <string name="do_not_exit">取消</string>
   <string name="canceling">正在取消</string>
   <string name="notification_channel_name">一般通知</string>
   <string name="success">成功</string>
diff --git a/strings/src/main/res/values-zu/strings.xml b/strings/src/main/res/values-zu/strings.xml
index 67dbc716a8d..23c53a9d741 100644
--- a/strings/src/main/res/values-zu/strings.xml
+++ b/strings/src/main/res/values-zu/strings.xml
@@ -65,8 +65,6 @@
   <string name="save_enter_data_description">Ususekupheleni kuka %s.</string>
   <string name="data_saved_error">Uxolo ifomu alilondolozekanga</string>
   <string name="data_saved_ok">Ifomu lilondolozeke ngempumelelo</string>
-  <!--Dialog title when exiting a drawing view. The name of the kind of drawing will be included-->
-  <string name="quit_application">Phuma %s</string>
   <!--Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="keep_changes">Gcina ushintsho</string>
   <string name="saving_form">Liyagcinwa ifomu</string>
@@ -335,7 +333,6 @@
   <string name="cancel_loading_form">Khansela</string>
   <string name="cancel_location">Khansela</string>
   <string name="do_not_change">Khansela</string>
-  <string name="do_not_exit">Khansela</string>
   <string name="success">Impumelelo</string>
   <string name="error_occured">Iphutha lenzekile</string>
   <string name="please_wait">Sicela ulinde imizuzu emibalwa.</string>
diff --git a/strings/src/main/res/values/strings.xml b/strings/src/main/res/values/strings.xml
index 6b4b0d7ca8c..b5d75f581de 100644
--- a/strings/src/main/res/values/strings.xml
+++ b/strings/src/main/res/values/strings.xml
@@ -156,8 +156,6 @@
     <string name="data_saved_ok">Form successfully saved!</string>
     <string name="save_point_error">Error saving recovery point: %s</string>
 
-    <!-- Dialog title when exiting a drawing view. The name of the kind of drawing will be included -->
-    <string name="quit_application">Exit %s</string>
     <!-- Used when exiting a form filling session in which a form was not properly loaded. &lt; and &gt; surrounds the text so it will appear as <no form loaded> -->
     <string name="do_not_save">Discard Form</string>
     <string name="discard_changes">Discard Changes</string>
@@ -252,7 +250,10 @@
     <string name="annotate_image">Annotate Image</string>
     <string name="gif_not_supported">Gif files are not supported</string>
     <string name="invalid_file_type">Application returned an invalid file type</string>
-    <!-- Dialog heading for saving annotated image -->
+    <!-- Title displayed in a dialog for saving a signature, drawing, or annotated image -->
+    <string name="save_drawing_title">Save changes?</string>
+    <!-- Explanation message displayed in a dialog for saving a signature, drawing, or annotated image -->
+    <string name="save_drawing_explanation">Do you want to save changes before you exit?</string>
     <string name="save_and_close">Save and Close</string>
     <string name="signature_capture">Signature Capture</string>
     <string name="sign_button">Gather Signature</string>
@@ -1044,7 +1045,6 @@
     <string name="cancel_loading_form">Cancel</string>
     <string name="cancel_location">Cancel</string>
     <string name="do_not_change">Cancel</string>
-    <string name="do_not_exit">Cancel</string>
     <string name="canceling">Canceling</string>
 
     <string name="notification_channel_name">General notifications</string>