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