Merge pull request #2247 from Philoul/watch_strings

Watch strings

wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.java

@@ -12,10 +12,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-
+import info.nightscout.androidaps.R;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
@@ -71,7 +72,7 @@ public class BolusActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editInsulin.editText.getText().toString());
                 }
                 editInsulin = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 30d, 0.1d, new DecimalFormat("#0.0"), false);
-                setLabelToPlusMinusView(view, "insulin");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_insulin));
                 container.addView(view);
                 return view;
             } else if(col == 1){
@@ -81,7 +82,7 @@ public class BolusActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editCarbs.editText.getText().toString());
                 }
                 editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), false);
-                setLabelToPlusMinusView(view, "carbs");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_carbs));
                 container.addView(view);
                 return view;
             } else {

wear/src/main/java/info/nightscout/androidaps/interaction/actions/CPPActivity.java

@@ -14,6 +14,7 @@ import android.widget.ImageView;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
@@ -83,7 +84,7 @@ public class CPPActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editTimeshift.editText.getText().toString());
                 }
                 editTimeshift = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 23d, 1d, new DecimalFormat("0"), true, true);
-                setLabelToPlusMinusView(view, "timeshift");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_timeshift));
                 container.addView(view);
                 return view;
             } else if(col == 1){
@@ -93,7 +94,7 @@ public class CPPActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editPercentage.editText.getText().toString());
                 }
                 editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 50d, 150d, 1d, new DecimalFormat("0"), false);
-                setLabelToPlusMinusView(view, "percentage");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_percentage));
                 container.addView(view);
                 return view;
             } else {

wear/src/main/java/info/nightscout/androidaps/interaction/actions/ECarbActivity.java

@@ -14,6 +14,7 @@ import android.widget.ImageView;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
@@ -71,7 +72,7 @@ public class ECarbActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editCarbs.editText.getText().toString());
                 }
                 editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), true);
-                setLabelToPlusMinusView(view, "carbs");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_carbs));
                 container.addView(view);
                 return view;
             } else if(col == 1){
@@ -81,7 +82,7 @@ public class ECarbActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editStartTime.editText.getText().toString());
                 }
                 editStartTime = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 300d, 15d, new DecimalFormat("0"), false);
-                setLabelToPlusMinusView(view, "start [min]");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_start_min));
                 container.addView(view);
                 return view;
             } else if(col == 2){
@@ -91,7 +92,7 @@ public class ECarbActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editDuration.editText.getText().toString());
                 }
                 editDuration = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 8d, 1d, new DecimalFormat("0"), false);
-                setLabelToPlusMinusView(view, "duration [h]");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_duration_h));
                 container.addView(view);
                 return view;
             } else {

wear/src/main/java/info/nightscout/androidaps/interaction/actions/FillActivity.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
@@ -70,7 +71,7 @@ public class FillActivity extends ViewSelectorActivity {
                     def = SafeParse.stringToDouble(editInsulin.editText.getText().toString());
                 }
                 editInsulin = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 30d, 0.1d, new DecimalFormat("#0.0"), false);
-                setLabelToPlusMinusView(view, "insulin");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_insulin));
                 container.addView(view);
                 return view;
             } else {

wear/src/main/java/info/nightscout/androidaps/interaction/actions/TempTargetActivity.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 import java.text.DecimalFormat;
 
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
 import info.nightscout.androidaps.interaction.utils.SafeParse;
@@ -85,7 +86,7 @@ public class TempTargetActivity extends ViewSelectorActivity {
                     double def = SafeParse.stringToDouble(time.editText.getText().toString());
                     time = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 24 * 60d, 5d, new DecimalFormat("0"), false);
                 }
-                 setLabelToPlusMinusView(view, "duration");
+                 setLabelToPlusMinusView(view, aaps.gs(R.string.action_duration));
                  container.addView(view);
                 return view;
 
@@ -105,9 +106,9 @@ public class TempTargetActivity extends ViewSelectorActivity {
                      lowRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 4d, 10d, 0.1d, new DecimalFormat("#0.0"), false);
                  }
                  if(isSingleTarget){
-                     setLabelToPlusMinusView(view, "target");
+                     setLabelToPlusMinusView(view, aaps.gs(R.string.action_target));
                  } else {
-                     setLabelToPlusMinusView(view, "low");
+                     setLabelToPlusMinusView(view, aaps.gs(R.string.action_low));
                  }
                  container.addView(view);
                  return view;
@@ -126,7 +127,7 @@ public class TempTargetActivity extends ViewSelectorActivity {
                      }
                      highRange = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 4d, 10d, 0.1d, new DecimalFormat("#0.0"), false);
                  }
-                 setLabelToPlusMinusView(view, "high");
+                 setLabelToPlusMinusView(view, aaps.gs(R.string.action_high));
                  container.addView(view);
                  return view;
              }else {

wear/src/main/java/info/nightscout/androidaps/interaction/actions/WizardActivity.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import java.text.DecimalFormat;
 
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interaction.utils.PlusMinusEditText;
@@ -80,7 +81,7 @@ public class WizardActivity extends ViewSelectorActivity {
                     editCarbs = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 0d, 150d, 1d, new DecimalFormat("0"), false);
 
                 }
-                setLabelToPlusMinusView(view, "carbs");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_carbs));
                 container.addView(view);
                 return view;
             } else if(col == 1 && hasPercentage){
@@ -91,7 +92,7 @@ public class WizardActivity extends ViewSelectorActivity {
                     double def = SafeParse.stringToDouble(editPercentage.editText.getText().toString());
                     editPercentage = new PlusMinusEditText(view, R.id.amountfield, R.id.plusbutton, R.id.minusbutton, def, 50d, 150d, 1d, new DecimalFormat("0"), false);
                 }
-                setLabelToPlusMinusView(view, "percentage");
+                setLabelToPlusMinusView(view, aaps.gs(R.string.action_percentage));
                 container.addView(view);
                 return view;
             } else {

wear/src/main/java/info/nightscout/androidaps/interaction/menus/FillMenuActivity.java

@@ -2,6 +2,8 @@ package info.nightscout.androidaps.interaction.menus;
 
 import android.content.Intent;
 
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.actions.FillActivity;
 import info.nightscout.androidaps.interaction.utils.MenuListActivity;
@@ -15,22 +17,22 @@ public class FillMenuActivity extends MenuListActivity {
     @Override
     protected String[] getElements() {
         return new String[]{
-                "Preset 1",
+                aaps.gs(R.string.action_preset_1),
-                "Preset 2",
+                aaps.gs(R.string.action_preset_2),
-                "Preset 3",
+                aaps.gs(R.string.action_preset_3),
-                "Free amount"
+                aaps.gs(R.string.action_free_amount)
         };
     }
 
     @Override
     protected void doAction(String action) {
-        if ("Preset 1".equals(action)) {
+        if (aaps.gs(R.string.action_preset_1).equals(action)) {
             ListenerService.initiateAction(this, "fillpreset 1");
-        } else if ("Preset 2".equals(action)) {
+        } else if (aaps.gs(R.string.action_preset_2).equals(action)) {
             ListenerService.initiateAction(this, "fillpreset 2");
-        } else if ("Preset 3".equals(action)) {
+        } else if (aaps.gs(R.string.action_preset_3).equals(action)) {
             ListenerService.initiateAction(this, "fillpreset 3");
-        } else if ("Free amount".equals(action)) {
+        } else if (aaps.gs(R.string.action_free_amount).equals(action)) {
             Intent intent = new Intent(this, FillActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);

wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.java

@@ -7,6 +7,8 @@ import android.preference.PreferenceManager;
 
 import java.util.Vector;
 
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.AAPSPreferences;
 import info.nightscout.androidaps.interaction.actions.AcceptActivity;
@@ -46,13 +48,13 @@ public class MainMenuActivity extends MenuListActivity {
         boolean showWizard  = sp.getBoolean("showWizard", true);
 
         Vector<String> menuitems = new Vector<String>();
-        menuitems.add("TempT");
+        menuitems.add(aaps.gs(R.string.menu_tempt));
-        if(showWizard) menuitems.add("Wizard");
+        if(showWizard) menuitems.add(aaps.gs(R.string.menu_wizard));
-        menuitems.add("eCarb");
+        menuitems.add(aaps.gs(R.string.menu_ecarb));
-        menuitems.add("Bolus");
+        menuitems.add(aaps.gs(R.string.menu_bolus));
-        menuitems.add("Settings");
+        menuitems.add(aaps.gs(R.string.menu_settings));
-        menuitems.add("Status");
+        menuitems.add(aaps.gs(R.string.menu_status));
-        if (showPrimeFill) menuitems.add("Prime/Fill");
+        if (showPrimeFill) menuitems.add(aaps.gs(R.string.menu_prime_fill));
 
         return menuitems.toArray(new String[menuitems.size()]);
     }
@@ -62,33 +64,33 @@ public class MainMenuActivity extends MenuListActivity {
 
         Intent intent;
 
-        if ("Settings".equals(action)) {
+        if (aaps.gs(R.string.menu_settings).equals(action)) {
             intent = new Intent(this, AAPSPreferences.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
         } else if ("Re-Sync".equals(action)) {
             ListenerService.requestData(this);
-        } else if ("TempT".equals(action)) {
+        } else if (aaps.gs(R.string.menu_tempt).equals(action)) {
             intent = new Intent(this, TempTargetActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
-        } else if ("Bolus".equals(action)) {
+        } else if (aaps.gs(R.string.menu_bolus).equals(action)) {
             intent = new Intent(this, BolusActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
-        } else if ("Wizard".equals(action)) {
+        } else if (aaps.gs(R.string.menu_wizard).equals(action)) {
             intent = new Intent(this, WizardActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
-        } else if ("Status".equals(action)) {
+        } else if (aaps.gs(R.string.menu_status).equals(action)) {
             intent = new Intent(this, StatusMenuActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
-        } else if ("Prime/Fill".equals(action)) {
+        } else if (aaps.gs(R.string.menu_prime_fill).equals(action)) {
             intent = new Intent(this, FillMenuActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             this.startActivity(intent);
-        } else if ("eCarb".equals(action)) {
+        } else if (aaps.gs(R.string.menu_ecarb).equals(action)) {
         intent = new Intent(this, ECarbActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         this.startActivity(intent);

wear/src/main/java/info/nightscout/androidaps/interaction/menus/StatusMenuActivity.java

@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.interaction.menus;
 
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.aaps;
 import info.nightscout.androidaps.data.ListenerService;
 import info.nightscout.androidaps.interaction.utils.MenuListActivity;
 
@@ -12,23 +14,23 @@ public class StatusMenuActivity extends MenuListActivity {
     @Override
     protected String[] getElements() {
         return new String[] {
-                "Pump",
+                aaps.gs(R.string.status_pump),
-                "Loop",
+                aaps.gs(R.string.status_loop),
-                "CPP",
+                aaps.gs(R.string.status_cpp),
-                "TDD"};
+                aaps.gs(R.string.status_tdd)};
 
 
     }
 
     @Override
     protected void doAction(String action) {
-        if ("Pump".equals(action)) {
+        if (aaps.gs(R.string.status_pump).equals(action)) {
             ListenerService.initiateAction(this, "status pump");
-        } else if ("Loop".equals(action)) {
+        } else if (aaps.gs(R.string.status_loop).equals(action)) {
             ListenerService.initiateAction(this, "status loop");
-        } else if ("CPP".equals(action)) {
+        } else if (aaps.gs(R.string.status_cpp).equals(action)) {
             ListenerService.initiateAction(this, "opencpp");
-        } else if ("TDD".equals(action)) {
+        } else if (aaps.gs(R.string.status_tdd).equals(action)) {
             ListenerService.initiateAction(this, "tddstats");
         }
     }

wear/src/main/res/layout/modern_layout.xml

@@ -35,7 +35,7 @@
             android:textSize="18sp"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
-            android:text="no status"
+            android:text="@string/activity_no_status"
             android:layout_gravity="center"
             android:layout_marginTop="-5dp" />
 

wear/src/main/res/layout/rect_activity_home_2.xml

@@ -237,7 +237,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:text="Carb"
+                        android:text="@string/activity_carb"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"
                         android:textStyle="bold" />
@@ -327,7 +327,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:text="IOB"
+                        android:text="@string/activity_IOB"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"

wear/src/main/res/layout/round_activity_home_2.xml

@@ -245,7 +245,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:text="Carb"
+                        android:text="@string/activity_carb"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"
                         android:textStyle="bold" />
@@ -335,7 +335,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center"
-                        android:text="IOB"
+                        android:text="@string/activity_IOB"
                         android:textAlignment="center"
                         android:textColor="#FFFFFF"
                         android:textSize="10sp"

wear/src/main/res/values/arrays.xml

@@ -2,11 +2,11 @@
 <resources>
 
     <string-array name="chart_timeframe">
-        <item>1 hour</item>
+        <item>@string/pref_1_hour</item>
-        <item>2 hours</item>
+        <item>@string/pref_2_hours</item>
-        <item>3 hours</item>
+        <item>@string/pref_3_hours</item>
-        <item>4 hours</item>
+        <item>@string/pref_4_hours</item>
-        <item>5 hours</item>
+        <item>@string/pref_5_hours</item>
     </string-array>
 
     <string-array name="chart_timeframe_values">
@@ -18,9 +18,9 @@
     </string-array>
 
     <string-array name="delta_granularity">
-        <item>Low</item>
+        <item>@string/pref_low</item>
-        <item>Medium</item>
+        <item>@string/pref_medium</item>
-        <item>High</item>
+        <item>@string/pref_high</item>
     </string-array>
 
     <string-array name="delta_granularity_values">
@@ -30,10 +30,10 @@
     </string-array>
 
     <string-array name="input_design">
-        <item>Default</item>
+        <item>@string/pref_default</item>
-        <item>Quick righty</item>
+        <item>@string/pref_quick_righty</item>
-        <item>Quick lefty</item>
+        <item>@string/pref_quick_lefty</item>
-        <item>Modern Sparse</item>
+        <item>@string/pref_modern_sparse</item>
     </string-array>
 
     <string-array name="input_design_values">
@@ -44,13 +44,13 @@
     </string-array>
 
     <string-array name="complication_tap_action">
-        <item>Default</item>
+        <item>@string/menu_default</item>
-        <item>Menu</item>
+        <item>@string/menu_menu</item>
-        <item>Wizard</item>
+        <item>@string/menu_wizard</item>
-        <item>Bolus</item>
+        <item>@string/menu_bolus</item>
-        <item>eCarb</item>
+        <item>@string/menu_ecarb</item>
-        <item>Status</item>
+        <item>@string/menu_status</item>
-        <item>None</item>
+        <item>@string/menu_none</item>
     </string-array>
 
     <string-array name="complication_tap_action_values">

wear/src/main/res/values/strings.xml

@@ -4,13 +4,14 @@
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
 
-
     <string name="label_xdrip">AAPS</string>
     <string name="label_xdrip_large">AAPS(Large)</string>
     <string name="label_xdrip_big_chart">AAPS(BigChart)</string>
     <string name="label_xdrip_no_chart">AAPS(NoChart)</string>
     <string name="label_xdrip_circle">AAPS(Circle)</string>
-
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
 
     <string name="label_warning_sync">No data!</string>
     <string name="label_warning_old">Old data!</string>
@@ -20,4 +21,101 @@
     <string name="msg_warning_sync">No data received since %1$s! Check if AAPS on the phone sends data to watch</string>
     <string name="msg_warning_old">AAPS data is %1$s old! Check your sensor, xDrip+, NS, AAPS config or other!</string>
 
+    <string name="pref_on">On</string>
+    <string name="pref_off">Off</string>
+    <string name="pref_vibrate_on_bolus">Vibrate on Bolus</string>
+    <string name="pref_units_for_actions">Units for Actions</string>
+    <string name="pref_show_date">Show Date</string>
+    <string name="pref_show_iob">Show IOB</string>
+    <string name="pref_show_cob">Show COB</string>
+    <string name="pref_show_delta">Show Delta</string>
+    <string name="pref_show_avgdelta">Show AvgDelta</string>
+    <string name="pref_show_phone_battery">Show Phone Battery</string>
+    <string name="pref_show_rig_battery">Show Rig Battery</string>
+    <string name="pref_show_basal_rate">Show Basal Rate</string>
+    <string name="pref_show_loop_status">Show Loop Status</string>
+    <string name="pref_show_bg">Show BG</string>
+    <string name="pref_show_direction_arrow">Show Direction Arrow</string>
+    <string name="pref_show_ago">Show Ago</string>
+    <string name="pref_dark">Dark</string>
+    <string name="pref_highlight_basals">Highlight Basals</string>
+    <string name="pref_matching_divider">Matching divider</string>
+    <string name="pref_chart_timeframe">Chart Timeframe</string>
+    <string name="pref_1_hour">1 hour</string>
+    <string name="pref_2_hours">2 hours</string>
+    <string name="pref_3_hours">3 hours</string>
+    <string name="pref_4_hours">4 hours</string>
+    <string name="pref_5_hours">5 hours</string>
+    <string name="pref_input_design">Input Design</string>
+    <string name="pref_default">Default</string>
+    <string name="pref_quick_righty">Quick righty</string>
+    <string name="pref_quick_lefty">Quick lefty</string>
+    <string name="pref_modern_sparse">Modern Sparse</string>
+    <string name="pref_delta_granularity">Delta Granularity (Steampunk)</string>
+    <string name="pref_low">Low</string>
+    <string name="pref_medium">Medium</string>
+    <string name="pref_high">High</string>
+    <string name="pref_big_numbers">Big Numbers</string>
+    <string name="pref_ring_history">Ring History</string>
+    <string name="pref_light_ring_history">Light Ring History</string>
+    <string name="pref_animations">Animations</string>
+    <string name="pref_wizard_in_menu">Wizard in Menu</string>
+    <string name="pref_prime_in_menu">Prime in Menu</string>
+    <string name="pref_single_target">Single Target</string>
+    <string name="pref_wizard_percentage">Wizard Percentage</string>
+    <string name="pref_complication_tap_action">Complication Tap Action</string>
+    <string name="pref_unicode_in_complications">Unicode in Complications</string>
+    <string name="pref_version">Version:</string>
+
+    <string name="menu_tempt">TempT</string>
+    <string name="menu_wizard">Wizard</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Settings</string>
+    <string name="menu_status">Status</string>
+    <string name="menu_prime_fill">Prime/Fill</string>
+    <string name="menu_none">None</string>
+    <string name="menu_default">Default</string>
+    <string name="menu_menu">Menu</string>
+
+    <string name="action_duration">duration</string>
+    <string name="action_target">target</string>
+    <string name="action_low">low</string>
+    <string name="action_high">high</string>
+    <string name="action_carbs">carbs</string>
+    <string name="action_percentage">percentage</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">duration [h]</string>
+    <string name="action_insulin">insulin</string>
+    <string name="action_preset_1">Preset 1</string>
+    <string name="action_preset_2">Preset 2</string>
+    <string name="action_preset_3">Preset 3</string>
+    <string name="action_free_amount">Free amount</string>
+    <string name="action_confirm">CONFIRM</string>
+    <string name="action_status_pump">STATUS PUMP</string>
+    <string name="action_status_loop">STATUS LOOP</string>
+    <string name="action_timeshift">timeshift</string>
+    <string name="action_tdd_weighted">TDD weighted</string>
+    <string name="action_bolus">bolus</string>
+
+
+    <string name="status_pump">Pump</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+
+    <string name="activity_carb">Carb</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">no status</string>
+
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g">g</string>
+    <string name="unit_u">U</string>
+    <string name="unit_u_p_h">U/h</string>
+    <string name="unit_h">h</string>
+    <string name="unit_d">d</string>
+    <string name="unit_w">w/s</string>
+
+
 </resources>

wear/src/main/res/xml/preferences.xml

@@ -5,14 +5,14 @@
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="vibrateOnBolus"
-        android:title="Vibrate on Bolus"
+        android:title="@string/pref_vibrate_on_bolus"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="units_mgdl"
-        android:title="Units for Actions"
+        android:title="@string/pref_units_for_actions"
         android:summaryOn="mg/dl"
         android:summaryOff="mmol/l"
         app:wear_iconOff="@drawable/settings_off"
@@ -21,14 +21,14 @@
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="show_date"
-        android:title="Show Date"
+        android:title="@string/pref_show_date"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_iob"
-        android:title="Show IOB"
+        android:title="@string/pref_show_iob"
         android:summary="Show insulin on board."
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
@@ -36,7 +36,7 @@
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_cob"
-        android:title="Show COB"
+        android:title="@string/pref_show_cob"
         android:summary="Show carb on board."
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
@@ -45,7 +45,7 @@
         android:defaultValue="true"
         android:key="showDelta"
         android:summary="Show delta. (Circle WF)"
-        android:title="Show Delta"
+        android:title="@string/pref_show_delta"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -53,35 +53,35 @@
         android:defaultValue="true"
         android:key="showAvgDelta"
         android:summary="Show the avgDelta."
-        android:title="Show AvgDelta"
+        android:title="@string/pref_show_avgdelta"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_uploader_battery"
-        android:title="Show Phone Battery"
+        android:title="@string/pref_show_phone_battery"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="show_rig_battery"
-        android:title="Show Rig Battery"
+        android:title="@string/pref_show_rig_battery"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_temp_basal"
-        android:title="Show Basal Rate"
+        android:title="@string/pref_show_basal_rate"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="showExternalStatus"
-        android:title="Show Loop Status"
+        android:title="@string/pref_show_loop_status"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
@@ -89,7 +89,7 @@
         android:defaultValue="true"
         android:key="showBG"
         android:summary="Show BG. (Circle WF)"
-        android:title="Show BG"
+        android:title="@string/pref_show_bg"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -97,7 +97,7 @@
         android:defaultValue="true"
         android:key="show_direction"
         android:summary="Show direction arrow"
-        android:title="Show Direction Arrow"
+        android:title="@string/pref_show_direction_arrow"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -105,7 +105,7 @@
         android:defaultValue="true"
         android:key="showAgo"
         android:summary="Minutes since last reading. (Circle WF)"
-        android:title="Show Ago"
+        android:title="@string/pref_show_ago"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -113,7 +113,7 @@
         android:defaultValue="true"
         android:key="dark"
         android:summary="Dark theme"
-        android:title="Dark"
+        android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -121,7 +121,15 @@
         android:defaultValue="false"
         android:key="highlight_basals"
         android:summary="Better visible basal rate and temp basals"
-        android:title="Highlight Basals"
+        android:title="@string/pref_highlight_basals"
+        app:wear_iconOff="@drawable/settings_off"
+        app:wear_iconOn="@drawable/settings_on"/>
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="match_divider"
+        android:summary="Status bar divider background matches watchface background"
+        android:title="@string/pref_matching_divider"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -139,7 +147,7 @@
         android:entryValues="@array/chart_timeframe_values"
         android:key="chart_timeframe"
         android:summary="Chart Timeframe"
-        android:title="Chart Timeframe" />
+        android:title="@string/pref_chart_timeframe" />
 
     <ListPreference
         android:defaultValue="1"
@@ -147,7 +155,7 @@
         android:entryValues="@array/input_design_values"
         android:key="input_design"
         android:summary="Input Design"
-        android:title="Input Design" />
+        android:title="@string/pref_input_design" />
 
     <ListPreference
         android:defaultValue="2"
@@ -155,13 +163,13 @@
         android:entryValues="@array/delta_granularity_values"
         android:key="delta_granularity"
         android:summary="Delta Granularity (Steampunk)"
-        android:title="Delta Granularity (Steampunk)" />
+        android:title="@string/pref_delta_granularity" />
 
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="showBigNumbers"
         android:summary="Big numbers. (Circle WF)"
-        android:title="Big Numbers"
+        android:title="@string/pref_big_numbers"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -169,7 +177,7 @@
         android:defaultValue="false"
         android:key="showRingHistory"
         android:summary="Graphical history. (Circle WF)"
-        android:title="Ring History"
+        android:title="@string/pref_ring_history"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
@@ -177,7 +185,7 @@
         android:defaultValue="true"
         android:key="softRingHistory"
         android:summary="Less eyecandy. (Circle WF)"
-        android:title="Light Ring History"
+        android:title="@string/pref_light_ring_history"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -185,7 +193,7 @@
         android:defaultValue="true"
         android:key="animation"
         android:summary="Animations. (Circle WF)"
-        android:title="Animations"
+        android:title="@string/pref_animations"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
 
@@ -193,49 +201,55 @@
         android:defaultValue="true"
         android:key="showWizard"
         android:summary="Wizard from watch possible"
-        android:title="Wizard in Menu"
+        android:title="@string/pref_wizard_in_menu"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="primefill"
         android:summary="Prime/Fill from watch possible"
-        android:title="Prime in Menu"
+        android:title="@string/pref_prime_in_menu"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="singletarget"
         android:summary="Single temp-target instead of a range."
-        android:title="Single Target"
+        android:title="@string/pref_single_target"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="wizardpercentage"
         android:summary="Percentage correction."
-        android:title="Wizard Percentage"
+        android:title="@string/pref_wizard_percentage"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+
     <ListPreference
         android:defaultValue="default"
         android:entries="@array/complication_tap_action"
         android:entryValues="@array/complication_tap_action_values"
         android:key="complication_tap_action"
         android:summary="What dialog to show after tap on complication"
-        android:title="Complication Tap Action" />
+        android:title="@string/pref_complication_tap_action" />
+
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="complication_unicode"
         android:summary="Use unicode special characters in complications."
-        android:title="Unicode in Complications"
+        android:title="@string/pref_unicode_in_complications"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on"/>
+
     <info.nightscout.androidaps.interaction.utils.VersionPreference
         android:defaultValue="1"
         android:entries="@array/input_design"
         android:entryValues="@array/input_design_values"
         android:key="version_number"
         android:summary="Input Design"
-        android:title="Version:" />
+        android:title="@string/pref_version" />
 </PreferenceScreen>