diff --git a/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java b/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java
index 5d000f2d9..29b48f782 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java
@@ -11,8 +11,6 @@ import androidx.fragment.app.FragmentManager;
 
 import java.util.ArrayList;
 
-import de.dennisguse.opentracks.R;
-
 public class ErrorListDialog extends DialogFragment {
 
     public static final String TAG = ErrorListDialog.class.getSimpleName();
@@ -61,7 +59,7 @@ public class ErrorListDialog extends DialogFragment {
         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity())
                 .setTitle(title)
                 .setItems(tracks, null)
-                .setPositiveButton(R.string.generic_ok, (dialog, which) -> dismiss());
+                .setPositiveButton(android.R.string.ok, (dialog, which) -> dismiss());
         return alertDialogBuilder.create();
     }
 }
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
index 95b112533..046cc1852 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
@@ -291,7 +291,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
 
     private void onExportEnded() {
         viewBinding.exportProgressRightButton.setVisibility(View.VISIBLE);
-        viewBinding.exportProgressRightButton.setText(getString(R.string.generic_ok));
+        viewBinding.exportProgressRightButton.setText(getString(android.R.string.ok));
         viewBinding.exportProgressRightButton.setOnClickListener((view) -> finish());
 
         viewBinding.exportProgressAlertIcon.setVisibility(View.VISIBLE);
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
index 8afb65d17..834e782db 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
@@ -176,7 +176,7 @@ public class ImportActivity extends FragmentActivity {
         viewBinding.importProgressAlertIcon.setVisibility(View.VISIBLE);
 
         viewBinding.importProgressRightButton.setVisibility(View.VISIBLE);
-        viewBinding.importProgressRightButton.setText(getString(R.string.generic_ok));
+        viewBinding.importProgressRightButton.setText(getString(android.R.string.ok));
         viewBinding.importProgressRightButton.setOnClickListener((view) -> {
             getViewModelStore().clear();
             finish();
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 63145bcee..8182d1a07 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -74,7 +74,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
                     .setIcon(R.drawable.ic_logo_24dp)
                     .setTitle(R.string.app_name)
                     .setMessage(R.string.export_error_post_workout)
-                    .setNeutralButton(R.string.generic_ok, null)
+                    .setNeutralButton(android.R.string.ok, null)
                     .create()
                     .show();
         }
diff --git a/src/main/res/layout/help.xml b/src/main/res/layout/help.xml
index 7aca91fb9..99ab71700 100644
--- a/src/main/res/layout/help.xml
+++ b/src/main/res/layout/help.xml
@@ -97,7 +97,7 @@
                 style="@style/TextMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/generic_no" />
+                android:text="@android:string/no" />
 
             <TextView
                 style="@style/TextMedium"
diff --git a/src/main/res/layout/import_activity.xml b/src/main/res/layout/import_activity.xml
index 4d92031dd..336e4cf42 100644
--- a/src/main/res/layout/import_activity.xml
+++ b/src/main/res/layout/import_activity.xml
@@ -224,7 +224,7 @@
             android:id="@+id/import_progress_right_button"
             style="@style/BottomButton"
             android:layout_gravity="end"
-            android:text="@string/generic_ok"
+            android:text="@android:string/ok"
             android:visibility="gone"
             tools:visibility="visible"/>
     </LinearLayout>
diff --git a/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml
index 5becbdddc..ecbd65ec7 100644
--- a/src/main/res/layout/marker_edit.xml
+++ b/src/main/res/layout/marker_edit.xml
@@ -117,7 +117,7 @@ limitations under the License.
             android:id="@+id/marker_edit_cancel"
             style="@style/BottomButton"
             android:layout_gravity="start"
-            android:text="@string/generic_cancel" />
+            android:text="@android:string/cancel" />
 
         <Button
             android:id="@+id/marker_edit_done"
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index 1f9017ac7..c860c0125 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -96,7 +96,7 @@ limitations under the License.
             android:id="@+id/track_edit_cancel"
             style="@style/BottomButton"
             android:layout_gravity="start"
-            android:text="@string/generic_cancel" />
+            android:text="@android:string/cancel" />
 
         <Button
             android:id="@+id/track_edit_save"
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 8e6f8f989..c1719c318 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 ملفات</string>
     <!-- Generic -->
     <string name="generic_add">إضافة</string>
-    <string name="generic_cancel">إلغاء</string>
     <string name="generic_delete_all_confirm_title">حذف الكل؟</string>
     <string name="generic_delete_selected_confirm_title">حذف ما تم تحديده؟</string>
     <string name="generic_description">الوصف</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">الاسم</string>
     <string name="generic_name_line">الاسم: %1$s</string>
     <string name="generic_no">لا</string>
-    <string name="generic_ok">موافق</string>
     <string name="generic_paused">متوقف مؤقتًا</string>
     <string name="generic_progress_title">الرجاء الانتظار…</string>
     <string name="generic_recording">جارٍ التسجيل…</string>
diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index 26525c08c..6c2aac36b 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 files</string>
     <string name="files_zero">0 files</string>
     <string name="generic_add">Add</string>
-    <string name="generic_cancel">Cancel</string>
     <string name="generic_delete_all_confirm_title">Delete all?</string>
     <string name="generic_delete_selected_confirm_title">Delete selected?</string>
     <string name="generic_description">Description</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Name</string>
     <string name="generic_name_line">Name: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Paused</string>
     <string name="generic_progress_title">Please wait…</string>
     <string name="generic_recording">Recording…</string>
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index 107913004..53800fcd5 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 archivos</string>
     <string name="files_zero">0 archivos</string>
     <string name="generic_add">Agregar</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">¿Eliminar todo?</string>
     <string name="generic_delete_selected_confirm_title">¿Eliminar elementos seleccionados?</string>
     <string name="generic_description">Descripción</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nombre</string>
     <string name="generic_name_line">Nombre: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">Aceptar</string>
     <string name="generic_paused">En pausa</string>
     <string name="generic_progress_title">Espera…</string>
     <string name="generic_recording">Grabando…</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 55b455083..3bc15485f 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 файла</string>
     <!-- Generic -->
     <string name="generic_add">Прибавяне</string>
-    <string name="generic_cancel">Отказ</string>
     <string name="generic_delete_all_confirm_title">Да се изтрият ли всички?</string>
     <string name="generic_delete_selected_confirm_title">Да се изтрият ли избраните?</string>
     <string name="generic_description">Описание</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Име</string>
     <string name="generic_name_line">Име: %1$s</string>
     <string name="generic_no">Не</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">На пауза</string>
     <string name="generic_progress_title">Моля, изчакайте…</string>
     <string name="generic_recording">Записва се…</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index fb12adb69..7093cb519 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 fitxers</string>
     <!-- Generic -->
     <string name="generic_add">Afegeix</string>
-    <string name="generic_cancel">Cancel·la</string>
     <string name="generic_delete_all_confirm_title">Voleu suprimir-ho tot?</string>
     <string name="generic_delete_selected_confirm_title">Voleu esborrar els elements seleccionats?</string>
     <string name="generic_description">Descripció</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Nom</string>
     <string name="generic_name_line">Nom: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">D\'acord</string>
     <string name="generic_paused">En pausa</string>
     <string name="generic_progress_title">Espereu…</string>
     <string name="generic_recording">S\'està enregistrant…</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 00d52cd17..23555236b 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -187,7 +187,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs
     <string name="files_zero">0 souborů</string>
     <!-- Generic -->
     <string name="generic_add">Přidat</string>
-    <string name="generic_cancel">Zrušit</string>
     <string name="generic_delete_all_confirm_title">Smazat vše?</string>
     <string name="generic_delete_selected_confirm_title">Smazat vybrané?</string>
     <string name="generic_description">Popis</string>
@@ -196,7 +195,6 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs
     <string name="generic_name">Název</string>
     <string name="generic_name_line">Název: %1$s</string>
     <string name="generic_no">Ne</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pozastaveno</string>
     <string name="generic_progress_title">Chvíli strpení…</string>
     <string name="generic_recording">Nahrávání…</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index aa64937d7..60a5c5ef9 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -191,7 +191,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="files_zero">0 filer</string>
     <!-- Generic -->
     <string name="generic_add">Tilføj</string>
-    <string name="generic_cancel">Annuller</string>
     <string name="generic_delete_all_confirm_title">Skal alle slettes?</string>
     <string name="generic_delete_selected_confirm_title">Skal de valgte slettes?</string>
     <string name="generic_description">Beskrivelse</string>
@@ -200,7 +199,6 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="generic_name">Navn</string>
     <string name="generic_name_line">Navn: %1$s</string>
     <string name="generic_no">Nej</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Midlertidigt afbrudt</string>
     <string name="generic_progress_title">Vent…</string>
     <string name="generic_recording">Registrerer…</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7cce5b13f..2f9bb966c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -196,7 +196,6 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="files_zero">0 Dateien</string>
     <!-- Generic -->
     <string name="generic_add">Hinzufügen</string>
-    <string name="generic_cancel">Abbrechen</string>
     <string name="generic_delete_all_confirm_title">Alles löschen?</string>
     <string name="generic_delete_selected_confirm_title">Ausgewählte Elemente löschen?</string>
     <string name="generic_description">Beschreibung</string>
@@ -205,7 +204,6 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="generic_name">Name</string>
     <string name="generic_name_line">Name: %1$s</string>
     <string name="generic_no">Nein</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pausiert</string>
     <string name="generic_progress_title">Bitte warten…</string>
     <string name="generic_recording">Aufzeichnung…</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 0c9b394ed..c24e94a72 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 αρχεία</string>
     <!-- Generic -->
     <string name="generic_add">Προσθήκη</string>
-    <string name="generic_cancel">Ακύρωση</string>
     <string name="generic_delete_all_confirm_title">Διαγραφή όλων;</string>
     <string name="generic_delete_selected_confirm_title">Διαγραφή επιλεγμένων;</string>
     <string name="generic_description">Περιγραφή</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Όνομα</string>
     <string name="generic_name_line">Όνομα: %1$s</string>
     <string name="generic_no">Όχι</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Σε παύση</string>
     <string name="generic_progress_title">Περιμένετε…</string>
     <string name="generic_recording">Καταγραφή…</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ce1442ee5..59415c4c8 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -187,7 +187,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="files_zero">0 archivos</string>
     <!-- Generic -->
     <string name="generic_add">Añadir</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">¿Eliminar todo?</string>
     <string name="generic_delete_selected_confirm_title">¿Eliminar elementos seleccionados?</string>
     <string name="generic_description">Descripción</string>
@@ -196,7 +195,6 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="generic_name">Nombre</string>
     <string name="generic_name_line">Nombre: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">Aceptar</string>
     <string name="generic_paused">En pausa</string>
     <string name="generic_progress_title">Espera…</string>
     <string name="generic_recording">Grabando…</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 745d94856..e308388f3 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -187,7 +187,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s
     <string name="files_zero">0 faili</string>
     <!-- Generic -->
     <string name="generic_add">Lisa</string>
-    <string name="generic_cancel">Tühista</string>
     <string name="generic_delete_all_confirm_title">Kas kustutada kõik?</string>
     <string name="generic_delete_selected_confirm_title">Kas kustutada valitud?</string>
     <string name="generic_description">Kirjeldus</string>
@@ -196,7 +195,6 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s
     <string name="generic_name">Nimi</string>
     <string name="generic_name_line">Nimi: %1$s</string>
     <string name="generic_no">Ei</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Peatatud</string>
     <string name="generic_progress_title">Oodake …</string>
     <string name="generic_recording">Salvestamine…</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 489d1d7f3..5c0415b43 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -188,7 +188,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="files_zero">0 fitxategi</string>
     <!-- Generic -->
     <string name="generic_add">Gehitu</string>
-    <string name="generic_cancel">Utzi</string>
     <string name="generic_delete_all_confirm_title">Guztiak ezabatu nahi dituzu?</string>
     <string name="generic_delete_selected_confirm_title">Hautatutakoak ezabatu nahi dituzu?</string>
     <string name="generic_description">Azalpena</string>
@@ -197,7 +196,6 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="generic_name">Izena</string>
     <string name="generic_name_line">Izena: %1$s</string>
     <string name="generic_no">Ez</string>
-    <string name="generic_ok">Ados</string>
     <string name="generic_paused">Etenda</string>
     <string name="generic_progress_title">Itxaron, mesedez…</string>
     <string name="generic_recording">Grabatzen…</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 20727b875..4a8371a25 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">۰ فایل</string>
     <!-- Generic -->
     <string name="generic_add">افزودن</string>
-    <string name="generic_cancel">لغو</string>
     <string name="generic_delete_all_confirm_title">حذف همه؟</string>
     <string name="generic_delete_selected_confirm_title">موارد انتخابی حذف شود؟</string>
     <string name="generic_description">شرح</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">نام</string>
     <string name="generic_name_line">نام: %1$s</string>
     <string name="generic_no">نه</string>
-    <string name="generic_ok">تأیید</string>
     <string name="generic_paused">در حال مکث</string>
     <string name="generic_progress_title">لطفاً منتظر بمانید…</string>
     <string name="generic_recording">در حال ضبط…</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 07e85d12e..0c936f871 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -192,7 +192,6 @@ limitations under the License.
     <string name="files_zero">0 tiedostoa</string>
     <!-- Generic -->
     <string name="generic_add">Lisää</string>
-    <string name="generic_cancel">Peruuta</string>
     <string name="generic_delete_all_confirm_title">Poistetaanko kaikki?</string>
     <string name="generic_delete_selected_confirm_title">Poistetaanko valitut?</string>
     <string name="generic_description">Kuvaus</string>
@@ -201,7 +200,6 @@ limitations under the License.
     <string name="generic_name">Nimi</string>
     <string name="generic_name_line">Nimi: %1$s</string>
     <string name="generic_no">Ei</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Keskeytetty</string>
     <string name="generic_progress_title">Odota…</string>
     <string name="generic_recording">Tallennetaan…</string>
diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml
index 35f8863aa..cfd0e0d36 100644
--- a/src/main/res/values-fr-rCA/strings.xml
+++ b/src/main/res/values-fr-rCA/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 fichiers</string>
     <string name="files_zero">0 fichier</string>
     <string name="generic_add">Ajouter</string>
-    <string name="generic_cancel">Annuler</string>
     <string name="generic_delete_all_confirm_title">Tout supprimer?</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés?</string>
     <string name="generic_description">Description</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nom</string>
     <string name="generic_name_line">Nom : %1$s</string>
     <string name="generic_no">Non</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Suspendue</string>
     <string name="generic_progress_title">Veuillez patienter…</string>
     <string name="generic_recording">Enregistrement en cours…</string>
diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml
index 8a878c999..4531e1de0 100644
--- a/src/main/res/values-fr-rCH/strings.xml
+++ b/src/main/res/values-fr-rCH/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 fichiers</string>
     <string name="files_zero">Aucun fichier</string>
     <string name="generic_add">Ajouter</string>
-    <string name="generic_cancel">Annuler</string>
     <string name="generic_delete_all_confirm_title">Tout supprimer ?</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés ?</string>
     <string name="generic_description">Description</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nom</string>
     <string name="generic_name_line">Nom : %1$s</string>
     <string name="generic_no">Non</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">En pause</string>
     <string name="generic_progress_title">Veuillez patienter…</string>
     <string name="generic_recording">Enregistrement…</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index d1cc5f3b8..7a4f33410 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -187,7 +187,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="files_zero">Aucun fichier</string>
     <!-- Generic -->
     <string name="generic_add">Ajouter</string>
-    <string name="generic_cancel">Annuler</string>
     <string name="generic_delete_all_confirm_title">Tout supprimer ?</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés ?</string>
     <string name="generic_description">Description</string>
@@ -196,7 +195,6 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="generic_name">Nom</string>
     <string name="generic_name_line">Nom : %1$s</string>
     <string name="generic_no">Non</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">En pause</string>
     <string name="generic_progress_title">Veuillez patienter…</string>
     <string name="generic_recording">Enregistrement…</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 355d16ca1..a6ac47d3e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -197,7 +197,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="files_zero">0 ficheiros</string>
     <!-- Generic -->
     <string name="generic_add">Engadir</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">Eliminar todos?</string>
     <string name="generic_delete_selected_confirm_title">Eliminar a selección?</string>
     <string name="generic_description">Descrición</string>
@@ -206,7 +205,6 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="generic_name">Nome</string>
     <string name="generic_name_line">Nome: %1$s</string>
     <string name="generic_no">Non</string>
-    <string name="generic_ok">Aceptar</string>
     <string name="generic_paused">En pausa</string>
     <string name="generic_progress_title">Agarda…</string>
     <string name="generic_recording">Gravando…</string>
diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
index d39519b2f..930d26bb7 100644
--- a/src/main/res/values-hi/strings.xml
+++ b/src/main/res/values-hi/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 फ़ाइलें</string>
     <!-- Generic -->
     <string name="generic_add">जोड़ें</string>
-    <string name="generic_cancel">रद्द करें</string>
     <string name="generic_delete_all_confirm_title">सभी हटाएं?</string>
     <string name="generic_delete_selected_confirm_title">चयनित हटाएं?</string>
     <string name="generic_description">विवरण</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">नाम</string>
     <string name="generic_name_line">नाम: %1$s</string>
     <string name="generic_no">नहीं</string>
-    <string name="generic_ok">ठीक</string>
     <string name="generic_paused">पॉज़ किया गया</string>
     <string name="generic_progress_title">कृपया प्रतीक्षा करें…</string>
     <string name="generic_recording">रेकॉर्ड हो रहा है…</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index f8d1198e8..25b075150 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 datoteka</string>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
-    <string name="generic_cancel">Otkaži</string>
     <string name="generic_delete_all_confirm_title">Želite li izbrisati sve?</string>
     <string name="generic_delete_selected_confirm_title">Želite li izbrisati odabrano?</string>
     <string name="generic_description">Opis</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Ime</string>
     <string name="generic_name_line">Ime: %1$s</string>
     <string name="generic_no">Ne</string>
-    <string name="generic_ok">U redu</string>
     <string name="generic_paused">Pauzirano</string>
     <string name="generic_progress_title">Pričekajte…</string>
     <string name="generic_recording">Snimanje…</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 876d855e7..e7c0cded6 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 fájl</string>
     <!-- Generic -->
     <string name="generic_add">Hozzáadás</string>
-    <string name="generic_cancel">Mégse</string>
     <string name="generic_delete_all_confirm_title">Mindent töröl?</string>
     <string name="generic_delete_selected_confirm_title">Törli a kiválasztott(ak)at?</string>
     <string name="generic_description">Leírás</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Név</string>
     <string name="generic_name_line">Név: %1$s</string>
     <string name="generic_no">Nem</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Szüneteltetett</string>
     <string name="generic_progress_title">Kis türelmet…</string>
     <string name="generic_recording">Rögzítés…</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index b680f89b5..4a0553f8e 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 file</string>
     <string name="files_zero">0 file</string>
     <string name="generic_add">Tambahkan</string>
-    <string name="generic_cancel">Batal</string>
     <string name="generic_delete_all_confirm_title">Hapus semua?</string>
     <string name="generic_delete_selected_confirm_title">Hapus yang dipilih?</string>
     <string name="generic_description">Deskripsi</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nama</string>
     <string name="generic_name_line">Nama: %1$s</string>
     <string name="generic_no">Tidak</string>
-    <string name="generic_ok">Oke</string>
     <string name="generic_paused">Dijeda</string>
     <string name="generic_progress_title">Harap tunggu…</string>
     <string name="generic_recording">Merekam…</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 9cce95201..21fb68f9e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -178,7 +178,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="files_zero">0 file</string>
     <!-- Generic -->
     <string name="generic_add">Aggiungi</string>
-    <string name="generic_cancel">Annulla</string>
     <string name="generic_delete_all_confirm_title">Eliminare tutto?</string>
     <string name="generic_delete_selected_confirm_title">Eliminare selezione?</string>
     <string name="generic_description">Descrizione</string>
@@ -187,7 +186,6 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="generic_name">Nome</string>
     <string name="generic_name_line">Nome: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">In pausa</string>
     <string name="generic_progress_title">Attendere…</string>
     <string name="generic_recording">Registrazione…</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 9fc4f25e7..2c3991bed 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">שני קבצים</string>
     <string name="files_zero">אפס קבצים</string>
     <string name="generic_add">הוסף</string>
-    <string name="generic_cancel">ביטול</string>
     <string name="generic_delete_all_confirm_title">למחוק את הכל?</string>
     <string name="generic_delete_selected_confirm_title">למחוק את הפריטים שנבחרו?</string>
     <string name="generic_description">תיאור</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">שם</string>
     <string name="generic_name_line">שם: %1$s</string>
     <string name="generic_no">לא</string>
-    <string name="generic_ok">אישור</string>
     <string name="generic_paused">מושהה</string>
     <string name="generic_progress_title">אנא המתן…</string>
     <string name="generic_recording">מקליט…</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index eb45f80ed..37a18886c 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0個のファイル</string>
     <!-- Generic -->
     <string name="generic_add">追加</string>
-    <string name="generic_cancel">キャンセル</string>
     <string name="generic_delete_all_confirm_title">すべて削除しますか？</string>
     <string name="generic_delete_selected_confirm_title">選択したアイテムを削除しますか？</string>
     <string name="generic_description">説明</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">名前</string>
     <string name="generic_name_line">名前: %1$s</string>
     <string name="generic_no">いいえ</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">一時停止</string>
     <string name="generic_progress_title">お待ちください…</string>
     <string name="generic_recording">記録中…</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index ed14dda43..c521403cf 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">파일 0개</string>
     <!-- Generic -->
     <string name="generic_add">추가하기</string>
-    <string name="generic_cancel">취소</string>
     <string name="generic_delete_all_confirm_title">모두 삭제하시겠습니까?</string>
     <string name="generic_delete_selected_confirm_title">선택한 항목을 삭제하시겠습니까?</string>
     <string name="generic_description">설명</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">이름</string>
     <string name="generic_name_line">이름: %1$s</string>
     <string name="generic_no">아니오</string>
-    <string name="generic_ok">확인</string>
     <string name="generic_paused">일시중지됨</string>
     <string name="generic_progress_title">잠시 기다려 주세요…</string>
     <string name="generic_recording">기록 중…</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index 84533aa3a..9c760e683 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 failų</string>
     <!-- Generic -->
     <string name="generic_add">Papildyti</string>
-    <string name="generic_cancel">Atšaukti</string>
     <string name="generic_delete_all_confirm_title">Ištrinti viską?</string>
     <string name="generic_delete_selected_confirm_title">Ištrinti pasirinktus?</string>
     <string name="generic_description">Aprašymas</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Vardas</string>
     <string name="generic_name_line">Vardas: %1$s</string>
     <string name="generic_no">Ne</string>
-    <string name="generic_ok">Gerai</string>
     <string name="generic_paused">Pristabdyta</string>
     <string name="generic_progress_title">Palaukite…</string>
     <string name="generic_recording">Įrašoma…</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index a76498003..2f1182bf1 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 failu</string>
     <!-- Generic -->
     <string name="generic_add">Pievienot</string>
-    <string name="generic_cancel">Atcelt</string>
     <string name="generic_delete_all_confirm_title">Vai dzēst visu?</string>
     <string name="generic_delete_selected_confirm_title">Vai dzēst atlasītos vienumus?</string>
     <string name="generic_description">Apraksts</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Nosaukums</string>
     <string name="generic_name_line">Nosaukums: %1$s</string>
     <string name="generic_no">Nē</string>
-    <string name="generic_ok">Labi</string>
     <string name="generic_paused">Apturēts</string>
     <string name="generic_progress_title">Lūdzu, gaidiet…</string>
     <string name="generic_recording">Notiek ierakstīšana…</string>
diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml
index 88b934cc0..9148ff310 100644
--- a/src/main/res/values-mo/strings.xml
+++ b/src/main/res/values-mo/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 fișiere</string>
     <string name="files_zero">0 fișiere</string>
     <string name="generic_add">Adăugați</string>
-    <string name="generic_cancel">Anulaţi</string>
     <string name="generic_delete_all_confirm_title">Ștergeți toate?</string>
     <string name="generic_delete_selected_confirm_title">Ștergeți cele selectate?</string>
     <string name="generic_description">Descriere</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nume</string>
     <string name="generic_name_line">Nume: %1$s</string>
     <string name="generic_no">Nu</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Oprit temporar</string>
     <string name="generic_progress_title">Așteptați…</string>
     <string name="generic_recording">Se înregistrează…</string>
diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml
index f6815d9c5..7d25e64df 100644
--- a/src/main/res/values-ms/strings.xml
+++ b/src/main/res/values-ms/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 fail</string>
     <!-- Generic -->
     <string name="generic_add">Tambah</string>
-    <string name="generic_cancel">Batal</string>
     <string name="generic_delete_all_confirm_title">Padamkan semua?</string>
     <string name="generic_delete_selected_confirm_title">Padamkan yang dipilih?</string>
     <string name="generic_description">Keterangan</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Nama</string>
     <string name="generic_name_line">Nama: %1$s</string>
     <string name="generic_no">Tidak</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Dijeda</string>
     <string name="generic_progress_title">Sila tunggu…</string>
     <string name="generic_recording">Merakam…</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index b8e6dc660..f2f083b2c 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 filer</string>
     <!-- Generic -->
     <string name="generic_add">Legg til</string>
-    <string name="generic_cancel">Avbryt</string>
     <string name="generic_delete_all_confirm_title">Vil du slette alle?</string>
     <string name="generic_delete_selected_confirm_title">Vil du slette de valgte elementene?</string>
     <string name="generic_description">Beskrivelse</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Navn</string>
     <string name="generic_name_line">Navn: %1$s</string>
     <string name="generic_no">Nei</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">I pausemodus</string>
     <string name="generic_progress_title">Vent litt …</string>
     <string name="generic_recording">Tar opp …</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 9291719c0..ad0c01fdb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -187,7 +187,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="files_zero">0 bestanden</string>
     <!-- Generic -->
     <string name="generic_add">Toevoegen</string>
-    <string name="generic_cancel">Annuleren</string>
     <string name="generic_delete_all_confirm_title">Alles verwijderen?</string>
     <string name="generic_delete_selected_confirm_title">Geselecteerde items verwijderen?</string>
     <string name="generic_description">Beschrijving</string>
@@ -196,7 +195,6 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="generic_name">Naam</string>
     <string name="generic_name_line">Naam: %1$s</string>
     <string name="generic_no">Nee</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Onderbroken</string>
     <string name="generic_progress_title">Een ogenblik geduld…</string>
     <string name="generic_recording">Opnemen…</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d9d84ea84..2d2db954e 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -143,7 +143,6 @@ limitations under the License.
     <string name="files_zero">0 plików</string>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
-    <string name="generic_cancel">Anuluj</string>
     <string name="generic_delete_all_confirm_title">Usunąć wszystko?</string>
     <string name="generic_delete_selected_confirm_title">Usunąć wybrane?</string>
     <string name="generic_description">Opis</string>
@@ -152,7 +151,6 @@ limitations under the License.
     <string name="generic_name">Nazwa</string>
     <string name="generic_name_line">Nazwa: %1$s</string>
     <string name="generic_no">Nie</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Wstrzymano</string>
     <string name="generic_progress_title">Czekaj…</string>
     <string name="generic_recording">Rejestrowanie…</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 879ea6fdc..c0ace0b55 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 arquivos</string>
     <string name="files_zero">0 arquivos</string>
     <string name="generic_add">Adicionar</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">Excluir tudo?</string>
     <string name="generic_delete_selected_confirm_title">Excluir selecionados?</string>
     <string name="generic_description">Descrição</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nome</string>
     <string name="generic_name_line">Nome: %1$s</string>
     <string name="generic_no">Não</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pausada</string>
     <string name="generic_progress_title">Aguarde…</string>
     <string name="generic_recording">Gravando…</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index 8f55eac16..fdc289450 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 ficheiros</string>
     <string name="files_zero">0 ficheiros</string>
     <string name="generic_add">Adicionar</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">Eliminar tudo?</string>
     <string name="generic_delete_selected_confirm_title">Eliminar seleção?</string>
     <string name="generic_description">Descrição</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">Nome</string>
     <string name="generic_name_line">Nome: %1$s</string>
     <string name="generic_no">Não</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Parado</string>
     <string name="generic_progress_title">Aguarde…</string>
     <string name="generic_recording">A gravar…</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 5def76015..09f5a8e64 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 arquivos</string>
     <!-- Generic -->
     <string name="generic_add">Adicionar</string>
-    <string name="generic_cancel">Cancelar</string>
     <string name="generic_delete_all_confirm_title">Excluir tudo?</string>
     <string name="generic_delete_selected_confirm_title">Excluir selecionados?</string>
     <string name="generic_description">Descrição</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Nome</string>
     <string name="generic_name_line">Nome: %1$s</string>
     <string name="generic_no">Não</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pausada</string>
     <string name="generic_progress_title">Aguarde…</string>
     <string name="generic_recording">Gravando…</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index a6c9de069..d94e6b10a 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 fișiere</string>
     <!-- Generic -->
     <string name="generic_add">Adăugați</string>
-    <string name="generic_cancel">Anulaţi</string>
     <string name="generic_delete_all_confirm_title">Ștergeți toate?</string>
     <string name="generic_delete_selected_confirm_title">Ștergeți cele selectate?</string>
     <string name="generic_description">Descriere</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Nume</string>
     <string name="generic_name_line">Nume: %1$s</string>
     <string name="generic_no">Nu</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Oprit temporar</string>
     <string name="generic_progress_title">Așteptați…</string>
     <string name="generic_recording">Se înregistrează…</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 04275ad60..eb6237db0 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 файлов</string>
     <!-- Generic -->
     <string name="generic_add">Добавить</string>
-    <string name="generic_cancel">Отмена</string>
     <string name="generic_delete_all_confirm_title">Удалить все?</string>
     <string name="generic_delete_selected_confirm_title">Удалить выбранное?</string>
     <string name="generic_description">Описание</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Название</string>
     <string name="generic_name_line">Название: %1$s</string>
     <string name="generic_no">Нет</string>
-    <string name="generic_ok">ОК</string>
     <string name="generic_paused">Пауза</string>
     <string name="generic_progress_title">Подождите…</string>
     <string name="generic_recording">Запись…</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 4f580435c..5e5ca5861 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 súborov</string>
     <!-- Generic -->
     <string name="generic_add">Pridať</string>
-    <string name="generic_cancel">Zrušiť</string>
     <string name="generic_delete_all_confirm_title">Odstrániť všetko?</string>
     <string name="generic_delete_selected_confirm_title">Odstrániť vybraté položky?</string>
     <string name="generic_description">Popis</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Meno</string>
     <string name="generic_name_line">Meno: %1$s</string>
     <string name="generic_no">Nie</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pozastavené</string>
     <string name="generic_progress_title">Počkajte…</string>
     <string name="generic_recording">Zaznamenáva sa…</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index 29d672048..2c4e57fc9 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 datotek</string>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
-    <string name="generic_cancel">Prekliči</string>
     <string name="generic_delete_all_confirm_title">Izbriši vse?</string>
     <string name="generic_delete_selected_confirm_title">Izbriši izbrano?</string>
     <string name="generic_description">Opis</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Ime</string>
     <string name="generic_name_line">Ime: %1$s</string>
     <string name="generic_no">Ne</string>
-    <string name="generic_ok">V redu</string>
     <string name="generic_paused">Začasno zaustavljeno</string>
     <string name="generic_progress_title">Prosimo, počakajte …</string>
     <string name="generic_recording">Poteka snemanje …</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 1f25e46a0..052c75439 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 датотека</string>
     <!-- Generic -->
     <string name="generic_add">Додај</string>
-    <string name="generic_cancel">Откажи</string>
     <string name="generic_delete_all_confirm_title">Желите да избришете све?</string>
     <string name="generic_delete_selected_confirm_title">Желите да избришете изабрано?</string>
     <string name="generic_description">Опис</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Име</string>
     <string name="generic_name_line">Име: %1$s</string>
     <string name="generic_no">Не</string>
-    <string name="generic_ok">Потврди</string>
     <string name="generic_paused">Паузирано</string>
     <string name="generic_progress_title">Сачекајте…</string>
     <string name="generic_recording">Снимање…</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index b5aaf2736..77fc002b4 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 filer</string>
     <!-- Generic -->
     <string name="generic_add">Lägg till</string>
-    <string name="generic_cancel">Avbryt</string>
     <string name="generic_delete_all_confirm_title">Ta bort alla?</string>
     <string name="generic_delete_selected_confirm_title">Ta bort markerade?</string>
     <string name="generic_description">Beskrivning</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Namn</string>
     <string name="generic_name_line">Namn: %1$s</string>
     <string name="generic_no">Nej</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Pausat</string>
     <string name="generic_progress_title">Vänta…</string>
     <string name="generic_recording">Spelar in…</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 1e9f18c28..90bef48cb 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 ไฟล์</string>
     <!-- Generic -->
     <string name="generic_add">เพิ่ม</string>
-    <string name="generic_cancel">ยกเลิก</string>
     <string name="generic_delete_all_confirm_title">ลบทั้งหมดใช่ไหม</string>
     <string name="generic_delete_selected_confirm_title">ลบรายการที่เลือกใช่ไหม</string>
     <string name="generic_description">รายละเอียด</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">ชื่อ</string>
     <string name="generic_name_line">ชื่อ: %1$s</string>
     <string name="generic_no">ไม่</string>
-    <string name="generic_ok">ตกลง</string>
     <string name="generic_paused">หยุดชั่วคราว</string>
     <string name="generic_progress_title">โปรดรอสักครู่…</string>
     <string name="generic_recording">กำลังบันทึก…</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index 2d2456155..7823df0d9 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 file</string>
     <!-- Generic -->
     <string name="generic_add">Idagdag</string>
-    <string name="generic_cancel">Kanselahin</string>
     <string name="generic_delete_all_confirm_title">Tanggalin lahat?</string>
     <string name="generic_delete_selected_confirm_title">Tanggalin ang pinili?</string>
     <string name="generic_description">Paglalarawan</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Pangalan</string>
     <string name="generic_name_line">Pangalan: %1$s</string>
     <string name="generic_no">Hindi</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Naka-pause</string>
     <string name="generic_progress_title">Mangyaring maghintay…</string>
     <string name="generic_recording">Nagre-record…</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index ae1ce5482..6148a3d13 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 dosya</string>
     <!-- Generic -->
     <string name="generic_add">Ekle</string>
-    <string name="generic_cancel">İptal</string>
     <string name="generic_delete_all_confirm_title">Tümü silinsin mi?</string>
     <string name="generic_delete_selected_confirm_title">Seçilenler silinsin mi?</string>
     <string name="generic_description">Açıklama</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Adı</string>
     <string name="generic_name_line">Adı: %1$s</string>
     <string name="generic_no">Hayır</string>
-    <string name="generic_ok">Tamam</string>
     <string name="generic_paused">Duraklatıldı</string>
     <string name="generic_progress_title">Lütfen bekleyin…</string>
     <string name="generic_recording">Kaydediliyor…</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index d5a2a2d70..7ff634815 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 файлів</string>
     <!-- Generic -->
     <string name="generic_add">Додати</string>
-    <string name="generic_cancel">Скасувати</string>
     <string name="generic_delete_all_confirm_title">Видалити все?</string>
     <string name="generic_delete_selected_confirm_title">Видалити вибрані?</string>
     <string name="generic_description">Опис</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Назва</string>
     <string name="generic_name_line">Назва: %1$s</string>
     <string name="generic_no">Ні</string>
-    <string name="generic_ok">ОК</string>
     <string name="generic_paused">Призупинено</string>
     <string name="generic_progress_title">Зачекайте…</string>
     <string name="generic_recording">Записування…</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2d72c960a..de3fd00b2 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0 tệp</string>
     <!-- Generic -->
     <string name="generic_add">Thêm</string>
-    <string name="generic_cancel">Hủy</string>
     <string name="generic_delete_all_confirm_title">Xóa tất cả?</string>
     <string name="generic_delete_selected_confirm_title">Xóa phần được chọn?</string>
     <string name="generic_description">Mô tả</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">Tên</string>
     <string name="generic_name_line">Tên: %1$s</string>
     <string name="generic_no">Không</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_paused">Đã tạm dừng</string>
     <string name="generic_progress_title">Vui lòng đợi…</string>
     <string name="generic_recording">Đang ghi…</string>
diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml
index 6c138acca..c886a3e62 100644
--- a/src/main/res/values-zh-rHK/strings.xml
+++ b/src/main/res/values-zh-rHK/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 個檔案</string>
     <string name="files_zero">0 個檔案</string>
     <string name="generic_add">新增</string>
-    <string name="generic_cancel">取消</string>
     <string name="generic_delete_all_confirm_title">確定要全部刪除？</string>
     <string name="generic_delete_selected_confirm_title">確定要刪除所選項目？</string>
     <string name="generic_description">內容描述</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">名稱</string>
     <string name="generic_name_line">名稱：%1$s</string>
     <string name="generic_no">否</string>
-    <string name="generic_ok">確定</string>
     <string name="generic_paused">已暫停</string>
     <string name="generic_progress_title">請稍候…</string>
     <string name="generic_recording">正在記錄…</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 6c138acca..c886a3e62 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -114,7 +114,6 @@
     <string name="files_two">2 個檔案</string>
     <string name="files_zero">0 個檔案</string>
     <string name="generic_add">新增</string>
-    <string name="generic_cancel">取消</string>
     <string name="generic_delete_all_confirm_title">確定要全部刪除？</string>
     <string name="generic_delete_selected_confirm_title">確定要刪除所選項目？</string>
     <string name="generic_description">內容描述</string>
@@ -123,7 +122,6 @@
     <string name="generic_name">名稱</string>
     <string name="generic_name_line">名稱：%1$s</string>
     <string name="generic_no">否</string>
-    <string name="generic_ok">確定</string>
     <string name="generic_paused">已暫停</string>
     <string name="generic_progress_title">請稍候…</string>
     <string name="generic_recording">正在記錄…</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 59b1f1738..4b7c7419e 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -135,7 +135,6 @@ limitations under the License.
     <string name="files_zero">0个文件</string>
     <!-- Generic -->
     <string name="generic_add">添加</string>
-    <string name="generic_cancel">取消</string>
     <string name="generic_delete_all_confirm_title">全部删除？</string>
     <string name="generic_delete_selected_confirm_title">删除所选项？</string>
     <string name="generic_description">说明</string>
@@ -144,7 +143,6 @@ limitations under the License.
     <string name="generic_name">名称</string>
     <string name="generic_name_line">名称：%1$s</string>
     <string name="generic_no">否</string>
-    <string name="generic_ok">确定</string>
     <string name="generic_paused">已暂停</string>
     <string name="generic_progress_title">请稍候…</string>
     <string name="generic_recording">正在记录…</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6cdfa1712..70a01f6b4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -236,7 +236,6 @@ limitations under the License.
     <string name="files_zero">0 files</string>
     <!-- Generic -->
     <string name="generic_add">Add</string>
-    <string name="generic_cancel">Cancel</string>
     <string name="generic_delete_all_confirm_title">Delete all?</string>
     <string name="generic_delete_selected_confirm_title">Delete selected?</string>
     <string name="generic_description">Description</string>
@@ -245,7 +244,6 @@ limitations under the License.
     <string name="generic_name">Name</string>
     <string name="generic_name_line">Name: %1$s</string>
     <string name="generic_no">No</string>
-    <string name="generic_ok">OK</string>
     <string name="generic_open_track">Open Track</string>
     <string name="generic_paused">Paused</string>
     <string name="generic_progress_title">Please wait&#8230;</string>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 70ee4e718..d4d653934 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -197,9 +197,9 @@ limitations under the License.
             android:dialogMessage="@string/settings_reset_confirm_message"
             android:dialogTitle="@string/settings_reset_confirm_title"
             android:key="@string/settings_reset_key"
-            android:negativeButtonText="@string/generic_cancel"
+            android:negativeButtonText="@android:string/cancel"
             android:persistent="false"
-            android:positiveButtonText="@string/generic_yes"
+            android:positiveButtonText="@android:string/ok"
             android:title="@string/settings_reset" />
     </PreferenceCategory>