diff --git a/collect_app/src/main/res/values-af/strings.xml b/collect_app/src/main/res/values-af/strings.xml
index 897138f0608..a1c54181b3f 100644
--- a/collect_app/src/main/res/values-af/strings.xml
+++ b/collect_app/src/main/res/values-af/strings.xml
@@ -256,6 +256,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-am/strings.xml b/collect_app/src/main/res/values-am/strings.xml
index 5bc0e4b2c28..2cb8f3f336f 100644
--- a/collect_app/src/main/res/values-am/strings.xml
+++ b/collect_app/src/main/res/values-am/strings.xml
@@ -216,7 +216,6 @@
   <string name="start">ይጀምሩ</string>
   <string name="enable_gps">GPSን አንቃ</string>
   <string name="clear">አጽዳ</string>
-  <string name="automatic_mode">ራስ-ሰር ሁኔታ</string>
   <string name="discard">አስወግድ</string>
   <string name="geoshape_view_change_location">GeoShapeን ይመልከቱ ወይም ይቀይሩ</string>
   <string name="geotrace_view_change_location">GeoTraceን ይመልከቱ ወይም ይቀይሩ</string>
@@ -228,7 +227,6 @@
   <string name="install_openmapkit">እባክዎ OpenMapKitን ይጫኑ!</string>
   <string name="go_back">ተመለስ</string>
   <string name="download_selected">የተመረጠውን አውርድ</string>
-  <string name="record_geopoint">GeoPointን ይቅዱ</string>
   <string name="selected_answer">ተመርጧል: 1 %s</string>
   <string name="version_number">ሥሪት: 1 %s</string>
   <string name="odk_website">የODKን ድረ ገፅ ይጎብኙ</string>
@@ -269,6 +267,7 @@
   <string name="high_resolution_title">ከፍተኛ ጥራት ቪዲዮ</string>
   <string name="image_size_title">የምስል መጠን</string>
   <string name="sort_by">ቅደምተከተሉ የተስተካከለው</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="search">ፈልግ</string>
   <string name="image_size_large">ትልቅ (3072 ፒክስል)</string>
   <string name="image_size_medium">መካከለኛ (2048 ፒክሰል)</string>
diff --git a/collect_app/src/main/res/values-ar/strings.xml b/collect_app/src/main/res/values-ar/strings.xml
index f741542aa19..80d4a52b37e 100644
--- a/collect_app/src/main/res/values-ar/strings.xml
+++ b/collect_app/src/main/res/values-ar/strings.xml
@@ -326,8 +326,6 @@
   <string name="polygon_validator">يجب توفر 3 نقاط GeoPoint لانشاء Polygon</string>
   <string name="polyline_validator">يجب توفر 2 نقاط لانشاء إحداث Polyline</string>
   <string name="clear">الغاء</string>
-  <string name="manual_mode">الوضع اليدوي</string>
-  <string name="automatic_mode">الوضع الآلي</string>
   <string name="geopoint_instruction">انقر مطولاً لانشاء علامة او انقر على زر إضافة علامة</string>
   <string name="geopoint_no_draggable_instruction">إضافة علامة</string>
   <string name="discard">تجاهل</string>
@@ -349,7 +347,6 @@
   <string name="install_openmapkit">رجاء قم بتحميل OpenMapKit</string>
   <string name="go_back">السابق</string>
   <string name="download_selected">تحميل المحدد</string>
-  <string name="record_geopoint">تسجيل GeoPoint</string>
   <string name="gps_result">خط العرض: %1$s\n خط الطول : %2$s\nالارتفاع : %3$sm\nالدقة : %4$sm</string>
   <string name="parser_exception">محلل الاخطاء \"%s\</string>
   <string name="selected_answer">المحددة %s</string>
@@ -481,9 +478,7 @@
   <string name="invalid_email_address">البريد الالكتروني غير صحيح</string>
   <string name="sort_by">ترتيب حسب</string>
   <string name="server">الخادم</string>
-<!--
-  <string name="submission_transport_admin_setting">نقل التقديم</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">اختر</string>
   <string name="edit_value">غير</string>
   <string name="no_value_selected">لم يتم اختيار قيمة</string>
diff --git a/collect_app/src/main/res/values-bn/strings.xml b/collect_app/src/main/res/values-bn/strings.xml
index 37960cda8c5..3b1a4a3f2fd 100644
--- a/collect_app/src/main/res/values-bn/strings.xml
+++ b/collect_app/src/main/res/values-bn/strings.xml
@@ -200,6 +200,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-ca/strings.xml b/collect_app/src/main/res/values-ca/strings.xml
index 45bc61428cb..32acb843865 100644
--- a/collect_app/src/main/res/values-ca/strings.xml
+++ b/collect_app/src/main/res/values-ca/strings.xml
@@ -299,8 +299,6 @@
   <string name="geo_exit_warning">Descartar canvis i tornar a ODK?</string>
   <string name="polygon_validator">Per crear un polígon calen mínim 3 punts </string>
   <string name="clear">Neteja</string>
-  <string name="manual_mode">Mòdus Manual</string>
-  <string name="automatic_mode">Mòdus Automàtic</string>
   <string name="geopoint_instruction">Prem una estona o toca el botó d\'afegir fita.</string>
   <string name="geopoint_no_draggable_instruction">Toca el botó afegir fita</string>
   <string name="discard">Descarta</string>
@@ -322,7 +320,6 @@
   <string name="install_openmapkit">Si us plau, instal·la OpenMapKit!</string>
   <string name="go_back">Enrera</string>
   <string name="download_selected">Descarrega seleccionat</string>
-  <string name="record_geopoint">Grava posicionament gps</string>
   <string name="gps_result">Latitud: %1$s\nLongitud: %2$s\nAltitud: %3$sm\nPrecisió: %4$sm</string>
   <string name="parser_exception">Exceptio XPathParser: \"%s\"</string>
   <string name="selected_answer">Seleccionat: %s</string>
@@ -371,6 +368,7 @@
   <string name="form_entry_setting">Característiques d\'omplir formulari</string>
   <string name="user_settings">Configuració d\'usuari</string>
   <string name="main_menu_settings">Menú principal de configuració</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-cs/strings.xml b/collect_app/src/main/res/values-cs/strings.xml
index 0b9a6e6156d..dd54fb9d5f1 100644
--- a/collect_app/src/main/res/values-cs/strings.xml
+++ b/collect_app/src/main/res/values-cs/strings.xml
@@ -344,8 +344,6 @@
   <string name="polygon_validator">Musí mít alespoň 3 body pro vytvoření polygonu</string>
   <string name="polyline_validator">Musí mít alespoň 2 body k vytvoření křivky</string>
   <string name="clear">Vymazat</string>
-  <string name="manual_mode">Ruční režim</string>
-  <string name="automatic_mode">Automatický režim</string>
   <string name="geopoint_instruction">Dlouhým stisknutím označit značku nebo klepnutím na tlačítko přidat značku.</string>
   <string name="geopoint_no_draggable_instruction">Klepnutím na tlačítko přidat značku.</string>
   <string name="discard">Vyřadit</string>
@@ -367,7 +365,6 @@
   <string name="install_openmapkit">Prosím nainstalujte OpenMapKit!</string>
   <string name="go_back">Zpět</string>
   <string name="download_selected">Stáhnout vybrané</string>
-  <string name="record_geopoint">Nahrát GeoPoint</string>
   <string name="gps_result">Zeměpisná šířka:%1$s \n Zeměpisná délka: %2$s \n Výška: %3$s m \n Přesnost %4$sm</string>
   <string name="parser_exception">Výjimka XPathParser: \"%s\"</string>
   <string name="selected_answer">Vybráno: %s</string>
@@ -506,9 +503,7 @@
   <string name="invalid_email_address">Neplatná emailová adresa!</string>
   <string name="sort_by">Seřazeno podle</string>
   <string name="server">Server</string>
-<!--
-  <string name="submission_transport_admin_setting">Přenos odeslání</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Vybrat hodnotu</string>
   <string name="edit_value">Upravit hodnotu</string>
   <string name="no_value_selected">Žádná hodnota nebyla vybrána</string>
@@ -645,8 +640,6 @@
   <string name="location_providers_disabled_dialog_message">Tento formulář chce sledovat vaši polohu, ale poskytovatelé polohy jsou zakázáni. Zvolte prosím nastavení v systému Android.</string>
   <string name="go_to_settings">Jít do nastavení</string>
   <string name="track_location">Sledovat polohu</string>
-  <string name="background_location_disabled">Tento formulář chce sledovat vaši polohu, ale sledování je zakázáno. Aktivujte prosím výše uvedené menu %1$s</string>
-  <string name="background_location_enabled">Tento formulář sleduje vaši polohu. V menu %1$s můžete vypnout sledování.</string>
   <string name="open_file">Otevřít soubor</string>
   <string name="read_details">Přečtěte si podrobnosti</string>
 </resources>
diff --git a/collect_app/src/main/res/values-de/strings.xml b/collect_app/src/main/res/values-de/strings.xml
index c667e63dae2..5bc9922fb38 100644
--- a/collect_app/src/main/res/values-de/strings.xml
+++ b/collect_app/src/main/res/values-de/strings.xml
@@ -331,10 +331,12 @@
   <string name="get_shape">GeoShape starten</string>
   <string name="get_trace">GeoTrace starten</string>
   <string name="geoshape_title">GeoShape</string>
+  <string name="input_method">Eingabemethode</string>
   <string name="start">Start</string>
   <string name="enable_gps">GPS aktivieren</string>
   <string name="geotrace_title">GeoTrace</string>
   <string name="polygon_save">Als Polygon speichern</string>
+  <string name="polygon_save_deprecation_warning">(Diese Option wird im nächsten Update entfernt. Schauen Sie unter bit.ly/odk18277 nach Alternativen.)</string>
   <string name="polyline_save">Als Polyline speichern</string>
   <string name="gps_enable_message">GPS ist auf ihrem Gerät deaktiviert. Möchten Sie es aktivieren?</string>
   <string name="select_offline_layer">Offline-Ebene auswählen</string>
@@ -344,8 +346,35 @@
   <string name="polygon_validator">Min. 3 Punkte notwendig um ein Polygon zu erzeugen</string>
   <string name="polyline_validator">Min. 2 Punkte notwendig um eine Polylinie zu erzeugen</string>
   <string name="clear">Löschen</string>
-  <string name="manual_mode">Manueller Modus</string>
-  <string name="automatic_mode">Automatischer Modus</string>
+  <string name="placement_mode">Platzierung durch Tippen</string>
+  <string name="manual_mode">Manuelle Standorterfassung</string>
+  <string name="automatic_mode">Automatische Standorterfassung</string>
+  <string name="recording_interval">Aufzeichnungsintervall:</string>
+  <plurals name="number_of_seconds">
+    <item quantity="one">%d Sekunde</item>
+    <item quantity="other">%d Sekunden</item>
+  </plurals>
+  <plurals name="number_of_minutes">
+    <item quantity="one">%d Minute</item>
+    <item quantity="other">%d Minuten</item>
+  </plurals>
+  <string name="accuracy_requirement">Genauigkeitsanforderung:</string>
+  <string name="none">Keine</string>
+  <plurals name="number_of_meters">
+    <item quantity="one">%d Meter</item>
+    <item quantity="other">%d Meter</item>
+  </plurals>
+  <string name="location_status_searching">Suche nach GPS-Position, bitte warten…</string>
+  <string name="location_status_accuracy">GPS Ortungsgenauigkeit: %.1f m</string>
+  <string name="location_status_acceptable">GPS Ortungsgenauigkeit: %.1f m (akzeptabel)</string>
+  <string name="location_status_unacceptable">GPS Ortungsgenauigkeit: %.1f m (inakzeptabel)</string>
+  <string name="collection_status_paused">erfasste Punkte: %d</string>
+  <string name="collection_status_placement">erfasste Punkte: %d (tippen zum Platzieren von Punkten)</string>
+  <string name="collection_status_manual">erfasste Punkte: %d (manuelle Standorterfassung)</string>
+  <string name="collection_status_auto_seconds">erfasste Punkte: %1$d (automatische Erfassung alle %2$d s)</string>
+  <string name="collection_status_auto_minutes">erfasste Punkte: %1$d (automatische Erfassung alle %2$d min)</string>
+  <string name="collection_status_auto_seconds_accuracy">erfasste Punkte: %1$d (automatische Erfassung alle%2$d s, Genauigkeit %3$d m)</string>
+  <string name="collection_status_auto_minutes_accuracy">erfasste Punkte: %1$d (automatische Erfassung alle %2$d min, Genauigkeit %3$d m)</string>
   <string name="geopoint_instruction">Lange Drücken um eine Markierung zu platzieren oder Button Markierung hinzufügen antippen.</string>
   <string name="geopoint_no_draggable_instruction">Button Markierung hinzufügen antippen.</string>
   <string name="discard">Verwerfen</string>
@@ -367,7 +396,7 @@
   <string name="install_openmapkit">Bitte OpenMapKit installieren!</string>
   <string name="go_back">Zurück</string>
   <string name="download_selected">Auswahl herunterladen</string>
-  <string name="record_geopoint">Standort erfassen</string>
+  <string name="record_geopoint">Punkt erfassen</string>
   <string name="gps_result">Breite (Lat.): %1$s\nLänge (Long.): %2$s\nHöhe (Alt.): %3$sm\nGenauigkeit: %4$sm</string>
   <string name="parser_exception">XPathParser Exception: \"%s\"</string>
   <string name="selected_answer">Ausgewählt: %s</string>
@@ -506,9 +535,7 @@
   <string name="invalid_email_address">Ungültige E-Mail-Adresse!</string>
   <string name="sort_by">Sortieren nach</string>
   <string name="server">Server</string>
-<!--
-  <string name="submission_transport_admin_setting">Einsendungsübertragung</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Wert auswählen</string>
   <string name="edit_value">Wert bearbeiten</string>
   <string name="no_value_selected">Kein Wert ausgewählt</string>
@@ -646,7 +673,10 @@
   <string name="background_location_disabled">Dieses Formular möchte ihren Standort aufzeichnen aber die Standortaufzeichnung ist deaktiviert. Bitte oben im %1$s Menü aktivieren.</string>
   <string name="background_location_enabled">Dieses Formular zeichnet Ihren Standort auf. Sie können die Standortaufzeichnung oben im %1$s Menü deaktivieren.</string>
   <string name="open_file">Datei öffnen</string>
+  <string name="sms_feature_disabled_dialog_title">SMS-Versand deaktiviert</string>
+  <string name="sms_feature_disabled_dialog_message">Der Versand von Einsendungen per SMS wurde wegen Google Play-Store-Bestimmungen deaktiviert.\n\nBitte stellen sicher, dass die Person, die dieses Gerät konfiguriert hat, die untenstehenden Details liest und entsprechend handelt. </string>
   <string name="read_details">Details lesen</string>
   <string name="google_sheets_encrypted_message">Verschlüsselte Formulare können nicht an Google Sheets gesendet werden.</string>
   <string name="number_picker_title">Zahlenwähler</string>
+  <string name="reading_files">Lese Dateien</string>
 </resources>
diff --git a/collect_app/src/main/res/values-es/strings.xml b/collect_app/src/main/res/values-es/strings.xml
index 3487aaffb74..d9ff6b1d870 100644
--- a/collect_app/src/main/res/values-es/strings.xml
+++ b/collect_app/src/main/res/values-es/strings.xml
@@ -333,10 +333,12 @@
   <string name="get_shape">Iniciar GeoArea</string>
   <string name="get_trace">Iniciar GeoLínea</string>
   <string name="geoshape_title">GeoArea</string>
+  <string name="input_method">Método de ingreso</string>
   <string name="start">Iniciar</string>
   <string name="enable_gps">Activar el GPS</string>
   <string name="geotrace_title">GeoLínea</string>
   <string name="polygon_save">Guardar como polígono</string>
+  <string name="polygon_save_deprecation_warning">(Esta opción será removida en la próxima actualización. Ver bit.ly/odk18277 para alternativas.)</string>
   <string name="polyline_save">Guardar como Polilínea</string>
   <string name="gps_enable_message">GPS esta deshabilitado. ¿Activar?</string>
   <string name="select_offline_layer">Seleccione la capa sin conexión</string>
@@ -346,8 +348,35 @@
   <string name="polygon_validator">Debe tener al menos 3 puntos para crear un polígono</string>
   <string name="polyline_validator">Deben existir al menos 2 puntos para crear una Polilínea</string>
   <string name="clear">Limpiar</string>
-  <string name="manual_mode">Modo Manual</string>
-  <string name="automatic_mode">Modo Automático </string>
+  <string name="placement_mode">Ubicación con toque</string>
+  <string name="manual_mode">Registro de ubicación manual</string>
+  <string name="automatic_mode">Registro de localización automática</string>
+  <string name="recording_interval">Intervalo de registro:</string>
+  <plurals name="number_of_seconds">
+    <item quantity="one">%d segundo</item>
+    <item quantity="other">%d segundos</item>
+  </plurals>
+  <plurals name="number_of_minutes">
+    <item quantity="one">%d minuto</item>
+    <item quantity="other">%d minutos</item>
+  </plurals>
+  <string name="accuracy_requirement">Requisito de precisión</string>
+  <string name="none">Ninguno</string>
+  <plurals name="number_of_meters">
+    <item quantity="one">%d metro</item>
+    <item quantity="other">%d metros</item>
+  </plurals>
+  <string name="location_status_searching">Buscando ubicación GPS, por favor espere …</string>
+  <string name="location_status_accuracy">Precisión GPS: %.1f m</string>
+  <string name="location_status_acceptable">Precisión GPS: %.1f m (aceptable)</string>
+  <string name="location_status_unacceptable">Precisión GPS: %.1f m (inaceptable)</string>
+  <string name="collection_status_paused">Puntos ingresados: %d</string>
+  <string name="collection_status_placement">Puntos ingresados: %d (toque para ublicar puntos)</string>
+  <string name="collection_status_manual">Puntos ingresados: %d (registro manual)</string>
+  <string name="collection_status_auto_seconds">Puntos ingresados: %1$d (registrando cada %2$d seg)</string>
+  <string name="collection_status_auto_minutes">Puntos ingresados: %1$d (registrando cada %2$d min)</string>
+  <string name="collection_status_auto_seconds_accuracy">Puntos ingresados:: %1$d (registrando cada %2$d seg, precisión %3$d m)</string>
+  <string name="collection_status_auto_minutes_accuracy">Puntos ingresados: %1$d (registrando cada %2$d min, precisión %3$d m)</string>
   <string name="geopoint_instruction">Pulsar prolongadamente para colocar la marca o tocar el botón marcador.</string>
   <string name="geopoint_no_draggable_instruction">Tap botón de agregar marker</string>
   <string name="discard">Descartar</string>
@@ -369,7 +398,7 @@
   <string name="install_openmapkit">Por favor instalar OpenMapKit!</string>
   <string name="go_back">Regresa</string>
   <string name="download_selected">Descarga Seleccionada</string>
-  <string name="record_geopoint">Grabar GeoPoint</string>
+  <string name="record_geopoint">Registrando un punto</string>
   <string name="gps_result">Latitud: %1$s\nLongitud: %2$s\nAltitud: %3$sm\nPrecisión: %4$sm</string>
   <string name="parser_exception">Excepción XPathParser: \"%s\"</string>
   <string name="selected_answer">Seleccionado: %s</string>
@@ -508,9 +537,7 @@
   <string name="invalid_email_address">Email inválido</string>
   <string name="sort_by">Ordenar por</string>
   <string name="server">Servidor</string>
-<!--
-  <string name="submission_transport_admin_setting">Transporte de Envío</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Seleccionar valor</string>
   <string name="edit_value">Editar valor</string>
   <string name="no_value_selected">Ningún valor seleccionado</string>
@@ -645,12 +672,14 @@
   <string name="location_providers_disabled_dialog_message">Este formulario quiere rastrear su ubicación pero los proveedores de ubicación están deshabilitados Por favor, habilite en la configuración de Android.</string>
   <string name="go_to_settings">Ir a ajustes</string>
   <string name="track_location">Rastrear ubicación</string>
-  <string name="background_location_disabled">Este formulario quiere rastrear su ubicación pero el seguimiento está deshabilitado. Por favor habilite en el %1$s menú arriba.</string>
-  <string name="background_location_enabled">Este formulario rastrea tu ubicación. Puede deshabilitar el seguimiento en la %1$s menú arriba.</string>
+  <string name="background_location_disabled">Este formulario requiere registrar su localización, pero el rastreo esta deshabilitado. Favor habilitar en el menú de arriba %1$s .</string>
+  <string name="background_location_enabled">Este formulario registra su localización. Puede deshabilitar el rastreo en el menú de arriba %1$s.</string>
   <string name="open_file">Abrir archivo</string>
   <string name="sms_feature_disabled_dialog_title">Envíos via SMS Deshabilitado</string>
   <string name="sms_feature_disabled_dialog_message">Envio de datos via SMS  se ha deshabilitado por restricciones de Google Play Store .\n\nPor favor asegúrese que la persona que configuró el dispositivo lea los detalles abajo y tome la acción que corresponda.</string>
   <string name="read_details">Leer detalles</string>
   <string name="google_sheets_encrypted_message">Los formularios encriptados no pueden ser enviados a Google Sheets</string>
   <string name="number_picker_title">Selector de números</string>
+  <string name="too_complex_form">Este formulario es muy complejo para este dispositivo. Intente simplificar las expresiones o busque ayuda en el Foro.</string>
+  <string name="reading_files">Leyendo archivos</string>
 </resources>
diff --git a/collect_app/src/main/res/values-et/strings.xml b/collect_app/src/main/res/values-et/strings.xml
index a8d2d766845..56bbc21a110 100644
--- a/collect_app/src/main/res/values-et/strings.xml
+++ b/collect_app/src/main/res/values-et/strings.xml
@@ -303,8 +303,6 @@
   <string name="geo_exit_warning">Loobu muudatustest ja ava ODK?</string>
   <string name="polygon_validator">Polügooni loomiseks on vaja vähemalt 3 punkti</string>
   <string name="clear">Eemalda</string>
-  <string name="manual_mode">Käsitsi sisestusviis</string>
-  <string name="automatic_mode">Automaatne sisestusviis</string>
   <string name="geopoint_instruction">Markeri paigutamiseks tuleb teha pikk hoidmine või valida marker nupp.</string>
   <string name="geopoint_no_draggable_instruction">Puuduta lisa marke nuppu.</string>
   <string name="discard">Loobu</string>
@@ -326,7 +324,6 @@
   <string name="install_openmapkit">Palun paigaldage OpenMapKit!</string>
   <string name="go_back">Liikuge tagasi</string>
   <string name="download_selected">Allalaadimine valitud</string>
-  <string name="record_geopoint">Salvesta asukohapunkt</string>
   <string name="gps_result">Laiuskraad: %1$s\nPikkuskraad: %2$s\nKõrgus: %3$sm\nTäpsusaste: %4$sm</string>
   <string name="parser_exception">XPathParser Viga: \"%s\"</string>
   <string name="selected_answer">Valitud: %s</string>
@@ -372,6 +369,7 @@
   <string name="encrypted_form">Krüptitud vorm</string>
   <string name="deleted_form">Kustutatud vorm</string>
   <string name="exit">Välju</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-fa/strings.xml b/collect_app/src/main/res/values-fa/strings.xml
index e2a9eca3790..c1b5d6ad518 100644
--- a/collect_app/src/main/res/values-fa/strings.xml
+++ b/collect_app/src/main/res/values-fa/strings.xml
@@ -34,6 +34,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-fi/strings.xml b/collect_app/src/main/res/values-fi/strings.xml
index 96e1a7fba4c..f53a163f9ac 100644
--- a/collect_app/src/main/res/values-fi/strings.xml
+++ b/collect_app/src/main/res/values-fi/strings.xml
@@ -331,10 +331,12 @@
   <string name="get_shape">Aloita GeoShape</string>
   <string name="get_trace">Aloita GeoTrace</string>
   <string name="geoshape_title">GeoShape</string>
+  <string name="input_method">Syöttötapa</string>
   <string name="start">Aloita</string>
   <string name="enable_gps">Ota GPS käyttöön</string>
   <string name="geotrace_title">GeoTrace</string>
   <string name="polygon_save">Tallenna monikulmiona - Polygon</string>
+  <string name="polygon_save_deprecation_warning">(Tämä vaihtoehto tullaan poistamaan seuraavassa päivityksessä. Katso vaihtoehdot: bit.ly/odk18277) </string>
   <string name="polyline_save">Tallenna murtoviivana - Polyline</string>
   <string name="gps_enable_message">GPS on poistettu käytöstä laitteellasi. Haluaisitko ottaa sen käyttöön?</string>
   <string name="select_offline_layer">Valitse Offline-taso</string>
@@ -344,8 +346,35 @@
   <string name="polygon_validator">Monikulmion luomiseen tarvitaan vähintään 3 pistettä</string>
   <string name="polyline_validator">Polyline-kuvion luomiseen tarvitaan vähintään 2 pistettä</string>
   <string name="clear">Tyhjennä</string>
-  <string name="manual_mode">Manuaalinen tila</string>
-  <string name="automatic_mode">Automaattinen tila</string>
+  <string name="placement_mode">Sijoittaminen napsauttamalla</string>
+  <string name="manual_mode">Manuaalinen sijainnin tallennus</string>
+  <string name="automatic_mode">Automaattinen sijainnin tallennus</string>
+  <string name="recording_interval">Tallennusväli:</string>
+  <plurals name="number_of_seconds">
+    <item quantity="one">%d sekunti</item>
+    <item quantity="other">%d sekuntia</item>
+  </plurals>
+  <plurals name="number_of_minutes">
+    <item quantity="one">%d minuutti</item>
+    <item quantity="other">%d minuuttia</item>
+  </plurals>
+  <string name="accuracy_requirement">Tarkkuusvaatimus:</string>
+  <string name="none">Ei mitään</string>
+  <plurals name="number_of_meters">
+    <item quantity="one">%d metri</item>
+    <item quantity="other">%d metriä</item>
+  </plurals>
+  <string name="location_status_searching">Etsitään GPS-sijaintia, ole hyvä ja odota…</string>
+  <string name="location_status_accuracy">GPS-sijaintitarkkuus: %.1f m</string>
+  <string name="location_status_acceptable">GPS-sijaintitarkkuus: %.1f m (hyväksyttävä)</string>
+  <string name="location_status_unacceptable">GPS-sijaintitarkkuus: %.1f m (ei hyväksyttävä)</string>
+  <string name="collection_status_paused">Syötettyjä pisteitä: %d</string>
+  <string name="collection_status_placement">Syötettyjä pisteitä: %d (napsauta sijoittaaksesi pisteitä)</string>
+  <string name="collection_status_manual">Syötettyjä pisteitä: %d (manuaalinen tallennus)</string>
+  <string name="collection_status_auto_seconds">Syötettyjä pisteitä: %1$d (tallennus joka %2$d s)</string>
+  <string name="collection_status_auto_minutes">Tallennettuja pisteitä: %1$d (tallennus joka %2$d min)</string>
+  <string name="collection_status_auto_seconds_accuracy">Tallennettuja pisteitä: %1$d (tallennus joka %2$d s, tarkkuus %3$d m)</string>
+  <string name="collection_status_auto_minutes_accuracy">Tallennettuja pisteitä: %1$d (tallennus joka %2$d min, tarkkuus %3$d m)</string>
   <string name="geopoint_instruction">Paina pitkään asettaaksesi merkin tai näpäytä merkkinäppäintä.</string>
   <string name="geopoint_no_draggable_instruction">Paina lisää merkki -näppäintä.</string>
   <string name="discard">Hylkää</string>
@@ -367,7 +396,7 @@
   <string name="install_openmapkit">Ole hyvä ja asenna OpenMapKit!</string>
   <string name="go_back">Palaa</string>
   <string name="download_selected">Lataaminen valittu</string>
-  <string name="record_geopoint">Tallenna GeoPoint-koordinaatit</string>
+  <string name="record_geopoint">Tallenna piste</string>
   <string name="gps_result">Leveysasteet: %1$s\nPituusasteet: %2$s\nKorkeus: %3$sm\nTarkkuus: %4$sm</string>
   <string name="parser_exception">XPathParser-virhe: \"%s\"</string>
   <string name="selected_answer">Valittu: %s</string>
@@ -506,9 +535,7 @@
   <string name="invalid_email_address">Virheellinen sähköpostiosoite!</string>
   <string name="sort_by">Lajitteluperuste</string>
   <string name="server">Palvelin</string>
-<!--
-  <string name="submission_transport_admin_setting">Lähetyksen välitys</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Valitse arvo</string>
   <string name="edit_value">Muokkaa arvoa</string>
   <string name="no_value_selected">Ei valittua arvoa</string>
@@ -643,8 +670,14 @@
   <string name="location_providers_disabled_dialog_message">Tämä lomake haluaa seurata sijaintiasi mutta sijaintipalvelut (location providers) eivät ole käytettävissä. Ole hyvä ja aktivoi ne Androidin asetuksissa.</string>
   <string name="go_to_settings">Asetuksiin</string>
   <string name="track_location">Sijainnin jäljittäminen</string>
-  <string name="background_location_disabled">Tämä lomake haluaa jäljittää sijaintiasi, mutta jäljittäminen on kytketty pois päältä. Ole hyvä ja aktivoi se valikossa %1$s yllä.</string>
-  <string name="background_location_enabled">Tämä lomake jäljittää sijaintiasi. Voit kytkeä jäljittämisen pois päältä valikossa %1$s yllä.</string>
+  <string name="background_location_disabled">Tämä lomake haluaa seurata sijaintiasi, mutta seuranta on poissa päältä. Ole hyvä ja laita se päälle valikossa %1$s yllä.</string>
+  <string name="background_location_enabled">Tämä lomake seuraa sijaintiasi. Voit laittaa seurannan pois päältä valikossa %1$s yllä.</string>
   <string name="open_file">Avaa tiedosto</string>
+  <string name="sms_feature_disabled_dialog_title">SMS-lähetys poissa päältä</string>
+  <string name="sms_feature_disabled_dialog_message">SMS-lähetykset poissa päältä Google Play Kaupan rajoitusten takia.\n\nOle hyvä ja varmista, että tämän laitteen asetukset tehnyt henkilö lukee yksityiskohdat alla ja ryhtyy toimenpiteisiin.</string>
   <string name="read_details">Lue yksityiskohdat</string>
+  <string name="google_sheets_encrypted_message">Salattuja lomakkeita ei voi lähettää Google Sheets -palveluun.</string>
+  <string name="number_picker_title">Numerovalitsin</string>
+  <string name="too_complex_form">Tämä lomake on liian monimutkainen tälle laitteelle. Yritä lausekkeiden yksinkertaistamista tai pyydä apua verkon keskusteluryhmästä.</string>
+  <string name="reading_files">Luetaan tiedostoja</string>
 </resources>
diff --git a/collect_app/src/main/res/values-fr/strings.xml b/collect_app/src/main/res/values-fr/strings.xml
index 344425c5776..03c3fe374ea 100644
--- a/collect_app/src/main/res/values-fr/strings.xml
+++ b/collect_app/src/main/res/values-fr/strings.xml
@@ -344,8 +344,6 @@
   <string name="polygon_validator">3 points minimum sont nécessaires pour créer un Polygone</string>
   <string name="polyline_validator">Il faut au moins 2 points pour créer une ligne</string>
   <string name="clear">Effacer</string>
-  <string name="manual_mode">Mode Manuel</string>
-  <string name="automatic_mode">Mode Automatique</string>
   <string name="geopoint_instruction">Appuyez longuement sur la carte pour placer un marqueur ou appuyez sur le bouton \"ajouter un marqueur\".</string>
   <string name="geopoint_no_draggable_instruction">Appuyez sur le bouton \"ajouter un marqueur\".</string>
   <string name="discard">Annuler</string>
@@ -367,7 +365,6 @@
   <string name="install_openmapkit">Veuillez installer OpenMapKit.</string>
   <string name="go_back">Retour</string>
   <string name="download_selected">Télécharger la sélection</string>
-  <string name="record_geopoint">Enregistrer un GeoPoint</string>
   <string name="gps_result">Latitude: %1$s\nLongitude: %2$s\nAltitude: %3$sm\nPrécision: %4$sm</string>
   <string name="parser_exception">Exception XPathParser: \\"%s\\"</string>
   <string name="selected_answer">Sélectionné: %s</string>
@@ -506,6 +503,7 @@
   <string name="invalid_email_address">Adresse mail invalide!</string>
   <string name="sort_by">Trier par</string>
   <string name="server">Serveur</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Choisir valeur</string>
   <string name="edit_value">Modifier valeur</string>
   <string name="no_value_selected">Aucune valeur choisie</string>
diff --git a/collect_app/src/main/res/values-hi/strings.xml b/collect_app/src/main/res/values-hi/strings.xml
index f99a6e140f5..022c1ab20bb 100644
--- a/collect_app/src/main/res/values-hi/strings.xml
+++ b/collect_app/src/main/res/values-hi/strings.xml
@@ -316,8 +316,6 @@
   <string name="geo_exit_warning">परिवर्तनों को रद्द करें और वापस ODK पर लौटें?</string>
   <string name="polygon_validator">बहुभुज बनाने के लिए कम से कम 3 पॉइंट होने चाहिए</string>
   <string name="clear">स्पष्ट</string>
-  <string name="manual_mode">मैन्युअल मोड</string>
-  <string name="automatic_mode">स्वचालित मोड</string>
   <string name="geopoint_instruction">प्लेस मार्क के लिए लंबे समय तक दबाएं या मार्कर बटन जोड़ने के लिए टैप करें।</string>
   <string name="geopoint_no_draggable_instruction">मार्कर बटन जोड़ें पर टैप करें</string>
   <string name="discard">छोड़ दें </string>
@@ -339,7 +337,6 @@
   <string name="install_openmapkit">कृपया ओपेन मैप किट  इनस्टॉल करें!</string>
   <string name="go_back">वापस जायें</string>
   <string name="download_selected">डाउनलोड चयनित</string>
-  <string name="record_geopoint">रिकॉर्ड जिओपॉइंट</string>
   <string name="gps_result">अक्षांश: %1$s \n देशांतर: %2$s \n ऊंचाई: %3$sm \n शुद्धता: %4$sm</string>
   <string name="parser_exception">XPathParser अपवाद:\"%s\"</string>
   <string name="selected_answer">चयनित :%s</string>
@@ -463,6 +460,7 @@
   <string name="form_entry">फॉर्म एंट्री से छुपाने के लिए चेक हटायें</string>
   <string name="use_device_language">डिवाइस की भाषा प्रयोग करें </string>
   <string name="not_supported_offline_layer_format">चयनित ऑफलाइन लेयर फाइल PBF फॉर्मेट उपयोग करती है जो कि समर्थित नहीं है! </string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="search">खोज</string>
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="moving_backwards_title">पीछे की ओर बढ़ रहा है</string>
diff --git a/collect_app/src/main/res/values-in/strings.xml b/collect_app/src/main/res/values-in/strings.xml
index acd9c04684c..db16fb3ffe7 100644
--- a/collect_app/src/main/res/values-in/strings.xml
+++ b/collect_app/src/main/res/values-in/strings.xml
@@ -344,8 +344,6 @@
   <string name="polygon_validator">Minimal harus memiliki 3 poin untuk membuat Polygon</string>
   <string name="polyline_validator">Dibutuhkan setidaknya 2 buah titik untuk membuat garis</string>
   <string name="clear">Hapus</string>
-  <string name="manual_mode">Mode manual</string>
-  <string name="automatic_mode">Mode otomatis</string>
   <string name="geopoint_instruction">tekan yang lama untuk menandai atau tap tombol tambah marker.</string>
   <string name="geopoint_no_draggable_instruction">Tap tombol tambah marker</string>
   <string name="discard">Buang</string>
@@ -367,7 +365,6 @@
   <string name="install_openmapkit">Silahkan pasang OpenMapKit!</string>
   <string name="go_back">Balik</string>
   <string name="download_selected">Unduh pilihan</string>
-  <string name="record_geopoint">Catat GeoPoint</string>
   <string name="gps_result">Lintang: %1$s\nBujur: %2$s\nKetinggian: %3$sm\nAkurasi: %4$sm</string>
   <string name="parser_exception">XPathParser Kesalahan: \"%s\"</string>
   <string name="selected_answer">Terpilih: %s</string>
@@ -506,9 +503,7 @@
   <string name="invalid_email_address">Alamat email tidak valid</string>
   <string name="sort_by">Urutkan dengan</string>
   <string name="server">Server</string>
-<!--
-  <string name="submission_transport_admin_setting">Pengiriman</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Pilih nilai</string>
   <string name="edit_value">Sunting nilai</string>
   <string name="no_value_selected">Tidak ada nilai terpilih</string>
@@ -642,7 +637,5 @@
   <string name="location_providers_disabled_dialog_message">Formulir ini ingin merekam pergerakan lokasi anda tapi pengaturan lokasi tidak aktif. Silahkan aktiftan terlebih dahulu.</string>
   <string name="go_to_settings">Pergi ke pengaturan</string>
   <string name="track_location">Rekam pergerakan lokasi</string>
-  <string name="background_location_disabled">Formulir ini ingin merekam pergerakan lokasi anda tapi perekaman lokasi tidak aktif. Silahkan aktifkan di %1$s menu di atas.</string>
-  <string name="background_location_enabled">Formulir ini ingin merekam pergerakan lokasi anda. Anda dapat menonaktifkan perekaman di %1$s menu di atas.</string>
   <string name="open_file">Buka berkas</string>
 </resources>
diff --git a/collect_app/src/main/res/values-it/strings.xml b/collect_app/src/main/res/values-it/strings.xml
index d892ce40049..ae528d92977 100644
--- a/collect_app/src/main/res/values-it/strings.xml
+++ b/collect_app/src/main/res/values-it/strings.xml
@@ -333,8 +333,6 @@
   <string name="geo_exit_warning">Vuoi scartare le modifiche e ritornare ad ODK?</string>
   <string name="polygon_validator">Devi avere almeno 3 punti per creare un Poligono</string>
   <string name="clear">Cancella</string>
-  <string name="manual_mode">Modalità manuale</string>
-  <string name="automatic_mode">Modalità automatica</string>
   <string name="geopoint_instruction">Premi a lungo per posizionare il segno altrimenti tocca su Aggiungi Posizione.</string>
   <string name="geopoint_no_draggable_instruction">Tocca Aggiungi Posizione.</string>
   <string name="discard">Annulla</string>
@@ -356,7 +354,6 @@
   <string name="install_openmapkit">Per favore installare OpenMapKit!</string>
   <string name="go_back">Torna indietro</string>
   <string name="download_selected">Selezionato il download</string>
-  <string name="record_geopoint">Registrare Coordinate</string>
   <string name="gps_result">Latitudine: %1$s\nLongitudine: %2$s\nAltitudine: %3$sm\nPrecisione: %4$sm</string>
   <string name="parser_exception">Eccezione XPathParser: \"%s\"</string>
   <string name="selected_answer">Selezionato: %s</string>
@@ -445,6 +442,7 @@
   <string name="guidance_no">No</string>
   <string name="server_settings_title">Server</string>
   <string name="server">Server</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="custom_date">%1$s (%2$s)</string>
   <string name="moving_backwards_title">Sfoglia indietro</string>
diff --git a/collect_app/src/main/res/values-ja/strings.xml b/collect_app/src/main/res/values-ja/strings.xml
index 59ed5d15dc3..509ebc085c0 100644
--- a/collect_app/src/main/res/values-ja/strings.xml
+++ b/collect_app/src/main/res/values-ja/strings.xml
@@ -331,10 +331,12 @@
   <string name="get_shape">GeoShape を開始</string>
   <string name="get_trace">GeoTrace を開始</string>
   <string name="geoshape_title">GeoShape</string>
+  <string name="input_method">入力方法</string>
   <string name="start">開始</string>
   <string name="enable_gps">GPS を有効にする</string>
   <string name="geotrace_title">GeoTrace</string>
   <string name="polygon_save">ポリゴンとして保存</string>
+  <string name="polygon_save_deprecation_warning">(このオプションは次の更新で削除されます。 代わりに bit.ly/odk18277 を参照してください。)</string>
   <string name="polyline_save">ポリラインとして保存</string>
   <string name="gps_enable_message">お使いのデバイスで GPS は無効になっています。有効にしますか?</string>
   <string name="select_offline_layer">オフライン レイヤーを選択</string>
@@ -344,8 +346,32 @@
   <string name="polygon_validator">ポリゴンを作成するには、少なくとも 3 点指定する必要があります</string>
   <string name="polyline_validator">ポリラインを作成するには、少なくとも2点指定する必要があります</string>
   <string name="clear">クリア</string>
-  <string name="manual_mode">手動モード</string>
-  <string name="automatic_mode">自動モード</string>
+  <string name="placement_mode">タップによる配置</string>
+  <string name="manual_mode">手動位置記録</string>
+  <string name="automatic_mode">自動位置記録</string>
+  <string name="recording_interval">記録間隔:</string>
+  <plurals name="number_of_seconds">
+    <item quantity="other">%d 秒</item>
+  </plurals>
+  <plurals name="number_of_minutes">
+    <item quantity="other">%d 分</item>
+  </plurals>
+  <string name="accuracy_requirement">精度要件:</string>
+  <string name="none">なし</string>
+  <plurals name="number_of_meters">
+    <item quantity="other">%d メートル</item>
+  </plurals>
+  <string name="location_status_searching">GPS の位置を検索しています、しばらくお待ちください…</string>
+  <string name="location_status_accuracy">GPS 位置精度: %.1f m</string>
+  <string name="location_status_acceptable">GPS位置精度: %.1f m (許容)</string>
+  <string name="location_status_unacceptable">GPS位置精度: %.1f m (許容不可)</string>
+  <string name="collection_status_paused">入力された位置: %d</string>
+  <string name="collection_status_placement">入力された位置: %d (タップして位置を配置)</string>
+  <string name="collection_status_manual">入力された位置: %d (手動記録)</string>
+  <string name="collection_status_auto_seconds">入力された位置: %1$d (%2$d 秒ごとに記録)</string>
+  <string name="collection_status_auto_minutes">入力された位置: %1$d (%2$d 分ごとに記録)</string>
+  <string name="collection_status_auto_seconds_accuracy">入力された位置: %1$d (%2$d 秒ごとに記録。精度 %3$d m)</string>
+  <string name="collection_status_auto_minutes_accuracy">入力された位置: %1$d (%2$d 分ごとに記録。精度 %3$d m)</string>
   <string name="geopoint_instruction">長押ししてマークするか、マーカーを追加ボタンをタップしてください。</string>
   <string name="geopoint_no_draggable_instruction">マーカーを追加ボタンをタップします。</string>
   <string name="discard">破棄</string>
@@ -367,7 +393,7 @@
   <string name="install_openmapkit">OpenMapKit をインストールしてください!</string>
   <string name="go_back">戻る</string>
   <string name="download_selected">選択済をダウンロード</string>
-  <string name="record_geopoint">地理位置を記録</string>
+  <string name="record_geopoint">位置を記録</string>
   <string name="gps_result">緯度: %1$s\n経度: %2$s\n高度: %3$sm\n精度: %4$sm</string>
   <string name="parser_exception">XPathParser 例外: \"%s\"</string>
   <string name="selected_answer">選択済: %s</string>
@@ -506,9 +532,7 @@
   <string name="invalid_email_address">メールアドレスが無効です!</string>
   <string name="sort_by">並び順</string>
   <string name="server">サーバー</string>
-<!--
-  <string name="submission_transport_admin_setting">送信トランスポート</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">値を選択</string>
   <string name="edit_value">値を編集</string>
   <string name="no_value_selected">値が選択されていません</string>
@@ -645,7 +669,10 @@
   <string name="background_location_disabled">このフォームは位置を追跡しようとしますが、追跡が無効になっています。 上の %1$s メニューで有効にしてください。</string>
   <string name="background_location_enabled">このフォームは位置を追跡します。 上の %1$s メニューで追跡を無効にすることができます。</string>
   <string name="open_file">ファイルを開く</string>
+  <string name="sms_feature_disabled_dialog_title">SMS 経由の送信は無効です</string>
+  <string name="sms_feature_disabled_dialog_message">Google Play ストアの制限により、SMS による送信は無効になっています。\n\nこのデバイスを設定する人が、以下の詳細を読んで対処してください。</string>
   <string name="read_details">詳細を読む</string>
   <string name="google_sheets_encrypted_message">暗号化されたフォームは Google スプレッドに送信できません。</string>
   <string name="number_picker_title">数値選択</string>
+  <string name="reading_files">ファイルを読み込んでいます</string>
 </resources>
diff --git a/collect_app/src/main/res/values-ka/strings.xml b/collect_app/src/main/res/values-ka/strings.xml
index b22533c901d..720fb79b97b 100644
--- a/collect_app/src/main/res/values-ka/strings.xml
+++ b/collect_app/src/main/res/values-ka/strings.xml
@@ -225,6 +225,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-km/strings.xml b/collect_app/src/main/res/values-km/strings.xml
index 5ae53cad588..d6e264aa6c8 100644
--- a/collect_app/src/main/res/values-km/strings.xml
+++ b/collect_app/src/main/res/values-km/strings.xml
@@ -333,8 +333,6 @@
   <string name="geo_exit_warning">បោះបង់​ការផ្លាស់​ប្តូរ និងត្រឡប់ទៅកាន់ ODK វិញ?</string>
   <string name="polygon_validator">ត្រូវការចំនុចយ៉ាងតិច 3 ដើម្បី​បង្កើតពហុកោណ</string>
   <string name="clear">លុ​បចេញ</string>
-  <string name="manual_mode">របៀបធ្វើដោយដៃ</string>
-  <string name="automatic_mode">របៀបធ្វើដោយស័្វយប្រវត្តិ</string>
   <string name="geopoint_instruction">ចុចយូរដើម្បីដាក់ស្លាកកន្លែង ឬប៉ះប៊ូតុងបន្ថែមស្លាក</string>
   <string name="geopoint_no_draggable_instruction">ប៉ះដើម្បីបន្ថែមប៊ូតុងសម្គាល់</string>
   <string name="discard">បោះបង់</string>
@@ -356,7 +354,6 @@
   <string name="install_openmapkit">សូមចុចដើម្បីដំឡើង OpenMapKit!</string>
   <string name="go_back">ត្រឡប់ក្រោយ</string>
   <string name="download_selected">ទាញយកនូវជំរើស</string>
-  <string name="record_geopoint">ថត GeoPoint</string>
   <string name="gps_result">រយៈទទឹង: %1$s\nរយៈបណ្ដោយ: %2$s\nរយៈកំពស់: %3$sm\nភាពត្រឹមត្រូវ: %4$sm</string>
   <string name="parser_exception">XPathParser Exception: \"%s\"</string>
   <string name="selected_answer">បានជ្រើសរើស៖ %s</string>
@@ -495,6 +492,7 @@
   <string name="invalid_email_address">អាសយដ្ឋាន​អ៊ីម៉េល​មិនត្រឹមត្រូវ!</string>
   <string name="sort_by">តំរៀបតាម</string>
   <string name="server">ម៉ាស៊ីនម៉េ</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">ជ្រើសរើសតម្លៃ</string>
   <string name="edit_value">កែប្រែ​តម្លៃ</string>
   <string name="no_value_selected">គ្មាន​តម្លៃត្រូវបានរើស</string>
diff --git a/collect_app/src/main/res/values-ln/strings.xml b/collect_app/src/main/res/values-ln/strings.xml
index 6dda4aaae92..5181bd1ca98 100644
--- a/collect_app/src/main/res/values-ln/strings.xml
+++ b/collect_app/src/main/res/values-ln/strings.xml
@@ -41,6 +41,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-lo-rLA/strings.xml b/collect_app/src/main/res/values-lo-rLA/strings.xml
index 149882e493a..41bf49f52ec 100644
--- a/collect_app/src/main/res/values-lo-rLA/strings.xml
+++ b/collect_app/src/main/res/values-lo-rLA/strings.xml
@@ -254,6 +254,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-lt/strings.xml b/collect_app/src/main/res/values-lt/strings.xml
index 562a2ef9d19..2f2afa041f0 100644
--- a/collect_app/src/main/res/values-lt/strings.xml
+++ b/collect_app/src/main/res/values-lt/strings.xml
@@ -197,6 +197,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-mg/strings.xml b/collect_app/src/main/res/values-mg/strings.xml
index f0b40133c3a..66da261231e 100644
--- a/collect_app/src/main/res/values-mg/strings.xml
+++ b/collect_app/src/main/res/values-mg/strings.xml
@@ -13,6 +13,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-ml/strings.xml b/collect_app/src/main/res/values-ml/strings.xml
index 4be09e680f9..78422f1500c 100644
--- a/collect_app/src/main/res/values-ml/strings.xml
+++ b/collect_app/src/main/res/values-ml/strings.xml
@@ -55,6 +55,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-mr/strings.xml b/collect_app/src/main/res/values-mr/strings.xml
index b827f23dbaa..a24519949b3 100644
--- a/collect_app/src/main/res/values-mr/strings.xml
+++ b/collect_app/src/main/res/values-mr/strings.xml
@@ -311,8 +311,6 @@
   <string name="geo_exit_warning">बदल टाकून ओडीके कडे परत जा?</string>
   <string name="polygon_validator">बहुभुज तयार करण्यासाठी किमान 3 गुण असणे आवश्यक आहे</string>
   <string name="clear">साफ करा</string>
-  <string name="manual_mode">मॅन्युअल माध्यम</string>
-  <string name="automatic_mode">स्वयंचलित माध्यम</string>
   <string name="geopoint_instruction">चिन्ह ठेवण्यासाठी जास्त वेळ दाबा किंवा जोडा मार्कर बटण टॅप करा</string>
   <string name="geopoint_no_draggable_instruction">जोडा मार्कर बटण टॅप करा</string>
   <string name="discard">टाकून द्या</string>
@@ -334,7 +332,6 @@
   <string name="install_openmapkit">कृपया ओपन मॅप किट स्थापित करा!</string>
   <string name="go_back">परत जा</string>
   <string name="download_selected">निवडलेल्या डाउनलोड करा</string>
-  <string name="record_geopoint">जिओ पॉईंट रेकॉर्ड करा</string>
   <string name="gps_result">अक्षांश: %1$s\nरेखांश: %2$s\nअल्टिट्यूड: %3$sm\nअॅक्चुसीसी: %4$sm</string>
   <string name="parser_exception">एक्स पाथ पार्सर अपवादः  \"%s\"</string>
   <string name="selected_answer">निवडलेले: %s</string>
@@ -452,6 +449,7 @@
   <string name="form_entry">फॉर्म एन्ट्रीमधून लपविण्यासाठी अनचेक करा</string>
   <string name="use_device_language">डिव्हाइस भाषा वापरा</string>
   <string name="not_supported_offline_layer_format">निवडलेली ऑफलाइन स्तर फाइल PBF स्वरूपन वापरते जी समर्थित नाही!</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-my/strings.xml b/collect_app/src/main/res/values-my/strings.xml
index 6a96babeb66..a8bf021fc42 100644
--- a/collect_app/src/main/res/values-my/strings.xml
+++ b/collect_app/src/main/res/values-my/strings.xml
@@ -206,6 +206,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-ne-rNP/strings.xml b/collect_app/src/main/res/values-ne-rNP/strings.xml
index f23909a6f22..fa3762e3d6f 100644
--- a/collect_app/src/main/res/values-ne-rNP/strings.xml
+++ b/collect_app/src/main/res/values-ne-rNP/strings.xml
@@ -324,7 +324,6 @@
   <string name="install_openmapkit">कृपया ओपन म्याप स्ट्रीट इन्सटल गर्नुहोस् !</string>
   <string name="go_back">पछाडि जानुहोस्</string>
   <string name="download_selected">चुनिएका डाउनलोड गर्नुहोस्</string>
-  <string name="record_geopoint">जियो पोइन्ट रेकर्ड गर्नुहोस्</string>
   <string name="odk_forum">ODK मंचमा आवद्ध हुनुहोस्</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in W 18°48'8"-->
   <string name="west">पश्चिम%1$s%2$s%3$s</string>
@@ -390,6 +389,7 @@
   <string name="image_size_title">फोटो साइज</string>
   <string name="form_import_category">फारम ल्याउदा</string>
   <string name="user_and_device_identity_title">प्रयोगकर्ता तथा यन्त्र पहिचान</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="yes">हो</string>
   <string name="no">होइन</string>
diff --git a/collect_app/src/main/res/values-nl/strings.xml b/collect_app/src/main/res/values-nl/strings.xml
index 7d58c67b000..5afc03d80ca 100644
--- a/collect_app/src/main/res/values-nl/strings.xml
+++ b/collect_app/src/main/res/values-nl/strings.xml
@@ -287,8 +287,6 @@
   <string name="start">Start</string>
   <string name="polygon_save">Bewaar als Polygoon</string>
   <string name="polyline_save">Bewaar als Lijnstuk</string>
-  <string name="manual_mode">Handmatig</string>
-  <string name="automatic_mode">Automatisch</string>
   <!--&lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="odk_website">Bezoek de ODK website</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in W 18°48'8"-->
@@ -331,6 +329,7 @@
   <string name="type">Type</string>
   <string name="sort_by">Sorteer op</string>
   <string name="server">Server</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="no">Nee</string>
   <string name="form_update_category">Formulier update</string>
diff --git a/collect_app/src/main/res/values-no/strings.xml b/collect_app/src/main/res/values-no/strings.xml
index 621eba82530..5a9d969efd1 100644
--- a/collect_app/src/main/res/values-no/strings.xml
+++ b/collect_app/src/main/res/values-no/strings.xml
@@ -265,6 +265,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-pl/strings.xml b/collect_app/src/main/res/values-pl/strings.xml
index 659859f2481..63797b471fc 100644
--- a/collect_app/src/main/res/values-pl/strings.xml
+++ b/collect_app/src/main/res/values-pl/strings.xml
@@ -344,8 +344,6 @@
   <string name="polygon_validator">Wymagane są przynajmniej 3 punkty aby utworzyć wielokąt</string>
   <string name="polyline_validator">Wymagane co najmniej 2 punkty, by utworzyć polilinię</string>
   <string name="clear">Wyczyść</string>
-  <string name="manual_mode">Tryb Ręczny</string>
-  <string name="automatic_mode">Tryb Automatyczny</string>
   <string name="geopoint_instruction">Długo naciśnij aby umieścić znacznik lub dotknij przycisk Dodaj znacznik.</string>
   <string name="geopoint_no_draggable_instruction">Dotknij przycisk Dodaj znacznik.</string>
   <string name="discard">Usuń</string>
@@ -367,7 +365,6 @@
   <string name="install_openmapkit">Proszę zainstalować OpenMapKit!</string>
   <string name="go_back">Cofnij się</string>
   <string name="download_selected">Pobierz Wybrane</string>
-  <string name="record_geopoint">Zapisz GeoPoint</string>
   <string name="gps_result">Szerokość: %1$s\nDługość: %2$s\nWzniesienie: %3$sm\nDokładność: %4$sm</string>
   <string name="parser_exception">Wyjątek XPathParser: \"%s\"</string>
   <string name="selected_answer">Wybrany: %s</string>
@@ -506,9 +503,7 @@
   <string name="invalid_email_address">Nieprawidłowy adres email!</string>
   <string name="sort_by">Sortuj według</string>
   <string name="server">Serwer</string>
-<!--
-  <string name="submission_transport_admin_setting">Przesyłanie zgłoszeń</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Wybierz wartość</string>
   <string name="edit_value">Edytuj wartość</string>
   <string name="no_value_selected">Nie wybrano wartości</string>
@@ -639,7 +634,5 @@
   <string name="location_providers_disabled_dialog_message">Ten formularz chce śledzić twoją lokalizację, ale usługi dostawców systemu lokalizacji są wyłączone. Włącz je w ustawieniach Androida.</string>
   <string name="go_to_settings">Przejdź do ustawień</string>
   <string name="track_location">Śledź lokalizację</string>
-  <string name="background_location_disabled">Ten formularz chce śledzić twoją lokalizację, ale opcja śledzenia jest wyłączona. Włącz śledzenie używając %1$s w menu powyżej.</string>
-  <string name="background_location_enabled">Ten formularz śledzi twoją lokalizację. Możesz wyłączyć funkcję śledzenia korzystając z %1$s w menu powyżej.</string>
   <string name="open_file">Otwórz plik</string>
 </resources>
diff --git a/collect_app/src/main/res/values-ps/strings.xml b/collect_app/src/main/res/values-ps/strings.xml
index 0d5d6da8eed..60a158284e8 100644
--- a/collect_app/src/main/res/values-ps/strings.xml
+++ b/collect_app/src/main/res/values-ps/strings.xml
@@ -112,6 +112,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
   <string name="guidance_no">نه</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="custom_date">%1$s ( %2$s)</string>
   <string name="multiple_media_folders_detected_notification">له یوې څخه زیات د رسنیو پوښه اوموندل شو، مهرباني وکړئ یو لیرې کړئ او بیا هڅه وکړئ</string>
diff --git a/collect_app/src/main/res/values-pt/strings.xml b/collect_app/src/main/res/values-pt/strings.xml
index 5a99b07be64..c74ae9f9b39 100644
--- a/collect_app/src/main/res/values-pt/strings.xml
+++ b/collect_app/src/main/res/values-pt/strings.xml
@@ -331,8 +331,6 @@ Escolher Imagem</string>
   <string name="polygon_validator">Precisa ter pelo menos 3 pontos para criar Polígono</string>
   <string name="polyline_validator">Precisa ter pelo menos 2 pontos para criar uma Cadeia de Linhas</string>
   <string name="clear">Limpar</string>
-  <string name="manual_mode">Modo manual</string>
-  <string name="automatic_mode">Modo automático</string>
   <string name="geopoint_instruction">Pressione por mais tempo para colocar marcador ou selecione o botão Adicionar Marcador.</string>
   <string name="geopoint_no_draggable_instruction">Selecione o botão Adicionar Marcador.</string>
   <string name="discard">Descartar</string>
@@ -354,7 +352,6 @@ Escolher Imagem</string>
   <string name="install_openmapkit">Por favor, instala o OpenMapKit!</string>
   <string name="go_back">Voltar</string>
   <string name="download_selected">Baixar selecionados</string>
-  <string name="record_geopoint">Gravar ponto de GPS</string>
   <string name="gps_result">Latitude: %1$s\nLongitude: %2$s\nAltitude: %3$sm\nPrecisão:%4$s m</string>
   <string name="parser_exception">Exceção XPathParser: \"%s\"</string>
   <string name="selected_answer">Selecionado: %s</string>
@@ -492,9 +489,7 @@ Escolher Imagem</string>
   <string name="invalid_email_address">Endereço de e-mail inválido!</string>
   <string name="sort_by">Organizar por</string>
   <string name="server">Servidor</string>
-<!--
-  <string name="submission_transport_admin_setting">Transporte de submissão</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Selecione valor</string>
   <string name="edit_value">Edite valor</string>
   <string name="image_size_large">Grande (3072px)</string>
diff --git a/collect_app/src/main/res/values-ro/strings.xml b/collect_app/src/main/res/values-ro/strings.xml
index ad683725212..a23fef365bf 100644
--- a/collect_app/src/main/res/values-ro/strings.xml
+++ b/collect_app/src/main/res/values-ro/strings.xml
@@ -302,6 +302,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
   <string name="north">Nord%1$s%2$s%3$s</string>
   <string name="guidance_no">Nu</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="search">Căutare</string>
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="yes">Da</string>
diff --git a/collect_app/src/main/res/values-ru/strings.xml b/collect_app/src/main/res/values-ru/strings.xml
index b4ce4501964..267204a4ec4 100644
--- a/collect_app/src/main/res/values-ru/strings.xml
+++ b/collect_app/src/main/res/values-ru/strings.xml
@@ -337,8 +337,6 @@
   <string name="polygon_validator">В многоугольнике должно быть как минимум 3 точки</string>
   <string name="polyline_validator">Должно быть как минимум 2 точки, что бы создать ломаную линию</string>
   <string name="clear">Очистить</string>
-  <string name="manual_mode">Ручной режим</string>
-  <string name="automatic_mode">Автоматический режим</string>
   <string name="geopoint_instruction">Используйте продолжительное нажатие, чтобы расставлять отметки или нажмите кнопку \"добавить отметку\".</string>
   <string name="geopoint_no_draggable_instruction">Нажмите кнопку \"добавить отметку\".</string>
   <string name="discard">Отменить</string>
@@ -360,7 +358,6 @@
   <string name="install_openmapkit">Пожалуйста, установите OpenMapKit!</string>
   <string name="go_back">Назад</string>
   <string name="download_selected">Загрузить выбранные</string>
-  <string name="record_geopoint">Записать геоточку</string>
   <string name="gps_result">Широта: %1$s\nДолгота: %2$s\nВысота: %3$sм\nТочность:%4$sм</string>
   <string name="parser_exception">Исключение XPathParser: \"%s\"</string>
   <string name="selected_answer">Выбрано: %s</string>
@@ -495,6 +492,7 @@
   <string name="invalid_email_address">Неверный адрес почты!</string>
   <string name="sort_by">Сортировать по</string>
   <string name="server">Сервер</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Выбрать значение</string>
   <string name="edit_value">Изменить значение</string>
   <string name="no_value_selected">Значение не выбрано</string>
diff --git a/collect_app/src/main/res/values-si/strings.xml b/collect_app/src/main/res/values-si/strings.xml
index 47c8136b4a3..a1fb6e800f0 100644
--- a/collect_app/src/main/res/values-si/strings.xml
+++ b/collect_app/src/main/res/values-si/strings.xml
@@ -12,6 +12,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="every_six_hours">සෑම පැය 6 කට වරක්</string>
   <string name="every_24_hours">සෑම පැය24 කට වරක්</string>
diff --git a/collect_app/src/main/res/values-sl/strings.xml b/collect_app/src/main/res/values-sl/strings.xml
index e5f696697c4..1ed4a28c2e7 100644
--- a/collect_app/src/main/res/values-sl/strings.xml
+++ b/collect_app/src/main/res/values-sl/strings.xml
@@ -295,7 +295,6 @@
   <string name="geo_clear_warning">Funkcija je že narejena. Želite izbrisati funkcijo?</string>
   <string name="geo_exit_warning">Želite zavreči spremembe in se vrniti v ODK?</string>
   <string name="clear">Počisti</string>
-  <string name="automatic_mode">Samodejni način</string>
   <string name="discard">Zavrzi</string>
   <!--&lt; and &gt; surrounds the text so it will appear as <no form loaded>-->
   <string name="no_form_loaded">&lt;noben obrazec ni naložen&gt;</string>
@@ -341,6 +340,7 @@
   <string name="cellular_autosend">Samo mobilno omrežje</string>
   <string name="wifi_cellular_autosend">WiFi ali mobilno omrežje</string>
   <string name="form_submission_category">Predložitev obrazca</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="form_delete_message">Izbriši izbrane obrazce</string>
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <string name="multiple_media_folders_detected_notification">Več kot ena medijska mapa je najdena. Odstranite eno in poskusite znova</string>
diff --git a/collect_app/src/main/res/values-so/strings.xml b/collect_app/src/main/res/values-so/strings.xml
index bd7bdaf8920..cd1c894ea68 100644
--- a/collect_app/src/main/res/values-so/strings.xml
+++ b/collect_app/src/main/res/values-so/strings.xml
@@ -43,6 +43,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-sq/strings.xml b/collect_app/src/main/res/values-sq/strings.xml
index e68a70c082e..259354176dd 100644
--- a/collect_app/src/main/res/values-sq/strings.xml
+++ b/collect_app/src/main/res/values-sq/strings.xml
@@ -298,8 +298,6 @@
   <string name="geo_exit_warning">Elimino ndryshimet dhe kthehu në ODK?</string>
   <string name="polygon_validator">Duhen së paku 3 pika për të krijuar Poligonin</string>
   <string name="clear">Pastro</string>
-  <string name="manual_mode">Manuale</string>
-  <string name="automatic_mode">Automatike</string>
   <string name="geopoint_instruction">Shtyp për pak sekonda për të vendosur një shenjë ose shtuar buton shenjues</string>
   <string name="discard">Elimino</string>
   <string name="geoshape_view_change_location">Shih ose ndrysho GeoShape</string>
@@ -319,7 +317,6 @@
   <string name="install_openmapkit">Lutemi, instaloni OpenMapKit!</string>
   <string name="go_back">Kthehu prapa</string>
   <string name="download_selected">Shkarko të përzgjedhurat</string>
-  <string name="record_geopoint">Regjistro vendndodhjen gjeografike</string>
   <string name="gps_result">Gjerësi: %1$s\nGjatësi: %2$s\nLartësi: %3$sm\nSaktësi: %4$sm</string>
   <string name="parser_exception">Përjashtim XPathParser \"%s\"</string>
   <string name="selected_answer">Përzgjedhur: %s</string>
@@ -453,6 +450,7 @@
   <string name="not_supported_offline_layer_format">Shtresa offline që përzgjodhët përdor format PBF, i cili nuk është i suportuar.</string>
   <string name="invalid_email_address">Adresa email nuk është e vlefshme</string>
   <string name="sort_by">Rendit sipas</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Përzgjidh vlerën</string>
   <string name="edit_value">Ndrysho vlerën</string>
   <string name="no_value_selected">Nuk keni përzgjedhur vlerën</string>
@@ -512,6 +510,5 @@
   <string name="missing_google_account_dialog_title">Llogaria në Google nuk është përcaktuar</string>
   <string name="go_to_settings">Shko tek parametrat</string>
   <string name="track_location">Gjurmo vendndodhjen</string>
-  <string name="background_location_enabled">Kjo formë gjurmon vendndodhjen tuaj. Mund ta ç\'aktivizoni gjurmimin e vendndodhjes duke shkuar në menunë %1$s më sipër.</string>
   <string name="open_file">Hap file</string>
 </resources>
diff --git a/collect_app/src/main/res/values-sv-rSE/strings.xml b/collect_app/src/main/res/values-sv-rSE/strings.xml
index d0b59136bd0..20d6cc37ff0 100644
--- a/collect_app/src/main/res/values-sv-rSE/strings.xml
+++ b/collect_app/src/main/res/values-sv-rSE/strings.xml
@@ -336,8 +336,6 @@ Dela ODK Collect med dem.</string>
   <string name="polygon_validator">Minst tre punkter krävs för att skapa en polygon</string>
   <string name="polyline_validator">Det behövs minst 2 punkter för att skapa en polyline</string>
   <string name="clear">Rensa</string>
-  <string name="manual_mode">Manuellt läge</string>
-  <string name="automatic_mode">Automatiskt läge</string>
   <string name="geopoint_instruction">Lång tryckning för att placera markör eller knacka på knappen \'lägg till markör\'</string>
   <string name="geopoint_no_draggable_instruction">Knacka på knappen \'lägg till markör\'.</string>
   <string name="discard">Ignorera</string>
@@ -359,7 +357,6 @@ Dela ODK Collect med dem.</string>
   <string name="install_openmapkit">Vänligen installera OpenMapKit!</string>
   <string name="go_back">Gå tillbaka</string>
   <string name="download_selected">Nedladdning vald</string>
-  <string name="record_geopoint">Lagra GeoPoint</string>
   <string name="gps_result">Latitud: %1$s\nLongitud: %2$s\nAltitud: %3$sm\nNoggrannhet: %4$sm</string>
   <string name="parser_exception">XPathParser undantag: \"%s\"</string>
   <string name="selected_answer">Vald: %s</string>
@@ -498,6 +495,7 @@ Dela ODK Collect med dem.</string>
   <string name="invalid_email_address">Ogiltig e-postadress!</string>
   <string name="sort_by">Sorteringsordning</string>
   <string name="server">Server</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Välj ett värde</string>
   <string name="edit_value">Redigera värde</string>
   <string name="no_value_selected">Inget värde valt</string>
diff --git a/collect_app/src/main/res/values-sw-rKE/strings.xml b/collect_app/src/main/res/values-sw-rKE/strings.xml
index abb9d484998..0bd92298394 100644
--- a/collect_app/src/main/res/values-sw-rKE/strings.xml
+++ b/collect_app/src/main/res/values-sw-rKE/strings.xml
@@ -234,6 +234,7 @@
   <string name="phone_number">Nambari ya simu</string>
   <string name="select_date">Changua tarehe</string>
   <string name="select_time">Chagua wakati</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-sw/strings.xml b/collect_app/src/main/res/values-sw/strings.xml
index bd37f9aca32..c37e9c0fcb9 100644
--- a/collect_app/src/main/res/values-sw/strings.xml
+++ b/collect_app/src/main/res/values-sw/strings.xml
@@ -340,8 +340,6 @@
   <string name="polygon_validator">Lazima uwe na angalau  nukta 3 ili kutengeneza poligoni</string>
   <string name="polyline_validator">Ni lazima uwe angalau na pointi 2 kutengeneza Mistari </string>
   <string name="clear">Futa</string>
-  <string name="manual_mode">Mfumo wa kawaida</string>
-  <string name="automatic_mode">Mfumo wa moja kwa moja</string>
   <string name="geopoint_instruction">Bonyeza kwa mda kuweka alama au bofya kitufe ongeza alama.</string>
   <string name="geopoint_no_draggable_instruction">Bofya kitufe cha kuongeza alama.</string>
   <string name="discard">Sitisha</string>
@@ -363,7 +361,6 @@
   <string name="install_openmapkit">Tafadhali sakinisha OpenMapKit!</string>
   <string name="go_back">Rudi  nyuma</string>
   <string name="download_selected">Pakua zilizochaguliwa</string>
-  <string name="record_geopoint">Hifadhi alama ya Kijigrafia</string>
   <string name="gps_result">Latitude: %1$s \nLongitude: %2$s \nUrefumwambao:%3$s m\nUsahihi: %4$s m</string>
   <string name="parser_exception">Isipokuwa ya XPathparser: \"%s\"</string>
   <string name="selected_answer">Iliyochaguliwa: %s</string>
@@ -502,9 +499,7 @@
   <string name="invalid_email_address">Anwani ya barua pepe ni batili!</string>
   <string name="sort_by">Panga kwa</string>
   <string name="server">Seva</string>
-<!--
-  <string name="submission_transport_admin_setting">Usafiri wa uwasilishaji</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Chagua thamani</string>
   <string name="edit_value">Hariri thamani</string>
   <string name="no_value_selected">Hakuna thamani iliyochaguliwa</string>
diff --git a/collect_app/src/main/res/values-th-rTH/strings.xml b/collect_app/src/main/res/values-th-rTH/strings.xml
index 2ed019ee4f1..81271ef5a66 100644
--- a/collect_app/src/main/res/values-th-rTH/strings.xml
+++ b/collect_app/src/main/res/values-th-rTH/strings.xml
@@ -294,8 +294,6 @@
   <string name="geo_exit_warning">ยกเลิกการเปลี่ยนแปลงและกลับไปที่ ODK?</string>
   <string name="polygon_validator">ต้องมีจุดพิกัด 3 จุดขึ้นไปเพื่อสร้าง Polygon</string>
   <string name="clear">ลบ</string>
-  <string name="manual_mode">โหมดตั้งค่าเอง</string>
-  <string name="automatic_mode">โหมดอัตโนมัติ</string>
   <string name="geopoint_instruction">กดแช่ไว้เพื่อวางเครื่องหมายหรือแตะที่ปุ่มเพิ่มเครื่องหมาย</string>
   <string name="geopoint_no_draggable_instruction">แตะที่ปุ่มเพิ่มเครื่องหมาย</string>
   <string name="discard">ยกเลิก</string>
@@ -309,7 +307,6 @@
   <string name="alert">แจ้งเตือน</string>
   <string name="install_openmapkit">กรุณาติดตั้ง OpenMapKit</string>
   <string name="go_back">ย้อนกลับ</string>
-  <string name="record_geopoint">บันทึกจุดพิกัด</string>
   <string name="version_number">เวอร์ชั่น: %s</string>
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in W 18°48'8"-->
   <string name="west">ตะวันตก %1$s%2$s%3$s</string>
@@ -361,6 +358,7 @@
   <string name="select_time">เลือกเวลา</string>
   <string name="no_date_selected">ยังไม่ได้เลือกวันที่</string>
   <string name="no_time_selected">ยังไม่ได้เลือกเวลา</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-ti/strings.xml b/collect_app/src/main/res/values-ti/strings.xml
index f0da6744136..8e75fc4b458 100644
--- a/collect_app/src/main/res/values-ti/strings.xml
+++ b/collect_app/src/main/res/values-ti/strings.xml
@@ -11,6 +11,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="ethiopian_month_1">መስከረም</string>
   <string name="ethiopian_month_2">ጥቅምቲ</string>
   <string name="ethiopian_month_3">ሕዳር</string>
diff --git a/collect_app/src/main/res/values-tl/strings.xml b/collect_app/src/main/res/values-tl/strings.xml
index a99a634d019..7de43fa6dbf 100644
--- a/collect_app/src/main/res/values-tl/strings.xml
+++ b/collect_app/src/main/res/values-tl/strings.xml
@@ -195,6 +195,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-tr/strings.xml b/collect_app/src/main/res/values-tr/strings.xml
index a083b67bf9f..dde97983585 100644
--- a/collect_app/src/main/res/values-tr/strings.xml
+++ b/collect_app/src/main/res/values-tr/strings.xml
@@ -157,6 +157,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-uk/strings.xml b/collect_app/src/main/res/values-uk/strings.xml
index 0432e83cb35..d868326d5b2 100644
--- a/collect_app/src/main/res/values-uk/strings.xml
+++ b/collect_app/src/main/res/values-uk/strings.xml
@@ -342,8 +342,6 @@
   <string name="polygon_validator">Для багатокутника необхідно мінімум 3 точки</string>
   <string name="polyline_validator">Для створення лінії необхідні принаймні дві точки</string>
   <string name="clear">Очистити</string>
-  <string name="manual_mode">Ручний режим</string>
-  <string name="automatic_mode">Автоматичний режим</string>
   <string name="geopoint_instruction">Довго натисніть для розміщення позначки або натисніть кнопку Додати позначку.</string>
   <string name="geopoint_no_draggable_instruction">Натисніть кнопку Додати позначку.</string>
   <string name="discard">Скинути</string>
@@ -365,7 +363,6 @@
   <string name="install_openmapkit">Будь ласка встановіть OpenMapKit!</string>
   <string name="go_back">Повернутись</string>
   <string name="download_selected">Завантажити обране</string>
-  <string name="record_geopoint">Записати ГеоТочку</string>
   <string name="gps_result">Широта: %1$s\nДовгота: %2$s\nВисота: %3$sm\nТочність: %4$sm</string>
   <string name="parser_exception">XPathParser Exception: \"%s\"</string>
   <string name="selected_answer">Обрано: %s</string>
@@ -504,9 +501,7 @@
   <string name="invalid_email_address">Некоректна електронна адреса!</string>
   <string name="sort_by">Сортувати за</string>
   <string name="server">Сервер</string>
-<!--
-  <string name="submission_transport_admin_setting">Транспортування відправлень</string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">Обрати заначення</string>
   <string name="edit_value">Редагувати значення</string>
   <string name="no_value_selected">Значення не обране</string>
diff --git a/collect_app/src/main/res/values-ur-rPK/strings.xml b/collect_app/src/main/res/values-ur-rPK/strings.xml
index ad97c662101..8fb6dd52d13 100644
--- a/collect_app/src/main/res/values-ur-rPK/strings.xml
+++ b/collect_app/src/main/res/values-ur-rPK/strings.xml
@@ -202,6 +202,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-ur/strings.xml b/collect_app/src/main/res/values-ur/strings.xml
index f01c76d8ad2..06da740cad5 100644
--- a/collect_app/src/main/res/values-ur/strings.xml
+++ b/collect_app/src/main/res/values-ur/strings.xml
@@ -340,8 +340,6 @@
   <string name="polygon_validator">قطبون بنانے کے لئے کم از کم 3 پوائنٹس لازمی ہیں</string>
   <string name="polyline_validator">پولی لائن بنانے کے لئے کم سے کم 2 پوائنٹس لازمی ہیں</string>
   <string name="clear">صاف کریں </string>
-  <string name="manual_mode">مینول موڈ</string>
-  <string name="automatic_mode">آٹومیٹک موڈ</string>
   <string name="geopoint_instruction">پلیس مارک کرنے کے لیے طویل دبائیں یا ایڈ مارکر بٹن ٹیپ کریں</string>
   <string name="geopoint_no_draggable_instruction"> مارکر بٹن پر کلک کریں.</string>
   <string name="discard">ختم کر دینا</string>
@@ -363,7 +361,6 @@
   <string name="install_openmapkit">برائے مہربانی اوپن میپ کیٹ  انسٹال کریں!</string>
   <string name="go_back">واپس جاؤ</string>
   <string name="download_selected">منتخب کردہ ڈاؤنلوڈ کریں</string>
-  <string name="record_geopoint">ریکارڈ جیو پوائنٹ</string>
   <string name="gps_result">طول عرض:  %1$s \nطول بلد: %2$s \n اونچائی:  %3$s میٹر\n ایکیوریسی: %4$s میٹر</string>
   <string name="parser_exception"> ایکس پاتھ پارسر ایکسپشن:\"%s\"</string>
   <string name="selected_answer">منتخب شدہ: %s</string>
@@ -502,9 +499,7 @@
   <string name="invalid_email_address">غلط ای میل ایڈریس!</string>
   <string name="sort_by">بہ ترتیب</string>
   <string name="server">سرور </string>
-<!--
-  <string name="submission_transport_admin_setting">سبمیشن ٹرانسپورٹ </string>
--->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <string name="select_value">سلیکٹ ویلیو </string>
   <string name="edit_value">ایڈٹ ویلیو </string>
   <string name="no_value_selected">کوئی ویلیو منتخب نہیں کی گئی </string>
diff --git a/collect_app/src/main/res/values-vi/strings.xml b/collect_app/src/main/res/values-vi/strings.xml
index 6cd0074e535..094df57e6a6 100644
--- a/collect_app/src/main/res/values-vi/strings.xml
+++ b/collect_app/src/main/res/values-vi/strings.xml
@@ -201,6 +201,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-zh/strings.xml b/collect_app/src/main/res/values-zh/strings.xml
index 45cca36f9cb..45ab95fb57e 100644
--- a/collect_app/src/main/res/values-zh/strings.xml
+++ b/collect_app/src/main/res/values-zh/strings.xml
@@ -236,6 +236,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
   <string name="autosend_selector_title">自动发送</string>
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>
diff --git a/collect_app/src/main/res/values-zu/strings.xml b/collect_app/src/main/res/values-zu/strings.xml
index dff644655ca..70b21eea796 100644
--- a/collect_app/src/main/res/values-zu/strings.xml
+++ b/collect_app/src/main/res/values-zu/strings.xml
@@ -216,6 +216,7 @@
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in E 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in S 18°48'8"-->
   <!--%1$s represents degrees, %2$s represents minutes and %3$s represents seconds as in N 18°48'8"-->
+  <!--<string name="submission_transport_admin_setting">Submission transport</string>-->
   <!--Displays dates in specialized calendars with the Gregorian dates in parentheses. This is translated so right-to-left languages can specify the correct order-->
   <!--Sms submission-->
 </resources>