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] 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>