From 05e07cf943ae46e8f78f0115e489f350333c6faf Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Thu, 12 Apr 2018 21:28:32 +0200
Subject: [PATCH] Align style of labels, i18n.

---
 .../res/layout/overview_newcarbs_dialog.xml   | 19 +++++++++++--------
 app/src/main/res/values/strings.xml           |  3 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/overview_newcarbs_dialog.xml b/app/src/main/res/layout/overview_newcarbs_dialog.xml
index 38dca30d8e..8d416467ef 100644
--- a/app/src/main/res/layout/overview_newcarbs_dialog.xml
+++ b/app/src/main/res/layout/overview_newcarbs_dialog.xml
@@ -125,7 +125,8 @@
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Time" />
+                    android:textStyle="bold"
+                    android:text="@string/time" />
 
                 <info.nightscout.utils.NumberPicker
                     android:id="@+id/newcarbs_time"
@@ -139,7 +140,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="m" />
+                    android:text="@string/shortminute" />
             </LinearLayout>
 
             <LinearLayout
@@ -153,7 +154,8 @@
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Duration"/>
+                    android:textStyle="bold"
+                    android:text="@string/duration"/>
 
                 <info.nightscout.utils.NumberPicker
                     android:id="@+id/new_carbs_duration"
@@ -167,7 +169,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="h"/>
+                    android:text="@string/shorthour"/>
             </LinearLayout>
 
             <View
@@ -187,7 +189,8 @@
                     android:layout_width="60dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="Carbs" />
+                    android:textStyle="bold"
+                    android:text="@string/overview_carbs_label" />
 
                 <info.nightscout.utils.NumberPicker
                     android:id="@+id/newcarb_carbsamount"
@@ -201,7 +204,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:text="g" />
+                    android:text="@string/shortgramm" />
             </LinearLayout>
 
             <LinearLayout
@@ -240,9 +243,9 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="60dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:layout_gravity="center_vertical"
                     android:width="60dp"
                     android:padding="2dp"
                     android:text="@string/careportal_newnstreatment_notes_label"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abdb0e1160..58c4eebc40 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -715,6 +715,8 @@
     <string name="connectiontimedout">Connection timed out</string>
     <string name="food">Food</string>
     <string name="shortgramm">g</string>
+    <string name="shortminute">m</string>
+    <string name="shorthour">h</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -995,4 +997,5 @@
     <string name="key_openapssmb_max_iob" translatable="false">openapsmb_max_iob</string>
     <string name="openapssmb_maxiob_title">Maximum total IOB OpenAPS can\'t go over [U]</string>
     <string name="openapssmb_maxiob_summary">This value is called Max IOB in OpenAPS context\nOpenAPS will not add more insulin if current IOB is greater than this value</string>
+    <string name="time">Time</string>
 </resources>