diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 31147b3b3..52966e61e 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         <activity android:name="com.health.openscale.gui.SettingsActivity"></activity>
         <activity android:name="com.health.openscale.gui.NewEntryActivity" android:theme="@android:style/Theme.Holo.Light.Dialog" android:label="@string/title_new_data_entry"></activity>
         <activity android:name="com.health.openscale.gui.EditDataActivity" android:theme="@android:style/Theme.Holo.Light.Dialog" android:label="@string/title_edit_data_entry"></activity>
-        <activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/title_user"></activity>
+        <activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/label_title_user"></activity>
     </application>
 
 </manifest>
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
index fbdba1c2f..a4262eac0 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/EditDataActivity.java
@@ -26,7 +26,7 @@
 import com.health.openscale.core.OpenScale;
 import com.health.openscale.core.ScaleData;
 
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
 
 public class EditDataActivity extends Activity {
 
@@ -74,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
         txtMuscle.setText(editScaleData.muscle+"");
         txtComment.setText(editScaleData.comment);
 
-        setTitle(getResources().getString(R.string.title_edit_data_entry) + ": " + new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(editScaleData.date_time));
+        setTitle(getResources().getString(R.string.title_edit_data_entry) + ": " + DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(editScaleData.date_time));
 
     }
 
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
index 7cdd4d0e2..40e6c05ed 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
@@ -36,7 +36,7 @@
 import com.health.openscale.core.ScaleData;
 import com.health.openscale.core.ScaleUser;
 
-import java.text.SimpleDateFormat;
+import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -196,7 +196,7 @@ private void updateGoal(ArrayList<ScaleData> scaleDataList) {
         txtGoalWeight.setText(currentScaleUser.goal_weight + " " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit]);
 
         double weight_diff = currentScaleUser.goal_weight - lastScaleData.weight;
-        txtGoalDiff.setText(String.format("%.1f" + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit], weight_diff));
+        txtGoalDiff.setText(String.format("%.1f " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit], weight_diff));
 
         Calendar goalDate = Calendar.getInstance();
         Calendar curDate = Calendar.getInstance();
@@ -205,9 +205,9 @@ private void updateGoal(ArrayList<ScaleData> scaleDataList) {
         long days = daysBetween(curDate, goalDate);
         txtGoalDayLeft.setText(days + " " + getResources().getString(R.string.label_days));
 
-        txtLabelGoalWeight.setText(Html.fromHtml(getResources().getString(R.string.label_weight_goal) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(currentScaleUser.goal_weight)) + " </small></font>"));
+        txtLabelGoalWeight.setText(Html.fromHtml(getResources().getString(R.string.label_goal_weight) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(currentScaleUser.goal_weight)) + " </small></font>"));
         txtLabelGoalDiff.setText(Html.fromHtml(getResources().getString(R.string.label_weight_difference) + " <br> <font color='grey'><small>BMI " + String.format("%.1f", currentScaleUser.getBMI(lastScaleData.weight) - currentScaleUser.getBMI(currentScaleUser.goal_weight))  + " </small></font>"));
-        txtLabelDayLeft.setText(Html.fromHtml(getResources().getString(R.string.label_days_left) + " <br> <font color='grey'><small>" + getResources().getString(R.string.label_goal_date_is) + " " + new SimpleDateFormat("dd. MMM yyyy (EE)").format(currentScaleUser.goal_date) + " </small></font>"));
+        txtLabelDayLeft.setText(Html.fromHtml(getResources().getString(R.string.label_days_left) + " <br> <font color='grey'><small>" + getResources().getString(R.string.label_goal_date_is) + " " + DateFormat.getDateInstance(DateFormat.LONG).format(currentScaleUser.goal_date) + " </small></font>")); // currentScaleUser.goal_date
 
         if (scaleDataList.size() > 2) {
             ScaleData diffScaleData = scaleDataList.get(1);
@@ -354,9 +354,9 @@ private void updateLastLineChart(ArrayList<ScaleData> scaleDataList) {
             long days = 0 - daysBetween(lastDate, histDate);
 
             if (days == 0) {
-                axisValues.add(new AxisValue(i, new SimpleDateFormat("dd/MM/yy").format(lastScaleData.date_time).toCharArray()));
+                axisValues.add(new AxisValue(i, DateFormat.getDateInstance(DateFormat.SHORT).format(lastScaleData.date_time).toCharArray()));
             } else {
-                axisValues.add(new AxisValue(i, String.format("%d days", days).toCharArray()));
+                axisValues.add(new AxisValue(i, String.format("%d " + getResources().getString(R.string.label_days), days).toCharArray()));
             }
         }
 
@@ -431,7 +431,7 @@ private void updateLastPieChart() {
         pieChartData.setHasLabels(false);
         pieChartData.setHasCenterCircle(true);
         pieChartData.setCenterText1(Float.toString(lastScaleData.weight) + " " + ScaleUser.UNIT_STRING[currentScaleUser.scale_unit]);
-        pieChartData.setCenterText2(new SimpleDateFormat("dd. MMM yyyy").format(lastScaleData.date_time));
+        pieChartData.setCenterText2(DateFormat.getDateInstance(DateFormat.MEDIUM).format(lastScaleData.date_time));
 
 
         if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE ||
@@ -468,8 +468,7 @@ public void onValueSelected(int i, SliceValue arcValue) {
                 return;
             }
 
-
-            String date_time = new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(lastScaleData.date_time);
+            String date_time = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT).format(lastScaleData.date_time);
 
             switch (i) {
                 case 0:
@@ -515,7 +514,7 @@ public void onValueSelected(int lineIndex, int pointIndex, PointValue pointValue
             ScaleData scaleData = scaleDataLastDays.get(pointIndex);
             lines selectedLine = activeLines.get(lineIndex);
 
-            String date_time = new SimpleDateFormat("dd. MMM yyyy (EE) HH:mm").format(scaleData.date_time);
+            String date_time = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.SHORT).format(scaleData.date_time);
 
             switch (selectedLine) {
                 case WEIGHT:
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
index 60e8f6e72..07e8ff298 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/SettingsActivity.java
@@ -84,7 +84,7 @@ private void updateUserPreferences()
         Preference prefAddUser = new Preference(this);
 
         prefAddUser.setOnPreferenceClickListener(new onClickListenerAddUser());
-        prefAddUser.setTitle("+ Add User");
+        prefAddUser.setTitle("+ " + getResources().getString(R.string.label_add_user));
 
         usersCategory.addPreference(prefAddUser);
     }
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
index 03067666d..8a20509cf 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
@@ -45,6 +45,7 @@
 import com.health.openscale.core.ScaleData;
 
 import java.io.IOException;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 
@@ -113,9 +114,9 @@ public void updateOnView(ArrayList<ScaleData> scaleDataList)
 			TextView dateTextView = new TextView(tableView.getContext());
             if ((getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_XLARGE ||
                 (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) == Configuration.SCREENLAYOUT_SIZE_LARGE) {
-                dateTextView.setText(new SimpleDateFormat("dd. MMM yyyy (EE)").format(scaleData.date_time));
+                dateTextView.setText(DateFormat.getDateInstance(DateFormat.MEDIUM).format(scaleData.date_time));
             } else{
-                dateTextView.setText(new SimpleDateFormat("dd/MM/yy").format(scaleData.date_time));
+                dateTextView.setText(DateFormat.getDateInstance(DateFormat.SHORT).format(scaleData.date_time));
             }
 			dateTextView.setPadding(0, 5, 5, 5);
 			dataRow.addView(dateTextView);
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 442e2ce00..9c42c8a2a 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -6,14 +6,14 @@
     <string name="error_exporting">Fehler beim Exportieren</string>
     <string name="error_fat_value_required">Fettanteil ist erforderlich!</string>
     <string name="error_importing">Fehler beim Importieren</string>
-    <string name="error_muscle_value_required">Muskelwert ist erforderlich!</string>
-    <string name="error_user_name_required">Fehller Benutzername ist erfoderlich!</string>
-    <string name="error_value_range_0_100">Wert muss zwischen 0 und 100 liegen!</string>
-    <string name="error_value_range_0_300">Wert muss zwischen 0 und 300 liegen!</string>
-    <string name="error_water_value_required">Wasseranteil ist erforderlich!</string>
+    <string name="error_muscle_value_required">Muskelanteil ist erforderlich!</string>
+    <string name="error_user_name_required">Fehler Benutzername ist erfoderlich!</string>
+    <string name="error_value_range_0_100">Der Wert muss zwischen 0 und 100 liegen!</string>
+    <string name="error_value_range_0_300">Der Wert muss zwischen 0 und 300 liegen!</string>
+    <string name="error_water_value_required">Wassergehalt ist erforderlich!</string>
     <string name="error_weight_value_required">Gewicht ist erforderlich!</string>
-    <string name="info_bluetooth_disable">Das Suchen nach einer Bluetooth Waage ist ausgeschaltet</string>
-    <string name="info_bluetooth_enable">Das Suchen nach einer Bluetooth Waage ist eingeschaltet</string>
+    <string name="info_bluetooth_disable">ist ausgeschaltet</string>
+    <string name="info_bluetooth_enable">ist eingeschaltet</string>
     <string name="info_bluetooth_not_established">Bluetooth Verbindung konnte nicht hergestellt werden</string>
     <string name="info_data_all_deleted">Alle Datenbank Einträge wurden gelöscht!</string>
     <string name="info_data_deleted">Datenbank wurde gelöscht!</string>
@@ -27,8 +27,8 @@
     <string name="info_enter_value_cm">Gebe deine Körpergröße 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>
+    <string name="info_is_not_visible">ist nicht sichtbar</string>
+    <string name="info_is_visible">ist sichtbar</string>
     <string name="info_no_selected_user">Kein Benutzer existiert! Bitte lege einen neuen Benutzer unter Einstellungen an</string>
     <string name="info_on_date">am</string>
     <string name="info_set_filename">Setzte Dateiname auf</string>
@@ -38,7 +38,7 @@
     <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">Such Modus</string>
+    <string name="label_bluetooth_enable">Suche nach Bluetooth Waage</string>
     <string name="label_bluetooth_title">Bluetooth</string>
     <string name="label_bmi">BMI</string>
     <string name="label_body_height">Körpergröße</string>
@@ -50,13 +50,13 @@
     <string name="label_delete">Löschen</string>
     <string name="label_delete_all">Alles löschen</string>
     <string name="label_device_name">Gerätename</string>
-    <string name="label_enable_fat">Fettanteillinie</string>
+    <string name="label_enable_fat">Körperfettanteillinie</string>
     <string name="label_enable_labels">Notiz auf den Datenpunkten</string>
     <string name="label_enable_muscle">Muskelanteillinie</string>
-    <string name="label_enable_water">Wasseranteillinie</string>
+    <string name="label_enable_water">Wassergehaltslinie</string>
     <string name="label_enable_weight">Gewichtslinie</string>
     <string name="label_export">Exportieren</string>
-    <string name="label_fat">Fettanteil</string>
+    <string name="label_fat">Körperfettanteil</string>
     <string name="label_gender">Geschlecht</string>
     <string name="label_goal_date">Zieldatum</string>
     <string name="label_goal_date_is">Das Zieldatum ist</string>
@@ -78,10 +78,9 @@
     <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">Wasseranteil</string>
+    <string name="label_water">Wassergehalt</string>
     <string name="label_weight">Gewicht</string>
     <string name="label_weight_difference">Gewichtsunterschied</string>
-    <string name="label_weight_goal">Gewichtsziel</string>
     <string name="label_woman">Weiblich</string>
     <string name="label_yes">Ja</string>
     <string name="question_really_delete_user">Wollen Sie wirklich den Benutzer löschen?</string>
@@ -91,5 +90,6 @@
     <string name="title_graph">Diagramm</string>
     <string name="title_new_data_entry">Dateneingabe</string>
     <string name="title_overview">Übersicht</string>
-    <string name="title_user">Benutzer</string>
+    <string name="title_users">Benutzer</string>
+    <string name="label_add_user">Benutzer hinzufügen</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 000000000..d18a6b73c
--- /dev/null
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">openScale</string>
+    <string name="title_users">ユーザー</string>
+    <string name="title_frag">早見表</string>
+    <string name="title_graph">図表</string>
+    <string name="title_new_data_entry">データ入力</string>
+    <string name="title_overview">概説</string>
+    <string name="label_yes">はい</string>
+    <string name="label_woman">女性</string>
+    <string name="label_user_name">高名</string>
+    <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>
+    <string name="label_body_height">身長</string>
+    <string name="label_cancel">キャンセル</string>
+    <string name="label_comment">コメント</string>
+    <string name="label_days">日</string>
+    <string name="label_date">期日</string>
+    <string name="label_delete">デリート</string>
+    <string name="label_export">レコードのエクスポート</string>
+    <string name="label_import">レコードのインポート</string>
+    <string name="label_male">男性</string>
+    <string name="label_muscle">筋肉率</string>
+    <string name="label_gender">性別</string>
+    <string name="label_water">体内の水分</string>
+    <string name="label_title_user">ユーザー</string>
+    <string name="label_goal_weight">目標体重</string>
+    <string name="label_days_left">目標まで</string>
+    <string name="label_title_goal">目標</string>
+    <string name="label_goal_date">目標期日</string>
+    <string name="label_scale_unit">単位</string>
+    <string name="label_set">Set</string>
+    <string name="label_measures">計測</string>
+    <string name="label_title_last_measurement">最終の計測</string>
+    <string name="label_goal_date_is">目標期日は</string>
+    <string name="label_enable_muscle">筋肉率線</string>
+    <string name="label_enable_water">体内の水分線</string>
+    <string name="label_enable_weight">体重線</string>
+    <string name="label_enable_fat">体脂肪線</string>
+    <string name="label_delete_all">全てデリート</string>
+    <string name="label_bluetooth_enable">Bluetoothの体重計を探索する</string>
+    <string name="title_edit_data_entry">エディット</string>
+    <string name="label_last_month">過去30日</string>
+    <string name="label_last_week">過去7日</string>
+    <string name="label_device_name">デバイス名</string>
+    <string name="info_bluetooth_enable">有効にします</string>
+    <string name="info_bluetooth_disable">無効にします</string>
+    <string name="error_exporting">エクスポートに失敗しました</string>
+    <string name="error_importing">インポートに失敗しました</string>
+    <string name="error_body_height_required">身長が必要です</string>
+    <string name="error_fat_value_required">体脂肪率が必要です</string>
+    <string name="error_muscle_value_required">筋肉率が必要です</string>
+    <string name="error_user_name_required">ユーザー名が必要です</string>
+    <string name="error_value_range_0_100">値は0から100の間でなければなりません</string>
+    <string name="error_value_range_0_300">値は0から300の間でなければなりません</string>
+    <string name="error_water_value_required">体内の水分が必要です</string>
+    <string name="error_weight_value_required">体重が必要です</string>
+    <string name="info_bluetooth_not_established">Bluetooth接続を確立できなかった場合</string>
+    <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>
+    <string name="info_is_not_visible">表示されていません</string>
+    <string name="info_enter_user_name">あなたの名前を入力してください</string>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 647e0a394..f74766803 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="title_overview">Overview</string>
     <string name="title_graph">Chart</string>
     <string name="title_frag">Table</string>
-    <string name="title_user">User</string>
+    <string name="title_users">Users</string>
     <string name="title_new_data_entry">Data entry</string>
     <string name="title_edit_data_entry">Edit</string>
 
@@ -17,20 +17,20 @@
     <string name="label_yes">Yes</string>
     <string name="label_no">No</string>
     <string name="label_delete">Delete</string>
+    <string name="label_add_user">Add user</string>
 
     <string name="label_id">Id</string>
     <string name="label_weight">Weight</string>
     <string name="label_bmi">BMI</string>
-    <string name="label_fat">Fat</string>
-    <string name="label_water">Water</string>
-    <string name="label_muscle">Muscle</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_comment">Comment</string>
 
     <string name="label_days">days</string>
     <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_goal">Weight goal</string>
     <string name="label_weight_difference">Weight difference</string>
     <string name="label_goal_date_is">Goal date is</string>
     <string name="label_days_left">Days left</string>
@@ -58,12 +58,12 @@
     <string name="label_export">Export</string>
     <string name="label_delete_all">Delete all</string>
 
-    <string name="error_weight_value_required">Weight value is required!</string>
-    <string name="error_fat_value_required">Fat value is required!</string>
-    <string name="error_water_value_required">Water value is required!</string>
-    <string name="error_muscle_value_required">Muscle value is required!</string>
-    <string name="error_value_range_0_300">Value must be in range from 0 to 300!</string>
-    <string name="error_value_range_0_100">Value must be in range from 0 to 100!</string>
+    <string name="error_weight_value_required">Weight is required!</string>
+    <string name="error_fat_value_required">Body fat percentage is required!</string>
+    <string name="error_water_value_required">Water percentage is required!</string>
+    <string name="error_muscle_value_required">Muscle percentage is required!</string>
+    <string name="error_value_range_0_300">The value must be in range from 0 to 300!</string>
+    <string name="error_value_range_0_100">The value must be in range from 0 to 100!</string>
     <string name="error_exporting">Error exporting</string>
     <string name="error_importing">Error importing</string>
     <string name="error_user_name_required">Error user name is required!</string>
@@ -78,10 +78,10 @@
     <string name="info_enter_value_unit">Enter value in</string>
     <string name="info_enter_comment">Enter an optional comment</string>
     <string name="info_enter_goal_weight">Enter your goal weight in your scale unit</string>
-    <string name="info_is_visible">Is visible</string>
-    <string name="info_is_not_visible">Is not visible</string>
-    <string name="info_bluetooth_enable">Searching for Bluetooth bathroom scale is enabled</string>
-    <string name="info_bluetooth_disable">Searching for Bluetooth bathroom scale is disabled</string>
+    <string name="info_is_visible">is visible</string>
+    <string name="info_is_not_visible">is not visible</string>
+    <string name="info_bluetooth_enable">is enabled</string>
+    <string name="info_bluetooth_disable">is disabled</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_not_established">Bluetooth connection not established</string>
@@ -93,18 +93,18 @@
     <string name="question_really_delete_user">Do you really want to delete the user? </string>
 
     <string name="label_bluetooth_title">Bluetooth</string>
-    <string name="label_bluetooth_enable">Search mode</string>
+    <string name="label_bluetooth_enable">Search for Bluetooth scale</string>
     <string name="label_device_name">Device Name</string>
 
     <string name="label_enable_labels">Label on data point</string>
     <string name="label_enable_weight">Weight line</string>
-    <string name="label_enable_fat">Fat line</string>
-    <string name="label_enable_water">Water line</string>
-    <string name="label_enable_muscle">Muscle line</string>
+    <string name="label_enable_fat">Body fat percentage line</string>
+    <string name="label_enable_water">Water percentage line</string>
+    <string name="label_enable_muscle">Muscle percentage line</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 body water was</string>
-    <string name="info_your_muscle">Your body muscle 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_on_date">on</string>
 </resources>
diff --git a/android_app/app/src/main/res/xml/preferences.xml b/android_app/app/src/main/res/xml/preferences.xml
index dbace69f8..c9dd523bd 100644
--- a/android_app/app/src/main/res/xml/preferences.xml
+++ b/android_app/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-<PreferenceCategory android:title="Users" android:key="catUsers">
+<PreferenceCategory android:title="@string/title_users" android:key="catUsers">
 </PreferenceCategory>
 
 <PreferenceCategory android:title="@string/label_bluetooth_title">