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

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="treatmentssafety_title">Behandeling veiligheid</string>
+  <string name="treatmentssafety_title">Behandelingen veiligheid</string>
   <string name="treatmentssafety_maxbolus_title">Max toegestane bolus [E]</string>
   <string name="treatmentssafety_maxcarbs_title">Max toegestane koolhydraten [g]</string>
   <string name="nav_preferences">Instellingen</string>
@@ -949,6 +949,10 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
   <string name="openapsama_max_daily_safety_multiplier">Maximale dagelijkse veiligheids vermeningvuldigings factor</string>
   <string name="openapsama_current_basal_safety_multiplier">Actuele veiliheids verhoger van basaal</string>
   <string name="value_unavailable_short">n/a</string>
+  <string name="virtualpump_type">Virtuele pomp Type</string>
+  <string name="virtualpump_definition">Pomp definitie</string>
+  <string name="virtualpump_pump_def">Bolus: Stap=%1$s\nExtended Bolus: [Stap=%2$s, Duur=%3$smin-%4$sh]\nBasaal: Stap=%5$s\nTBR: %6$s (by %7$s), Duur=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Basaal- /boluswaarden worden niet ondersteund door virtuele pomp.</string>
   <string name="ns_autobackfill_title">Automatische BG aanvullen</string>
   <string name="wear_wizard_settings">Wizard instellingen</string>
   <string name="wear_wizard_settings_summary">Berekeningen inclusief in het resultaat van de wizard</string>
@@ -1027,6 +1031,7 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
   <string name="send_all_logs">Verstuur Logs per e-mail</string>
   <string name="delete_logs">Verwijder Logs</string>
   <string name="error_adding_treatment_message">Een Behandeling (insuline: %1$.2f, koolhydraten: %2$d, in: %3$s) niet konden worden toegevoegd aan Behandelingen. Gelieve te controleren en handmatig een record toe te voegen indien nodig.</string>
+  <string name="generated_ecarbs_note">eCarbs: %1$d g (%2$d h), vertraging: %3$d m</string>
   <string name="openaps_noasdata">Geen autosens-gegevens beschikbaar</string>
   <string name="nav_logsettings">Log instellingen</string>
   <string name="resettodefaults">Terug naar standaardinstellingen</string>
@@ -1034,6 +1039,11 @@ Stel in en gebruik tijdelijk en standaard tijdelijke streefdoelen (bv. bij sport
   <string name="as">AS</string>
   <string name="versionavailable">Versie %1$s is beschikbaar</string>
   <string name="time_offset">Tijdverschuiving</string>
+  <string name="setupwizard_preferred_aps_mode">Voorkeur APS-modus</string>
+  <string name="treatments_wizard_total_label">Totaal</string>
+  <string name="calculation_short">Calc</string>
+  <string name="handshaking">Handshaking</string>
+  <string name="sendlogfiles">Logboekbestanden van vandaag verzenden aan ontwikkelaars samen met de onverwachte situatie.</string>
   <plurals name="objective_days">
     <item quantity="one">%1$d dag</item>
     <item quantity="other">%1$d dag</item>

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

@@ -948,6 +948,10 @@
   <string name="openapsama_max_daily_safety_multiplier">Multiplicator sigur maxim zilnic</string>
   <string name="openapsama_current_basal_safety_multiplier">Multiplicator sigur pentru bazala curentă</string>
   <string name="value_unavailable_short">indisponibil</string>
+  <string name="virtualpump_type">Tipul pompei virtuale</string>
+  <string name="virtualpump_definition">Definirea pompei</string>
+  <string name="virtualpump_pump_def">Bolus: Pas=%1$s\nBolus Extins: [Pas=%2$s, Durată=%3$smin-%4$sh]\nBazală: Pas=%5$s\nRBT: %6$s (cu %7$s), Durată=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">Valorile bazalei/bolusului variate nu sunt suportate de căter Pompa Virtuală.</string>
   <string name="ns_autobackfill_title">Autocompletează glicemiile lipsă</string>
   <string name="wear_wizard_settings">Asistent setări</string>
   <string name="wear_wizard_settings_summary">Calcule incluse în rezultatul asistentului:</string>
@@ -1034,6 +1038,11 @@
   <string name="as">AS</string>
   <string name="versionavailable">Versiunea %1$s este disponibilă</string>
   <string name="time_offset">Diferență de fus orar</string>
+  <string name="setupwizard_preferred_aps_mode">Modul APS preferat</string>
+  <string name="treatments_wizard_total_label">Total</string>
+  <string name="calculation_short">Calc</string>
+  <string name="handshaking">Împerechere</string>
+  <string name="sendlogfiles">Trimite înregistrările zilei de astăzi către dezvoltatori, împreună cu timpul curent. Situație neașteptată.</string>
   <plurals name="objective_days">
     <item quantity="one">%1$d zi</item>
     <item quantity="few">%1$d zi</item>

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

@@ -948,6 +948,10 @@
   <string name="openapsama_max_daily_safety_multiplier">Множитель безопасности макс суточного базала</string>
   <string name="openapsama_current_basal_safety_multiplier">Текущий множитель безопасности базала</string>
   <string name="value_unavailable_short">н/д</string>
+  <string name="virtualpump_type">Тип виртуальной помпы</string>
+  <string name="virtualpump_definition">Определение помпы</string>
+  <string name="virtualpump_pump_def">Болюс: Шаг =%1$s\nПродленный Болюс: [Шаг =%2$s, Длительность =%3$sмин -%4$sh] \nБазал: Шаг =%5$s\ nTBR: %6$s (на %7$s), Длительность =%8$sмин -%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* Величины в данных диапазонах не поддерживаются Виртуальной Помпой.</string>
   <string name="ns_autobackfill_title">Автозаполнение пропущенных данных СК</string>
   <string name="wear_wizard_settings">Параметры мастера настройки смарт-часов wear</string>
   <string name="wear_wizard_settings_summary">Расчеты, включены в результат мастера настройки смарт-часов wear:</string>
@@ -1040,4 +1044,5 @@ Context | Edit Context</string>
   <string name="treatments_wizard_total_label">Итого</string>
   <string name="calculation_short">Кальк</string>
   <string name="handshaking">Подтверждение связи</string>
+  <string name="sendlogfiles">Отправьте файлы сегодняшнего лога разработчикам наряду с этим. Непредвиденная ситуация.</string>
 </resources>

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

@@ -712,6 +712,8 @@
   <string name="dexcomg5_xdripupload_title">将血糖数据发送到 xDrip +</string>
   <string name="dexcomg5_xdripupload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
   <string name="nsclientbg">NSClient 血糖</string>
+  <string name="minimalbasalvaluereplaced">基础率值被泵支持的最小值: %s 替换了</string>
+  <string name="maximumbasalvaluereplaced">基础率值被泵支持的最大值:%s 替换了</string>
   <string name="overview_editquickwizard_usebg">血糖计算</string>
   <string name="overview_editquickwizard_usebolusiob">大剂量IOB (活性胰岛素) 计算</string>
   <string name="overview_editquickwizard_usebasaliob">基础率IOB (活性胰岛素) 计算</string>
@@ -765,6 +767,7 @@
   <string name="combo_error_no_connection_no_bolus_delivered">找不到泵，大剂量输注失败</string>
   <string name="combo_error_no_bolus_delivered">大剂量输注失败，看起来好像没有大剂量被输注。安全起见，请检查泵，避免重复输注大剂量。软件考虑安全因素，不会再自动重试大剂量输注.</string>
   <string name="combo_error_partial_bolus_delivered">由于遇到一个错误， %2$.2f U 中只有%1$.2fU 输注成功了. 请在泵上检查并核实，看是否需要采取适当的措施.</string>
+  <string name="combo_error_bolus_verification_failed">正在输注大剂量和核实泵的历史失败了，请检查泵，如果大剂量已经输注成功，下次连接泵的时候会在治疗的标签里自动添加一个大剂量记录.</string>
   <string name="combo_reservoir_level_insufficient_for_bolus">储药器里没有足够的胰岛素可用于大剂量输注了</string>
   <string name="extendedbolusdeliveryerror">扩展大剂量(方波) 输注错误</string>
   <string name="insightpump_shortname">Insight</string>
@@ -945,6 +948,10 @@
   <string name="openapsama_max_daily_safety_multiplier">最大日基础率安全倍数</string>
   <string name="openapsama_current_basal_safety_multiplier">当前基础率安全倍数</string>
   <string name="value_unavailable_short">无可用</string>
+  <string name="virtualpump_type">虚拟泵类型</string>
+  <string name="virtualpump_definition">泵定义</string>
+  <string name="virtualpump_pump_def">大剂量: Step=%1$s\n扩展大剂量: [Step=%2$s, 持续时间=%3$smin-%4$sh]\n基础率: Step=%5$s\nTBR临时基础率: %6$s (by %7$s), 持续时间=%8$smin-%9$sh\n%10$s</string>
+  <string name="virtualpump_pump_def_extended_note">* 虚拟泵不支持远程修改基础率或输注大剂量</string>
   <string name="ns_autobackfill_title">Autobackfill 血糖</string>
   <string name="wear_wizard_settings">向导设置</string>
   <string name="wear_wizard_settings_summary">包含在向导中的计算结果：</string>
@@ -985,6 +992,7 @@
   <string name="danar_pumpalarm_vibrate">振动</string>
   <string name="danar_pumpalarm_both">两者都</string>
   <string name="danar_screentimeout">LCD屏幕亮的时间[s]</string>
+  <string name="danar_backlight">背景光开启的时间[s]</string>
   <string name="danar_glucoseunits">血糖单位</string>
   <string name="danar_shutdown">关机(小时)</string>
   <string name="danar_lowreservoir">储药器药量低(单位)</string>
@@ -1012,10 +1020,29 @@
   <string name="storedsettingsfound">发现曾经保存过的设置</string>
   <string name="allow_hardware_pump_text">注意：如果你激活并且连接到了一个硬件泵，AndroidAPS将会从配置文件复制基础率到泵上。覆盖泵上已有的基础率。请确定你已经在AndroidAPS上设置了正确的基础率。如果你不确定或者不想覆盖泵上的基础率设置，按取消键，以后再切换激活配置文件。</string>
   <string name="error_adding_treatment_title">治疗数据不完整</string>
+  <string name="maintenance_settings">维护设置</string>
+  <string name="maintenance_email">电子邮箱</string>
+  <string name="invalid_email_message">邮箱地址无效</string>
+  <string name="maintenance_amount">没有要发送的日志</string>
+  <string name="maintenance">维护</string>
+  <string name="maintenance_shortname">维护</string>
+  <string name="description_maintenance">提供了几个维护功能 (例如日志发送、日志删除)。</string>
+  <string name="send_all_logs">用电子邮件发送</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 分钟</string>
   <string name="openaps_noasdata">Autosens 数据不可用</string>
   <string name="nav_logsettings">日志设置</string>
   <string name="resettodefaults">重置为默认值</string>
+  <string name="nsmalfunction">NSClient故障。 考虑Nightscout和NSClient重启。</string>
+  <string name="as">AS</string>
+  <string name="versionavailable">版本 %1$s 可用</string>
+  <string name="time_offset">时区偏移</string>
+  <string name="setupwizard_preferred_aps_mode">首选的APS模式</string>
+  <string name="treatments_wizard_total_label">总计</string>
+  <string name="calculation_short">计算</string>
+  <string name="handshaking">握手</string>
+  <string name="sendlogfiles">发送包括当前时间的今日的日志文件给开发者。描述一下意外情况</string>
   <plurals name="objective_days">
     <item quantity="other">%1$d　天</item>
   </plurals>