Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

app/src/main/res/values-fr-rFR/strings.xml

@@ -605,7 +605,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="secondcarbsincrement">Deuxième incrément de glucides</string>
     <string name="thirdcarbsincrement">Troisième incrément de glucides</string>
     <string name="cgm">MGC</string>
+    <string name="ns_cellular">Utiliser la connexion mobile</string>
+    <string name="ns_wifi">Utilisez la connexion Wi-Fi</string>
     <string name="ns_wifi_ssids">Wi-fi SSID</string>
+    <string name="ns_charging">Pendant la charge</string>
+    <string name="ns_battery">Sur batterie</string>
     <string name="connectionsettings_title">Paramètres de connexion</string>
     <string name="ns_wifi_allowedssids">SSIDs autorisés (séparés par point-virgule)</string>
     <string name="ns_allowroaming">Autoriser connexion données itinérance</string>
@@ -684,7 +688,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="miscellaneous">Divers</string>
     <string name="nav_logsettings">Paramètres journal</string>
     <string name="resettodefaults">Réinitialiser les valeurs par défaut</string>
-    <string name="nsmalfunction">Dysfonctionnement NSClient. Faites une réinitialisation de NS et de NSClient.</string>
+    <string name="nsmalfunction">Dysfonctionnement NSClient. Redémarrez NS et NSClient.</string>
     <string name="time_offset">Décalage horaire</string>
     <string name="bolus_reminder">Rappel du bolus plus tard</string>
     <string name="setupwizard_preferred_aps_mode">Mode APS préféré</string>
@@ -1035,4 +1039,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="aidex">GlucoRx Aidex</string>
     <string name="aidex_short">Aidex</string>
     <string name="description_source_aidex">Recevoir les valeurs de glycémie du MGC GlucoRx Aidex.</string>
+    <string name="blocked_by_charging">Bloqué par les options de recharge</string>
+    <string name="blocked_by_connectivity">Bloqué par les options de connectivité</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -475,6 +475,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="localalertsettings_title">Yerel uyarılar</string>
     <string name="enable_missed_bg_readings_alert">KŞ bilgisi alınmadığında uyar</string>
     <string name="enable_pump_unreachable_alert">Pompa ulaşılamıyorsa uyar</string>
+    <string name="pump_unreachable_threshold">Pompa ulaşılamaz eşiği [dk]</string>
     <string name="enable_carbs_req_alert">Karbonhidrat gerekliyse uyar</string>
     <string name="urgent_alarm">Acil önemli Alarm</string>
     <string name="info">BİLGİ</string>

core/src/main/res/values-fr-rFR/strings.xml

@@ -446,7 +446,7 @@
     <string name="autotune_description">Aide pour ajuster le profil (SI, rapport G/I et débits de basal)</string>
     <string name="autotune_shortname">AT</string>
     <string name="autotune_settings">Paramètres Autotune</string>
-    <string name="autotune_auto_title">Changement de profil avec l\'Automatisation</string>
+    <string name="autotune_auto_title">Changr le profil avec l\'automatisation</string>
     <string name="autotune_auto_summary">Si activé, Autotune mettra à jour automatiquement à jour le profil sélectionné et activera le profil calculé effectué à partir d\'une règle d\'automatisation.</string>
     <string name="autotune_categorize_uam_as_basal_title">Catégoriser UAM en tant que Basal</string>
     <string name="autotune_categorize_uam_as_basal_summary">Activer uniquement si vous avez correctement saisi tous les glucides consommés, avec cette option, des hausses soudaines vues par Autotune seront utilisées pour modifier les débits de basal.</string>

core/src/main/res/values-ru-rRU/strings.xml

@@ -451,6 +451,11 @@
     <string name="autotune_categorize_uam_as_basal_title">Классифицировать UAM как базал</string>
     <string name="autotune_categorize_uam_as_basal_summary">Включите, если только вы точно ввели все съеденные углеводы. С этой опцией внезапные подъемы, зафиксированные Autotune, будут использованы для рекомендаций изменения базальной скорости.</string>
     <string name="autotune_tune_insulin_curve_title">Настройка кривой инсулина</string>
+    <string name="autotune_tune_insulin_curve_summary">Включите, если используете беспиковый. Настроит пики и DIA</string>
+    <string name="autotune_default_tune_days_title">Количество дней с данными</string>
+    <string name="autotune_circadian_ic_isf_title">Применить усредненный суточный IC/ISF</string>
+    <string name="autotune_circadian_ic_isf_summary">Autotune не настраивает суточные вариации, эта опция только применяет усредненные коэффициенты IC и ISF к суточному профилю</string>
+    <string name="autotune_additional_log_title">Включить больше информации логов для отладки</string>
     <string name="autotune_default_tune_days_summary">Количество дней обработки данных Autotune по умолчанию (до 30)</string>
     <string name="autotune_error">Ошибка ввода данных, попробуйте запустить снова autotune или уменьшить количество дней</string>
     <string name="autotune_profile_invalid">Неверный профиль</string>

wear/src/main/res/values-cs-rCZ/strings.xml

@@ -168,4 +168,20 @@
     <string name="tile_no_config">Není dostupná žádná konfigurace</string>
     <string name="wear_control_not_enabled">Ovládání hodinkami vypnuto</string>
     <string name="wear_control_no_data">Žádná data k dispozici</string>
+    <string name="increment">zvýšení</string>
+    <string name="decrement">snížení</string>
+    <string name="first_char_high">V</string>
+    <string name="first_char_low">N</string>
+    <string name="abbreviation_average">prům</string>
+    <string name="no_iob_u">--U</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--U/h</string>
+    <string name="uploader_na">Uploader: ---%</string>
+    <string name="no_status">S: žádný status</string>
+    <string name="time_stamp_na_min_ago">Před -- minutamí</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Žádný stav smyčky</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00U</string>
 </resources>

wear/src/main/res/values-fr-rFR/strings.xml

@@ -168,4 +168,17 @@
     <string name="tile_no_config">Aucune configuration disponible</string>
     <string name="wear_control_not_enabled">Contrôles Wear désactivés</string>
     <string name="wear_control_no_data">Aucune donnée disponible</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">B</string>
+    <string name="abbreviation_average">moy</string>
+    <string name="no_iob_u">--U</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.-- U/h</string>
+    <string name="uploader_na">Téléchargement : ---%</string>
+    <string name="time_stamp_na_min_ago">Il y a -- minutes</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Aucun statut de la boucle</string>
+    <string name="cob_000g">000 g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00 U</string>
 </resources>

wear/src/main/res/values-no-rNO/strings.xml

@@ -168,4 +168,20 @@
     <string name="tile_no_config">Ingen konfigurasjon tilgjengelig</string>
     <string name="wear_control_not_enabled">Wear kontroller deaktivert</string>
     <string name="wear_control_no_data">Ingen data tilgjengelig</string>
+    <string name="increment">økning</string>
+    <string name="decrement">reduksjon</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">L</string>
+    <string name="abbreviation_average">snitt</string>
+    <string name="no_iob_u">--E</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--E/t</string>
+    <string name="uploader_na">Opplaster: ---%</string>
+    <string name="no_status">S: ingen status</string>
+    <string name="time_stamp_na_min_ago">-- Minutter siden</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Ingen loop status</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00E</string>
 </resources>

wear/src/main/res/values-ru-rRU/strings.xml

@@ -168,4 +168,20 @@
     <string name="tile_no_config">Нет доступной конфигурации</string>
     <string name="wear_control_not_enabled">Функция управления Wear выключена</string>
     <string name="wear_control_no_data">Нет данных</string>
+    <string name="increment">приращение</string>
+    <string name="decrement">декремент</string>
+    <string name="first_char_high">В</string>
+    <string name="first_char_low">Н</string>
+    <string name="abbreviation_average">сред</string>
+    <string name="no_iob_u">--ед</string>
+    <string name="no_cob_g">--г</string>
+    <string name="no_tmp_basal_u_h">-.--ед/ч</string>
+    <string name="uploader_na">Загрузчик: --%</string>
+    <string name="no_status">S: статус отсутствует</string>
+    <string name="time_stamp_na_min_ago">-- Минут назад</string>
+    <string name="delta_na">--- мг/дл</string>
+    <string name="no_loop_status">Нет статуса</string>
+    <string name="cob_000g">000г</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00 ед</string>
 </resources>

wear/src/main/res/values-sk-rSK/strings.xml

@@ -168,4 +168,19 @@
     <string name="tile_no_config">Nie je dostupná žiadna konfigurácia</string>
     <string name="wear_control_not_enabled">Ovládanie hodinkami vypnuté</string>
     <string name="wear_control_no_data">Žiadne údaje nie sú k dispozícii</string>
+    <string name="increment">prírastok</string>
+    <string name="decrement">zníženie</string>
+    <string name="first_char_high">H</string>
+    <string name="first_char_low">L</string>
+    <string name="abbreviation_average">priemer</string>
+    <string name="no_iob_u">--JI</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--JI/h</string>
+    <string name="no_status">S: žiadny stav</string>
+    <string name="time_stamp_na_min_ago">Pred -- minútami</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Žiadny stav uzavretého okruhu</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00JI</string>
 </resources>

wear/src/main/res/values-tr-rTR/strings.xml

@@ -168,4 +168,20 @@
     <string name="tile_no_config">Mevcut yapılandırma yok</string>
     <string name="wear_control_not_enabled">Saat kontrolleri devre dışı</string>
     <string name="wear_control_no_data">Veri yok</string>
+    <string name="increment">artış</string>
+    <string name="decrement">azalma</string>
+    <string name="first_char_high">Y</string>
+    <string name="first_char_low">D</string>
+    <string name="abbreviation_average">ort</string>
+    <string name="no_iob_u">--Ü</string>
+    <string name="no_cob_g">--g</string>
+    <string name="no_tmp_basal_u_h">-.--Ü/sa</string>
+    <string name="uploader_na">Yükleyici: ---%</string>
+    <string name="no_status">S: durum yok</string>
+    <string name="time_stamp_na_min_ago">-- Dakika önce</string>
+    <string name="delta_na">--- mg/dl</string>
+    <string name="no_loop_status">Döngü Durumu Yok</string>
+    <string name="cob_000g">000g</string>
+    <string name="svg_00_0">00,0</string>
+    <string name="iob_0_00u">0,00Ü</string>
 </resources>