From f3707ddef096b186c666bb39600d8ccbcbe70ba7 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Sun, 17 Sep 2023 10:10:32 -0400
Subject: [PATCH 01/20] Remove setting: Unbond G5 before each read

---
 .../dexdrip/utilitymodels/IdempotentMigrations.java          | 1 +
 .../java/com/eveningoutpost/dexdrip/utils/Preferences.java   | 1 +
 app/src/main/res/xml/pref_data_source.xml                    | 5 -----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
index 713d86f0e5..06a65e6960 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java
@@ -146,6 +146,7 @@ public static void migrateOOP2CalibrationPreferences() {
     private static void legacySettingsFix() {
         Pref.setBoolean("use_ob1_g5_collector_service", true);
         Pref.setBoolean("ob1_g5_fallback_to_xdrip", false);
+        Pref.setBoolean("always_unbond_G5", false);
     }
 
 }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
index 678d02933f..2f8ac81970 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -2457,6 +2457,7 @@ public void run() {
        private void removeLegacyPreferences() {
            //  removePreferenceFromCategory("use_ob1_g5_collector_service", "ob1_options");
            //  removePreferenceFromCategory("ob1_g5_fallback_to_xdrip", "ob1_options");
+           //  removePreferenceFromCategory("always_unbond_G5", "ob1_options");
        }
 
        private void removePreferenceFromCategory(final String preference, final String category) {
diff --git a/app/src/main/res/xml/pref_data_source.xml b/app/src/main/res/xml/pref_data_source.xml
index ef43b0ff5e..c67216fd6d 100644
--- a/app/src/main/res/xml/pref_data_source.xml
+++ b/app/src/main/res/xml/pref_data_source.xml
@@ -404,11 +404,6 @@
                     android:key="always_get_new_keys"
                     android:summary="@string/g5_full_authentification"
                     android:title="@string/authentificate_before_reading" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="always_unbond_G5"
-                    android:summary="@string/g5_remove_before_read"
-                    android:title="@string/unbond_g5_before_read" />
             </PreferenceCategory>
             <PreferenceCategory
                 android:key="dex_battery_category"

From 654f1f31c1214d13c765cb02fdaecf609a84f750 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Thu, 21 Sep 2023 12:20:24 -0400
Subject: [PATCH 02/20] No update available toast

---
 .../dexdrip/utilitymodels/UpdateActivity.java               | 6 ++++++
 app/src/main/res/values/strings.xml                         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
index fa11688f47..0c4b45477a 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
@@ -80,6 +80,9 @@ public class UpdateActivity extends BaseAppCompatActivity {
     private static String CHECKSUM = "";
 
     public static void checkForAnUpdate(final Context context) {
+        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
+        StackTraceElement stack = stacktrace[3];
+        String callingMethodName = stack.getMethodName(); // Name of the method that has called this one
         if (prefs == null) prefs = PreferenceManager.getDefaultSharedPreferences(context);
         if ((last_check_time != -1) && (!prefs.getBoolean(AUTO_UPDATE_PREFS_NAME, true))) return;
         if (last_check_time == 0)
@@ -169,6 +172,9 @@ public static void checkForAnUpdate(final Context context) {
                                     }
                                 } else {
                                     Log.i(TAG, "Our current version is the most recent: " + versionnumber + " vs " + newversion);
+                                    if ((callingMethodName).equals("checkForUpdate")) {
+                                        JoH.static_toast_long(xdrip.gs(R.string.current_version_is_up_to_date)); // Only for manual update check
+                                    }
                                 }
                             } catch (Exception e) {
                                 Log.e(TAG, "Got exception parsing update version: " + e.toString());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d8d21bbac..c1735b6499 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,6 +195,7 @@
     <string name="libre_last_x_minutes_graph">Libre last %d minutes graph</string>
     <string name="share_config_via_qr_code">Share config via QR code</string>
     <string name="check_for_updated_version">Check for updated version</string>
+    <string name="current_version_is_up_to_date">No update in the selected channel</string>
     <string name="send_feedback_to_developer">Send Feedback to developers</string>
     <string name="home_screen">Home Screen</string>
     <string name="event_logs">Event Logs</string>

From 41996fa3eb61c9f28d5ddfc4e2458fdff175de13 Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Sat, 23 Sep 2023 08:35:42 -0400
Subject: [PATCH 03/20] Using the new fromUI flag

---
 .../eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
index ba8ca268a9..8b4990ff48 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/UpdateActivity.java
@@ -173,8 +173,8 @@ public static void checkForAnUpdate(final Context context, final boolean fromUi)
                                     }
                                 } else {
                                     Log.i(TAG, "Our current version is the most recent: " + versionnumber + " vs " + newversion);
-                                    if ((callingMethodName).equals("checkForUpdate")) {
-                                        JoH.static_toast_long(xdrip.gs(R.string.current_version_is_up_to_date)); // Only for manual update check
+                                    if (fromUi) { // Only for manual update check
+                                        JoH.static_toast_long(xdrip.gs(R.string.current_version_is_up_to_date));
                                     }
                                 }
                             } catch (Exception e) {

From e315309ddb884c27c7fa7cb2af33a98fe9bd1eb2 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:55:37 +0100
Subject: [PATCH 04/20] New translations strings.xml (Hungarian)

---
 app/src/main/res/values-hu/strings-hu.xml | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-hu/strings-hu.xml b/app/src/main/res/values-hu/strings-hu.xml
index 43c9d97080..92e738c85d 100644
--- a/app/src/main/res/values-hu/strings-hu.xml
+++ b/app/src/main/res/values-hu/strings-hu.xml
@@ -1611,6 +1611,14 @@
     <string name="message_variant">Az xDrip+ varánsok lehetővé teszik az alkalmazás több példányban történő telepítését. Akár haladó használatra, akár azért, hogy a kísérleti és az éles rendszer egyszerre legyen telepítve.\n\n A variánsoknál előfordulhat, hogy néhány dolog nem működik megfelelően, mert az egyik vagy másik kizárólagos hozzáféréssel rendelkezik, például a bluetooth párosítás. A variánsokkal kapcsolatos visszajelzéseket és hibajelzéseket szívesen fogadjuk!</string>
     <string name="expires_unknown">Lejárat: ???</string>
     <string name="sensor_expired">LEJÁRT!</string>
+    <plurals name="sensor_expires">
+        <item quantity="one">Lejárat: %sd</item>
+        <item quantity="other">Lejárat: %sd</item>
+    </plurals>
+    <plurals name="sensor_age">
+        <item quantity="one">Kor: %sd</item>
+        <item quantity="other">Kor: %sd</item>
+    </plurals>
     <string name="external_status_strings_eg_tbr">Külső alkalmazásokból származó adatok (pl. AAPS-ből TBR)</string>
     <string name="accept_external_status">Adatfogadás külső alkalmazásokból</string>
     <string name="old">Régi</string>
@@ -1621,6 +1629,7 @@
     <string name="zero_value">Nulla érték</string>
     <string name="adjust_dose">Adagolás beállítása</string>
     <string name="Dose">Adag</string>
+    <string name="choose_type">Válasszon típust</string>
     <string name="invalid_serial">Érvénytelen szériaszám</string>
     <string name="allow_do_not_disturb_text">Adjon Ne zavarjanak-engedélyt az xDrip-nek a rendszerbeállításokban a következő oldalon, hogy akkor is tudjon figyelmeztetni az xDrip, ha az Androidban a Ne zavarjanak funkció aktív</string>
     <string name="graphical_editor_for_pump_basal">Pumpák bázisinzulin-profiljának szerkesztése</string>
@@ -1664,6 +1673,9 @@
     <string name="backing_up">Biztonsági mentés</string>
     <string name="did_backup_ok">Biztonsági mentés kész</string>
     <string name="backup_failed">Biztonsági mentés meghiúsult</string>
+    <string name="use_alternate_file">Alternatív File használata</string>
+    <string name="choose_backup_file">Biztonsági mentés fájl választása</string>
+    <string name="select_alternate_file">Alternatví file kiválasztása</string>
     <string name="change_account">Fiókváltás</string>
     <string name="keep_same_account">Fiók megtartása</string>
     <string name="change_google_account">Google-fiók váltása</string>
@@ -1674,7 +1686,13 @@
     <string name="checking_file">Fájl ellenőrzése</string>
     <string name="failed_to_read_file">Fájl beolvasása sikertelen</string>
     <string name="permission_problem_retry">Alkalmazásengedély probléma - újrapróbálkozás</string>
+    <string name="alternate_file_selected">Alternatív file kiválasztva</string>
+    <string name="temporary_google_drive_file">Ideiglenes Google Drive file</string>
+    <string name="no_file_was_chosen">Nincs fájl kiválasztva</string>
     <string name="could_not_sign_in">Bejelentkezés sikertelen</string>
+    <string name="problem_with_file_selection">Probléma a file kiválasztással</string>
+    <string name="selected_file_location">A kiválasztott fájl helye</string>
+    <string name="please_reselect_backup_file">Kérem válassza ki újra a biztonsági mentést</string>
     <string name="ready">Kész</string>
     <string name="uploading_to_cloud">Feltöltés a felhőbe</string>
     <string name="error_with_local_backup">Sikertelen helyi biztonsági mentés</string>
@@ -1686,6 +1704,13 @@
     <string name="please_grant_permission">Alkalmazásengedély adása</string>
     <string name="drive_permission_blurb">Az automatikus biztonsági mentéshez az xDrip-nek engedélyre van szüksége a Google Drive használatához.\n\nAz xDrip fejlesztői nem férhetnek hozzá a fájljaihoz, és nem láthatják a személyes adatait.</string>
     <string name="cloud_backup">Biztonsági mentés felhőbe</string>
+    <string name="megabyte_format_string">%.1f MB</string>
+    <string name="manual_selection_google_drive_file_warning">Kiválasztott egy fájlt a Google Drive-ról, de ezt nem kezeli automatikusan az xDrip, így csak manuális biztonsági mentéshez és visszaállításhoz használható.\n\nNem történik automatikus biztonsági mentés ezzel a fájllal.\n\nFolytatja?</string>
+    <string name="alternate_file_selected_warning">Egy alternatív fájlt választott. Ez általában csak egy helyileg tárolt biztonsági másolatból történő visszaállításra való.\n\nNem történik automatikus biztonsági mentés ezzel a fájllal.\n\nFolytatja?</string>
+    <string name="backup_file_security_error_advice">A biztonsági másolat fájl biztonsági hibát jelez. Általában ez azt jelenti, hogy újra ki kell választania, hogy továbbra is engedélyezze az xDrip hozzáférést.</string>
+    <string name="invalid_time">Érvénytelen idő</string>
+    <string name="none">semmi</string>
+    <string name="format_string_ago">%s ezelőtt</string>
     <string name="use_background_scans">Szkennelés háttérben is</string>
     <string name="android_8_background_scanning">Android 8-astól lehetséges a szkennelés háttérben is</string>
     <string name="title_yRange">Y-tengely beállításai</string>

From 6f6a6f751d812243fa164db002b412f9b434bd3f Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Sun, 24 Sep 2023 18:55:46 +0100
Subject: [PATCH 05/20] New translations strings.xml (Slovak)

---
 app/src/main/res/values-sk/strings-sk.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/res/values-sk/strings-sk.xml b/app/src/main/res/values-sk/strings-sk.xml
index d96fa4a81a..365a65564f 100644
--- a/app/src/main/res/values-sk/strings-sk.xml
+++ b/app/src/main/res/values-sk/strings-sk.xml
@@ -864,19 +864,24 @@
     <string name="advanced_bluereader_settings">Nastavenia blueReader</string>
     <string name="blueReader_turnoffvalue">Hodnota v %</string>
     <string name="days">dni</string>
+    <string name="bluereaderuglystate">blueReader nefunguje správne! Bude vypnutý a vy ho zapnite (krátkym stlačením tlačítka). Potom by blueReader mal pracovať správne!</string>
     <string name="offical_msg">Oficiálna aplikácia</string>
     <string name="yes">Áno</string>
     <string name="xdrip_compatible_features">Vlastnosti xDrip+ %s</string>
     <string name="garmin">Garmin</string>
     <string name="fitbit">Fitbit</string>
+    <string name="enable_local_web_server_feature">Zapnúť lokálny web server pre Garmin watchface?</string>
+    <string name="enable_local_web_server_feature_fitbit">Zapnúť lokálny web server pre Fitbit watchface?</string>
     <string name="set_data_source_to">Nastaviť zdroj dát na: %s ?</string>
     <string name="are_you_sure">Si si istý?</string>
     <string name="g4_share_receiver">G4 Share prijímač</string>
     <string name="bluetooth_wixel">Bluetooth Wixel</string>
     <string name="parakeet_wifi">Parakeet / Wifi</string>
     <string name="other">Iné</string>
+    <string name="which_software_is_the_wixel_running">Akú verziu softvéru má Wixel?</string>
     <string name="start_source_setup_wizard">Spustiť sprievodcu nastavením zdroju dát</string>
     <string name="hour_format">%s hodín</string>
+    <string name="enter_your_transmitter_id_exactly">Zadajte ID vysielača tak, ako je vytlačené</string>
     <string name="which_type_of_device">S ktorým zdrojom dát sa chceš prepojiť?</string>
     <string name="enable_local_broadcast">Povoliť lokálne vysielanie?</string>
     <string name="androidaps">AndroidAPS</string>
@@ -885,12 +890,19 @@
     <string name="use_librealarm">Použiť aplikáciu LibreAlarm ako zdroj údajov?</string>
     <string name="noise_blocking">Blokovanie šumu</string>
     <string name="level_at_which_noisy_data_should_not_be_broadcast">Úroveň pri ktorej zašumené údaje nebudú vysielané, pretože môžu zmiasť prijímajúce aplikácie</string>
+    <string name="low_parakeet_battery">Nízka úroveň batérie Parkeet-u</string>
     <string name="glucose_units_mmol_or_mgdl">Jednotka merania glukózy (mmol/L alebo mg/dL)</string>
     <string name="is_your_typical_glucose_value">Vyber hodnotu, ktorá sa podobá typickej hodnote tvojej glykémie: 5.5 (mmol/L) alebo 100 (mg/dL)</string>
     <string name="settings_updated_to_mmol">Nastavenia zmenené na mmol/L</string>
+    <string name="channel_name">Hlavná služba</string>
+    <string name="code_accepted">Kód akceptovaný</string>
+    <string name="invalid_or_unsupported_code">Nesprávny alebo nepodporovaný kód!</string>
     <string name="g6_sensor_code">Kód senzoru G6</string>
     <string name="please_enter_printed_calibration_code">Prosím vložte vytlačený číselný kalibračný kód, 4 číslice, napr: 5678</string>
     <string name="enable_update_checks">Povoliť kontrolu aktualizácií?</string>
+    <string name="you_can_easily_roll_back_dialog_msg">S xDrip sa jednoducho viete vrátiť k predchádzajúcej verzii spustením pôvodného APK súboru vo vašich stiahnutých súboroch, ak sa vám nepáči terajšia verzia.\n\nChcete zapnúť automatickú kontrolu aktualizácií?</string>
+    <string name="you_have_update_checks_off">Automatická kontrola aktualizácií je vypnutá!\n\nV xDrip+ pridávame nové funkcie a opravujeme chyby pravidelne.\n\nKaždých 60 dní vás zažiadame o zapnutie automatických aktualizácií.</string>
+    <string name="update_checking_enabled">Kontola aktualizácií je zapnutá!</string>
     <string name="cancel_alarm">Zrušiť výstrahu?</string>
     <string name="please_confirm_to_cancel_the_alert">Naozaj zrušiť výstrahu?</string>
     <string name="yes_cancel">Áno, zrušiť</string>
@@ -908,6 +920,7 @@
     <string name="emergency_message_near_format_string">%1$s blízko %2$s %3$s %4$s %5$s</string>
     <string name="choose_when_to_send_messages">Vyber kedy poslať správu:</string>
     <string name="low_alert_not_acknowledged">Výstraha nízkej glykémie nie je potvrdená</string>
+    <string name="lowest_alert_not_acknowledged">Výstraha prvej spodnej glykémie nie je potvrdená</string>
     <string name="high_alert_not_acknowledged">Výstraha vysokej glykémie nie je potvrdená</string>
     <string name="device_inactivity">Neaktivita zariadenia</string>
     <string name="test_message_sending">Test odoslania správy</string>
@@ -927,6 +940,7 @@
     <string name="summary_Shared_Secret_for_open_web_service">Zdieľané heslo pre otvorenú web službu (má byť zhodné s Nightscout API heslom)</string>
     <string name="summary_Display_status_from_other_apps_like_AndroidAPS">Zobraziť stav z iných aplikácií ako AndroidAPS</string>
     <string name="title_External_Status">Externý stav</string>
+    <string name="title_Pump_Status">Stav pumpy</string>
     <string name="title_Carb_Insulin_Ratio">Sacharidovo-inzulínový pomer</string>
     <string name="summary_Ask_for_a_second_optional_initial_calibration_blood_test">Požiadavka na druhú voliteľnú kalibráciu z kapilárnej krvi</string>
     <string name="title_Double_Calibrations">Dvojité kalibrácie</string>

From dad7f2f618a13ed53b399753d95389024c9bf9a7 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:44 +0100
Subject: [PATCH 06/20] New translations strings.xml (Czech)

---
 app/src/main/res/values-cs/strings-cs.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cs/strings-cs.xml b/app/src/main/res/values-cs/strings-cs.xml
index dd41976f44..64cc21c00c 100644
--- a/app/src/main/res/values-cs/strings-cs.xml
+++ b/app/src/main/res/values-cs/strings-cs.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Graf za posledních %d minut z Libre</string>
     <string name="share_config_via_qr_code">Sdílet konfiguraci QR kódem</string>
     <string name="check_for_updated_version">Kontrola nové verze</string>
+    <string name="current_version_is_up_to_date">Zvolený kanál nemá žádnou aktualizaci</string>
     <string name="send_feedback_to_developer">Odeslat zpětnou vazbou vývojářům</string>
     <string name="home_screen">Domácí obrazovka</string>
     <string name="event_logs">Log událostí</string>

From 02e6d43db9c1c03387a81779e8569044184cd8a8 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:45 +0100
Subject: [PATCH 07/20] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index f1c04f1eca..74f43f2a56 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Graphe des dernières %d minutes du Libre</string>
     <string name="share_config_via_qr_code">Partager la config via le code QR</string>
     <string name="check_for_updated_version">Vérifier les mises à jour</string>
+    <string name="current_version_is_up_to_date">Aucune mise à jour dans le canal sélectionné</string>
     <string name="send_feedback_to_developer">Envoyer des messages au développeur</string>
     <string name="home_screen">Écran d\'accueil</string>
     <string name="event_logs">Journal des événements</string>

From 63b2cce803febe0060d4efb660f240cd9569aead Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:47 +0100
Subject: [PATCH 08/20] New translations strings.xml (Spanish)

---
 app/src/main/res/values-es/strings-es.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-es/strings-es.xml b/app/src/main/res/values-es/strings-es.xml
index 4bc05d43fc..cbaaf60046 100644
--- a/app/src/main/res/values-es/strings-es.xml
+++ b/app/src/main/res/values-es/strings-es.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Gráfica últimos %d minutos del Libre</string>
     <string name="share_config_via_qr_code">Compartir ajustes a través de código QR</string>
     <string name="check_for_updated_version">Comprobar actualizaciones</string>
+    <string name="current_version_is_up_to_date">No hay actualizaciones en el canal seleccionado</string>
     <string name="send_feedback_to_developer">Enviar comentarios al desarrollador</string>
     <string name="home_screen">Pantalla de inicio</string>
     <string name="event_logs">Registro de Eventos</string>

From 5a797bfea3e29e3873341c352b174e426447f4e5 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:48 +0100
Subject: [PATCH 09/20] New translations strings.xml (Arabic)

---
 app/src/main/res/values-ar/strings-ar.xml | 65 +++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/app/src/main/res/values-ar/strings-ar.xml b/app/src/main/res/values-ar/strings-ar.xml
index 0aa6a1f95e..e08b645113 100644
--- a/app/src/main/res/values-ar/strings-ar.xml
+++ b/app/src/main/res/values-ar/strings-ar.xml
@@ -70,6 +70,7 @@
     <string name="pref_title_broadcast_enabled">البث محليا</string>
     <string name="title_activity_share_test">مشاركة الاختبار</string>
     <!-- pebble settings -->
+    <string name="pref_summary_display_trend">إظهار اتجاه قراءة السكر على وجه الساعة.</string>
     <string name="pref_pebble_display_high_line">عرض خط الارتفاع</string>
     <string name="pref_pebble_display_low_line">عرض خط الانخفاض</string>
     <!-- Amazfit Settings -->
@@ -91,6 +92,7 @@
     <string name="taskerConfiguration">Tasker Configuration</string>
     <string name="add_widget">اضافة تطبيق مصغر</string>
     <string name="title_activity_alert_list">قائمة التنبيه</string>
+    <string name="speaktreatment">نطق العلاج</string>
     <string name="title_activity_update">تحديث xDrip+ متوفر</string>
     <string name="title_activity_display_qrcode">مشاركة الإعدادات بواسطة رمز QR</string>
     <string name="title_activity_send_feed_back">إرسال ملاحظات إلى Jamorham</string>
@@ -170,31 +172,56 @@
     <string name="extrapolate_data_to_try_to_predict_lows">استخراج البيانات لمحاولة التنبؤ بانخفاض</string>
     <string name="other_xdrip_plus_alerts">تنبيهات xDrip+ الأخرى</string>
     <string name="xdrip_plus_display_settings">إعدادات عرض xDrip+</string>
+    <string name="display_customisations">تخصيصات العرض</string>
     <string name="insulin_carb_ratios_etc_for_models">إنسولين، نسب كارب إلخ للنماذج</string>
+    <string name="grams_of_carbohydrate_one_unit_covers">غرام من الكاربوهيدرات يغطي وحدة واحدة</string>
     <string name="carb_absorption_rate">معدل امتصاص الكارب</string>
     <string name="add_calibration">إضافة معايرة</string>
     <string name="system_status">حالة النظام</string>
     <string name="settings">الإعدادات</string>
     <string name="cannot_calibrate_right_now">لا يمكن المعايرة الآن</string>
+    <string name="hardware_data_source">مصدر البيانات</string>
+    <string name="enter_ten_character_dexcom_receiver_serial">ادخل الرقم التسلسلي الخاص بمستقبل ديكسكوم (10 أحرف)</string>
+    <string name="data_source_settings">إعدادات مصدر البيانات</string>
     <string name="smart_watch_features">خصائص الساعة الذكية</string>
+    <string name="pref_show_treatments">اظهار المعالجة</string>
+    <string name="pref_summary_show_treatments">اظهار المعالجة في الرسم البياني</string>
     <string name="history">السجل</string>
     <string name="statistics">الإحصائيات</string>
     <string name="snooze_alert">تنبيه الغفوة</string>
+    <string name="less_common_settings">إعدادات أقل شيوعاً</string>
     <string name="view_recent_errors_warnings">عرض الأخطاء/التنبيهات الأخيرة</string>
     <string name="other_settings">إعدادات أخرى</string>
+    <string name="speak_readings">تحدث القراءات</string>
     <string name="manage_followers">إدارة المتابعين</string>
     <string name="manage_existing_followers">إدارة متابعيك الحاليين ودعوة أشخاص جدد.</string>
+    <string name="invite_follower">دعوة متابع</string>
     <string name="glucose_calibration_and_other_alerts">مستوى السكر ، المعايرة، والتنبيهات الأخرى</string>
+    <string name="smart_alerting">التنبيه الذكي</string>
+    <string name="dont_alarm_during_phone_calls">لا تفعل التنبيه أثناء المكالمات الهاتفية.</string>
+    <string name="start_snoozed">بدء غفوة</string>
+    <string name="reset">إعادة تعيين</string>
+    <string name="pebble_and_android_wear_options">خيارات لساعات مختلفة</string>
+    <string name="customize_colours">تخصيص الألوان</string>
+    <string name="xdrip_plus_color_settings">إعدادات عرض xDrip+</string>
     <string name="high_glucose_values">قيم السكر المرتفعة</string>
     <string name="in_range_glucose_values">قيم السكر في النطاق المطلوب</string>
+    <string name="default_color_selected">اللون الافتراضي المحدد</string>
+    <string name="color_bg_values">ألوان قراءات سكر الدم وأسهم الاتجاه</string>
+    <string name="xdrip_plus_extra_settings">إعدادات xDrip+ إضافية</string>
+    <string name="treatments_prediction_curves">العلاج / منحنيات التنبؤات</string>
     <string name="carbs_per_unit">كربوهيدرات لكل وحدة</string>
     <string name="everyday">كل يوم</string>
     <string name="insulin_sensitivity_glucose_drop_per_unit">معامل حساسية الإنسولين: خفض السكر لكل وحدة</string>
+    <string name="transmitter_battery">بطارية جهاز الإرسال</string>
     <string name="very_low">منخفض جدا</string>
     <string name="low">منخفض</string>
     <string name="space_units">" وحدات"</string>
     <string name="units">وحدات</string>
     <string name="carbs">كربوهيدرات</string>
+    <string name="speak_your_treatment">قراءة معالجتك مثال: س وحدات الإنسولين / ص غرام نشويات</string>
+    <string name="speech_recognition_is_not_supported">تسجيل الحديث غير مدعوم</string>
+    <string name="treatment_note">ملاحظة معالجة</string>
     <string name="exported_to">"تصدير إلى "</string>
     <string name="done">تم</string>
     <string name="entering_a_calibration_now_will_override_your_previously_entered_calibration">إدخال المعايرة الآن سيتجاهل المعايرة التي أدخلتها سابقا.</string>
@@ -202,6 +229,10 @@
     <string name="this_does_not_get_used_for_anything_its_just_to_keep_track_of_differences_for_algorithem_improvement_purposes">هذا لا يستخدم لأي شيء, فقط لتتبع الاختلافات لأغراض تحسين الخوارزميات</string>
     <string name="no_active_alert_exists">لا توجد تنبيهات نشطة</string>
     <string name="all_alerts_disabled_until">"تم تعطيل جميع التنبيهات حتى "</string>
+    <string name="low_alerts_disabled_until">"تم تعطيل تنبيهات الإنخفاض حتى "</string>
+    <string name="high_alerts_disabled_until">"تم تعطيل تنبيهات الإرتفاع حتى "</string>
+    <string name="default_snooze">الغفوة الافتراضية</string>
+    <string name="until_you_reenable">حتى تقوم بإعادة التفعيل</string>
     <string name="set">ضبط</string>
     <string name="disable_low_alerts">تعطيل التنبيهات الانخفاض</string>
     <string name="re_enable_low_alerts">اعادة تشغيل تنبيهات الانخفاض</string>
@@ -209,22 +240,56 @@
     <string name="re_enable_high_alerts">إعادة تشغيل تنبيهات الارتفاع</string>
     <string name="disable_all_alerts">تعطيل جميع التنبيهات</string>
     <string name="re_enable_all_alerts">إعادة تشغيل جميع التنبيهات</string>
+    <string name="alert_snoozed_by_watch"> غفوة التنبيه بواسطة الساعة</string>
     <string name="a_new_version_is_available">يتوفر إصدار جديد</string>
     <string name="version_details">تفاصيل الإصدار</string>
     <string name="download_now">تنزيل الآن</string>
     <string name="automatically_check_for_updates">التحقق تلقائياً من وجود تحديثات</string>
+    <string name="here_you_can_save_the_settings_to_the_external_storage_sdcard">هنا، يمكنك حفظ الإعدادات إلى وحدة التخزين الداخلية (Download/xDrip-export/com.eveningoutpost.dexdrip_preferences.xml).\n\nبمجرد الحفظ في ملف، قد يكون من الممكن لأي تطبيق قراءة الإعدادات التي قد تحتوي على معلومات حساسة.\n\nينصح بحذف الإعدادات بمجرد استيرادها مرة أخرى إذا كنت قلقا حيال ذلك.</string>
     <string name="save_all_settings_to_sdcard">حفظ كافة الإعدادات في بطاقة الذاكرة</string>
     <string name="load_all_settings_from_sdcard">تحميل جميع الإعدادات من بطاقة الذاكرة</string>
+    <string name="delete_any_settings_on_sdcard">حذف مجلد الإعدادات (Download/xDrip-export)</string>
+    <string name="use_qr_codes_to_transfer_settings_using_settings_auto_configure_feature"><![CDATA[استخدام رمز QR لنقل الإعدادات باستخدام الإعدادات-> تكوين تلقائي]]></string>
     <string name="copy_all_settings">نسخ جميع الإعدادات</string>
+    <string name="sensor_is_ready_please_enter_double_calibration">المستشعر جاهز، الرجاء إدخال المعايرة الأولية</string>
+    <string name="in_order_to_get_started_please_perform_two_finger">من أجل البدء، يرجى إجراء اختبار أو اثنين للأصابع وإدخال القيم هنا!</string>
+    <string name="enter_first_bg_value">ادخل قراءة الدم الأولى</string>
+    <string name="enter_second_bg_value">ادخل قراءة الدم الثانية</string>
+    <string name="language_editor">تحرير اللغات</string>
+    <string name="reset_all_language_data">إعادة تعيين جميع بيانات اللغة</string>
+    <string name="treatment_color">الإنسولين النشط</string>
+    <string name="treatment_color_dark">نشاط الإنسولين</string>
+    <string name="treatment_background">خلفية العلاج</string>
+    <string name="treatment_foreground">تمهيد العلاج</string>
     <string name="pref_message_influxdb_uri">استبدل القيم في المثال التي في {} مع القيم الصحيحة الخاصة بك</string>
+    <string name="process_nsclient_treatments">معالجة بيانات العلاج الواردة من تطبيق NSClient</string>
+    <string name="accept_treatments">قبول العلاج</string>
+    <string name="show_total_carbs">اظهر إجمالي النشويات</string>
+    <string name="show_total_insulin">اظهر إجمالي وحدات الإنسولين</string>
     <string name="low_prediction_values">مستوى التنبؤ للقيم المنخفضة</string>
     <string name="stop_sensor">إيقاف الحساس</string>
     <string name="initial_calibration">المعايرة الأولية</string>
     <string name="bluetooth_scan">بحث البلوتوث</string>
     <!-- trend arrow for speak -->
+    <string name="summary_cloud_storage_api_download_enable">قم بتحميل بيانات المعالجة من NS</string>
+    <string name="title_cloud_storage_api_download_enable">تنزيل بيانات العلاج</string>
+    <string name="title_send_treatments_to_nightscout">رفع بيانات العلاج</string>
+    <string name="sync_treatments">مزامنة العلاج</string>
+    <string name="title_miband_graph_treatment_enable">اظهر الجرعة</string>
+    <string name="summary_nsfollow_download_treatments">قم بتحميل بيانات المعالجة من NS كمتابع</string>
+    <string name="title_nsfollow_download_treatments">تنزيل بيانات العلاج</string>
+    <string name="summary_plus_accept_follower_actions">سيتم قبول العلاج والمعايرة والإجراءات الأخرى من المتابعين</string>
+    <string name="summary_pendiq_send_treatments">قم بإعداد القلم مع وحدات الأنسولين العلاجية. يجب عليك دائماً التحقق من ذلك.</string>
+    <string name="title_pendiq_send_treatments">ارسل المعالجة إلى القلم</string>
     <string name="calibrate_sensor">معايرة الحساس؟</string>
     <string name="calibrate">معايرة</string>
+    <string name="are_you_sure_you_want_to_delete_this_treatment">هل أنت متأكد أنك تريد حذف هذه المعالجة؟</string>
     <string name="yes_please">نعم, من فضلك</string>
+    <string name="treatment_cancelled">تم إلغاء المعالجة</string>
+    <string name="treatment_time_wrong">وقت العلاج خاطئ</string>
+    <string name="treatment_error">خطأ في العلاج</string>
+    <string name="treatment_processed">سيرت المعالجة</string>
     <string name="enable_streaming_dialog_dont_ask_again"> لا تسألني ذلك مرة أخرى</string>
+    <string name="type_treatment_eg">نوع المعالجة\nمثال: وحدات x.x</string>
     <string name="titleInside_yRange">تفعيل</string>
 </resources>

From 12618afe712ee964069f7ee0cadaf661ea7f98e5 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:49 +0100
Subject: [PATCH 10/20] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings-de.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-de/strings-de.xml b/app/src/main/res/values-de/strings-de.xml
index 83b6f24cea..561545afc5 100644
--- a/app/src/main/res/values-de/strings-de.xml
+++ b/app/src/main/res/values-de/strings-de.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Libre-Kurve der letzten %d Minuten</string>
     <string name="share_config_via_qr_code">Einstellungen per QR-Code senden</string>
     <string name="check_for_updated_version">Auf Aktualisierung prüfen</string>
+    <string name="current_version_is_up_to_date">Keine neue Version im gewählten Update-Kanal</string>
     <string name="send_feedback_to_developer">Feedback an Entwickler senden</string>
     <string name="home_screen">Startbildschirm</string>
     <string name="event_logs">Ereignisprotokolle</string>

From 98b16c97e9b5b0436090a9db26abee199d3d23fa Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:51 +0100
Subject: [PATCH 11/20] New translations strings.xml (Dutch)

---
 app/src/main/res/values-nl/strings-nl.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/res/values-nl/strings-nl.xml b/app/src/main/res/values-nl/strings-nl.xml
index ca02d7c10c..0199a148d6 100644
--- a/app/src/main/res/values-nl/strings-nl.xml
+++ b/app/src/main/res/values-nl/strings-nl.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Libre laatste %d minuten grafiek</string>
     <string name="share_config_via_qr_code">Deel configuratie via QR-code</string>
     <string name="check_for_updated_version">Controleer op bijgewerkte versie</string>
+    <string name="current_version_is_up_to_date">Geen update in het geselecteerde kanaal</string>
     <string name="send_feedback_to_developer">Stuur feedback naar de ontwikkelaar</string>
     <string name="home_screen">Thuisscherm</string>
     <string name="event_logs">Gebeurtenislogboeken</string>
@@ -304,6 +305,7 @@
     <string name="high_glucose_values">Hoge glucosewaarden</string>
     <string name="in_range_glucose_values">In-range glucosewaarden</string>
     <string name="default_color_selected">Standaard kleur geselecteerd</string>
+    <string name="color_bg_values">Kleuren van de BG-lezing en Trendpijl</string>
     <string name="xdrip_plus_extra_settings">xDrip+ extra instellingen</string>
     <string name="example_chart">Voorbeeld Grafiek</string>
     <string name="treatments_prediction_curves">Behandelingen / Voorspelling Curves</string>
@@ -910,8 +912,10 @@
     <string name="bluereader_position">controleer de positie van blueReader op de sensor, aangezien deze niet kon lezen!</string>
     <string name="bluereaderuglystate">De blueReader is in een lelijke staat gevonden! Het wordt nu uitgeschakeld en u zet het weer aan (korte druk op de knop). Daarna zou de blueReader moeten werken zoals verwacht!</string>
     <string name="offical_msg">De officiële app</string>
+    <string name="aggressive_power_manager">Uw apparaat heeft een agressieve stroombeheerapp. Meestal toegankelijk via systeeminstellingen. Zorg ervoor dat xDrip is uitgesloten van achtergrondbeperkingen.</string>
     <string name="use_conflict_msg">kan ook proberen om toegang te krijgen tot het zenderapparaat en dit kan problemen veroorzaken met beide apps</string>
     <string name="use_confict_msg_glimp">U kunt Glimp instellingen aanpassen: opties -&gt; apparaten -&gt; deselecteer Bluetooth optie</string>
+    <string name="eng_mode_is_on">Engineering mode is ingeschakeld. Schakel het uit, tenzij je zeker weet dat je het nodig hebt, omdat het onverwacht gedrag kan veroorzaken.</string>
     <string name="yes">Ja</string>
     <string name="xdrip_compatible_features">xDrip+ %s functies</string>
     <string name="garmin">Garmin</string>
@@ -973,6 +977,7 @@
     <string name="emergency_message_near_format_string">%1$s in de buurt van %2$s %3$s %4$s %5$s</string>
     <string name="choose_when_to_send_messages">Kies wanneer u berichten wilt verzenden:</string>
     <string name="low_alert_not_acknowledged">Lage waarschuwing niet herkend</string>
+    <string name="lowest_alert_not_acknowledged">Lage waarschuwing niet herkend</string>
     <string name="high_alert_not_acknowledged">Hoge waarschuwing niet herkend</string>
     <string name="device_inactivity">Inactiviteit van het apparaat</string>
     <string name="test_message_sending">Testbericht verzenden</string>

From 6f4fcc01702eccab369fef771db7ae229a29de2d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:52 +0100
Subject: [PATCH 12/20] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl/strings-pl.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pl/strings-pl.xml b/app/src/main/res/values-pl/strings-pl.xml
index e39bd1dcfa..69327f98e9 100644
--- a/app/src/main/res/values-pl/strings-pl.xml
+++ b/app/src/main/res/values-pl/strings-pl.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Wykres ostatnich %d minut z Libre</string>
     <string name="share_config_via_qr_code">Udostepnij konfiguracje poprzez kod QR</string>
     <string name="check_for_updated_version">Sprawdź czy jest nowa wersja</string>
+    <string name="current_version_is_up_to_date">Brak aktualizacji dla wybranego kanału</string>
     <string name="send_feedback_to_developer">Prześlij uwagi do programisty</string>
     <string name="home_screen">Ekran główny</string>
     <string name="event_logs">Dzienniki zdarzeń</string>

From cbacb303d2ca659e9dfd6599060cbc347b285279 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:54 +0100
Subject: [PATCH 13/20] New translations strings.xml (Russian)

---
 app/src/main/res/values-ru/strings-ru.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml
index c8e0ae1ebc..3a134ada59 100644
--- a/app/src/main/res/values-ru/strings-ru.xml
+++ b/app/src/main/res/values-ru/strings-ru.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">График Libre за последние(-юю) %d мин.</string>
     <string name="share_config_via_qr_code">Поделиться настройками через QR-код</string>
     <string name="check_for_updated_version">Проверить обновления</string>
+    <string name="current_version_is_up_to_date">Нет обновлений в выбранном канале</string>
     <string name="send_feedback_to_developer">Отправить отзыв разработчику</string>
     <string name="home_screen">Домашний экран</string>
     <string name="event_logs">Журнал событий</string>

From c5176eee5d79fac5252592500fd5bc5a02767c04 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Mon, 25 Sep 2023 19:25:55 +0100
Subject: [PATCH 14/20] New translations strings.xml (Estonian)

---
 app/src/main/res/values-et/strings-et.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-et/strings-et.xml b/app/src/main/res/values-et/strings-et.xml
index a322716c1c..03500d67b2 100644
--- a/app/src/main/res/values-et/strings-et.xml
+++ b/app/src/main/res/values-et/strings-et.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Libre viimase %d minuti graafik</string>
     <string name="share_config_via_qr_code">Jaga seadeid QR koodiga</string>
     <string name="check_for_updated_version">Otsi uuendatud versiooni</string>
+    <string name="current_version_is_up_to_date">Valitud kanalis ei ole värskendust</string>
     <string name="send_feedback_to_developer">Saada arendajale tagasiside</string>
     <string name="home_screen">Avakuva</string>
     <string name="event_logs">Sündmuste logid</string>

From 3c294f99e28ad34efe85f8f561419474fcc60516 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:44:58 +0100
Subject: [PATCH 15/20] New translations strings.xml (French)

---
 app/src/main/res/values-fr/strings-fr.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr/strings-fr.xml b/app/src/main/res/values-fr/strings-fr.xml
index 74f43f2a56..aa9950306f 100644
--- a/app/src/main/res/values-fr/strings-fr.xml
+++ b/app/src/main/res/values-fr/strings-fr.xml
@@ -177,7 +177,7 @@
     <string name="libre_last_x_minutes_graph">Graphe des dernières %d minutes du Libre</string>
     <string name="share_config_via_qr_code">Partager la config via le code QR</string>
     <string name="check_for_updated_version">Vérifier les mises à jour</string>
-    <string name="current_version_is_up_to_date">Aucune mise à jour dans le canal sélectionné</string>
+    <string name="current_version_is_up_to_date">Pas de mise à jour disponible dans le canal sélectionné</string>
     <string name="send_feedback_to_developer">Envoyer des messages au développeur</string>
     <string name="home_screen">Écran d\'accueil</string>
     <string name="event_logs">Journal des événements</string>

From 4b4aa067eecf6b1eddfd63587e03d56236894e27 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:45:00 +0100
Subject: [PATCH 16/20] New translations strings.xml (Italian)

---
 app/src/main/res/values-it/strings-it.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-it/strings-it.xml b/app/src/main/res/values-it/strings-it.xml
index 038a0e609e..ba420b8c2e 100644
--- a/app/src/main/res/values-it/strings-it.xml
+++ b/app/src/main/res/values-it/strings-it.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Grafico Libre ultimi %d minuti</string>
     <string name="share_config_via_qr_code">Configura via codice QR</string>
     <string name="check_for_updated_version">Verifica versione aggiornata</string>
+    <string name="current_version_is_up_to_date">Nessun aggiornamento nel canale selezionato</string>
     <string name="send_feedback_to_developer">Invia Feedback agli  sviluppatori</string>
     <string name="home_screen">Schermata Home</string>
     <string name="event_logs">Registro eventi</string>

From 01d82d388411f284bf046a270dad1025220c584d Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:45:01 +0100
Subject: [PATCH 17/20] New translations strings.xml (Japanese)

---
 app/src/main/res/values-ja/strings-ja.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ja/strings-ja.xml b/app/src/main/res/values-ja/strings-ja.xml
index 338c6c08ac..2685707cfd 100644
--- a/app/src/main/res/values-ja/strings-ja.xml
+++ b/app/src/main/res/values-ja/strings-ja.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">リブレの最後の %d 分グラフ</string>
     <string name="share_config_via_qr_code">QRコードで設定を共有する</string>
     <string name="check_for_updated_version">最新バージョンを確認する</string>
+    <string name="current_version_is_up_to_date">選択したチャンネルのアップデートがありません</string>
     <string name="send_feedback_to_developer">開発者にフィードバックを送信</string>
     <string name="home_screen">ホーム画面</string>
     <string name="event_logs">イベントログ</string>

From 77d000673af9901b4a67782c76455dad28e9a516 Mon Sep 17 00:00:00 2001
From: JamOrHam <jamorham@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:45:03 +0100
Subject: [PATCH 18/20] New translations strings.xml (Ukrainian)

---
 app/src/main/res/values-uk/strings-uk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-uk/strings-uk.xml b/app/src/main/res/values-uk/strings-uk.xml
index ca020b04ab..a3f5bf9b25 100644
--- a/app/src/main/res/values-uk/strings-uk.xml
+++ b/app/src/main/res/values-uk/strings-uk.xml
@@ -177,6 +177,7 @@
     <string name="libre_last_x_minutes_graph">Графік Libre за останні %d хв.</string>
     <string name="share_config_via_qr_code">Поділитися налаштуваннями через QR-код</string>
     <string name="check_for_updated_version">Перевірити оновлення</string>
+    <string name="current_version_is_up_to_date">У вибраному каналі оновлень немає</string>
     <string name="send_feedback_to_developer">Надіслати відгук розробнику</string>
     <string name="home_screen">Домашній екран</string>
     <string name="event_logs">Журнал подій</string>

From d83296df765ca774a6b35f2e4242121c9d1c844e Mon Sep 17 00:00:00 2001
From: Navid <Navid200@users.noreply.github.com>
Date: Wed, 4 Oct 2023 14:14:32 -0400
Subject: [PATCH 19/20] Offer to hard reset Mod TX

---
 .../com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java  | 2 +-
 .../eveningoutpost/dexdrip/g5model/FirmwareCapability.java | 7 +++++++
 .../eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
index 17dad25b35..9962db5d79 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/DexTimeKeeper.java
@@ -36,7 +36,7 @@ public static void updateAge(final String transmitterId, final int dexTimeStamp,
         if (dexTimeStamp < 1) {
             UserError.Log.e(TAG, "Invalid dex timestamp in updateAge: " + dexTimeStamp);
             if (dexTimeStamp == 0 && absolute) {
-                if (FirmwareCapability.isTransmitterRawIncapable(getTransmitterID())) { // Firefly, which cannot be hard reset
+                if (FirmwareCapability.isTransmitterStandardFirefly(getTransmitterID())) { // Firefly, which cannot be hard reset
                     UserError.Log.e(TAG, "Your transmitter clock has stopped or never started.");
                 } else {
                     DexResetHelper.offer("Your transmitter clock has stopped or never started. Do you want to hard reset it?");
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
index d9000f9f84..7c69f874e0 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/FirmwareCapability.java
@@ -91,6 +91,13 @@ public static boolean isTransmitterModified(final String tx_id) {
         return false;
     }
 
+    public static boolean isTransmitterStandardFirefly(final String tx_id) { // Firefly that has not been modified
+        if (!isTransmitterModified(tx_id) && isTransmitterRawIncapable(tx_id)) {
+            return true;
+        }
+        return false;
+    }
+
     public static boolean isTransmitterG5(final String tx_id) {
         return isG5Firmware(getRawFirmwareVersionString(tx_id));
     }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
index a5d0e87be7..7d76e2ee35 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
@@ -770,7 +770,7 @@ public static boolean doGetData(Ob1G5CollectionService parent, RxBleConnection c
                                 if (session_start.isFubar()) {
                                     final long tk = DexTimeKeeper.getDexTime(getTransmitterID(), tsl());
                                     if (tk > 0) {
-                                        if (FirmwareCapability.isTransmitterRawIncapable(getTransmitterID())) {// Firefly, which cannot be hard reset
+                                        if (FirmwareCapability.isTransmitterStandardFirefly(getTransmitterID())) {// Firefly, which cannot be hard reset
                                             UserError.Log.e(TAG, "Unusual session start failure");
                                         } else {
                                             DexResetHelper.offer("Unusual session start failure, is transmitter crashed? Try Hard Reset?");

From af3a008255800be4b4fce08b5609b2edf5cd255c Mon Sep 17 00:00:00 2001
From: Jamorham <jamorham@users.noreply.github.com>
Date: Fri, 6 Oct 2023 16:44:12 +0000
Subject: [PATCH 20/20] Update PrefView to support default true

---
 .../dexdrip/utilitymodels/PrefsViewImpl.java  | 56 ++++++++---
 .../utilitymodels/PrefsViewImplTest.java      | 99 +++++++++++++++++++
 2 files changed, 144 insertions(+), 11 deletions(-)
 create mode 100644 app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImplTest.java

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
index 69cef658fb..d77931bfb8 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImpl.java
@@ -4,9 +4,11 @@
 
 import com.eveningoutpost.dexdrip.adapters.ObservableArrayMapNoNotify;
 
+import lombok.val;
+
 /**
  * Created by jamorham on 05/10/2017.
- *
+ * <p>
  * Implementation of PrefsView
  */
 
@@ -15,12 +17,14 @@ public class PrefsViewImpl extends ObservableArrayMapNoNotify<String, Boolean> i
     private Runnable runnable;
 
     public boolean getbool(String name) {
-        return Pref.getBooleanDefaultFalse(name);
+        if (name == null) return false;
+        return PrefHandle.parse(name).getBoolean();
     }
 
     public void setbool(String name, boolean value) {
-        Pref.setBoolean(name, value);
-        super.put(name, value);
+        val handle = PrefHandle.parse(name);
+        Pref.setBoolean(handle.key, value);
+        super.put(handle.key, value);
         doRunnable();
     }
 
@@ -42,27 +46,57 @@ private void doRunnable() {
     @NonNull
     @Override
     public Boolean get(Object key) {
-        Boolean value = super.get(key);
+        val handle = PrefHandle.parse((String) key);
+        Boolean value = super.get(handle.key);
         if (value == null) {
             value = getbool((String) key);
-            super.putNoNotify((String) key, value);
+            super.putNoNotify(handle.key, value);
         }
         return value;
     }
 
     @Override
     public Boolean put(String key, Boolean value) {
-        if (!(super.get(key).equals(value))) {
-            Pref.setBoolean(key, value);
-            super.put(key, value);
+        val handle = PrefHandle.parse(key);
+        if (!(super.get(handle.key).equals(value))) {
+            Pref.setBoolean(handle.key, value);
+            super.put(handle.key, value);
             doRunnable();
         }
         return value;
     }
 
     public void put(Object key, boolean value) {
-        if (!(super.get(key).equals(value))) {
-            super.put((String) key, value);
+        val handle = PrefHandle.parse((String) key);
+        if (!(super.get(handle.key).equals(value))) {
+            super.put(handle.key, value);
+        }
+    }
+
+    public static class PrefHandle {
+        public final String key;
+        public final boolean defaultValue;
+
+        public PrefHandle(final String key, final boolean defaultValue) {
+            this.key = key;
+            this.defaultValue = defaultValue;
+        }
+
+        boolean getBoolean() {
+            return Pref.getBoolean(key, defaultValue);
+        }
+
+        public static PrefHandle parse(final String identifier) {
+            if (identifier == null) {
+                return null;
+            }
+
+            final String[] parts = identifier.split(":", 2);
+            if (parts.length == 2) {
+                return new PrefHandle(parts[0], Boolean.parseBoolean(parts[1]));
+            } else {
+                return new PrefHandle(identifier, false);
+            }
         }
     }
 
diff --git a/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImplTest.java b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImplTest.java
new file mode 100644
index 0000000000..a6a141758b
--- /dev/null
+++ b/app/src/test/java/com/eveningoutpost/dexdrip/utilitymodels/PrefsViewImplTest.java
@@ -0,0 +1,99 @@
+package com.eveningoutpost.dexdrip.utilitymodels;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import com.eveningoutpost.dexdrip.RobolectricTestWithConfig;
+
+import org.junit.Test;
+
+public class PrefsViewImplTest extends RobolectricTestWithConfig {
+
+
+    private final PrefsViewImpl view = new PrefsViewImpl();
+
+    @Test
+    public void getboolTest() {
+
+        assertWithMessage("test default plain false").that(view.getbool("plain-example-no-default")).isFalse();
+        assertWithMessage("test default specified false").that(view.getbool("plain-example-default:false")).isFalse();
+        assertWithMessage("test default specified true").that(view.getbool("plain-example-default:true")).isTrue();
+        assertWithMessage("test default specified invalid 1").that(view.getbool("plain-example-default:")).isFalse();
+        assertWithMessage("test default specified invalid 2").that(view.getbool("plain-example-default:blah")).isFalse();
+        assertWithMessage("test default specified invalid 3").that(view.getbool("plain-example-default:true:")).isFalse();
+
+    }
+
+    @Test
+    public void setboolTest() {
+
+        String pref1 = "test-bool-pref1:true";
+
+        Pref.removeItem(pref1);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref1).key);
+        assertWithMessage("test 1 default before").that(view.getbool(pref1)).isTrue();
+        view.setbool(pref1, false);
+        assertWithMessage("test 1 false after").that(view.getbool(pref1)).isFalse();
+        view.setbool(pref1, true);
+        assertWithMessage("test 1 true after").that(view.getbool(pref1)).isTrue();
+
+        String pref2 = "test-bool-pref2:false";
+
+        Pref.removeItem(pref2);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref2).key);
+        assertWithMessage("test 2 default before").that(view.getbool(pref2)).isFalse();
+        view.setbool(pref2, false);
+        assertWithMessage("test 2 false after").that(view.getbool(pref2)).isFalse();
+        view.setbool(pref2, true);
+        assertWithMessage("test 2 true after").that(view.getbool(pref2)).isTrue();
+        assertWithMessage("test 2 false low level").that(Pref.getBooleanDefaultFalse(pref2)).isFalse();
+        assertWithMessage("test 2 false low level").that(Pref.getBooleanDefaultFalse(PrefsViewImpl.PrefHandle.parse(pref2).key)).isTrue();
+
+        String pref3 = "test-bool-pref3";
+
+        Pref.removeItem(pref3);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref3).key);
+        assertWithMessage("test 3 default before").that(view.getbool(pref3)).isFalse();
+        view.setbool(pref3, false);
+        assertWithMessage("test 3 false after").that(view.getbool(pref3)).isFalse();
+        view.setbool(pref3, true);
+        assertWithMessage("test 3 true after").that(view.getbool(pref3)).isTrue();
+
+        Pref.removeItem(pref1);
+        Pref.removeItem(pref2);
+        Pref.removeItem(pref3);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref1).key);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref2).key);
+        Pref.removeItem(PrefsViewImpl.PrefHandle.parse(pref3).key);
+    }
+
+
+    @Test
+    public void getTest() {
+        assertWithMessage("test default plain false").that(view.get("plain-example-no-default1")).isFalse();
+        assertWithMessage("test default specified false").that(view.get("plain-example-default2:false")).isFalse();
+        assertWithMessage("test default specified false 2").that(view.get("plain-example-default2:true")).isFalse(); // cached
+        assertWithMessage("test default specified true").that(view.get("plain-example-default3:true")).isTrue();
+        assertWithMessage("test default specified true 2").that(view.get("plain-example-default3:false")).isTrue(); // cached
+        assertWithMessage("test default specified invalid 1").that(view.get("plain-example-default4:")).isFalse();
+        assertWithMessage("test default specified invalid 2").that(view.get("plain-example-default5:blah")).isFalse();
+        assertWithMessage("test default specified invalid 3").that(view.get("plain-example-default6:true:")).isFalse();
+    }
+
+    @Test
+    public void putTest() {
+
+        assertWithMessage("test default plain false 1").that(view.get("plain-example-put-test-1")).isFalse();
+        view.put("plain-example-put-test-1", false);
+        assertWithMessage("test default plain false 2").that(view.get("plain-example-put-test-1")).isFalse();
+        view.put("plain-example-put-test-1", true);
+        assertWithMessage("test default plain false 3").that(view.get("plain-example-put-test-1")).isTrue();
+
+        String pref = "plain-example-put-test-2:true";
+        assertWithMessage("test default plain true 1").that(view.get(pref)).isTrue();
+        view.put(pref, false);
+        assertWithMessage("test default plain true 2").that(view.get(pref)).isFalse();
+        view.put(pref, true);
+        assertWithMessage("test default plain true 3").that(view.get(pref)).isTrue();
+    }
+
+}
\ No newline at end of file