From 0dce111e4e4f2e396270e256ee3795969da3ad3d Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Fri, 11 Feb 2022 10:15:37 +0100
Subject: [PATCH] chore: fix merge conficts

---
 .../bgQualityCheck/BgQualityCheckPlugin.kt    |  4 +--
 .../careportal_stats_fragment_lowres.xml      |  1 +
 .../layout/overview_statuslights_layout.xml   |  1 +
 app/src/main/res/values/strings.xml           | 27 ++++---------------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
index 19868a5524..74ab3aef5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
@@ -105,8 +105,8 @@ class BgQualityCheckPlugin @Inject constructor(
 
     fun stateDescription(): String =
         when (state) {
-            State.RECALCULATED -> rh.gs(R.string.a11_bg_quality_recalculated)
-            State.DOUBLED      -> rh.gs(R.string.a11_bg_quality_doubles)
+            State.RECALCULATED -> rh.gs(R.string.a11y_bg_quality_recalculated)
+            State.DOUBLED      -> rh.gs(R.string.a11y_bg_quality_doubles)
             else               -> ""
         }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/careportal_stats_fragment_lowres.xml b/app/src/main/res/layout/careportal_stats_fragment_lowres.xml
index 5813bc2994..7cd144893c 100644
--- a/app/src/main/res/layout/careportal_stats_fragment_lowres.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment_lowres.xml
@@ -124,6 +124,7 @@
         android:focusable="true">
 
         <TextView
+            android:id="@+id/cannula_or_patch"
             android:layout_width="wrap_content"
             android:layout_height="25dp"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml
index 0738364e34..75a71faf3b 100644
--- a/app/src/main/res/layout/overview_statuslights_layout.xml
+++ b/app/src/main/res/layout/overview_statuslights_layout.xml
@@ -20,6 +20,7 @@
         android:gravity="center_horizontal">
 
         <ImageView
+            android:id="@+id/cannula_or_patch"
             android:layout_width="38dp"
             android:layout_height="fill_parent"
             android:contentDescription="@string/statuslights_cannula_age"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6ff80ee43..25989f4c62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1140,29 +1140,12 @@
     <string name="key_last_processed_glunovo_timestamp" translatable="false">last_processed_glunovo_timestamp</string>
     <string name="identification">Identification (email, FB or Discord nick etc)</string>
     <string name="identification_not_set">Identification not set in dev mode</string>
-    <string name="a11y_high">heigh</string>
-    <string name="a11y_inrange">in range</string>
-    <string name="a11y_low">low</string>
-    <string name="a11y_arrow_double_down">down fast</string>
-    <string name="a11y_arrow_single_down">down</string>
-    <string name="a11y_arrow_forty_five_down">down trending</string>
-    <string name="a11y_arrow_flat">flat</string>
-    <string name="a11y_arrow_forty_five_up">up trending</string>
-    <string name="a11y_arrow_single_up">up</string>
-    <string name="a11y_arrow_double_up">up fast</string>
-    <string name="a11y_arrow_none">none</string>
-    <string name="a11y_arrow_unknown">unknown</string>
-    <string name="a11y_graph">graph</string>
-    <string name="a11y_bg_quality">Blood glucose quality</string>
-    <string name="a11_bg_quality_recalculated">recalculated</string>
-    <string name="a11_bg_quality_doubles">double entries</string>
-    <string name="a11y_insulin_label">insulin</string>
     <string name="a11y_dialog">dialog</string>
-    <string name="a11y_current_bg">current blood glucode</string>
+    <string name="a11y_current_bg">current blood glucose</string>
     <string name="a11_correction_percentage">correct outcome with %</string>
     <string name="a11_correction_units">correct outcome with units</string>
     <string name="not_available_full">Not available</string>
-    <string name="a11y_high">heigh</string>
+    <string name="a11y_high">high</string>
     <string name="a11y_inrange">in range</string>
     <string name="a11y_low">low</string>
     <string name="a11y_arrow_double_down">falling rapidly</string>
@@ -1176,10 +1159,10 @@
     <string name="a11y_arrow_unknown">unknown</string>
     <string name="a11y_graph">graph</string>
     <string name="a11y_bg_quality">blood glucose quality</string>
-    <string name="a11_bg_quality_recalculated">recalculated</string>
-    <string name="a11_bg_quality_doubles">double entries</string>
+    <string name="a11y_bg_quality_recalculated">recalculated</string>
+    <string name="a11y_bg_quality_doubles">double entries</string>
     <string name="a11y_insulin_label">insulin</string>
     <string name="a11y_blood_glucose">blood glucose</string>
-    <string name="a11y_bg_outdated">out dated</string>
+    <string name="a11y_bg_outdated">outdated</string>
 
 </resources>