From f95b8fa53c5b61c48429bbb09d90f2cf16a141cf Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Fri, 23 Feb 2018 21:35:37 +0100
Subject: [PATCH 1/6] Remove unused strings

---
 .../app/src/main/res/values-ca/strings.xml        | 15 ---------------
 .../app/src/main/res/values-cs/strings.xml        |  7 -------
 .../app/src/main/res/values-de/strings.xml        | 15 ---------------
 .../app/src/main/res/values-es/strings.xml        | 15 ---------------
 .../app/src/main/res/values-fr/strings.xml        | 15 ---------------
 .../app/src/main/res/values-ja/strings.xml        | 15 ---------------
 .../app/src/main/res/values-nl/strings.xml        | 15 ---------------
 .../app/src/main/res/values-pl/strings.xml        | 15 ---------------
 .../app/src/main/res/values-pt/strings.xml        | 15 ---------------
 .../app/src/main/res/values-sk/strings.xml        | 15 ---------------
 .../app/src/main/res/values-sv/strings.xml        | 15 ---------------
 .../app/src/main/res/values-tr/strings.xml        | 15 ---------------
 android_app/app/src/main/res/values/strings.xml   | 15 ---------------
 13 files changed, 187 deletions(-)

diff --git a/android_app/app/src/main/res/values-ca/strings.xml b/android_app/app/src/main/res/values-ca/strings.xml
index 7f430f84..32a6b732 100644
--- a/android_app/app/src/main/res/values-ca/strings.xml
+++ b/android_app/app/src/main/res/values-ca/strings.xml
@@ -6,14 +6,12 @@
     <string name="title_table">Taula</string>
     <string name="title_statistics">Estadístiques</string>
     <string name="title_users">Usuaris</string>
-    <string name="title_data">Dades</string>
     <string name="title_measurements">Mesures</string>
     <string name="title_about">Quant a</string>
 
     <string name="action_settings">Configuració</string>
     <string name="action_bluetooth_status">Estat del Bluetooth</string>
 
-    <string name="label_add">Afegir</string>
     <string name="label_cancel">Cancel·lar</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Sí</string>
@@ -21,7 +19,6 @@
     <string name="label_delete">Elimina</string>
     <string name="label_add_user">Afegir usuari</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Pes</string>
     <string name="label_bmi">Índex de massa corporal (IMC)</string>
     <string name="label_bmr">Taxa metabòlica basal (TMB)</string>
@@ -41,7 +38,6 @@
         <item quantity="one">%d dia</item>
         <item quantity="other">%d dies</item>
     </plurals>
-    <string name="label_measures">mesures</string>
     <string name="label_last_week">Darrers 7 dies</string>
     <string name="label_last_month">Darrers 30 dies</string>
     <string name="label_weight_difference">Diferència de pes</string>
@@ -64,7 +60,6 @@
     <string name="label_title_user">usuari</string>
     <string name="label_title_last_measurement">darrera mesura</string>
     <string name="label_title_goal">objectiu</string>
-    <string name="label_title_statistics">estadístiques</string>
 
     <string name="label_import">Importar</string>
     <string name="label_export">Exportar</string>
@@ -78,7 +73,6 @@
     <string name="error_body_height_required">Error, cal l\'altura</string>
     <string name="error_initial_weight_required">Error, cal el pes inicial</string>
     <string name="error_goal_weight_required">Error, cal l\'objetiu de pes</string>
-    <string name="error_hip_value_required">cal la circumferència del maluc</string>
 
     <string name="info_data_deleted">Entrada eliminada</string>
     <string name="info_data_all_deleted">Totes les entrades eliminades</string>
@@ -86,7 +80,6 @@
     <string name="info_data_imported">Dades importades de</string>
     <string name="info_set_filename">Establir nom d\'arxiu a</string>
     <string name="info_enter_value_cm">Valor en cm</string>
-    <string name="info_enter_value_percent">Valor en %</string>
     <string name="info_enter_value_unit">Valor en</string>
     <string name="info_enter_comment">Comentari opcional</string>
     <string name="info_enter_initial_weight">Pes inicial en la seua unitat de mesura</string>
@@ -96,8 +89,6 @@
     <string name="info_is_enable">està activat</string>
     <string name="info_is_not_enable">està desactivat</string>
     <string name="info_is_not_available">no està disponible</string>
-    <string name="info_delete_bluetooth_data">Eliminar totes les dades de Bluetooth</string>
-    <string name="info_delete_bluetooth_data_success">Les dades de Bluetooth s\'han eliminat</string>
     <string name="info_bluetooth_try_connection">Intentant connectar a</string>
     <string name="info_bluetooth_connection_lost">S\'ha perdut la connexió Bluetooth</string>
     <string name="info_bluetooth_no_device">No s\'ha trobat un dispositiu Bluetooth</string>
@@ -147,12 +138,6 @@
     <string name="label_reminder_notify_text">Text de la notificació</string>
     <string name="default_value_reminder_notify_text">És hora de pesar-se</string>
 
-    <string name="info_your_weight">El teu pes era</string>
-    <string name="info_your_fat">La teua massa corporal era</string>
-    <string name="info_your_water">El teu percentatge d\'aigua era</string>
-    <string name="info_your_muscle">El teu percentatge muscular era</string>
-    <string name="info_your_waist">La teua cintura era</string>
-    <string name="info_your_hip">El teu maluc era</string>
     <string name="info_on_date">el</string>
 
     <string name="Monday">Dilluns</string>
diff --git a/android_app/app/src/main/res/values-cs/strings.xml b/android_app/app/src/main/res/values-cs/strings.xml
index 10f612cf..bb999904 100644
--- a/android_app/app/src/main/res/values-cs/strings.xml
+++ b/android_app/app/src/main/res/values-cs/strings.xml
@@ -4,7 +4,6 @@
     <string name="title_table">Tabulka</string>
     <string name="title_statistics">Statistiky</string>
     <string name="title_users">Uživatelé</string>
-    <string name="title_data">Data</string>
     <string name="title_measurements">Měření</string>
     <string name="title_about">O aplikaci</string>
     <string name="title_general">Obecné</string>
@@ -14,7 +13,6 @@
     <string name="open_drawer">otevřít</string>
     <string name="close_drawer">zavřít</string>
 
-    <string name="label_add">Přidat</string>
     <string name="label_cancel">Storno</string>
     <string name="label_yes">Ano</string>
     <string name="label_no">Ne</string>
@@ -22,7 +20,6 @@
     <string name="label_add_user">Přidat uživatele</string>
     <string name="label_share">Sdílet</string>
 
-    <string name="label_id">Identifikátor</string>
     <string name="label_weight">Hmotnost</string>
     <string name="label_bmi">Index tělesné hmotnosti (BMI)</string>
     <string name="label_bmr">Bazální metabolický výdej (BMR)</string>
@@ -61,7 +58,6 @@
     <string name="label_title_user">uživatel</string>
     <string name="label_title_last_measurement">minulé měření</string>
     <string name="label_title_goal">cíl</string>
-    <string name="label_title_statistics">statistiky</string>
 
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
@@ -81,7 +77,6 @@
     <string name="info_data_exported">Data exportována na</string>
     <string name="info_data_imported">Data importována z</string>
     <string name="info_enter_value_cm">Zadejte hodnotu v cm</string>
-    <string name="info_enter_value_percent">Zadejte hodnotu v %</string>
     <string name="info_enter_value_unit">Zadejte hodnotu v</string>
     <string name="info_enter_comment">Zadejte volitelný komentář</string>
     <string name="info_is_visible">je viditelné</string>
@@ -89,7 +84,6 @@
     <string name="info_is_enable">je zapnuté</string>
     <string name="info_is_not_enable">je vypnuté</string>
     <string name="info_is_not_available">není k dispozici</string>
-    <string name="info_delete_bluetooth_data">Vyčistit všechna bluetooth data</string>
     <string name="info_bluetooth_connection_lost">Ztraceno bluetooth spojení</string>
     <string name="info_bluetooth_no_device">Nebylo nalezeno žádné bluetooth zařízení</string>
     <string name="info_bluetooth_no_device_set">Nebylo vybráno žádné bluetooth zařízení</string>
@@ -123,7 +117,6 @@
     <string name="label_reminder_weekdays">Dny v týdnu</string>
     <string name="label_reminder_time">Čas</string>
     <string name="label_reminder_notify_text">Text upozornění</string>
-    <string name="info_your_weight">Vaše hmotnost byla</string>
     <string name="info_on_date">v</string>
 
     <string name="Monday">pondělí</string>
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 3b11933e..6bc9dcbf 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -5,17 +5,13 @@
     <string name="error_exporting">Fehler beim Exportieren</string>
     <string name="error_importing">Fehler beim Importieren</string>
     <string name="error_user_name_required">Fehler Benutzername ist erfoderlich</string>
-    <string name="error_hip_value_required">Hüftumfang ist erforderlich</string>
     <string name="info_data_all_deleted">Alle Datenbank Einträge wurden gelöscht</string>
     <string name="info_data_deleted">Datenbank Eintrag wurde gelöscht</string>
     <string name="info_data_exported">Daten werden exportiert nach</string>
     <string name="info_data_imported">Daten werden importiert von</string>
-    <string name="info_delete_bluetooth_data">Lösche alle Bluetooth Daten</string>
-    <string name="info_delete_bluetooth_data_success">Bluetooth Daten wurden erfolgreich gelöscht</string>
     <string name="info_enter_comment">Gebe ein optionalen Kommentar ein</string>
     <string name="info_enter_user_name">Gebe dein Namen ein</string>
     <string name="info_enter_value_cm">Gebe dein Wert in cm an</string>
-    <string name="info_enter_value_percent">Gebe dein Wert in % an</string>
     <string name="info_enter_value_unit">Gebe dein Wert an in</string>
     <string name="info_is_not_visible">ist nicht sichtbar</string>
     <string name="info_is_visible">ist sichtbar</string>
@@ -23,11 +19,6 @@
     <string name="info_no_selected_user">Kein Benutzer vorhanden. Bitte erzeugen Sie ein neuen Benutzer unter Einstellungen.</string>
     <string name="info_on_date">am</string>
     <string name="info_set_filename">Setzte Dateiname auf</string>
-    <string name="info_your_fat">Dein Körperfett war</string>
-    <string name="info_your_muscle">Dein Muskelanteil war</string>
-    <string name="info_your_water">Dein Wasseranteil war</string>
-    <string name="info_your_weight">Dein Gewicht war</string>
-    <string name="label_add">Hinzufügen</string>
     <string name="label_birthday">Geburtstag</string>
     <string name="label_bluetooth_enable">Suche nach Waage beim Start</string>
     <string name="label_bluetooth_title">Bluetooth</string>
@@ -49,12 +40,10 @@
     <string name="label_goal_date">Zieldatum</string>
     <string name="label_goal_date_is">Das Zieldatum ist</string>
     <string name="label_goal_weight">Zielgewicht</string>
-    <string name="label_id">Id</string>
     <string name="label_import">Importieren</string>
     <string name="label_last_month">Letzten 30 Tage</string>
     <string name="label_last_week">Letzten 7 Tage</string>
     <string name="label_male">Männlich</string>
-    <string name="label_measures">Messungen</string>
     <string name="label_muscle">Muskelanteil</string>
     <string name="label_no">Nein</string>
     <string name="label_ok">OK</string>
@@ -62,7 +51,6 @@
     <string name="label_time">Zeit</string>
     <string name="label_title_goal">Ziel</string>
     <string name="label_title_last_measurement">Letzte Messung</string>
-    <string name="label_title_statistics">Statistiken</string>
     <string name="label_title_user">Benutzer</string>
     <string name="label_user_name">Name</string>
     <string name="label_water">Wassergehalt</string>
@@ -78,13 +66,10 @@
     <string name="title_users">Benutzer</string>
     <string name="label_add_user">Benutzer hinzufügen</string>
     <string name="error_goal_weight_required">Fehler Zielgewicht ist erforderlich</string>
-    <string name="title_data">Daten</string>
     <string name="info_is_not_enable">ist ausgeschaltet</string>
     <string name="info_is_enable">ist eingeschaltet</string>
     <string name="label_waist">Taillenumfang</string>
     <string name="label_hip">Hüftumfang</string>
-    <string name="info_your_hip">Dein Hüftumfang war</string>
-    <string name="info_your_waist">Dein Bauchumfang war</string>
     <string name="info_no_evaluation_available">Kann den Wert nicht evaluieren</string>
     <string name="label_whtr">Taille-zu-Größe Verhältnis</string>
     <string name="label_whr">Taille-Hüft Verhältnis</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 a9726fdc..96e7caea 100644
--- a/android_app/app/src/main/res/values-es/strings.xml
+++ b/android_app/app/src/main/res/values-es/strings.xml
@@ -6,14 +6,12 @@
     <string name="title_table">Tabla</string>
     <string name="title_statistics">Estadísticas</string>
     <string name="title_users">Usuarios</string>
-    <string name="title_data">Datos</string>
     <string name="title_measurements">Mediciones</string>
     <string name="title_about">Acerca de</string>
 
     <string name="action_settings">Configuración</string>
     <string name="action_bluetooth_status">Estado del Bluetooth</string>
 
-    <string name="label_add">Añadir</string>
     <string name="label_cancel">Cancelar</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Si</string>
@@ -21,7 +19,6 @@
     <string name="label_delete">Borrar</string>
     <string name="label_add_user">Añadir usuario</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Peso</string>
     <string name="label_bmi">Índice de masa corporal (IMC)</string>
     <string name="label_bmr">Tasa metabólica basal (TMB)</string>
@@ -41,7 +38,6 @@
         <item quantity="one">%d día</item>
         <item quantity="other">%d días</item>
     </plurals>
-    <string name="label_measures">medidas</string>
     <string name="label_last_week">Últimos 7 días</string>
     <string name="label_last_month">Últimos 30 días</string>
     <string name="label_weight_difference">Diferencia de peso</string>
@@ -64,7 +60,6 @@
     <string name="label_title_user">usuario</string>
     <string name="label_title_last_measurement">última medición</string>
     <string name="label_title_goal">objetivo</string>
-    <string name="label_title_statistics">estadísticas</string>
 
     <string name="label_import">Importar</string>
     <string name="label_export">Exportar</string>
@@ -78,7 +73,6 @@
     <string name="error_body_height_required">Error, se requiere la altura</string>
     <string name="error_initial_weight_required">Error, se requiere el peso inicial</string>
     <string name="error_goal_weight_required">Error, se requiere el objetivo de peso</string>
-    <string name="error_hip_value_required">se requiere circunferencia de la cadera</string>
 
     <string name="info_data_deleted">Entrada borrada</string>
     <string name="info_data_all_deleted">Todas las entradas borradas</string>
@@ -86,7 +80,6 @@
     <string name="info_data_imported">Datos importados de</string>
     <string name="info_set_filename">Establecer nombre de archivo a</string>
     <string name="info_enter_value_cm">Introduzca valor en cm</string>
-    <string name="info_enter_value_percent">Introduzca valor en %</string>
     <string name="info_enter_value_unit">Introduzca valor en</string>
     <string name="info_enter_comment">Introduzca un comentario opcional</string>
     <string name="info_enter_initial_weight">Introduzca su peso inicial en su unidad de medida</string>
@@ -96,8 +89,6 @@
     <string name="info_is_enable">está activado</string>
     <string name="info_is_not_enable">está desactivado</string>
     <string name="info_is_not_available">no está disponible</string>
-    <string name="info_delete_bluetooth_data">Borrar todos los datos de Bluetooth</string>
-    <string name="info_delete_bluetooth_data_success">Los datos de Bluetooth fueron borrados</string>
     <string name="info_bluetooth_try_connection">Intentando conectar a</string>
     <string name="info_bluetooth_connection_lost">Se perdió la conexión Bluetooth</string>
     <string name="info_bluetooth_no_device">No se encontró un dispositivo Bluetooth</string>
@@ -147,12 +138,6 @@
     <string name="label_reminder_notify_text">Texto de la notificación</string>
     <string name="default_value_reminder_notify_text">Es hora de pesarse</string>
 
-    <string name="info_your_weight">Tu peso era</string>
-    <string name="info_your_fat">Tu masa corporal era</string>
-    <string name="info_your_water">Tu porcentaje de agua era</string>
-    <string name="info_your_muscle">Tu porcentaje muscular era</string>
-    <string name="info_your_waist">Tu cintura era</string>
-    <string name="info_your_hip">Tu cadera era</string>
     <string name="info_on_date">el</string>
 
     <string name="Monday">Lunes</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 2fe17d70..fae1f682 100644
--- a/android_app/app/src/main/res/values-fr/strings.xml
+++ b/android_app/app/src/main/res/values-fr/strings.xml
@@ -5,13 +5,11 @@
     <string name="title_graph">Diagramme</string>
     <string name="title_table">Tableau</string>
     <string name="title_users">Utilisateurs</string>
-    <string name="title_data">Données</string>
     <string name="title_measurements">Mesures</string>
 
     <string name="action_settings">Paramètres</string>
     <string name="action_bluetooth_status">État du Bluetooth</string>
 
-    <string name="label_add">Ajouter</string>
     <string name="label_cancel">Annuler</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Oui</string>
@@ -19,7 +17,6 @@
     <string name="label_delete">Supprimer</string>
     <string name="label_add_user">Ajouter un utilisateur</string>
 
-    <string name="label_id">ID</string>
     <string name="label_weight">Poids</string>
     <string name="label_bmi">IMC</string>
     <string name="label_fat">Pourcentage de graisse corporelle</string>
@@ -36,7 +33,6 @@
         <item quantity="one">%d jour</item>
         <item quantity="other">%d jours</item>
     </plurals>
-    <string name="label_measures">mesures</string>
     <string name="label_last_week">7 derniers jours</string>
     <string name="label_last_month">30 derniers jours</string>
     <string name="label_weight_difference">Différence de poids</string>
@@ -59,7 +55,6 @@
     <string name="label_title_user">utilisateur</string>
     <string name="label_title_last_measurement">dernière mesure</string>
     <string name="label_title_goal">objectif</string>
-    <string name="label_title_statistics">statistiques</string>
 
     <string name="label_import">Importer</string>
     <string name="label_export">Exporter</string>
@@ -72,7 +67,6 @@
     <string name="error_user_name_required">Erreur : le nom d\'utilisateur est requis</string>
     <string name="error_body_height_required">Erreur : la hauteur du corps est requise</string>
     <string name="error_goal_weight_required">Erreur : un objectif de poids est requis</string>
-    <string name="error_hip_value_required">Erreur : le tour de hanches est requis</string>
 
     <string name="info_data_deleted">L\'entrée a été supprimée de la base de données</string>
     <string name="info_data_all_deleted">Toutes les entrées ont été supprimées de la base de données</string>
@@ -80,7 +74,6 @@
     <string name="info_data_imported">Donnéees importées depuis</string>
     <string name="info_set_filename">Définir le nom du fichier vers</string>
     <string name="info_enter_value_cm">Entrez la valeur en cm</string>
-    <string name="info_enter_value_percent">Entrez la valeur en %</string>
     <string name="info_enter_value_unit">Entrez la valeur en</string>
     <string name="info_enter_comment">Ajouter un commentaire optionnel</string>
     <string name="info_enter_goal_weight">Entrez votre objectif de poids dans votre unité d\'échelle</string>
@@ -89,8 +82,6 @@
     <string name="info_is_enable">est activé</string>
     <string name="info_is_not_enable">est désactivé</string>
     <string name="info_is_not_available">n\'est pas disponible</string>
-    <string name="info_delete_bluetooth_data">Effacer toutes les données Bluetooth</string>
-    <string name="info_delete_bluetooth_data_success">Les données Bluetooth ont bien été effacées</string>
     <string name="info_bluetooth_try_connection">Tentative de connexion à</string>
     <string name="info_bluetooth_connection_lost">La connexion Bluetooth a été perdue</string>
     <string name="info_bluetooth_no_device">Aucun appareil Bluetooth détecté</string>
@@ -121,12 +112,6 @@
     <string name="label_reminder_notify_text">Intitulé de la notification</string>
     <string name="default_value_reminder_notify_text">C\'est l\'heure de se peser!</string>
 
-    <string name="info_your_weight">Votre poids était de</string>
-    <string name="info_your_fat">Votre taux de graisse corporelle était de</string>
-    <string name="info_your_water">Votre pourcentage d\'eau était de</string>
-    <string name="info_your_muscle">Votre pourcentage de muscle était de</string>
-    <string name="info_your_waist">Votre tour de taille était de</string>
-    <string name="info_your_hip">Votre circonférence de la hanche était de</string>
     <string name="info_on_date">le</string>
 
     <string name="Monday">Lundi</string>
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
index 7ebe3990..27127ea0 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -10,12 +10,10 @@
     <string name="label_time">時刻</string>
     <string name="label_ok">OK</string>
     <string name="label_no">いいえ</string>
-    <string name="label_id">Id</string>
     <string name="label_fat">体脂肪率</string>
     <string name="label_bmi">BMI</string>
     <string name="label_bluetooth_title">Bluetooth</string>
     <string name="label_birthday">誕生日</string>
-    <string name="label_title_statistics">統計</string>
     <string name="label_weight">体重</string>
     <string name="label_weight_difference">体重差</string>
     <string name="action_settings">設定</string>
@@ -39,7 +37,6 @@
     <string name="label_title_goal">目標</string>
     <string name="label_goal_date">目標期日</string>
     <string name="label_scale_unit">単位</string>
-    <string name="label_measures">計測</string>
     <string name="label_title_last_measurement">最終の計測</string>
     <string name="label_goal_date_is">目標期日は</string>
     <string name="label_delete_all">全てデリート</string>
@@ -53,17 +50,10 @@
     <string name="info_data_all_deleted">すべてのレコードが削除されます</string>
     <string name="info_data_deleted">レコードが削除されます</string>
     <string name="info_data_exported">レコードのエクスポート</string>
-    <string name="info_delete_bluetooth_data">すべてのBluetoothデータを削除します</string>
     <string name="info_data_imported">レコードのインポート</string>
-    <string name="info_delete_bluetooth_data_success">Bluetoothのデータが正常に削除されました</string>
     <string name="info_on_date">でした -</string>
     <string name="info_no_selected_user">ユーザーは存在しません！設定で新しいユーザを入れてください</string>
     <string name="label_add_user">ユーザーの追加する</string>
-    <string name="label_add">追加する</string>
-    <string name="info_your_fat">あなたは体脂肪率が</string>
-    <string name="info_your_muscle">あなたは筋肉率が</string>
-    <string name="info_your_water">あなたは体内の水分</string>
-    <string name="info_your_weight">あなたは体重</string>
     <string name="info_set_filename">にファイル名を設定</string>
     <string name="label_enable_labels">メモの上にデータ点</string>
     <string name="info_is_visible">表示されています</string>
@@ -73,19 +63,14 @@
     <string name="info_enter_goal_weight">あなたの体重をあなたの単位で入力してください</string>
     <string name="info_enter_comment">任意でコメントを入力してください</string>
     <string name="info_enter_value_cm">あなたの値をcmで入力してください</string>
-    <string name="info_enter_value_percent">あなたの値を％で入力してください</string>
     <string name="info_enter_value_unit">あなたの値を入力してください</string>
     <string name="question_really_delete_all">あなたは本当にすべてのレコードを削除しますか</string>
     <string name="question_really_delete_user">あなたが本当にユーザーを削除しますか</string>
     <string name="error_goal_weight_required">目標体重が必要です</string>
-    <string name="title_data">データ</string>
     <string name="info_is_not_enable">無効にします</string>
     <string name="info_is_enable">有効にします</string>
-    <string name="error_hip_value_required">腰囲が必要です</string>
     <string name="label_waist">胴囲</string>
     <string name="label_hip">腰囲</string>
-    <string name="info_your_waist">あなたは胴囲が</string>
-    <string name="info_your_hip">あなたは腰囲が</string>
     <string name="info_no_evaluation_available">値を評価することはできません</string>
     <string name="label_whtr">腰と高さの比</string>
     <string name="label_whr">ウエストヒップ比</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 2cb976b7..923719c6 100644
--- a/android_app/app/src/main/res/values-nl/strings.xml
+++ b/android_app/app/src/main/res/values-nl/strings.xml
@@ -6,7 +6,6 @@
     <string name="title_table">Tabel</string>
     <string name="title_statistics">Statistieken</string>
     <string name="title_users">Gebruikers</string>
-    <string name="title_data">Data</string>
     <string name="title_measurements">Metingen</string>
     <string name="title_about">Info</string>
 
@@ -15,7 +14,6 @@
     <string name="open_drawer">openen</string>
     <string name="close_drawer">sluiten</string>
 
-    <string name="label_add">Toevoegen</string>
     <string name="label_cancel">Annuleren</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Ja</string>
@@ -23,7 +21,6 @@
     <string name="label_delete">Verwijderen</string>
     <string name="label_add_user">Gebruiker toevoegen</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Gewicht</string>
     <string name="label_bmi">Body mass index (BMI)</string>
     <string name="label_bmr">Basaal Metabolisme (BMR)</string>
@@ -43,7 +40,6 @@
         <item quantity="one">%d dag</item>
         <item quantity="other">%d dagen</item>
     </plurals>
-    <string name="label_measures">Metingen</string>
     <string name="label_last_week">Laatste 7 dagen</string>
     <string name="label_last_month">Laaste 30 dagen</string>
     <string name="label_weight_difference">Verschil in gewicht</string>
@@ -66,7 +62,6 @@
     <string name="label_title_user">Gebruiker</string>
     <string name="label_title_last_measurement">Laatste meting</string>
     <string name="label_title_goal">Doel</string>
-    <string name="label_title_statistics">Statistieken</string>
 
     <string name="label_import">Importeren</string>
     <string name="label_export">Exporteren</string>
@@ -80,7 +75,6 @@
     <string name="error_body_height_required">Fout: Lichaamslengte is vereist</string>
     <string name="error_initial_weight_required">Fout: Begingewicht is vereist</string>
     <string name="error_goal_weight_required">Fout: Streefgewicht is vereist</string>
-    <string name="error_hip_value_required">Fout: Heupomtrek is vereist</string>
 
     <string name="info_data_deleted">Database vermelding verwijderd</string>
     <string name="info_data_all_deleted">Alle database vermeldingen verwijderd</string>
@@ -88,7 +82,6 @@
     <string name="info_data_imported">Data geinporteerd van</string>
     <string name="info_set_filename">Zet bestandsnaam op</string>
     <string name="info_enter_value_cm">Geef waarde op cm's in</string>
-    <string name="info_enter_value_percent">Geef waarde op in %</string>
     <string name="info_enter_value_unit">Geef waaarde op</string>
     <string name="info_enter_comment">Voeg een optionele opmerking toe.</string>
     <string name="info_enter_initial_weight">Voer uw begingewicht in uw weegschaal in</string>
@@ -98,8 +91,6 @@
     <string name="info_is_enable">is ingeschakeld</string>
     <string name="info_is_not_enable">is uitgeschakeld</string>
     <string name="info_is_not_available">is niet beschikbaar</string>
-    <string name="info_delete_bluetooth_data">Wis alle Bluetooth gegevens</string>
-    <string name="info_delete_bluetooth_data_success">Bluetooth gegevens succesvol gewist</string>
     <string name="info_bluetooth_try_connection">Poging verbinding te maken</string>
     <string name="info_bluetooth_connection_lost">Bluetooth-verbinding verloren</string>
     <string name="info_bluetooth_no_device">Geen Bluetooth-apparaat gevonden</string>
@@ -149,12 +140,6 @@
     <string name="label_reminder_notify_text">Notificatietekst</string>
     <string name="default_value_reminder_notify_text">Tijd om te wegen</string>
 
-    <string name="info_your_weight">Uw gewicht was</string>
-    <string name="info_your_fat">Uw vetmassa was</string>
-    <string name="info_your_water">Uw vochtmassa was</string>
-    <string name="info_your_muscle">Uw spierpercentage was</string>
-    <string name="info_your_waist">Uw buikomtrek was</string>
-    <string name="info_your_hip">Uw heupomtrek was</string>
     <string name="info_on_date">op</string>
 
     <string name="Monday">Maandag</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 0400b093..7d02f1b4 100644
--- a/android_app/app/src/main/res/values-pl/strings.xml
+++ b/android_app/app/src/main/res/values-pl/strings.xml
@@ -6,13 +6,11 @@
     <string name="title_table">Tabele</string>
     <string name="title_statistics">Statystyki</string>
     <string name="title_users">Użytkownicy</string>
-    <string name="title_data">Dane</string>
     <string name="title_measurements">Pomiary</string>
 
     <string name="action_settings">Ustawienia</string>
     <string name="action_bluetooth_status">Stan Bluetooth</string>
 
-    <string name="label_add">Dodaj</string>
     <string name="label_cancel">Anuluj</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Tak</string>
@@ -20,7 +18,6 @@
     <string name="label_delete">Usuń</string>
     <string name="label_add_user">Dodaj użytkownika</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Waga</string>
     <string name="label_bmi">Wskaźnik masy ciała (BMI)</string>
     <string name="label_bmr">Wskaźnik podstawowej przemiany materii (BMR)</string>
@@ -38,7 +35,6 @@
     <plurals name="label_days">
         <item quantity="other">%d dni</item>
     </plurals>
-    <string name="label_measures">pomiarów</string>
     <string name="label_last_week">Ostatnie 7 dni</string>
     <string name="label_last_month">Ostatnie 30 dni</string>
     <string name="label_weight_difference">Różnica wagi</string>
@@ -61,7 +57,6 @@
     <string name="label_title_user">użytkownik</string>
     <string name="label_title_last_measurement">ostatni pomiar</string>
     <string name="label_title_goal">cel</string>
-    <string name="label_title_statistics">statystyki</string>
 
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
@@ -75,7 +70,6 @@
     <string name="error_body_height_required">Błąd wzrost jest wymagany</string>
     <string name="error_initial_weight_required">Błąd waga początkowa jest wymagana</string>
     <string name="error_goal_weight_required">Błąd waga docelowa jest wymagana</string>
-    <string name="error_hip_value_required">Obwód bioder jest wymagany</string>
 
     <string name="info_data_deleted">Wpis w bazie danych usunięty</string>
     <string name="info_data_all_deleted">Wszytkie wpisy w bazie danych usunięte</string>
@@ -83,7 +77,6 @@
     <string name="info_data_imported">Dane zaimportowane z</string>
     <string name="info_set_filename">Ustaw nazwę pliku na</string>
     <string name="info_enter_value_cm">Wprowadź wartość w cm</string>
-    <string name="info_enter_value_percent">Wprowadź wartość w %</string>
     <string name="info_enter_value_unit">Wprowadź wartość w</string>
     <string name="info_enter_comment">Wprowadź opcjonlany komentarz</string>
     <string name="info_enter_initial_weight">Wprowadź twoją wagę początkową w wybranej jednostce wagi</string>
@@ -93,8 +86,6 @@
     <string name="info_is_enable">jest włączone</string>
     <string name="info_is_not_enable">jest wyłączone</string>
     <string name="info_is_not_available">jest niedostępne</string>
-    <string name="info_delete_bluetooth_data">Wyczyść wszystkie dane Bluetooth</string>
-    <string name="info_delete_bluetooth_data_success">Dane Bluetooth usunięte</string>
     <string name="info_bluetooth_try_connection">Próba połączenia do</string>
     <string name="info_bluetooth_connection_lost">Utracono połączenie Bluetooth.</string>
     <string name="info_bluetooth_no_device">Nie znaleziono urządzeń Bluetooth</string>
@@ -127,12 +118,6 @@
     <string name="label_reminder_notify_text">Tekst powiadomienia</string>
     <string name="default_value_reminder_notify_text">Pora by się zważyć</string>
 
-    <string name="info_your_weight">Twój wzrost</string>
-    <string name="info_your_fat">Twój procent tkanki tłuszczowej</string>
-    <string name="info_your_water">Twój procent wody organizmie</string>
-    <string name="info_your_muscle">Twój procent masy mięśniowej</string>
-    <string name="info_your_waist">Twój obwód talii</string>
-    <string name="info_your_hip">Twój obwód bioder</string>
     <string name="info_on_date">na dzień</string>
 
     <string name="Monday">Poniedziałek</string>
diff --git a/android_app/app/src/main/res/values-pt/strings.xml b/android_app/app/src/main/res/values-pt/strings.xml
index 5d5382d3..3d355409 100644
--- a/android_app/app/src/main/res/values-pt/strings.xml
+++ b/android_app/app/src/main/res/values-pt/strings.xml
@@ -13,7 +13,6 @@
     <string name="error_body_height_required">Erro: Altura é obrigatória</string>
     <string name="error_exporting">Erro ao exportar</string>
     <string name="error_goal_weight_required">Erro: Objetivo de peso é obrigatório</string>
-    <string name="error_hip_value_required">Erro: circunferência do quadril é obrigatória</string>
     <string name="error_importing">Erro ao importar</string>
     <string name="error_initial_weight_required">Erro: Peso inicial é obrigatório</string>
     <string name="error_max_scale_users">Numero máximo de balanças concorrentes alcançado</string>
@@ -30,14 +29,11 @@
     <string name="info_data_deleted">Entrada da base de dados deletada</string>
     <string name="info_data_exported">Dados exportados para</string>
     <string name="info_data_imported">Dados importados de</string>
-    <string name="info_delete_bluetooth_data">Apagar todos os dados de Bluetooth</string>
-    <string name="info_delete_bluetooth_data_success">Dados de Bluetooh apagados com sucesso</string>
     <string name="info_enter_comment">Digite um comentário opcional</string>
     <string name="info_enter_goal_weight">Digite seu objetivo de peso na sua medida de peso</string>
     <string name="info_enter_initial_weight">Digite seu peso inicial na sua medida de peso</string>
     <string name="info_enter_user_name">Digite seu nome</string>
     <string name="info_enter_value_cm">Digite o valor em centímetros</string>
-    <string name="info_enter_value_percent">Digite o valor em %</string>
     <string name="info_enter_value_unit">Digite o valor em</string>
     <string name="info_is_enable">está ativado</string>
     <string name="info_is_not_available">não está disponível</string>
@@ -50,13 +46,6 @@
     <string name="info_no_selected_user">Nenhum usuário existe. Por favor, crie um novo usuário em Configurações.</string>
     <string name="info_set_filename">Definir nome de arquivo para</string>
     <string name="info_step_on_scale">Por favor suba na balança para medidas de referência</string>
-    <string name="info_your_fat">Sua gordura corporal foi</string>
-    <string name="info_your_hip">Sua circunferência de quadril foi</string>
-    <string name="info_your_muscle">Sua porcentagem de massa muscular foi</string>
-    <string name="info_your_waist">Sua circunferência de cintura foi</string>
-    <string name="info_your_water">Sua porcentagem de água foi</string>
-    <string name="info_your_weight">Seu peso foi</string>
-    <string name="label_add">Adicionar</string>
     <string name="label_add_user">Adicionar usuário</string>
     <string name="label_average_data">Calcular média</string>
     <string name="label_backup">Backup</string>
@@ -88,7 +77,6 @@
     <string name="label_goal_line">Linha objetivo</string>
     <string name="label_goal_weight">Objetivo de peso</string>
     <string name="label_hip">Circunferência de quadril</string>
-    <string name="label_id">Id</string>
     <string name="label_ignoreOutOfRange">Ignorar dados fora do intervalo</string>
     <string name="label_import">Importar</string>
     <string name="label_importBackup">Importar Backup</string>
@@ -96,7 +84,6 @@
     <string name="label_last_month">Últimos 30 dias</string>
     <string name="label_last_week">Últimos 7 dias</string>
     <string name="label_male">Masc</string>
-    <string name="label_measures">medidas</string>
     <string name="label_muscle">Porcentagem de massa muscular</string>
     <string name="label_no">Não</string>
     <string name="label_ok">OK</string>
@@ -112,7 +99,6 @@
     <string name="label_time">Hora</string>
     <string name="label_title_goal">objetivo</string>
     <string name="label_title_last_measurement">última medida</string>
-    <string name="label_title_statistics">estatísticas</string>
     <string name="label_title_user">usuário</string>
     <string name="label_user_name">Nome</string>
     <string name="label_waist">Circunferência de quadril</string>
@@ -126,7 +112,6 @@
     <string name="question_really_delete">Tem certeza que quer deletar essa entrada da base?</string>
     <string name="question_really_delete_all">Tem certeza que quer deletar todas as entradas da base?</string>
     <string name="question_really_delete_user">Tem certeza que quer deletar esse usuário?</string>
-    <string name="title_data">Dados</string>
     <string name="title_graph">Gráfico</string>
     <string name="title_measurements">Medidas</string>
     <string name="title_overview">Visão geral</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 decb853b..fb69a2e7 100644
--- a/android_app/app/src/main/res/values-sk/strings.xml
+++ b/android_app/app/src/main/res/values-sk/strings.xml
@@ -5,18 +5,15 @@
   <string name="title_table">Tabuľka</string>
   <string name="title_statistics">Štatistiky</string>
   <string name="title_users">Používatelia</string>
-  <string name="title_data">Údaje</string>
   <string name="title_measurements">Merania</string>
   <string name="action_settings">Nastavenia</string>
   <string name="action_bluetooth_status">Stav Bluetooth</string>
-  <string name="label_add">Pridať</string>
   <string name="label_cancel">Zrušiť</string>
   <string name="label_ok">OK</string>
   <string name="label_yes">Áno</string>
   <string name="label_no">Nie</string>
   <string name="label_delete">Vymazať</string>
   <string name="label_add_user">Pridať používateľa</string>
-  <string name="label_id">ID</string>
   <string name="label_weight">Hmotnosť</string>
   <string name="label_bmi">Index telesnej hmotnosti (BMI)</string>
   <string name="label_bmr">Bazálny metabolický výdaj (BMR)</string>
@@ -33,7 +30,6 @@
   <plurals name="label_days">
         <item quantity="other">%d dni</item>
     </plurals>
-  <string name="label_measures">merania</string>
   <string name="label_last_week">Posledných 7 dní</string>
   <string name="label_last_month">Posledných 30 dní</string>
   <string name="label_weight_difference">Rozdiel hmotnosti</string>
@@ -53,7 +49,6 @@
   <string name="label_title_user">používateľ</string>
   <string name="label_title_last_measurement">posledné meranie</string>
   <string name="label_title_goal">cieľ</string>
-  <string name="label_title_statistics">štatistiky</string>
   <string name="label_import">Import</string>
   <string name="label_export">Export</string>
   <string name="label_delete_all">Vymazať všetko</string>
@@ -65,14 +60,12 @@
   <string name="error_body_height_required">Chyba, telesná výška je povinná</string>
   <string name="error_initial_weight_required">Chyba, počiatočná hmotnosť je povinná</string>
   <string name="error_goal_weight_required">Chyba, cieľová hmotnosť je povinná</string>
-  <string name="error_hip_value_required">obvod bokov je povinný</string>
   <string name="info_data_deleted">Položka bola vymazaná z databázy</string>
   <string name="info_data_all_deleted">Všetkých položky boli vymazané z databázy</string>
   <string name="info_data_exported">Údaje boli exportované do</string>
   <string name="info_data_imported">Údaje boli importované z</string>
   <string name="info_set_filename">Nastaviť názov súboru na</string>
   <string name="info_enter_value_cm">Zadajte hodnotu v cm</string>
-  <string name="info_enter_value_percent">Zadajte hodnotu v %</string>
   <string name="info_enter_value_unit">Zadajte hodnotu v palcoch</string>
   <string name="info_enter_comment">Zadajte voliteľný komentár</string>
   <string name="info_enter_initial_weight">Zadajte vaša počiatočná hmotnosť v jednotkách stupnice</string>
@@ -82,8 +75,6 @@
   <string name="info_is_enable">je povolené</string>
   <string name="info_is_not_enable">je zakázané</string>
   <string name="info_is_not_available">nie je k dispozícii</string>
-  <string name="info_delete_bluetooth_data">Vymazať všetky Bluetooth údaje</string>
-  <string name="info_delete_bluetooth_data_success">Bluetooth údaje boli vymazané</string>
   <string name="info_bluetooth_try_connection">Pokus o pripojenie ku</string>
   <string name="info_bluetooth_connection_lost">Bluetooth pripojenie sa stratilo.</string>
   <string name="info_bluetooth_no_device">Nenašli sa žiadne Bluetooth zariadenia</string>
@@ -109,12 +100,6 @@
   <string name="label_reminder_time">Čas</string>
   <string name="label_reminder_notify_text">Text upozornenia</string>
   <string name="default_value_reminder_notify_text">Čas na váženie</string>
-  <string name="info_your_weight">Vaša hmotnosť bola</string>
-  <string name="info_your_fat">Váš telesný tuk bol</string>
-  <string name="info_your_water">Vaše percento vody v tele bolo</string>
-  <string name="info_your_muscle">Vaše percento svalov v tele bolo</string>
-  <string name="info_your_waist">Váš obvod pása bol</string>
-  <string name="info_your_hip">Váš obvod bokov bol</string>
   <string name="info_on_date">v deň</string>
   <string name="Monday">Pondelok</string>
   <string name="Tuesday">Utorok</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 6a5f924b..afebadd5 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -5,19 +5,16 @@
     <string name="title_table">Tabell</string>
     <string name="title_statistics">Statistik</string>
     <string name="title_users">Användare</string>
-    <string name="title_data">Data</string>
     <string name="title_measurements">Mätvärden</string>
     <string name="title_about">Om</string>
     <string name="action_settings">Inställningar</string>
     <string name="action_bluetooth_status">Bluetooth-status</string>
-    <string name="label_add">Lägg till</string>
     <string name="label_cancel">Avbryt</string>
     <string name="label_ok">Ok</string>
     <string name="label_yes">Ja</string>
     <string name="label_no">Nej</string>
     <string name="label_delete">Ta bort</string>
     <string name="label_add_user">Lägg till användare</string>
-    <string name="label_id">Id</string>
     <string name="label_weight">Vikt</string>
     <string name="label_bmi">Kroppsmasseindex (BMI)</string>
     <string name="label_bmr">Basal ämnesomsättning (BMR)</string>
@@ -32,10 +29,6 @@
     <string name="Sunday">Söndag</string>
     <string name="label_backup">Säkerhetskopia</string>
     <string name="default_value_reminder_notify_text">Dags att väga</string>
-    <string name="info_your_weight">Din vikt var</string>
-    <string name="info_your_fat">Din mängd kroppsfett var</string>
-    <string name="info_your_water">Din andel vatten var</string>
-    <string name="info_your_muscle">Din andel muskler var</string>
     <string name="label_reminder_time">Tid</string>
     <string name="label_reminder_weekdays">Veckodagar</string>
     <string name="label_website">Hemsida</string>
@@ -62,7 +55,6 @@
         <item quantity="one">%d dag</item>
         <item quantity="other">%d dagar</item>
     </plurals>
-    <string name="label_measures">mätningar</string>
     <string name="label_last_week">Senast 7 dagarna</string>
     <string name="label_last_month">Senast 30 dagarna</string>
     <string name="label_muscle">Muskler</string>
@@ -74,7 +66,6 @@
     <string name="label_whtr">Midja-till-längd-kvot</string>
     <string name="label_bone">Benmassa</string>
     <string name="label_smartUserAssign">Smart tilldelning av användare</string>
-    <string name="label_title_statistics">statistik</string>
     <string name="label_import">Importera</string>
     <string name="label_export">Exportera</string>
     <string name="label_delete_all">Ta bort alla</string>
@@ -85,14 +76,12 @@
     <string name="error_body_height_required">Fel: längd krävs</string>
     <string name="error_initial_weight_required">Fel: startvikt krävs</string>
     <string name="error_goal_weight_required">Fel: målvikt krävs</string>
-    <string name="error_hip_value_required">höftomkrets krävs</string>
     <string name="info_data_deleted">Databaspost borttagen</string>
     <string name="info_data_all_deleted">Alla databasposter borttagna</string>
     <string name="info_data_exported">Data exporterad till</string>
     <string name="info_data_imported">Data importerad från</string>
     <string name="info_set_filename">Sätt filnamn till</string>
     <string name="info_enter_value_cm">Ange värde i cm</string>
-    <string name="info_enter_value_percent">Ange värde i %</string>
     <string name="info_enter_value_unit">Ange värde i</string>
     <string name="info_enter_comment">Ange en frivillig kommentar</string>
     <string name="info_enter_initial_weight">Ange din startvikt i din viktenhet</string>
@@ -102,8 +91,6 @@
     <string name="info_is_enable">är aktiverad</string>
     <string name="info_is_not_enable">är inaktiverad</string>
     <string name="info_is_not_available">är inte tillgänglig</string>
-    <string name="info_delete_bluetooth_data">Rensa all Bluetooth-data</string>
-    <string name="info_delete_bluetooth_data_success">Bluetooth-data togs bort</string>
     <string name="info_bluetooth_try_connection">Försöker ansluta till</string>
     <string name="info_bluetooth_connection_lost">Förlorade Bluetooth-anslutningen</string>
     <string name="info_bluetooth_no_device">Ingen Bluetooth-enhet hittades</string>
@@ -137,8 +124,6 @@
     <string name="label_automatic">auto</string>
     <string name="label_reminder">Påminnelse</string>
     <string name="label_reminder_notify_text">Meddelandetext</string>
-    <string name="info_your_waist">Ditt midjemått var</string>
-    <string name="info_your_hip">Din höftomkrets var</string>
     <string name="info_on_date">på</string>
     <string name="label_bt_device_no_support">enheten stöds inte</string>
     <string name="label_exportBackup">Exportera säkerhetskopia</string>
diff --git a/android_app/app/src/main/res/values-tr/strings.xml b/android_app/app/src/main/res/values-tr/strings.xml
index 4d4853aa..44f783c0 100644
--- a/android_app/app/src/main/res/values-tr/strings.xml
+++ b/android_app/app/src/main/res/values-tr/strings.xml
@@ -5,14 +5,12 @@
     <string name="title_table">Tablo</string>
     <string name="title_statistics">Ýstatistik</string>
     <string name="title_users">Kullanýcý</string>
-    <string name="title_data">Veri</string>
     <string name="title_measurements">Ölçüler</string>
     <string name="title_about">Yaklaþýk</string>
 
     <string name="action_settings">Ayarlar</string>
     <string name="action_bluetooth_status">Bluetooth Konumu</string>
 
-    <string name="label_add">Ekle</string>
     <string name="label_cancel">Ýptal</string>
     <string name="label_ok">Tamam</string>
     <string name="label_yes">Evet</string>
@@ -20,7 +18,6 @@
     <string name="label_delete">Sil</string>
     <string name="label_add_user">Kullanýcý ekle</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Aðýrlýk</string>
     <string name="label_bmi">Vucüt Kitle Endeksi (BMI)</string>
     <string name="label_bmr">Bazal Metabolik Oraný (BMR)</string>
@@ -39,7 +36,6 @@
     <plurals name="label_days">
         <item quantity="other">%d Günler</item>
     </plurals>
-    <string name="label_measures">Ölçüler</string>
     <string name="label_last_week">Son 7 Gün</string>
     <string name="label_last_month">Son 30 Gün</string>
     <string name="label_weight_difference">Aðýrlýk farký</string>
@@ -62,7 +58,6 @@
     <string name="label_title_user">Kullanýcý</string>
     <string name="label_title_last_measurement">Son ölçüm</string>
     <string name="label_title_goal">Hedef</string>
-    <string name="label_title_statistics">Ýstatistik</string>
 
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
@@ -76,7 +71,6 @@
     <string name="error_body_height_required">Error: Vücut boyu gerekli</string>
     <string name="error_initial_weight_required">Error: Baþlangýç aðýrlýðý gerekli</string>
     <string name="error_goal_weight_required">Error: Hedef aðýrlýk gerekli</string>
-    <string name="error_hip_value_required">Kalça çevre aðýrlýðý gerekli</string>
 
     <string name="info_data_deleted">Database entry deleted</string>
     <string name="info_data_all_deleted">Veri tabaný giriþi silindi</string>
@@ -84,7 +78,6 @@
     <string name="info_data_imported">Veri içeri aktarma</string>
     <string name="info_set_filename">Dosya adýný ayarla</string>
     <string name="info_enter_value_cm">Deðeri cm olarak girin</string>
-    <string name="info_enter_value_percent">Deðeri % olarak girin</string>
     <string name="info_enter_value_unit">Ýçine deðer girin</string>
     <string name="info_enter_comment">Ýsteðebaðlý açýklama girin</string>
     <string name="info_enter_initial_weight">Kendi baþlangýç aðýrlýðýnýzý girin</string>
@@ -94,8 +87,6 @@
     <string name="info_is_enable">etkindir</string>
     <string name="info_is_not_enable">etkin deðildir</string>
     <string name="info_is_not_available">Mevcut deðil</string>
-    <string name="info_delete_bluetooth_data">Tüm Bluetooth verisini sil</string>
-    <string name="info_delete_bluetooth_data_success">Bluetooth veri silinmesi baþarýlý oldu</string>
     <string name="info_bluetooth_try_connection">Baðlanmaya çalýþýyorsunuz</string>
     <string name="info_bluetooth_connection_lost">Bluetooth baðlantýsý koptu</string>
     <string name="info_bluetooth_no_device">Bluetooth cihazý bulunamadý</string>
@@ -145,12 +136,6 @@
     <string name="label_reminder_notify_text">Bildirim metni</string>
     <string name="default_value_reminder_notify_text">Aðýrlýk zamaný</string>
 
-    <string name="info_your_weight">Kilonuz</string>
-    <string name="info_your_fat">Yað oranýnýz</string>
-    <string name="info_your_water">Su oraný yüzdeniz</string>
-    <string name="info_your_muscle">Kas oraný yüzdeniz</string>
-    <string name="info_your_waist">Bel çevreniz</string>
-    <string name="info_your_hip">Kalça çevreniz</string>
     <string name="info_on_date">Üzerinde</string>
 
     <string name="Monday">Pazartesi</string>
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 5ba19ab9..9e65b77a 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -7,7 +7,6 @@
     <string name="title_table">Table</string>
     <string name="title_statistics">Statistics</string>
     <string name="title_users">Users</string>
-    <string name="title_data">Data</string>
     <string name="title_measurements">Measurements</string>
     <string name="title_about">About</string>
     <string name="title_general">General</string>
@@ -17,7 +16,6 @@
     <string name="open_drawer">open</string>
     <string name="close_drawer">close</string>
 
-    <string name="label_add">Add</string>
     <string name="label_cancel">Cancel</string>
     <string name="label_ok">OK</string>
     <string name="label_yes">Yes</string>
@@ -27,7 +25,6 @@
     <string name="label_share">Share</string>
     <string name="label_share_subject">openScale CSV data export (%s)</string>
 
-    <string name="label_id">Id</string>
     <string name="label_weight">Weight</string>
     <string name="label_bmi">Body mass index (BMI)</string>
     <string name="label_bmr">Basal metabolic rate (BMR)</string>
@@ -51,7 +48,6 @@
         <item quantity="one">%d day</item>
         <item quantity="other">%d days</item>
     </plurals>
-    <string name="label_measures">measures</string>
     <string name="label_last_week">Last 7 days</string>
     <string name="label_last_month">Last 30 days</string>
     <string name="label_weight_difference">Weight difference</string>
@@ -73,7 +69,6 @@
     <string name="label_title_user">user</string>
     <string name="label_title_last_measurement">last measurement</string>
     <string name="label_title_goal">goal</string>
-    <string name="label_title_statistics">statistics</string>
 
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
@@ -88,7 +83,6 @@
     <string name="error_body_height_required">Error: body height is required</string>
     <string name="error_initial_weight_required">Error: initial weight is required</string>
     <string name="error_goal_weight_required">Error: goal weight is required</string>
-    <string name="error_hip_value_required">hip circumference is required</string>
 
     <string name="info_data_deleted">Database entry deleted</string>
     <string name="info_data_all_deleted">All database entries deleted</string>
@@ -96,7 +90,6 @@
     <string name="info_data_imported">Data imported from</string>
     <string name="info_set_filename">Set filename to</string>
     <string name="info_enter_value_cm">Enter value in cm</string>
-    <string name="info_enter_value_percent">Enter value in %</string>
     <string name="info_enter_value_unit">Enter value in</string>
     <string name="info_enter_comment">Enter an optional comment</string>
     <string name="info_enter_initial_weight">Enter your initial weight in your scale unit</string>
@@ -106,8 +99,6 @@
     <string name="info_is_enable">is enabled</string>
     <string name="info_is_not_enable">is disabled</string>
     <string name="info_is_not_available">is not available</string>
-    <string name="info_delete_bluetooth_data">Clear all Bluetooth data</string>
-    <string name="info_delete_bluetooth_data_success">Bluetooth data was successful cleared</string>
     <string name="info_bluetooth_try_connection">Trying to connect to</string>
     <string name="info_bluetooth_connection_lost">Lost Bluetooth connection</string>
     <string name="info_bluetooth_no_device">No Bluetooth device found</string>
@@ -162,12 +153,6 @@
     <string name="label_reminder_notify_text">Notification text</string>
     <string name="default_value_reminder_notify_text">Time to weight</string>
 
-    <string name="info_your_weight">Your weight was</string>
-    <string name="info_your_fat">Your body fat was</string>
-    <string name="info_your_water">Your water percentage was</string>
-    <string name="info_your_muscle">Your muscle percentage was</string>
-    <string name="info_your_waist">Your waist circumference was</string>
-    <string name="info_your_hip">Your hip circumference was</string>
     <string name="info_on_date">on</string>
 
     <string name="Monday">Monday</string>

From 56552bcfbc99061a762ecaec38b4834a40391ae0 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sat, 24 Feb 2018 21:40:02 +0100
Subject: [PATCH 2/6] Add missing escape

---
 android_app/app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 923719c6..a41b4e57 100644
--- a/android_app/app/src/main/res/values-nl/strings.xml
+++ b/android_app/app/src/main/res/values-nl/strings.xml
@@ -81,7 +81,7 @@
     <string name="info_data_exported">Data geexporteerd naar</string>
     <string name="info_data_imported">Data geinporteerd van</string>
     <string name="info_set_filename">Zet bestandsnaam op</string>
-    <string name="info_enter_value_cm">Geef waarde op cm's in</string>
+    <string name="info_enter_value_cm">Geef waarde op cm\'s in</string>
     <string name="info_enter_value_unit">Geef waaarde op</string>
     <string name="info_enter_comment">Voeg een optionele opmerking toe.</string>
     <string name="info_enter_initial_weight">Voer uw begingewicht in uw weegschaal in</string>

From 2143763800384c017646a1dc4b08bfa9c65d807a Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sat, 24 Feb 2018 21:47:21 +0100
Subject: [PATCH 3/6] Unify measurement strings

- Remove percentage from strings as fat, water and muscle can all be
  in both % and kg now.

- Always call it just fat, water and muscle without the "body"
  prefix. There should be no risk for someone thinking it's some other
  kind of fat.
---
 .../app/src/main/res/values/strings.xml       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 9e65b77a..5ec3a027 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -28,9 +28,9 @@
     <string name="label_weight">Weight</string>
     <string name="label_bmi">Body mass index (BMI)</string>
     <string name="label_bmr">Basal metabolic rate (BMR)</string>
-    <string name="label_fat">Body fat percentage</string>
-    <string name="label_water">Water percentage</string>
-    <string name="label_muscle">Muscle percentage</string>
+    <string name="label_fat">Fat</string>
+    <string name="label_water">Water</string>
+    <string name="label_muscle">Muscle</string>
     <string name="label_lbw">Lean body weight</string>
     <string name="label_waist">Waist circumference</string>
     <string name="label_hip">Hip circumference</string>
@@ -40,8 +40,8 @@
     <string name="label_bone">Bone mass</string>
     <string name="label_smartUserAssign">Smart User assignment</string>
 
-    <string name="label_fat_percentage">Body fat in %</string>
-    <string name="label_water_percentage">Body water in %</string>
+    <string name="label_fat_percentage">Fat in %</string>
+    <string name="label_water_percentage">Water in %</string>
     <string name="label_muscle_percentage">Muscle in %</string>
 
     <plurals name="label_days">
@@ -128,9 +128,9 @@
 
     <string name="label_delete_confirmation">Delete confirmation</string>
 
-    <string name="label_estimate_water">Estimate body water</string>
+    <string name="label_estimate_water">Estimate water</string>
     <string name="label_estimate_lbw">Estimate lean body weight</string>
-    <string name="label_estimate_fat">Estimate body fat</string>
+    <string name="label_estimate_fat">Estimate fat</string>
 
     <string name="label_category_display">Display</string>
     <string name="label_category_body_metrics_estimation">Body metrics estimation</string>
@@ -140,9 +140,9 @@
     <string name="label_website">Website</string>
     <string name="label_license">License</string>
 
-    <string name="label_estimate_water_formula">Body water formula</string>
-    <string name="label_estimate_lbw_formula">Body lean body weight formula</string>
-    <string name="label_estimate_fat_formula">Body fat formula</string>
+    <string name="label_estimate_water_formula">Water formula</string>
+    <string name="label_estimate_lbw_formula">Lean body weight formula</string>
+    <string name="label_estimate_fat_formula">Fat formula</string>
     <string name="label_automatic">auto</string>
 
     <string name="label_theme">Theme</string>

From 05e93749afdee1fbacea5aefe7682f9fccc14789 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sat, 24 Feb 2018 21:51:34 +0100
Subject: [PATCH 4/6] Body height -> height

---
 .../health/openscale/gui/activities/UserSettingsActivity.java | 2 +-
 android_app/app/src/main/res/layout/activity_usersettings.xml | 2 +-
 android_app/app/src/main/res/values-ca/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-cs/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-de/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-es/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-fr/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-ja/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-nl/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-pl/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-pt/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-sk/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-sv/strings.xml            | 4 ++--
 android_app/app/src/main/res/values-tr/strings.xml            | 4 ++--
 android_app/app/src/main/res/values/strings.xml               | 4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
index c32e4303..623137b2 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
@@ -260,7 +260,7 @@ public class UserSettingsActivity extends AppCompatActivity {
         }
 
         if (txtBodyHeight.getText().toString().length() == 0) {
-            txtBodyHeight.setError(getResources().getString(R.string.error_body_height_required));
+            txtBodyHeight.setError(getResources().getString(R.string.error_height_required));
             validate = false;
         }
 
diff --git a/android_app/app/src/main/res/layout/activity_usersettings.xml b/android_app/app/src/main/res/layout/activity_usersettings.xml
index 19564ea4..1c615622 100644
--- a/android_app/app/src/main/res/layout/activity_usersettings.xml
+++ b/android_app/app/src/main/res/layout/activity_usersettings.xml
@@ -65,7 +65,7 @@
                         android:id="@+id/lblBodyHeight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/label_body_height" />
+                        android:text="@string/label_height" />
 
                     <EditText
                         android:id="@+id/txtBodyHeight"
diff --git a/android_app/app/src/main/res/values-ca/strings.xml b/android_app/app/src/main/res/values-ca/strings.xml
index 32a6b732..30bf9525 100644
--- a/android_app/app/src/main/res/values-ca/strings.xml
+++ b/android_app/app/src/main/res/values-ca/strings.xml
@@ -48,7 +48,7 @@
     <string name="label_time">Hora</string>
     <string name="label_birthday">D. Naiximent</string>
     <string name="label_user_name">Nom</string>
-    <string name="label_body_height">Altura</string>
+    <string name="label_height">Altura</string>
     <string name="label_scale_unit">Unitat</string>
     <string name="label_gender">Gènere</string>
     <string name="label_male">Home</string>
@@ -70,7 +70,7 @@
     <string name="error_exporting">Error exportant</string>
     <string name="error_importing">Error important</string>
     <string name="error_user_name_required">Error, cal un nom d\'usuari</string>
-    <string name="error_body_height_required">Error, cal l\'altura</string>
+    <string name="error_height_required">Error, cal l\'altura</string>
     <string name="error_initial_weight_required">Error, cal el pes inicial</string>
     <string name="error_goal_weight_required">Error, cal l\'objetiu de pes</string>
 
diff --git a/android_app/app/src/main/res/values-cs/strings.xml b/android_app/app/src/main/res/values-cs/strings.xml
index bb999904..9956c35b 100644
--- a/android_app/app/src/main/res/values-cs/strings.xml
+++ b/android_app/app/src/main/res/values-cs/strings.xml
@@ -48,7 +48,7 @@
     <string name="label_time">Čas</string>
     <string name="label_birthday">Narozeniny</string>
     <string name="label_user_name">Jméno</string>
-    <string name="label_body_height">Tělesná hmotnost</string>
+    <string name="label_height">Tělesná hmotnost</string>
     <string name="label_gender">Pohlaví</string>
     <string name="label_male">Muž</string>
     <string name="label_woman">Žena</string>
@@ -69,7 +69,7 @@
     <string name="error_importing">Chyba při importu</string>
     <string name="error_user_name_required">Chyba: je třeba uživatelské jméno</string>
     <string name="error_user_name_too_short">Chyba: je třeba, aby uživatelské jméno bylo alespoň 3 znaky dlouhé</string>
-    <string name="error_body_height_required">Chyba: je třeba zadat výšku člověka</string>
+    <string name="error_height_required">Chyba: je třeba zadat výšku člověka</string>
     <string name="error_initial_weight_required">Chyba: je třeba zadat počáteční hmotnost</string>
     <string name="error_goal_weight_required">Chyba: je třeba zadat cílovou hmotnost</string>
     <string name="info_data_deleted">Položka v databázi smazána</string>
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 6bc9dcbf..ad4bc556 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="action_settings">Einstellungen</string>
-    <string name="error_body_height_required">Fehler Körpergröße ist erforderlich</string>
+    <string name="error_height_required">Fehler Körpergröße ist erforderlich</string>
     <string name="error_exporting">Fehler beim Exportieren</string>
     <string name="error_importing">Fehler beim Importieren</string>
     <string name="error_user_name_required">Fehler Benutzername ist erfoderlich</string>
@@ -23,7 +23,7 @@
     <string name="label_bluetooth_enable">Suche nach Waage beim Start</string>
     <string name="label_bluetooth_title">Bluetooth</string>
     <string name="label_bmi">Body-Mass-Index (BMI)</string>
-    <string name="label_body_height">Körpergröße</string>
+    <string name="label_height">Körpergröße</string>
     <string name="label_comment">Kommentar</string>
     <string name="label_date">Datum</string>
     <plurals name="label_days">
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 96e7caea..fcb01479 100644
--- a/android_app/app/src/main/res/values-es/strings.xml
+++ b/android_app/app/src/main/res/values-es/strings.xml
@@ -48,7 +48,7 @@
     <string name="label_time">Hora</string>
     <string name="label_birthday">F. Nacimiento</string>
     <string name="label_user_name">Nombre</string>
-    <string name="label_body_height">Altura</string>
+    <string name="label_height">Altura</string>
     <string name="label_scale_unit">Unidad</string>
     <string name="label_gender">Género</string>
     <string name="label_male">Hombre</string>
@@ -70,7 +70,7 @@
     <string name="error_exporting">Error exportando</string>
     <string name="error_importing">Error importando</string>
     <string name="error_user_name_required">Error, se require un nombre de usuario</string>
-    <string name="error_body_height_required">Error, se requiere la altura</string>
+    <string name="error_height_required">Error, se requiere la altura</string>
     <string name="error_initial_weight_required">Error, se requiere el peso inicial</string>
     <string name="error_goal_weight_required">Error, se requiere el objetivo de peso</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 fae1f682..be1449cc 100644
--- a/android_app/app/src/main/res/values-fr/strings.xml
+++ b/android_app/app/src/main/res/values-fr/strings.xml
@@ -43,7 +43,7 @@
     <string name="label_time">Heure</string>
     <string name="label_birthday">Date de naissance</string>
     <string name="label_user_name">Nom</string>
-    <string name="label_body_height">Hauteur du corps</string>
+    <string name="label_height">Hauteur du corps</string>
     <string name="label_scale_unit">Unité d\'échelle</string>
     <string name="label_gender">Sexe</string>
     <string name="label_male">Homme</string>
@@ -65,7 +65,7 @@
     <string name="error_exporting">Erreur durant l\'exportation</string>
     <string name="error_importing">Erreur durant l\'importation</string>
     <string name="error_user_name_required">Erreur : le nom d\'utilisateur est requis</string>
-    <string name="error_body_height_required">Erreur : la hauteur du corps est requise</string>
+    <string name="error_height_required">Erreur : la hauteur du corps est requise</string>
     <string name="error_goal_weight_required">Erreur : un objectif de poids est requis</string>
 
     <string name="info_data_deleted">L\'entrée a été supprimée de la base de données</string>
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
index 27127ea0..64fdc0e7 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -17,7 +17,7 @@
     <string name="label_weight">体重</string>
     <string name="label_weight_difference">体重差</string>
     <string name="action_settings">設定</string>
-    <string name="label_body_height">身長</string>
+    <string name="label_height">身長</string>
     <string name="label_cancel">キャンセル</string>
     <string name="label_comment">コメント</string>
     <plurals name="label_days">
@@ -45,7 +45,7 @@
     <string name="label_last_week">過去7日</string>
     <string name="error_exporting">エクスポートに失敗しました</string>
     <string name="error_importing">インポートに失敗しました</string>
-    <string name="error_body_height_required">身長が必要です</string>
+    <string name="error_height_required">身長が必要です</string>
     <string name="error_user_name_required">ユーザー名が必要です</string>
     <string name="info_data_all_deleted">すべてのレコードが削除されます</string>
     <string name="info_data_deleted">レコードが削除されます</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 a41b4e57..968ecae9 100644
--- a/android_app/app/src/main/res/values-nl/strings.xml
+++ b/android_app/app/src/main/res/values-nl/strings.xml
@@ -50,7 +50,7 @@
     <string name="label_time">Tijd</string>
     <string name="label_birthday">Geboortedatum</string>
     <string name="label_user_name">Naam</string>
-    <string name="label_body_height">Lichaamslengte</string>
+    <string name="label_height">Lichaamslengte</string>
     <string name="label_scale_unit">Schaal</string>
     <string name="label_gender">Geslacht</string>
     <string name="label_male">Man</string>
@@ -72,7 +72,7 @@
     <string name="error_exporting">Fout met exporteren</string>
     <string name="error_importing">Fout met importeren</string>
     <string name="error_user_name_required">Fout: Naam is vereist</string>
-    <string name="error_body_height_required">Fout: Lichaamslengte is vereist</string>
+    <string name="error_height_required">Fout: Lichaamslengte is vereist</string>
     <string name="error_initial_weight_required">Fout: Begingewicht is vereist</string>
     <string name="error_goal_weight_required">Fout: Streefgewicht is vereist</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 7d02f1b4..76e4082a 100644
--- a/android_app/app/src/main/res/values-pl/strings.xml
+++ b/android_app/app/src/main/res/values-pl/strings.xml
@@ -45,7 +45,7 @@
     <string name="label_time">Czas</string>
     <string name="label_birthday">Urodziny</string>
     <string name="label_user_name">Imie</string>
-    <string name="label_body_height">Wzrost</string>
+    <string name="label_height">Wzrost</string>
     <string name="label_scale_unit">Jednostka wagi</string>
     <string name="label_gender">Płęć</string>
     <string name="label_male">Mężczyzna</string>
@@ -67,7 +67,7 @@
     <string name="error_exporting">Błąd eksportu</string>
     <string name="error_importing">Błąd importu</string>
     <string name="error_user_name_required">Błąd nazwa użytkownika jest wymagana</string>
-    <string name="error_body_height_required">Błąd wzrost jest wymagany</string>
+    <string name="error_height_required">Błąd wzrost jest wymagany</string>
     <string name="error_initial_weight_required">Błąd waga początkowa jest wymagana</string>
     <string name="error_goal_weight_required">Błąd waga docelowa jest wymagana</string>
 
diff --git a/android_app/app/src/main/res/values-pt/strings.xml b/android_app/app/src/main/res/values-pt/strings.xml
index 3d355409..4d97ee72 100644
--- a/android_app/app/src/main/res/values-pt/strings.xml
+++ b/android_app/app/src/main/res/values-pt/strings.xml
@@ -10,7 +10,7 @@
     <string name="action_bluetooth_status">Estado do Bluetooth</string>
     <string name="action_settings">Configurações</string>
     <string name="default_value_reminder_notify_text">Hora de pesar-se</string>
-    <string name="error_body_height_required">Erro: Altura é obrigatória</string>
+    <string name="error_height_required">Erro: Altura é obrigatória</string>
     <string name="error_exporting">Erro ao exportar</string>
     <string name="error_goal_weight_required">Erro: Objetivo de peso é obrigatório</string>
     <string name="error_importing">Erro ao importar</string>
@@ -53,7 +53,7 @@
     <string name="label_bluetooth_enable">Procurar por balança ao iniciar</string>
     <string name="label_bluetooth_title">Bluetooth</string>
     <string name="label_bmi">IMC</string>
-    <string name="label_body_height">Altura</string>
+    <string name="label_height">Altura</string>
     <string name="label_cancel">Cancelar</string>
     <string name="label_comment">Comentário</string>
     <string name="label_date">Data</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 fb69a2e7..ea7b2f57 100644
--- a/android_app/app/src/main/res/values-sk/strings.xml
+++ b/android_app/app/src/main/res/values-sk/strings.xml
@@ -39,7 +39,7 @@
   <string name="label_time">Čas</string>
   <string name="label_birthday">Dátum narodenia</string>
   <string name="label_user_name">Meno</string>
-  <string name="label_body_height">Telesná výška</string>
+  <string name="label_height">Telesná výška</string>
   <string name="label_scale_unit">Jednotka hmotnosti</string>
   <string name="label_gender">Pohlavie</string>
   <string name="label_male">Muž</string>
@@ -57,7 +57,7 @@
   <string name="error_exporting">Chyba pri exporte</string>
   <string name="error_importing">Chyba pri importe</string>
   <string name="error_user_name_required">Chyba, používateľské meno je povinné</string>
-  <string name="error_body_height_required">Chyba, telesná výška je povinná</string>
+  <string name="error_height_required">Chyba, telesná výška je povinná</string>
   <string name="error_initial_weight_required">Chyba, počiatočná hmotnosť je povinná</string>
   <string name="error_goal_weight_required">Chyba, cieľová hmotnosť je povinná</string>
   <string name="info_data_deleted">Položka bola vymazaná z databázy</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 afebadd5..cd127148 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -46,7 +46,7 @@
     <string name="label_time">Tid</string>
     <string name="label_birthday">Födelsedag</string>
     <string name="label_user_name">Namn</string>
-    <string name="label_body_height">Längd</string>
+    <string name="label_height">Längd</string>
     <string name="label_scale_unit">Viktenhet</string>
     <string name="label_days_left">Dagar kvar</string>
     <string name="label_goal_date_is">Måldatum är</string>
@@ -73,7 +73,7 @@
     <string name="error_value_range">Värdet är inte inom intervallet</string>
     <string name="error_importing">Fel vid import</string>
     <string name="error_user_name_required">Fel: namn krävs</string>
-    <string name="error_body_height_required">Fel: längd krävs</string>
+    <string name="error_height_required">Fel: längd krävs</string>
     <string name="error_initial_weight_required">Fel: startvikt krävs</string>
     <string name="error_goal_weight_required">Fel: målvikt krävs</string>
     <string name="info_data_deleted">Databaspost borttagen</string>
diff --git a/android_app/app/src/main/res/values-tr/strings.xml b/android_app/app/src/main/res/values-tr/strings.xml
index 44f783c0..485cae5a 100644
--- a/android_app/app/src/main/res/values-tr/strings.xml
+++ b/android_app/app/src/main/res/values-tr/strings.xml
@@ -46,7 +46,7 @@
     <string name="label_time">Zaman</string>
     <string name="label_birthday">Doðum Tarihi</string>
     <string name="label_user_name">Ýsim</string>
-    <string name="label_body_height">Boy uzunluðu</string>
+    <string name="label_height">Boy uzunluðu</string>
     <string name="label_scale_unit">Ölçek birimi</string>
     <string name="label_gender">Cinsiyet</string>
     <string name="label_male">Erkek</string>
@@ -68,7 +68,7 @@
     <string name="error_exporting">Hatalý export</string>
     <string name="error_importing">Hatalý import</string>
     <string name="error_user_name_required">Hata: kullanýcý adý gerekiyor</string>
-    <string name="error_body_height_required">Error: Vücut boyu gerekli</string>
+    <string name="error_height_required">Error: Vücut boyu gerekli</string>
     <string name="error_initial_weight_required">Error: Baþlangýç aðýrlýðý gerekli</string>
     <string name="error_goal_weight_required">Error: Hedef aðýrlýk gerekli</string>
 
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 5ec3a027..c1a4b959 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="label_time">Time</string>
     <string name="label_birthday">Birthday</string>
     <string name="label_user_name">Name</string>
-    <string name="label_body_height">Body height</string>
+    <string name="label_height">Height</string>
     <string name="label_scale_unit">Scale unit</string>
     <string name="label_gender">Gender</string>
     <string name="label_male">Male</string>
@@ -80,7 +80,7 @@
     <string name="error_importing">Error importing</string>
     <string name="error_user_name_required">Error: user name is required</string>
     <string name="error_user_name_too_short">Error: user name have to be at least 3 characters</string>
-    <string name="error_body_height_required">Error: body height is required</string>
+    <string name="error_height_required">Error: height is required</string>
     <string name="error_initial_weight_required">Error: initial weight is required</string>
     <string name="error_goal_weight_required">Error: goal weight is required</string>
 

From e23051e549f8c9ce7745cf5993912e9edc1dc3c6 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sun, 25 Feb 2018 20:12:02 +0100
Subject: [PATCH 5/6] fat/water -> body fat/water

---
 android_app/app/src/main/res/values/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index c1a4b959..2d544ee6 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -28,8 +28,8 @@
     <string name="label_weight">Weight</string>
     <string name="label_bmi">Body mass index (BMI)</string>
     <string name="label_bmr">Basal metabolic rate (BMR)</string>
-    <string name="label_fat">Fat</string>
-    <string name="label_water">Water</string>
+    <string name="label_fat">Body fat</string>
+    <string name="label_water">Body water</string>
     <string name="label_muscle">Muscle</string>
     <string name="label_lbw">Lean body weight</string>
     <string name="label_waist">Waist circumference</string>
@@ -40,8 +40,8 @@
     <string name="label_bone">Bone mass</string>
     <string name="label_smartUserAssign">Smart User assignment</string>
 
-    <string name="label_fat_percentage">Fat in %</string>
-    <string name="label_water_percentage">Water in %</string>
+    <string name="label_fat_percentage">Body fat in %</string>
+    <string name="label_water_percentage">Body water in %</string>
     <string name="label_muscle_percentage">Muscle in %</string>
 
     <plurals name="label_days">
@@ -128,9 +128,9 @@
 
     <string name="label_delete_confirmation">Delete confirmation</string>
 
-    <string name="label_estimate_water">Estimate water</string>
+    <string name="label_estimate_water">Estimate body water</string>
     <string name="label_estimate_lbw">Estimate lean body weight</string>
-    <string name="label_estimate_fat">Estimate fat</string>
+    <string name="label_estimate_fat">Estimate body fat</string>
 
     <string name="label_category_display">Display</string>
     <string name="label_category_body_metrics_estimation">Body metrics estimation</string>
@@ -140,9 +140,9 @@
     <string name="label_website">Website</string>
     <string name="label_license">License</string>
 
-    <string name="label_estimate_water_formula">Water formula</string>
+    <string name="label_estimate_water_formula">Body water formula</string>
     <string name="label_estimate_lbw_formula">Lean body weight formula</string>
-    <string name="label_estimate_fat_formula">Fat formula</string>
+    <string name="label_estimate_fat_formula">Body fat formula</string>
     <string name="label_automatic">auto</string>
 
     <string name="label_theme">Theme</string>

From ebea3814c73165c21da135b002ceaff688086c46 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sun, 25 Feb 2018 20:16:13 +0100
Subject: [PATCH 6/6] Update swedish translation accordingly

---
 .../app/src/main/res/values-sv/strings.xml    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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 cd127148..f3855ef9 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -19,7 +19,7 @@
     <string name="label_bmi">Kroppsmasseindex (BMI)</string>
     <string name="label_bmr">Basal ämnesomsättning (BMR)</string>
     <string name="label_fat">Kroppsfett</string>
-    <string name="label_water">Vatten</string>
+    <string name="label_water">Kroppsvatten</string>
     <string name="Monday">Måndag</string>
     <string name="Tuesday">Tisdag</string>
     <string name="Wednesday">Onsdag</string>
@@ -111,16 +111,16 @@
     <string name="label_enable_labels">Etikett på datapunkt</string>
     <string name="label_enable_points">Punkt på datapunkt</string>
     <string name="label_delete_confirmation">Borttagningsbekräftelse</string>
-    <string name="label_estimate_water">Estimera vatten</string>
+    <string name="label_estimate_water">Estimera kroppsvatten</string>
     <string name="label_estimate_lbw">Estimera fettfri kroppsvikt</string>
     <string name="label_estimate_fat">Estimera kroppsfett</string>
     <string name="label_category_display">Visa</string>
     <string name="label_category_body_metrics_estimation">Uppskatta mätvärden</string>
     <string name="label_category_measurement_database">Mätningsdatabas</string>
     <string name="label_maintainer">Utvecklare</string>
-    <string name="label_estimate_water_formula">Vattenformel</string>
-    <string name="label_estimate_lbw_formula">Fettfri kroppsvikt-formel</string>
-    <string name="label_estimate_fat_formula">Kroppsfettformel</string>
+    <string name="label_estimate_water_formula">Formel för kroppsvatten</string>
+    <string name="label_estimate_lbw_formula">Formel för fettfri kroppsvikt</string>
+    <string name="label_estimate_fat_formula">Formel för kroppsfett</string>
     <string name="label_automatic">auto</string>
     <string name="label_reminder">Påminnelse</string>
     <string name="label_reminder_notify_text">Meddelandetext</string>
@@ -143,7 +143,7 @@
     <string name="close_drawer">stäng</string>
     <string name="label_fat_percentage">Kroppsfett i %</string>
     <string name="label_muscle_percentage">Muskler i %</string>
-    <string name="label_water_percentage">Vatten i %</string>
+    <string name="label_water_percentage">Kroppsvatten i %</string>
     <string name="info_bluetooth_no_device_set">Ingen Bluetooth-enhet vald</string>
     <string name="info_new_data_duplicated">mätning med samma datum och tid existerar redan</string>
     <string name="title_general">Allmänt</string>
@@ -165,9 +165,9 @@
     <string name="customactivityoncrash_error_activity_error_details_copy">Kopiera till urklipp</string>
     <string name="customactivityoncrash_error_activity_error_details_copied">Kopierat till urklipp</string>
     <string name="customactivityoncrash_error_activity_error_details_clipboard_label">Felinformation</string>
-<string name="save">Spara</string>
+    <string name="save">Spara</string>
 
-<string name="label_share">Dela</string>
+    <string name="label_share">Dela</string>
 
     <string name="label_bluetooth_searching_finished">Sökning efter Bluetooth-vågar slutförd</string>
     <string name="label_help">Hjälp</string>
@@ -180,13 +180,13 @@
     <string name="permission_bluetooth_info">openScale kräver åtkomst till grov platsbestämning för att söka efter Bluetooth-enheter</string>
     <string name="permission_bluetooth_info_title">Information</string>
 
-<string name="label_share_subject">openScale CSV dataexport (%s)</string>
+    <string name="label_share_subject">openScale CSV dataexport (%s)</string>
 
     <string name="label_next">Nästa</string>
     <string name="label_measurement_order">Mätordning</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>
+    <string name="label_weeks_view">Veckovy</string>
 
-    </resources>
+</resources>