From 62c3f7f21638a79b0c9f724ea83c7f08c542ffd3 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Tue, 8 May 2018 21:41:42 +0200
Subject: [PATCH] Improve strings in measurement preferences

Make it clear that a measurement can both be reordered and have a
sub-menu where they can be configured.

See #253
---
 android_app/app/src/main/res/values-de/strings.xml         | 1 -
 android_app/app/src/main/res/values-el/strings.xml         | 1 -
 android_app/app/src/main/res/values-es/strings.xml         | 1 -
 android_app/app/src/main/res/values-fr/strings.xml         | 1 -
 android_app/app/src/main/res/values-it/strings.xml         | 1 -
 android_app/app/src/main/res/values-nb/strings.xml         | 1 -
 android_app/app/src/main/res/values-nl/strings.xml         | 1 -
 android_app/app/src/main/res/values-pl/strings.xml         | 1 -
 android_app/app/src/main/res/values-pt-rBR/strings.xml     | 1 -
 android_app/app/src/main/res/values-ro/strings.xml         | 1 -
 android_app/app/src/main/res/values-sk/strings.xml         | 1 -
 android_app/app/src/main/res/values-sv/strings.xml         | 1 -
 android_app/app/src/main/res/values-zh-rTW/strings.xml     | 1 -
 android_app/app/src/main/res/values/strings.xml            | 3 ++-
 .../app/src/main/res/xml/measurement_preferences.xml       | 7 +++++--
 15 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index 305f3ba7..0738c57c 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -163,7 +163,6 @@
     <string name="permission_bluetooth_info">Erlaubnis erforderlich um auf den ungefähren Standort zuzugreifen, um nach Bluetooth-Geräten zu suchen. Sobald das Gerät gefunden wurde kann diese widerrufen werden.</string>
     <string name="permission_bluetooth_info_title">Information</string>
     <string name="label_next">Weiter</string>
-    <string name="label_press_hold_reorder">Halten Sie die Taste gedrückt, um die Reihenfolge zu ändern</string>
     <string name="label_set_default_order">Default Reihenfolge wiederherstellen</string>
     <string name="label_share_subject">CSV Datenexport (%s)</string>
     <string name="label_mergeWithLastMeasurement">Zusammenführen mit der letzten Messung</string>
diff --git a/android_app/app/src/main/res/values-el/strings.xml b/android_app/app/src/main/res/values-el/strings.xml
index 6100b732..f175f6e5 100644
--- a/android_app/app/src/main/res/values-el/strings.xml
+++ b/android_app/app/src/main/res/values-el/strings.xml
@@ -191,7 +191,6 @@
     <string name="permission_bluetooth_info">Άδεια τραχύς τοποθεσίας αναγκαία για την αναζήτηση συσκευών Bluetooth. Μπορεί να ανακληθεί αφού βρεθεί η συσκευή.</string>
     <string name="permission_bluetooth_info_title">Πληροφορίες</string>
     <string name="label_next">Επόμενο</string>
-    <string name="label_press_hold_reorder">Πιέστε και κρατήστε για επαναδιάταξη</string>
     <string name="label_set_default_order">Θέσε προκαθορισμένη διάταξη</string>
     <string name="label_export_overwrite">Αντικατέστησε προηγούμενη εξαγωγή \"%s\";</string>
     <string name="label_include_in_overview_graph">Περιέλαβε στο γράφημα επισκόπησης</string>
diff --git a/android_app/app/src/main/res/values-es/strings.xml b/android_app/app/src/main/res/values-es/strings.xml
index 6f94dde2..39a04b67 100644
--- a/android_app/app/src/main/res/values-es/strings.xml
+++ b/android_app/app/src/main/res/values-es/strings.xml
@@ -203,7 +203,6 @@
     <string name="label_weeks_view">Vista semanal</string>
 
     <string name="label_next">Siguiente</string>
-    <string name="label_press_hold_reorder">Presiona y mantén para reordenar</string>
     <string name="label_set_default_order">Establecer orden por defecto</string>
     <string name="label_export_overwrite">¿Sobreescribir la exportación anterior %s?</string>
     <string name="label_include_in_overview_graph">Incluir en el gráfico general</string>
diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml
index cbff2a7f..f82b8229 100644
--- a/android_app/app/src/main/res/values-fr/strings.xml
+++ b/android_app/app/src/main/res/values-fr/strings.xml
@@ -162,7 +162,6 @@
     <string name="label_month_view">Vue mensuelle</string>
     <string name="label_weeks_view">Vue hebdomadaire</string>
 
-    <string name="label_press_hold_reorder">Appuyez et maintenez pour réorganiser</string>
     <string name="label_set_default_order">Définir l\'ordre par défaut</string>
     <string name="label_measurement_in_percent">Mesure en %</string>
     <string name="theme_light">Clair</string>
diff --git a/android_app/app/src/main/res/values-it/strings.xml b/android_app/app/src/main/res/values-it/strings.xml
index 76250c0f..3e8c81d6 100644
--- a/android_app/app/src/main/res/values-it/strings.xml
+++ b/android_app/app/src/main/res/values-it/strings.xml
@@ -191,7 +191,6 @@
     <string name="permission_bluetooth_info">L\'autorizzazione di \"geolocalizzazione a basso consumo\" è necessaria per la ricerca dei dispositivi Bluetooth. Può essere revocata dopo che il dispositivo viene rilevato.</string>
     <string name="permission_bluetooth_info_title">Informazioni</string>
     <string name="label_next">Avanti</string>
-    <string name="label_press_hold_reorder">Premere e tenere premuto per riordinare</string>
     <string name="label_set_default_order">Imposta ordine predefinito</string>
     <string name="label_export_overwrite">Sovrascrivere la precedente esportazione \"%s\"?</string>
     <string name="label_include_in_overview_graph">Includere nel grafico di riepilogo</string>
diff --git a/android_app/app/src/main/res/values-nb/strings.xml b/android_app/app/src/main/res/values-nb/strings.xml
index 7a7c15bb..ac38d1d0 100644
--- a/android_app/app/src/main/res/values-nb/strings.xml
+++ b/android_app/app/src/main/res/values-nb/strings.xml
@@ -192,7 +192,6 @@
     <string name="permission_bluetooth_info">Omtrentlig tilgang til plassering kreves for å søke etter Blåtannsenheter. Tilgangen kan tilbakekalles etter at enheten er funnet.</string>
     <string name="permission_bluetooth_info_title">Info</string>
     <string name="label_next">Neste</string>
-    <string name="label_press_hold_reorder">Trykk og hold for å endre rekkefølge</string>
     <string name="label_set_default_order">Sett forvalgt rekkefølge</string>
     <string name="label_export_overwrite">Overskriv forrige eksportering \"%s\"?</string>
     <string name="label_include_in_overview_graph">Inkluder i oversiktsgraf</string>
diff --git a/android_app/app/src/main/res/values-nl/strings.xml b/android_app/app/src/main/res/values-nl/strings.xml
index 32a95da2..1787dc85 100644
--- a/android_app/app/src/main/res/values-nl/strings.xml
+++ b/android_app/app/src/main/res/values-nl/strings.xml
@@ -198,7 +198,6 @@
     <string name="permission_bluetooth_info">openScale heeft toestemming nodig tot uw locatie om te kunnen zoeken naar Bluetooth apparaten</string>
     <string name="permission_bluetooth_info_title">Informatie</string>
     <string name="label_next">Volgende</string>
-    <string name="label_press_hold_reorder">Indrukken en vasthouden om opnieuw in te delen</string>
     <string name="label_set_default_order">Stel standaard volgorde in</string>
     <string name="label_export_overwrite">Vorige export \"%s\" overschrijven?</string>
 
diff --git a/android_app/app/src/main/res/values-pl/strings.xml b/android_app/app/src/main/res/values-pl/strings.xml
index 926a8c47..a3b1f4a5 100644
--- a/android_app/app/src/main/res/values-pl/strings.xml
+++ b/android_app/app/src/main/res/values-pl/strings.xml
@@ -192,7 +192,6 @@
     <string name="permission_bluetooth_info">Wymagane zezwolenie na dostęp do lokalizacji w celu znalezienia urządzeń Bluetooth. Po znalezieniu urządzenia zezwolenie można wycofać.</string>
     <string name="permission_bluetooth_info_title">Informacje</string>
     <string name="label_next">Następny</string>
-    <string name="label_press_hold_reorder">Naciśnij i przytrzymaj by zmienić kolejność</string>
     <string name="label_set_default_order">Ustaw domyślną kolejność</string>
     <string name="label_export_overwrite">Nadpisać poprzedni eksport \"%s\"?</string>
 
diff --git a/android_app/app/src/main/res/values-pt-rBR/strings.xml b/android_app/app/src/main/res/values-pt-rBR/strings.xml
index 1e5466f8..d35310ef 100644
--- a/android_app/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android_app/app/src/main/res/values-pt-rBR/strings.xml
@@ -174,7 +174,6 @@
     <string name="permission_bluetooth_info">openScale precisa de permissão para procurar dispositivos Bluetooth</string>
     <string name="permission_bluetooth_info_title">Informação</string>
     <string name="label_next">Próximo</string>
-    <string name="label_press_hold_reorder">Carrega e espera para reordenar</string>
     <string name="label_set_default_order">Define ordem por defeito</string>
     <string name="label_export_overwrite">"Gravar sobre o export \"%s\"  anterior ?"</string>
     <string name="label_include_in_overview_graph">Incluir no gráfico geral</string>
diff --git a/android_app/app/src/main/res/values-ro/strings.xml b/android_app/app/src/main/res/values-ro/strings.xml
index ad8cb8e8..9058ec6c 100644
--- a/android_app/app/src/main/res/values-ro/strings.xml
+++ b/android_app/app/src/main/res/values-ro/strings.xml
@@ -182,7 +182,6 @@
     <string name="permission_bluetooth_info">Permisiunea accesului la localizare e necesară pentru a căuta dispozitive Bluetooth. Permisiunea poate fi revocată o dată ce dispozitivul a fost găsit.</string>
     <string name="permission_bluetooth_info_title">Informație</string>
     <string name="label_next">Următoarea</string>
-    <string name="label_press_hold_reorder">Apăsați și mențineți pentru a reorganiza</string>
     <string name="label_set_default_order">Definire a ordinii de bază</string>
     <string name="label_reminder_weekdays">Zile lucrătoare</string>
     <string name="label_reminder_time">Ora</string>
diff --git a/android_app/app/src/main/res/values-sk/strings.xml b/android_app/app/src/main/res/values-sk/strings.xml
index 3a649e71..ae7b0510 100644
--- a/android_app/app/src/main/res/values-sk/strings.xml
+++ b/android_app/app/src/main/res/values-sk/strings.xml
@@ -175,7 +175,6 @@
     <string name="permission_bluetooth_info">openScale vyžaduje povolenie prístupu k približnej polohe na vyhľadávanie bluetooth zariadení. Po nájdení zaradenia môžete toto povolenie zamietnuť.</string>
     <string name="permission_bluetooth_info_title">Informácie</string>
     <string name="label_next">Ďalej</string>
-    <string name="label_press_hold_reorder">Stlačte a podržte pre zmenu radenia</string>
     <string name="label_set_default_order">Nastaviť predvolené radenie</string>
     <string name="label_export_overwrite">Prepísať predchádzajúci export \"%s\"?</string>
 
diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml
index 4ebf85b5..22baddb3 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -170,7 +170,6 @@
     <string name="label_share_subject">CSV dataexport (%s)</string>
 
     <string name="label_next">Nästa</string>
-    <string name="label_press_hold_reorder">Tryck och håll för att ändra ordning</string>
     <string name="label_set_default_order">Ställ in standardordning</string>
 
     <string name="label_weeks_view">Veckovy</string>
diff --git a/android_app/app/src/main/res/values-zh-rTW/strings.xml b/android_app/app/src/main/res/values-zh-rTW/strings.xml
index 1c8074c7..5a64a7dd 100644
--- a/android_app/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android_app/app/src/main/res/values-zh-rTW/strings.xml
@@ -191,7 +191,6 @@
 \n當搜尋完成時， 此權限可以再次關上。</string>
     <string name="permission_bluetooth_info_title">資料</string>
     <string name="label_next">下一項</string>
-    <string name="label_press_hold_reorder">長按下去排序</string>
     <string name="label_set_default_order">設定預設的排序</string>
     <string name="label_export_overwrite">覆寫舊有的滙出資料 \"%s\"?</string>
     <string name="label_include_in_overview_graph">附設在概覽圖表中</string>
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 378e8961..095f957c 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -191,7 +191,8 @@
     <string name="permission_bluetooth_info">Coarse location permission needed to search for Bluetooth devices. It can be revoked after the device is found.</string>
     <string name="permission_bluetooth_info_title">Info</string>
     <string name="label_next">Next</string>
-    <string name="label_press_hold_reorder">Press and hold to reorder</string>
+    <string name="label_long_press_drag_reorder">Long press and drag measurement to reorder</string>
+    <string name="label_click_measurement_configure">Click measurement to configure</string>
     <string name="label_set_default_order">Set default order</string>
     <string name="label_export_overwrite">Overwrite previous export \"%s\"?</string>
     <string name="label_include_in_overview_graph">Include in overview graph</string>
diff --git a/android_app/app/src/main/res/xml/measurement_preferences.xml b/android_app/app/src/main/res/xml/measurement_preferences.xml
index 7def7024..5470d051 100644
--- a/android_app/app/src/main/res/xml/measurement_preferences.xml
+++ b/android_app/app/src/main/res/xml/measurement_preferences.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference android:key="resetOrder" android:title="@string/label_set_default_order"/>
-    <PreferenceCategory android:title="@string/label_press_hold_reorder" android:key="measurements" />
+    <Preference
+        android:key="resetOrder"
+        android:summary="@string/label_long_press_drag_reorder"
+        android:title="@string/label_set_default_order" />
+    <PreferenceCategory android:title="@string/label_click_measurement_configure" android:key="measurements" />
     <PreferenceCategory android:title="@string/label_category_measurement_database">
         <Preference
             android:title="@string/label_delete_all"