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

app/src/main/res/values-bg/strings.xml

@@ -998,7 +998,7 @@
   <string name="completed_well_done">Приключихме, Браво!</string>
   <string name="not_completed_yet">Все още не сме неприключили</string>
   <string name="time_elapsed">Изминало време</string>
-  <string name="nth_objective">%1$дни. Цел</string>
+  <string name="nth_objective">%1$d. Цел</string>
   <string name="poctech">Poctech</string>
   <string name="description_source_poctech">Получавай данни за КЗ от Poctech апликацията.</string>
   <string name="high_temptarget_raises_sensitivity_title">Високите временни цели да вдигат ли чувствителността?</string>

app/src/main/res/values-cs/strings.xml

@@ -4,7 +4,7 @@
   <string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
   <string name="treatmentssafety_maxbolus_title">Maximální povolený bolus [U]</string>
   <string name="treatmentssafety_maxcarbs_title">Maximální počet sacharidů [g]</string>
-  <string name="nav_preferences">Předvolby</string>
+  <string name="nav_preferences">Nastavení</string>
   <string name="nav_refreshtreatments">Obnovit ošetření z NS</string>
   <string name="nav_resetdb">Inicializovat databáze</string>
   <string name="reset_db_confirm">Opravdu resetovat všechny databáze?</string>
@@ -1026,6 +1026,7 @@
   <string name="send_all_logs">Poslat logy e-mailem</string>
   <string name="delete_logs">Smazat logy</string>
   <string name="error_adding_treatment_message">Ošetření (inzulín: %1$.2f, sacharidy: %2$d, čas: %3$s) nelze přidat. Zkontrolujte a podle potřeby ručně přidejte záznam.</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), start: %3$d m</string>
   <string name="openaps_noasdata">Nedostupná data o glykémiích</string>
   <string name="nav_logsettings">Nastavení logování</string>
   <string name="resettodefaults">Obnovit výchozí</string>

app/src/main/res/values-ro/strings.xml

@@ -1026,6 +1026,7 @@
   <string name="send_all_logs">Trimite un email cu loguri</string>
   <string name="delete_logs">Șterge logurile</string>
   <string name="error_adding_treatment_message">Un tratament (insulină: %1$.2f, carbohidrați: %2$d, la: %3$s) nu a putut fi înregistrat. Reverificați și apoi adăugați manual înregistrarea corectă.</string>
+  <string name="generated_ecarbs_note">eCarbohidrați: %1$d g (%2$d h), întârziere: %3$d m</string>
   <string name="openaps_noasdata">Nu există date disponibile privind autosens</string>
   <string name="nav_logsettings">Setări loguri</string>
   <string name="resettodefaults">Resetare la setările implicite</string>

app/src/main/res/values-ru/strings.xml

@@ -1028,6 +1028,7 @@ Context | Edit Context</string>
   <string name="send_all_logs">Отправить журналы (логи) по email</string>
   <string name="delete_logs">Удалить записи журнала</string>
   <string name="error_adding_treatment_message">Назначение (инсулин: %1$.2f, углеводы: %2$d, в: %3$s) не было добавлено. Пожалуйста, проверьте и при необходимости добавьте запись вручную.</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d г. (%2$d h), задержка: %3$d m</string>
   <string name="openaps_noasdata">Данные autosens недоступны</string>
   <string name="nav_logsettings">Настройки журнала</string>
   <string name="resettodefaults">Восстановить значения по умолчанию</string>

app/src/main/res/values-sv/strings.xml

@@ -684,7 +684,7 @@
   <string name="shortprotein">Pr</string>
   <string name="shortfat">Fett</string>
   <string name="active"><![CDATA[<Aktiv>]]></string>
-  <string name="waitingforestimatedbolusend">Väntar på att bolus ska slutföras (%1$d sek).</string>
+  <string name="waitingforestimatedbolusend">Slutför bolus (%1$d sek)</string>
   <string name="processinghistory">Behandlar</string>
   <string name="startingbolus">Påbörjar bolus</string>
   <string name="executingrightnow">Kommando körs just nu</string>
@@ -712,6 +712,8 @@
   <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
   <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
   <string name="nsclientbg">NSClient BG</string>
+  <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %s</string>
+  <string name="maximumbasalvaluereplaced">Basalvärdet ersatt med det maximala tillåtna: %s</string>
   <string name="overview_editquickwizard_usebg">Använd BG</string>
   <string name="overview_editquickwizard_usebolusiob">Använd bolus-IOB</string>
   <string name="overview_editquickwizard_usebasaliob">Använd basal-IOB</string>
@@ -1024,6 +1026,7 @@
   <string name="send_all_logs">Skicka loggar per e-post</string>
   <string name="delete_logs">Radera loggar</string>
   <string name="error_adding_treatment_message">En behandling (insulin: %1$.2f, kolhydrater: %2$d, tid: %3$s) kunde inte läggas till listan i Behandlingar. Vänligen kontrollera och lägg till en post manuellt vid behov.</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), fördröjd i %3$d m</string>
   <string name="openaps_noasdata">Ingen data tillgänglig för autosens</string>
   <string name="nav_logsettings">Loggningsinställningar</string>
   <string name="resettodefaults">Återställ standardinställningar</string>