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

app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt

@@ -12,7 +12,6 @@ import info.nightscout.shared.R
 import kotlinx.serialization.Serializable
 import org.json.JSONObject
 import java.io.BufferedOutputStream
-import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -77,7 +76,7 @@ enum class ResFormat(val extension: String) {
 @Serializable
 data class ResData(val value: ByteArray, val format: ResFormat) {
 
-    fun toDrawable(resources: Resources): Drawable? {
+    fun toDrawable(resources: Resources, width: Int? = null, height: Int? = null): Drawable? {
         try {
             return when (format) {
                 ResFormat.PNG, ResFormat.JPG -> {
@@ -86,7 +85,9 @@ data class ResData(val value: ByteArray, val format: ResFormat) {
                 }
 
                 ResFormat.SVG                -> {
-                    val svg = SVG.getFromInputStream(ByteArrayInputStream(value))
+                    val svg = SVG.getFromString(String(value))
+                    svg.documentWidth = width?.toFloat() ?: svg.documentWidth
+                    svg.documentHeight = height?.toFloat() ?: svg.documentHeight
                     val picture = svg.renderToPicture()
                     PictureDrawable(picture).apply {
                         setBounds(0, 0, svg.documentWidth.toInt(), svg.documentHeight.toInt())
@@ -160,7 +161,8 @@ enum class CwfMetadataKey(val key: String, @StringRes val label: Int, val isPref
     CWF_PREF_WATCH_SHOW_DIRECTION("key_show_direction", R.string.pref_show_direction_arrow, true),
     CWF_PREF_WATCH_SHOW_AGO("key_show_ago", R.string.pref_show_ago, true),
     CWF_PREF_WATCH_SHOW_BG("key_show_bg", R.string.pref_show_bg, true),
-    CWF_PREF_WATCH_SHOW_LOOP_STATUS("key_show_loop_status", R.string.pref_show_loop_status, true);
+    CWF_PREF_WATCH_SHOW_LOOP_STATUS("key_show_loop_status", R.string.pref_show_loop_status, true),
+    CWF_PREF_WATCH_SHOW_WEEK_NUMBER("key_show_week_number", R.string.pref_show_week_number, true);
 
     companion object {
 
@@ -195,6 +197,7 @@ enum class ViewKeys(val key: String, @StringRes val comment: Int) {
     TIMEPERIOD("timePeriod", R.string.cwf_comment_timePeriod),
     DAY_NAME("day_name", R.string.cwf_comment_day_name),
     DAY("day", R.string.cwf_comment_day),
+    WEEKNUMBER("week_number",R.string.cwf_comment_week_number),
     MONTH("month", R.string.cwf_comment_month),
     LOOP("loop", R.string.cwf_comment_loop),
     DIRECTION("direction", R.string.cwf_comment_direction),
@@ -233,7 +236,8 @@ enum class JsonKeys(val key: String) {
     COLOR("color"),
     ALLCAPS("allCaps"),
     DAYNAMEFORMAT("dayNameFormat"),
-    MONTHFORMAT("monthFormat")
+    MONTHFORMAT("monthFormat"),
+    BACKGROUND("background")
 }
 
 enum class JsonKeyValues(val key: String) {

app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml

@@ -34,4 +34,60 @@
     <string name="disconnecting">Afbryder</string>
     <string name="waiting_for_disconnection">Venter på afbrydelse</string>
     <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Oprettet den: %1$s</string>
+    <string name="metadata_label_watchface_author">Forfatter: %1$s</string>
+    <string name="metadata_label_watchface_name">Navn: %1$s</string>
+    <string name="metadata_wear_import_filename">Filnavn: %1$s</string>
+    <string name="metadata_label_plugin_version">Plugin version: %1$s</string>
+    <string name="metadata_label_watchface_name_version">Navn: %1$s (%2$s)</string>
+    <string name="metadata_label_watchface_infos">Oplysning: %1$s</string>
+    <string name="pref_show_iob">Vis IOB</string>
+    <string name="pref_show_detailed_iob">Vis detaljeret IOB</string>
+    <string name="pref_show_cob">Vis COB</string>
+    <string name="pref_show_delta">Vis Delta</string>
+    <string name="pref_show_detailed_delta">Vis detaljeret Delta</string>
+    <string name="pref_show_avgdelta">Show GnsDelta</string>
+    <string name="pref_show_phone_battery">Vis Telefonbatteri</string>
+    <string name="pref_show_rig_battery">Vis Rig-batteri</string>
+    <string name="pref_show_basal_rate">Vis Basalrate</string>
+    <string name="pref_show_loop_status">Vis Loop-status</string>
+    <string name="pref_show_bg">Vis BS</string>
+    <string name="pref_show_bgi">Vis BSI</string>
+    <string name="pref_show_direction_arrow">Vis Retningspil</string>
+    <string name="pref_show_ago">Vis alder</string>
+    <string name="default_custom_watchface_comment">Standard urskive, du kan klikke på EKSPORTÉR URSKIVE-knappen for at generere en skabelon</string>
+    <string name="wear_default_watchface">Standard Urskive</string>
+    <string name="cwf_comment_background">Baggrundsbillede</string>
+    <string name="cwf_comment_chart">Grafer (BS, basal, prognoselinjer...)</string>
+    <string name="cwf_comment_cover_chart">Billede foran graf og bag tekstfelter</string>
+    <string name="cwf_comment_freetext1">Fritekst 1</string>
+    <string name="cwf_comment_freetext2">Fri tekst 2</string>
+    <string name="cwf_comment_freetext3">Fri tekst 3</string>
+    <string name="cwf_comment_freetext4">Fri tekst 4</string>
+    <string name="cwf_comment_iob1">IOB-etiket eller IOB-sum, hvis givet</string>
+    <string name="cwf_comment_iob2">IOB-sum eller (Bolus_IOB|Basal_IOB) hvis givet</string>
+    <string name="cwf_comment_cob1">COB-etiket</string>
+    <string name="cwf_comment_cob2">COB-værdi</string>
+    <string name="cwf_comment_delta">Kort BG-delta</string>
+    <string name="cwf_comment_avg_delta">Gennemsnitlig BG-delta (15min)</string>
+    <string name="cwf_comment_uploader_battery">Telefonbatteri (%)</string>
+    <string name="cwf_comment_rig_battery">Globalt loop batteri (%)</string>
+    <string name="cwf_comment_basalRate">Basalrate</string>
+    <string name="cwf_comment_bgi">BGI-værdi</string>
+    <string name="cwf_comment_time">Tid (TT:MM eller TT:MM:SS)</string>
+    <string name="cwf_comment_hour">Time (TT)</string>
+    <string name="cwf_comment_minute">Minut (MM)</string>
+    <string name="cwf_comment_second">Sekund (SS)</string>
+    <string name="cwf_comment_timePeriod">AM eller PM</string>
+    <string name="cwf_comment_day_name">Navn på ugedag</string>
+    <string name="cwf_comment_day">Dag (DD)</string>
+    <string name="cwf_comment_month">Måned navn (kort)</string>
+    <string name="cwf_comment_loop">Loop status og tid</string>
+    <string name="cwf_comment_direction">Retningspil</string>
+    <string name="cwf_comment_timestamp">Minutter siden sidst modtaget BS</string>
+    <string name="cwf_comment_sgv">BS-værdi</string>
+    <string name="cwf_comment_cover_plate">Dækbillede foran tekst (opkald...)</string>
+    <string name="cwf_comment_hour_hand">Billede af timeviser (Analogur)</string>
+    <string name="cwf_comment_minute_hand">Billede af minutviser (Analogur)</string>
+    <string name="cwf_comment_second_hand">Billede af sekundviser (Analogur)</string>
 </resources>

app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml

@@ -40,6 +40,7 @@
     <string name="metadata_wear_import_filename">Nome file: %1$s</string>
     <string name="metadata_label_plugin_version">Versione plugin: %1$s</string>
     <string name="metadata_label_watchface_name_version">Nome: %1$s (%2$s)</string>
+    <string name="metadata_label_watchface_infos">Info: %1$s</string>
     <string name="pref_show_iob">Mostra IOB</string>
     <string name="pref_show_detailed_iob">Mostra IOB dettagliato</string>
     <string name="pref_show_cob">Mostra COB</string>

app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml

@@ -2,7 +2,12 @@
 <resources>
     <!--    DateUtil-->
     <string name="minago">%1$d 분 전</string>
+    <string name="minago_long">%1$d분 전</string>
     <string name="hoursago">%1$.1f 시간 전</string>
+    <string name="days_ago">%1$.1f일 전</string>
+    <string name="days_ago_round">%1$.0f 일 전</string>
+    <string name="in_days">%1$.0f 일 이내에</string>
+    <string name="in_days_round">%1$.0f 일 이내에</string>
     <string name="shorthour">시간</string>
     <string name="days">일</string>
     <string name="hours">시간</string>
@@ -18,10 +23,70 @@
     <string name="unit_weeks">주</string>
     <string name="shortminute">분</string>
     <string name="shortday">일</string>
+    <string name="later_today">오늘 늦게</string>
+    <string name="tomorrow">내일</string>
+    <string name="today">오늘</string>
+    <string name="yesterday">어제</string>
     <!-- Rx -->
     <string name="connecting_for">%1$d 초 동안 연결중</string>
     <string name="handshaking">통신 확인</string>
     <string name="connected">연결됨</string>
     <string name="disconnecting">연결끊기중</string>
+    <string name="waiting_for_disconnection">연결 해제 대기 중</string>
     <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">생성 시간: %1$s</string>
+    <string name="metadata_label_watchface_author">작성자: %1$s</string>
+    <string name="metadata_label_watchface_name">이름: %1$s</string>
+    <string name="metadata_wear_import_filename">파일 이름: %1$s</string>
+    <string name="metadata_label_plugin_version">플러그인 버전: %1$s</string>
+    <string name="metadata_label_watchface_name_version">이름: %1$s (%2$s)</string>
+    <string name="pref_show_iob">IOB 표시</string>
+    <string name="pref_show_detailed_iob">IOB 자세한 표시</string>
+    <string name="pref_show_cob">COB 표시</string>
+    <string name="pref_show_delta">델타 표시하기</string>
+    <string name="pref_show_detailed_delta">자세한 델타 표시하기</string>
+    <string name="pref_show_avgdelta">평균 델타 표시하기</string>
+    <string name="pref_show_phone_battery">핸드폰 배터리 표시하기</string>
+    <string name="pref_show_rig_battery">리그 베터리 표시하기</string>
+    <string name="pref_show_basal_rate">Basal 값 표시하기</string>
+    <string name="pref_show_loop_status">루프 상태 표시하기</string>
+    <string name="pref_show_bg">BG 표시하기</string>
+    <string name="pref_show_bgi">BGI 표시하기</string>
+    <string name="pref_show_direction_arrow">화살표 표시하기</string>
+    <string name="pref_show_ago">이전 표시하기</string>
+    <string name="default_custom_watchface_comment">기본 시계, 워치페이스 내보내기 버튼을 클릭하여 템플릿을 생성할 수 있습니다.</string>
+    <string name="wear_default_watchface">기본 워치페이스</string>
+    <string name="cwf_comment_background">배경화면 이미지</string>
+    <string name="cwf_comment_chart">그래픽 (혈당, basal, 예측 선...)</string>
+    <string name="cwf_comment_cover_chart">그래프 앞 그리고 문자 필드 뒤 이미지</string>
+    <string name="cwf_comment_freetext1">무료 문자 1</string>
+    <string name="cwf_comment_freetext2">무료 문자 2</string>
+    <string name="cwf_comment_freetext3">무료 문자 3</string>
+    <string name="cwf_comment_freetext4">무료 문자 4</string>
+    <string name="cwf_comment_iob1">자세한 경우 IOB 레이블 또는 IOB 합계</string>
+    <string name="cwf_comment_iob2">자세한 경우 IOB 합계 또는 (Bolus_IOB|Basal_IOB)</string>
+    <string name="cwf_comment_cob1">COB 레이블</string>
+    <string name="cwf_comment_cob2">COB 값</string>
+    <string name="cwf_comment_delta">단기 BG 델타</string>
+    <string name="cwf_comment_avg_delta">평균 BG 델타 (15분)</string>
+    <string name="cwf_comment_uploader_battery">핸드폰 베터리 (%)</string>
+    <string name="cwf_comment_rig_battery">글로벌 루프 베터리 (%)</string>
+    <string name="cwf_comment_basalRate">Basal양</string>
+    <string name="cwf_comment_bgi">BGI 값</string>
+    <string name="cwf_comment_time">시간 (HH:MM 또는 HH:MM:SS)</string>
+    <string name="cwf_comment_hour">시간 (HH)</string>
+    <string name="cwf_comment_minute">분 (MM)</string>
+    <string name="cwf_comment_second">초 (SS)</string>
+    <string name="cwf_comment_timePeriod">오전 또는 오후</string>
+    <string name="cwf_comment_day_name">요일</string>
+    <string name="cwf_comment_day">일 (DD)</string>
+    <string name="cwf_comment_month">월명 (짧게)</string>
+    <string name="cwf_comment_loop">루프 상태 및 이전</string>
+    <string name="cwf_comment_direction">방향 화살표</string>
+    <string name="cwf_comment_timestamp">몇 분 전에 마지막으로 받은 BG</string>
+    <string name="cwf_comment_sgv">BG 값</string>
+    <string name="cwf_comment_cover_plate">문자 앞의 표지 이미지 (다이얼...)</string>
+    <string name="cwf_comment_hour_hand">시침 이미지 (아날로그 시계)</string>
+    <string name="cwf_comment_minute_hand">분침 이미지 (아날로그 시계)</string>
+    <string name="cwf_comment_second_hand">초침 이미지 (아날로그 시계)</string>
 </resources>

app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml

@@ -29,7 +29,7 @@
     <string name="yesterday">Wczoraj</string>
     <!-- Rx -->
     <string name="connecting_for">Łączenie przez %1$d s</string>
-    <string name="handshaking">Uściskdłoni</string>
+    <string name="handshaking">Nawiązywanie połączenia</string>
     <string name="connected">Połączono</string>
     <string name="disconnecting">Rozłączanie</string>
     <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>

app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    DateUtil-->
-    <string name="minago">%1$dm sedan</string>
-    <string name="minago_long">%1$d minuter sedan</string>
     <string name="hoursago">%1$.1f tim sedan</string>
     <string name="days_ago">%1$.1f dagar sedan</string>
     <string name="days_ago_round">%1$.0f dagar sedan</string>

app-wear-shared/shared/src/main/res/values/strings.xml

@@ -62,6 +62,7 @@
     <string name="pref_show_bgi">Show BGI</string>
     <string name="pref_show_direction_arrow">Show Direction Arrow</string>
     <string name="pref_show_ago">Show Ago</string>
+    <string name="pref_show_week_number">Show Week number</string>
     <string name="default_custom_watchface_comment">Default watchface, you can click on EXPORT WATCHFACE button to generate a template</string>
     <string name="wear_default_watchface">Default Watchface</string>
     <string name="cwf_comment_background">Background image</string>
@@ -88,12 +89,13 @@
     <string name="cwf_comment_timePeriod">AM or PM</string>
     <string name="cwf_comment_day_name">Name of day of the week</string>
     <string name="cwf_comment_day">Day (DD)</string>
+    <string name="cwf_comment_week_number">Week number (ww)</string>
     <string name="cwf_comment_month">Month name (short)</string>
     <string name="cwf_comment_loop">Loop status and ago</string>
     <string name="cwf_comment_direction">Direction arrow</string>
     <string name="cwf_comment_timestamp">Mintutes ago for last received BG</string>
     <string name="cwf_comment_sgv">BG value</string>
-    <string name="cwf_comment_cover_plate">Cover image in front of text (dials...)</string>
+    <string name="cwf_comment_cover_plate">Cover image in front of text (dials…)</string>
     <string name="cwf_comment_hour_hand">Image of hour hand (Analog Watch)</string>
     <string name="cwf_comment_minute_hand">Image of minute hand (Analog Watch)</string>
     <string name="cwf_comment_second_hand">Image of second hand (Analog Watch)</string>

app/build.gradle

@@ -184,7 +184,6 @@ dependencies {
     implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:main')
-    implementation project(':core:graph')
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:libraries')

app/src/main/res/values-ko-rKR/strings.xml

@@ -33,6 +33,8 @@
     <string name="enable_carbs_req_alert">탄수화물이 요구되는 경우 경고함</string>
     <string name="open_navigation">메뉴 열기</string>
     <string name="close_navigation">메뉴 닫기</string>
+    <string name="remove_items">항목 제거하기</string>
+    <string name="sort_items">항목 분류하기</string>
     <string name="error_adding_treatment_title">관리 데이터가 불완전합니다</string>
     <string name="error_adding_treatment_message">관리 데이터 (인슐린: %1$.2f, 탄수화물: %2$d, at: %3$s) 가 추가되지 못하였습니다. 확인해본 다음 적절한 데이터를 수동으로 입력하세요..</string>
     <string name="generated_ecarbs_note">확장탄수화물: %1$d g (%2$d 시간), 지연: %3$d 분</string>
@@ -42,8 +44,17 @@
     <string name="clearqueueconfirm">대기열을 삭제하시겠습니까? 대기열에 있는 모든 데이터가 삭제됩니다!</string>
     <string name="chartmenu">차트 메뉴</string>
     <string name="authorizationfailed">인증 실패</string>
+    <string name="copytolocalprofile_invalid">프로필을 생성하지 못했습니다. 프로필이 유효하지 않습니다.</string>
     <string name="clear_filter">필터 지우기</string>
     <string name="cannula">캐뉼라</string>
     <string name="email_address">이메일 주소</string>
+    <string name="remove_bg_readings">BG 판독 제거하기</string>
+    <string name="identification_not_set">개발 모드에서 신원 확인이 설정되지 않았습니다.</string>
+    <string name="a11y_dialog">대화 상자</string>
     <!-- WEAR OS-->
+    <string name="wear_unknown_action_string">알 수 없는 작업 명령:</string>
+    <string name="remove_selected_items">선택된 항목 제거하기</string>
+    <string name="count_selected">%1$d 선택됨</string>
+    <string name="sort_label">분류</string>
+    <string name="search">검색</string>
 </resources>

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

@@ -7,11 +7,10 @@
     <string name="nav_refreshtreatments">Синхронизировать назначения с NS</string>
     <string name="nav_exit">Выход</string>
     <string name="delta">изменение</string>
-    <string name="profile_label">профиль</string>
+    <string name="profile_label">Профиль</string>
     <string name="save">Сохранить</string>
     <string name="reloadprofile">обновить профиль</string>
-    <string name="correctionbous">коррекция</string>
-    <string name="ns_upload_only">(ОТКЛЮЧЕНИЕ ОПАСНО) Только загрузка в NS</string>
+    <string name="correctionbous">Коррекция</string>
     <string name="ns_upload_only_summary">Только загрузка в NS (синхронизация отключена). Не влияет на данные мониторинга если не выбран локальный источник, такой как xDrip. Профили, иные чем профиль NS не действуют.\n!!! ПРЕДУПРЕЖДЕНИЕ !!! Отключение этой опции может привести к сбою и передозировке инсулина, если какой-либо из компонентов (AAPS, NS, xDrip) настроен неправильно. Внимательно следите за тем, чтобы данные соответствовали состоянию помпы!</string>
     <string name="wear">Смарт-часы Wear</string>
     <string name="nav_about">о приложении</string>

build.gradle

@@ -62,7 +62,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.1.1'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
 
         // NOTE: Do not place your application dependencies here; they belong

core/graph/.gitignore

@@ -1 +0,0 @@
-/build

core/graph/build.gradle

@@ -1,27 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlin-parcelize'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-dependencies {
-    implementation project(':core:graphview')
-    implementation project(':app-wear-shared:shared')
-    implementation project(':database:entities')
-    implementation project(':core:interfaces')
-    implementation project(':core:ui')
-
-    api "com.google.android.material:material:$material_version"
-}
-
-android {
-    namespace 'info.nightscout.core.graph'
-}

core/graph/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

core/graph/src/main/AndroidManifest.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>

core/interfaces/src/main/java/info/nightscout/interfaces/pump/DetailedBolusInfo.kt

@@ -5,6 +5,7 @@ import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
 import info.nightscout.database.entities.TherapyEvent
+import info.nightscout.database.entities.embedments.InterfaceIDs
 import info.nightscout.interfaces.pump.defs.PumpType
 
 class DetailedBolusInfo {
@@ -97,6 +98,9 @@ class DetailedBolusInfo {
             glucoseType = glucoseType?.toDbMeterType()
         )
 
+    /**
+     * Used for create record going directly to db (record only)
+     */
     fun createBolus(): Bolus =
         if (insulin != 0.0)
             Bolus(
@@ -104,6 +108,7 @@ class DetailedBolusInfo {
                 amount = insulin,
                 type = bolusType.toDBbBolusType(),
                 notes = notes,
+                interfaceIDs_backing = InterfaceIDs(pumpId = timestamp)
             )
         else throw IllegalStateException("insulin == 0.0")
 
@@ -113,7 +118,7 @@ class DetailedBolusInfo {
                 timestamp = carbsTimestamp ?: timestamp,
                 amount = carbs,
                 duration = carbsDuration,
-                notes = notes,
+                notes = notes
             )
         else throw IllegalStateException("carbs == 0.0")
 

core/interfaces/src/main/res/values-ko-rKR/strings.xml

@@ -14,6 +14,7 @@
     <!--    PumpType-->
     <string name="def_extended_note">* 가상 펌프에서는 Basal/Bolus에 대해 범위로 지정이 될 수 없고, 이산값(discrete values)만 지원 됩니다.</string>
     <!-- PumpPluginBase -->
+    <string name="pump_driver_changed" comment="26 characters max for translation">펌프 드라이버가 변경되었습니다.</string>
     <!--    DecimalFormatter-->
     <string name="format_insulin_units1">%1$.1f U</string>
     <string name="format_insulin_units">%1$.2f U</string>

core/main/build.gradle

@@ -15,7 +15,7 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 dependencies {
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':core:graph')
+    implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
@@ -28,6 +28,7 @@ dependencies {
 
     api "androidx.activity:activity-ktx:$activity_version"
     api "androidx.appcompat:appcompat:$appcompat_version"
+    api "com.google.android.material:material:$material_version"
 
     api "com.google.dagger:dagger-android:$dagger_version"
     api "com.google.dagger:dagger-android-support:$dagger_version"

core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt

@@ -2,7 +2,7 @@ package info.nightscout.core.graph.data
 
 import android.content.Context
 import android.graphics.Paint
-import info.nightscout.core.graph.R
+import info.nightscout.core.main.R
 import info.nightscout.database.entities.Carbs
 import info.nightscout.shared.interfaces.ResourceHelper
 

core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java

@@ -17,7 +17,7 @@ import com.jjoe64.graphview.series.BaseSeries;
 
 import java.util.Iterator;
 
-import info.nightscout.core.graph.R;
+import info.nightscout.core.main.R;
 
 /**
  * Series that plots the data as points.

core/ui/src/main/res/values-el-rGR/strings.xml

@@ -326,6 +326,7 @@
     <string name="uel_error_dialog_mute">ΠΑΡΑΘΥΡΟ ΣΦΑΛΜΑΤΟΣ ΣΙΓΑΣΗ </string>
     <string name="uel_error_dialog_mute_5min">ΠΑΡΑΘΥΡΟ ΣΦΑΛΜΑΤΟΣ ΣΙΓΑΣΗ 5ΛΕΠΤΑ</string>
     <string name="uel_objective_started">ΕΝΑΡΞΗ ΣΤΟΧΟΥ</string>
+    <string name="uel_objective_unstarted">Ο ΣΤΟΧΟΣ ΔΕΝ ΕΧΕΙ ΞΕΚΙΝΗΣΕΙ</string>
     <string name="uel_objectives_skipped">ΠΑΡΑΛΗΨΗ ΣΤΟΧΟΥ</string>
     <string name="uel_stat_reset">ΕΠΑΝΑΦΟΡΑ ΣΤΑΤΙΣΤΙΚΩΝ</string>
     <string name="uel_delete_logs">ΔΙΑΓΡΑΦΗ ΚΑΤΑΓΡΑΦΩΝ</string>

core/ui/src/main/res/values-ko-rKR/protection.xml

@@ -6,13 +6,26 @@
     <string name="application_protection">애플리케이션 보안</string>
     <string name="bolus_protection">Bolus 보안</string>
     <string name="settings_password">설정 비밀번호</string>
+    <string name="settings_pin">설정 PIN</string>
     <string name="application_password">애플리케이션 비밀번호</string>
+    <string name="application_pin">투여 PIN</string>
     <string name="bolus_password">Bolus 비밀번호</string>
+    <string name="bolus_pin">Bolus PIN</string>
+    <string name="protection_timeout_title">암호 및 PIN 보존 [s]</string>
+    <string name="protection_timeout_summary">암호 또는 PIN을 입력하기 전까지의 시간</string>
     <string name="biometric">생체 인식</string>
     <string name="custom_password">사용자 지정 비밀번호</string>
+    <string name="custom_pin">사용자 지정 PIN</string>
     <string name="noprotection">보안 없음</string>
+    <string name="unsecure_fallback_biometric">안전하지 않은 대비책</string>
+    <string name="unsecure_fallback_descriotion_biometric">생체 인식 보호를 효율적으로 사용하려면, 대비책을 위한 마스터 암호가 설정되어 있어야 합니다. \n\n 마스터 암호를 설정하십시오!</string>
     <string name="password_set">비밀번호가 설정되었습니다!</string>
+    <string name="pin_set">PIN 설정!</string>
     <string name="password_not_set">비밀번호가 설정되지 않았습니다.</string>
+    <string name="pin_not_set">PIN이 설정되지 않음</string>
     <string name="password_not_changed">비밀번호가 변경되지 않았습니다.</string>
+    <string name="pin_not_changed">PIN이 변경되지 않음</string>
+    <string name="pin_cleared">PIN이 제거됨!</string>
     <string name="password_hint">여기에 비밀번호를 입력하세요</string>
+    <string name="pin_hint">이곳에 PIN을 입력하세요</string>
 </resources>

core/ui/src/main/res/values-ko-rKR/strings.xml

@@ -14,6 +14,7 @@
     <string name="pump_base_basal_rate">%1$.2f U/h</string>
     <string name="pump_not_initialized_profile_not_set">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <string name="failed_update_basal_profile">Basal 프로파일 갱신 실패</string>
+    <string name="bolus_delivered_successfully">Bolus %1$.2f U이 성공적으로 주입되었습니다</string>
     <string name="no_valid_basal_rate">펌프에서 유효한 Basal양을 읽을 수 없습니다.</string>
     <string name="limiting_iob">%2$s로 인해 IOB가 %1$.1f U으로 제한됩니다.</string>
     <string name="loop_disabled">제한으로 인해 LOOP가 사용불가합니다.</string>
@@ -44,12 +45,15 @@
     <string name="mute5min">5분 동안 음소거</string>
     <string name="mute">음소거</string>
     <string name="success">성공</string>
-    <string name="extendedbolusdeliveryerror">확장Bolus 주입 에러</string>
+    <string name="advanced_settings_title">고급 설정</string>
+    <string name="extendedbolusdeliveryerror">확장 Bolus 주입 에러</string>
+    <string name="aps_mode_title">APS 모드</string>
     <string name="extended_bolus">확장 Bolus</string>
     <string name="paused">일시중지</string>
     <string name="tdd_total">TDD Total</string>
     <string name="goingtodeliver">%1$.2f U을 주입합니다.</string>
     <string name="waitingforpump">펌프를 기다리는 중</string>
+    <string name="androidaps_start">AAPS 시작</string>
     <string name="formatsignedinsulinunits">%1$+.2f U</string>
     <string name="format_carbs">%1$d g</string>
     <string name="format_hours">%1$.2f 시간</string>
@@ -58,6 +62,8 @@
     <string name="please_wait">잠시 기다려 주세요...</string>
     <string name="stop">정지</string>
     <string name="carbs">탄수화물</string>
+    <string name="invalid_profile">유효하지 않은 프로파일!</string>
+    <string name="no_profile_set">프로파일 설정되지 않음</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="date">날짜</string>
     <string name="units_label">단위</string>
@@ -66,7 +72,11 @@
     <string name="isf_label">인슐린 민감도(ISF):</string>
     <string name="basal_label">Basal</string>
     <string name="target_label">목표:</string>
+    <string name="dia_long_label">인슐린 지속 시간</string>
+    <string name="ic_long_label">인슐린 대 탄수화물 비율</string>
+    <string name="isf_long_label">인슐린 민감도</string>
     <string name="basal_long_label">Basal양</string>
+    <string name="target_long_label">혈당 목표치</string>
     <string name="shortgram">g</string>
     <string name="shortpercent">%</string>
     <string name="bluetooth">블루투스</string>
@@ -96,20 +106,33 @@
     <string name="loading">로딩 중 …</string>
     <string name="notes_label">노트</string>
     <string name="remove_button">삭제</string>
+    <string name="add_new">새로 추가하기</string>
+    <string name="addnew_above">위에 새로 추가하기</string>
     <string name="wrong_pump_data">다른 펌프에서 전송된 데이터. 펌프 상태 재설정을 위해 펌프 드라이버를 바꾸세요.</string>
     <string name="bg_label">혈당</string>
     <string name="calibration">보정</string>
     <string name="alarminxmin">%1$d분 뒤 알람 울림</string>
+    <string name="treatmentdeliveryerror">Bolus가 오류를 보고했습니다. 수동으로 실제 투여된 양을 확인합니다.</string>
+    <string name="bolus_reminder">BOLUS 알림</string>
     <string name="duration_label">기간</string>
     <string name="shortgramm">g</string>
     <string name="pumpsuspended">펌프 일시중지됨</string>
     <string name="notconfigured">설정되지 않음</string>
     <string name="loopsuspended">Loop 일시중지</string>
     <string name="trend_arrow">경향 화살표</string>
+    <string name="a11y_autosens_label">자동 감지</string>
     <string name="required">필요량</string>
+    <string name="a11y_arrow_double_down">급속 하락</string>
+    <string name="a11y_arrow_single_down">하락</string>
+    <string name="a11y_arrow_forty_five_down">저속 하락</string>
+    <string name="a11y_arrow_flat">안정된</string>
+    <string name="a11y_arrow_forty_five_up">저속 상승</string>
+    <string name="a11y_arrow_single_up">상승</string>
+    <string name="a11y_arrow_double_up">고속 상승</string>
     <string name="a11y_arrow_none">없음</string>
     <string name="a11y_arrow_unknown">알수없음</string>
     <string name="a11y_high">대</string>
+    <string name="a11y_inrange">범위 내</string>
     <string name="a11y_low">소</string>
     <string name="average">평균</string>
     <string name="tir">TIR</string>
@@ -119,7 +142,10 @@
     <string name="reset">재설정</string>
     <string name="profileswitch_ismissing">프로파일변경 누락. 로컬 프로파일에서 프로파일 변경을 하거나 \"프로파일 활성화하기\"를 누르세요.</string>
     <string name="profile">프로파일</string>
+    <string name="select_for_removal">제거할 항목 선택하기</string>
+    <string name="confirm_remove_multiple_items">정말로 %1$d 항목을 제거하시겠습니까?</string>
     <string name="overview_treatment_label">관리</string>
+    <string name="copytolocalprofile">이 프로파일에서 새로운 프로파일을 생성하시겠습니까?</string>
     <string name="wear_wizard_settings">마법사 설정</string>
     <string name="bg_trend_label">15분 추이</string>
     <string name="treatments_wizard_cob_label">COB</string>
@@ -127,6 +153,7 @@
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="invalid">유효하지 않음</string>
     <string name="login">로그인</string>
+    <string name="prime_fill">프라임/채우기</string>
     <string name="overview_insulin_label">인슐린</string>
     <string name="stoptemptarget">임시 목표 중지</string>
     <string name="closedloop">Closed Loop</string>
@@ -135,13 +162,19 @@
     <string name="dia">DIA</string>
     <string name="ic_short">IC</string>
     <string name="isf_short">ISF</string>
+    <string name="canceling_tbr_failed">임시 basal 취소 실패</string>
+    <string name="canceling_eb_failed">확장 Bolus 취소 실패</string>
+    <string name="virtualpump_uploadstatus_title">NS에 펌프상태 업로드하기</string>
     <string name="suspendloop_label">중지 또는 일시중지된 loop</string>
     <string name="iob_label">활성 인슐린 (IOB)</string>
     <!--    Protection-->
     <string name="wrongpassword">잘못된 비밀번호</string>
+    <string name="wrongpin">잘못된 PIN</string>
     <string name="passwords_dont_match">비밀번호가 일치하지 않습니다.</string>
+    <string name="pin_dont_match">PIN이 일치하지 않습니다</string>
     <!--    Profile-->
     <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
+    <string name="minimalbasalvaluereplaced">지원되는 최대 값으로 Basal 값이 대체되었습니다: %1$s</string>
     <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
@@ -149,6 +182,7 @@
     <!--    ProfileFunction-->
     <string name="startprofile">프로파일 %1$d%%을 %2$d 분 동안 시작</string>
     <!--    APSResult-->
+    <string name="cancel_temp">임시 basal 취소하기</string>
     <string name="let_temp_basal_run">임시Basal 허용</string>
     <string name="rate">주입량</string>
     <string name="duration">기간</string>
@@ -166,18 +200,27 @@
     <string name="careportal_note">노트</string>
     <string name="careportal_question">의문</string>
     <string name="careportal_exercise">운동</string>
+    <string name="careportal_announcement_message">알림 : %1$s</string>
+    <string name="careportal_note_message">노트 : %1$s</string>
+    <string name="careportal_question_message">질문 : %1$s</string>
+    <string name="careportal_exercise_message">운동 : %1$s</string>
+    <string name="careportal_pump_site_change">펌프 위치 변경</string>
+    <string name="cgm_sensor_insert">CGM 센서 삽입</string>
     <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
     <string name="careportal_cgm_sensor_stop">CGM 센서 정지</string>
     <string name="careportal_dad_alert">D.A.D 경고</string>
+    <string name="careportal_insulin_cartridge_change">인슐린 카트리지 교체</string>
     <string name="careportal_profileswitch">프로파일 변경</string>
-    <string name="careportal_snackbolus">간식Bolus</string>
-    <string name="careportal_mealbolus">Meal Bolus</string>
-    <string name="careportal_correctionbolus">교정Bolus</string>
-    <string name="careportal_combobolus">콤보Bolus</string>
+    <string name="careportal_snackbolus">간식 Bolus</string>
+    <string name="careportal_mealbolus">식사 Bolus</string>
+    <string name="careportal_correctionbolus">교정 Bolus</string>
+    <string name="careportal_combobolus">콤보 Bolus</string>
     <string name="careportal_tempbasalstart">임시Basal 시작</string>
     <string name="careportal_tempbasalend">임시Basal 종료</string>
     <string name="careportal_carbscorrection">탄수화물 교정</string>
     <string name="careportal_openapsoffline">OpenAPS 오프라인</string>
+    <string name="pump_battery_change">펌프 배터리 교체</string>
+    <string name="temporary_target">임시 목표</string>
     <string name="careportal_temporarytargetvalue">임시 목표 수치</string>
     <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
     <string name="boluswizard">Bolus 마법사</string>
@@ -204,7 +247,9 @@
     <string name="waitingforpumpresult">결과 기다리는 중</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%2$d 분 내에 %1$d g의 추가적인 탄수화물이 필요함</string>
     <!--    TDDStatsActivity-->
+    <string name="cumulative_tdd">누적 TDD</string>
     <string name="expweight">지수가중 일총량</string>
     <string name="basalrate">Basal</string>
     <string name="bolus">Bolus</string>
@@ -213,13 +258,15 @@
     <string name="amount_days">#일</string>
     <string name="weight">가중</string>
     <string name="warning_Message">교체/채움을 위해 Bolus를 사용한 경우 부정확할 수 있습니다!!</string>
+    <string name="olddata_Message">이전 데이터, \"다시 로딩하기\"를 누르세요</string>
     <string name="tbb">총 기본 Basal</string>
     <string name="tbb2">총기초량 * 2</string>
     <!--    Ntp-->
     <string name="timedetection">시간 감지</string>
     <!-- User Entry -->
     <string name="uel_bolus">Bolus</string>
-    <string name="uel_bolus_advisor">Bolus 어드바이저</string>
+    <string name="uel_bolus_calculator">BOLUS 계산기</string>
+    <string name="uel_bolus_advisor">Bolus 조언자</string>
     <string name="uel_extended_bolus">확장 bolus</string>
     <string name="uel_superbolus_tbr">Superbolus TBR</string>
     <string name="uel_carbs">탄수화물</string>
@@ -284,9 +331,11 @@
     <string name="uel_stat_reset">통계 재설정</string>
     <string name="uel_delete_logs">로그 지우기</string>
     <string name="uel_delete_future_treatments">이후의 처치 지우기</string>
+    <string name="delete_future_treatments">향후 치료 삭제하기</string>
     <string name="uel_export_settings">설정 내보내기</string>
     <string name="uel_import_settings">설정 들여오기</string>
     <string name="uel_reset_databases">데이터베이스 재설정</string>
+    <string name="uel_cleanup_databases">데이터베이스 정리하기</string>
     <string name="uel_export_databases">데이터베이스 내보내기</string>
     <string name="uel_import_databases">데이터베이스 들여오기</string>
     <string name="uel_otp_export">OTP 내보내기</string>
@@ -323,29 +372,123 @@
     <string name="value_out_of_hard_limits">»%1$s« %2$.2f이 \'고정된 한계값\'을 벗어났습니다.</string>
     <string name="basal_value">Basal 값</string>
     <!-- Command Queue + readStatus reasons -->
+    <string name="bolus_u_min">BOLUS %1$.2f U</string>
+    <string name="carbs_g">탄수화물 %1$d g</string>
+    <string name="extended_bolus_u_min">확장 BOLUS %1$.2f U %2$d 분</string>
+    <string name="load_events">이벤트 로딩하기</string>
+    <string name="clear_alarms">알람 제거하기</string>
+    <string name="deactivate">비활성화</string>
+    <string name="update_time">시간 업데이트</string>
+    <string name="load_history">기록 로딩하기 %1$d</string>
+    <string name="load_tdds">TDDs 로딩하기</string>
+    <string name="set_profile">프로파일 설정하기</string>
+    <string name="set_user_settings">사용자 설정 설정하기</string>
+    <string name="smb_bolus_u">SMB BOLUS %1$.2f U</string>
+    <string name="start_pump">펌프 시작하기</string>
+    <string name="stop_pump">펌프 중지하기</string>
+    <string name="temp_basal_absolute">임시 BASAL %1$.2f U/h %2$d 분</string>
+    <string name="temp_basal_percent">임시 BASAL %1$d%% %2$d 분</string>
+    <string name="insight_set_tbr_over_notification">알림에 대한 인식 설정 TBR</string>
+    <string name="read_status" comment="10 characters max for READSTATUS translation">상태 읽기 %1$s</string>
+    <string name="keepalive_status_outdated" comment="26 characters max for translation">계속 살아있습니다. 상태가 오래되었습니다.</string>
+    <string name="keepalive_basal_outdated" comment="26 characters max for translation">계속 살아있습니다. Basal가 오래되었습니다.</string>
     <string name="sms" comment="26 characters max for translation">SMS</string>
     <string name="formatPercent">%1$.0f%%</string>
     <string name="basal">Basal</string>
     <string name="basalpct">Basal %</string>
+    <string name="a11y_file">파일</string>
     <string name="a11y_user">사용자</string>
     <!-- Autotune -->
+    <string name="autotune">Autotune</string>
+    <string name="autotune_description">프로파일의 잠재적 조정 (ISF, 탄수화물 비율 및 basal 비율) 에 대한 도움</string>
+    <string name="autotune_shortname">AT</string>
+    <string name="autotune_settings">Autotune 설정</string>
+    <string name="autotune_auto_title">자동 프로파일 전환</string>
+    <string name="autotune_auto_summary">옵션이 활성화되면, 자동화 규칙에서 계산한 후 Autotune이 자동으로 업데이트되고 입력 프로파일로 전환됩니다.</string>
+    <string name="autotune_categorize_uam_as_basal_title">UAM을 Basal로 분류하기</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_additional_log_summary">개발자가 Autotune 플러그인의 디버깅을 지원하기 위해 로그 정보를 더 보내도록 요청한 경우에만 활성화됩니다</string>
+    <string name="autotune_default_tune_days_summary">Autotune 에서 처리할 기본 데이터 일수 (최대 30일)</string>
+    <string name="autotune_tunedprofile_name">조정된</string>
+    <string name="autotune_profile">프로파일 :</string>
+    <string name="autotune_tune_days">조정 일수 :</string>
+    <string name="autotune_last_run">최근 실행 :</string>
+    <string name="autotune_warning">경고 :</string>
+    <string name="autotune_select_profile">조정할 프로파일 선택하기</string>
+    <string name="autotune_ic_warning">선택한 프로파일의 IC 값은 %1$d 입니다. Autotune은 %2$.2f g/U을 사용합니다.</string>
+    <string name="autotune_isf_warning">선택한 프로파일의 ISF 값은 %1$d 입니다. Autotune은 %2$.1f %3$s/U을 사용합니다.</string>
+    <string name="autotune_error">입력 데이터에서 오류가 발생했습니다. 다시 Autotune하거나, 일수를 줄이십시오</string>
+    <string name="autotune_error_more_days">입력 데이터에서 오류가 발생했습니다, 일수를 증가시키십시오</string>
+    <string name="autotune_warning_during_run">Autotune 계산이 시작되었습니다, 잠시 기다려 주십시오</string>
+    <string name="autotune_warning_after_run">사용하기 전에 결과를 주의 깊게 확인하세요!</string>
+    <string name="autotune_partial_result">부분 결과 날짜 %1$d / %2$d 조정됨</string>
     <string name="autotune_result">결과: %1$s</string>
+    <string name="autotune_param">매개변수</string>
+    <string name="autotune_percent">%</string>
     <string name="autotune_missing">누락</string>
+    <string name="autotune_profile_name">Autotune 프로파일 %1$s</string>
+    <string name="autotune_run">Autotune 실행하기</string>
+    <string name="autotune_check_input_profile_button">입력 프로파일 확인하기</string>
     <string name="autotune_compare_profile">프로파일 비교하기</string>
+    <string name="autotune_copy_localprofile_button">로컬 프로파일로 복사하기</string>
+    <string name="autotune_update_input_profile_button">입력 프로파일 확인하기</string>
+    <string name="autotune_revert_input_profile_button">입력 프로파일 되돌리기</string>
+    <string name="autotune_copy_local_profile_message">Autotune 프로파일에서 새로운 로컬 프로파일을 생성하시겠습니까?</string>
+    <string name="autotune_update_local_profile_message">Autotune 프로파일에서 %1$s 프로파일을 업데이트 하시겠습니까?</string>
+    <string name="autotune_revert_local_profile_message">입력 프로파일과 함께 %1$s 프로파일을 되돌리시겠습니까?</string>
+    <string name="autotune_profile_invalid">프로파일이 잘못되었습니다</string>
+    <string name="autotune_run_without_autoswitch">프로파일 변경 없이 Autotune이 실행되었습니다</string>
+    <string name="autotune_run_with_autoswitch">Autotune 및 프로파일 자동 전환이 실행되었습니다</string>
+    <string name="autotune_run_with_error">마지막 Autotune 실행시 오류가 발생했습니다</string>
+    <string name="autotune_run_cancelled">Autotune의 또 다른 실행이 감지되었습니다, 실행이 취소되었습니다</string>
     <!-- Alerts -->
     <string name="raise_notifications_as_android_notifications">경고와 알림시 시스템 알림 사용하기</string>
     <string name="urgent_alarm">긴급 알람</string>
     <string name="info">정보</string>
     <!-- BolusWizard -->
+    <string name="bolus_advisor">Bolus 조언자</string>
+    <string name="bolus_advisor_message">현재 높은 혈당을 가지고 있습니다. 지금 먹는 대신 더 나은 혈당을 기다리는 게 좋습니다. 지금 교정bolus 을 진행하고, 식사 시간을 알려드릴까요? 이 경우 탄수화물은 기록되지 않으며, 다시 알림을 줄 때 마법사를 다시 사용해야 합니다.</string>
     <string name="cobvsiob">COB vs IOB</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
     <string name="partialboluswizard">Bolus 마법사 결과의 이 부분 주입[%]</string>
+    <string name="partialboluswizard_reset_time">이전 혈당 시간 임계값 [min]</string>
+    <string name="bolus_constraint_applied_warn">적용된 Bolus 제약 조건: %1$.2f U 에서 %2$.2f U</string>
+    <string name="bolus_recorded_only">Bolus는 이 경우(펌프를 통해 공급되지 않음) 에만 기록됩니다</string>
     <string name="advisoralarm">식사 시간이 되면 알람을 울리기</string>
     <string name="no_action_selected">선택한 실행이 없습니다. 아무런 실행이 되지 않습니다.</string>
+    <string name="wizard_no_actual_bg">기저 계산에는 최근 BG가 없습니다!</string>
+    <string name="wizard_no_active_profile">활성화된 프로파일 설정이 없습니다!</string>
+    <string name="wizard_no_cob">알 수 없는 COB입니다! BG 판독이 누락되었거나, 최근 앱을 다시 시작하였습니까?</string>
+    <string name="wizard_carbs_constraint">탄수화물 제한 위반!</string>
+    <string name="wizard_explain_calc">계산 (IC: %1$.1f, ISF: %2$.1f)</string>
+    <string name="wizard_explain_carbs">탄수화물: %1$.2fU</string>
+    <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fU</string>
+    <string name="wizard_explain_bg">BG: %1$.2fU</string>
+    <string name="wizard_explain_iob">IOB: %1$.2fU</string>
+    <string name="wizard_explain_superbolus">Superbolus: %1$.2fU</string>
+    <string name="wizard_explain_trend">15\' 트렌드: %1$.2fU</string>
+    <string name="wizard_explain_percent">퍼센트: %1$.2fU x %2$d%% ≈ %3$.2fU</string>
+    <string name="wizard_constraint_bolus_size">인슐린 제약 위반!\n %1$.2fU을 전달할 수 없습니다</string>
+    <string name="wizard_explain_tt">임시T: %1$s</string>
+    <string name="wizard_explain_tt_to">%1$s 에서 %2$s</string>
+    <string name="wizard_pump_not_available">이용가능한 펌프가 없습니다!</string>
+    <string name="quickwizard">빠른 마법사 실행</string>
     <!--    Preferences-->
+    <string name="child">어린이</string>
     <string name="teenage">청소년</string>
     <string name="adult">성인</string>
+    <string name="resistant_adult">인슐린 저항성을 나타내는 어른</string>
     <string name="pregnant">임신 중</string>
+    <string name="patient_age_summary">안전한 제한 설정을 위해 환자 유형을 선택하십시오</string>
+    <string name="max_bolus_title">최대 허용 bolus [U]</string>
+    <string name="max_carbs_title">최대 허용 탄수화물 [g]</string>
+    <string name="patient_type">환자 유형</string>
     <!--    Protection-->
     <string name="unlock_settings">설정 잠금해제</string>
     <!--    Pumps -->
@@ -359,11 +502,16 @@
     <string name="serial_number">시리얼번호</string>
     <string name="disconnected">연결 끊김</string>
     <string name="connecting">연결중</string>
+    <string name="clicked_connect_to_pump" comment="26 characters max for translation">펌프를 연결하기 위해 클릭하기</string>
     <string name="reservoir_value">%1$.0f / %2$d U</string>
     <string name="daily_units">일 인슐린 총량</string>
+    <string name="pump_icon">펌프 아이콘</string>
     <string name="view_profile">프로파일 보기</string>
     <string name="pump_history">펌프 이력</string>
     <string name="stats">통계</string>
+    <string name="pump_driver_change" comment="26 characters max for translation">펌프 드라이버가 교체되었습니다.</string>
+    <string name="device_changed" comment="26 characters max for translation">장치가 교체되었습니다</string>
+    <string name="bolus_ok" comment="26 characters max for translation">Bolus OK</string>
     <string name="temp_basal_delivery_error">임시Basal 주입 에러</string>
     <string name="not_set_short">설정되지 않음</string>
     <string name="pump_busy">펌프가 바쁩니다</string>
@@ -391,11 +539,17 @@
     <!-- TwoMessagesDialog -->
     <string name="password_preferences_decrypt_prompt">내보낸 preferences를 가져오기 위해서는 마스터 비밀번호가 필요합니다.</string>
     <!-- NumberPicker -->
+    <string name="a11y_min_button_description">%1$s을 %2$s만큼 감소하였습니다</string>
+    <string name="a11y_plus_button_description">%1$s을 %2$s만큼 증가하였습니다</string>
+    <string name="you_are_on_allowed_limit">허용된 제한에 도달했습니다</string>
     <string name="format_hour_minute">%1$d시 %2$d분</string>
     <!-- datetime layout -->
     <string name="event_time_label">이벤트 시간</string>
     <!-- BluetoothDevicePreference -->
+    <string name="need_connect_permission">어플리케이션에 블루투스 권한이 필요합니다</string>
     <!--    Combo-->
+    <string name="user_request" comment="26 characters max for translation">사용자 요청</string>
+    <string name="pump_paired" comment="26 characters max for translation">펌프 연결됨</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">BLE(블루투스 저전력) 지원되지 않음</string>
     <string name="ble_not_supported_or_not_paired">저전력 블루투스(BLE)가 작동하지 않거나, 기기가 연동되지 않았습니다.</string>
@@ -407,6 +561,9 @@
     <!-- SmsCommunicator -->
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <!-- About -->
+    <string name="cta_dont_kill_my_app_info">앱이 종료되지 않도록 해야합니다?</string>
+    <string name="fabric_upload_disabled">충돌 로그 업로드가 작동되지 않습니다!</string>
+    <string name="about_link_urls">\n\n문서:\nhttps://wiki.aaps.app\n\nFacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <plurals name="days">
         <item quantity="other">%1$d 일</item>
     </plurals>
@@ -417,4 +574,7 @@
         <item quantity="other">%1$d 분</item>
     </plurals>
     <!--    Maintenance-->
+    <string name="cleanup_db_confirm">데이터베이스를 정리하시겠습니까?\n3개월 이상 경과한 추적된 변경 내용 및 기록 데이터가 제거됩니다.</string>
+    <string name="cleanup_db_confirm_sync">데이터베이스를 정리하시겠습니까?\n3개월 이상 경과한 추적된 변경 내용 및 기록 데이터가 제거됩니다.\n이 작업을 수행하면 전체 동기화 속도가 크게 향상됩니다.</string>
+    <string name="cleared_entries">입력된 내용 제거됨</string>
 </resources>

core/utils/src/main/res/values-ko-rKR/strings.xml

@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="count_selected">%1$d 선택됨</string>
+    <string name="remove_items">항목 제거하기</string>
+    <string name="sort_items">항목 분류하기</string>
+    <string name="remove_selected_items">선택된 항목 제거하기</string>
+    <string name="sort_label">분류</string>
+</resources>

crowdin.yml

@@ -37,8 +37,8 @@ files:
     translation: /plugins/sync/src/main/res/values-%android_code%/oh_strings.xml
   - source: /plugins/constraints/src/main/res/values/strings.xml
     translation: /plugins/constraints/src/main/res/values-%android_code%/strings.xml
-  - source: /core/graph/src/main/res/values/strings.xml
-    translation: /core/graph/src/main/res/values-%android_code%/strings.xml
+  - source: /core/main/src/main/res/values/strings.xml
+    translation: /core/main/src/main/res/values-%android_code%/strings.xml
   - source: /core/interfaces/src/main/res/values/strings.xml
     translation: /core/interfaces/src/main/res/values-%android_code%/strings.xml
   - source: /core/utils/src/main/res/values/strings.xml

implementation/build.gradle

@@ -19,7 +19,6 @@ dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:main')
-    implementation project(':core:graph')
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:ui')

implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt

@@ -39,7 +39,7 @@ class CommandBolus(
 
     override fun log(): String {
         return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(info.nightscout.interfaces.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") +
-            if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.graph.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
+            if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else ""
     }
 
     override fun cancel() {

implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt

@@ -42,7 +42,8 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: Da
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.interfaces.R.string.format_insulin_units1, basalAmount) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) })
             if (includeCarbs)
-                row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.toInt()) })
+                row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs
+                    .toInt()) })
         }
     }
 
@@ -59,6 +60,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.interfaces.R.string.format_insulin_units1, basalAmount) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) })
             if (includeCarbs)
-                row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.toInt()) })
+                row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs
+                    .toInt()) })
         }
     }

implementation/src/main/res/values-el-rGR/strings.xml

@@ -4,7 +4,21 @@
     <string name="executing_right_now">Η εντολή εκτελείται τώρα</string>
     <string name="basal_value_below_minimum">Τιμή βασικού κάτω από το ελάχιστο. Δεν έχει ρυθμιστεί το προφίλ!</string>
     <string name="permission">Άδεια</string>
+    <string name="need_whitelisting">Το %1$s πρέπει να απενεργοποιήσει τη βελτιστοποίηση της μπαταρίας για βέλτιστη απόδοση</string>
+    <string name="need_location_permission">Η εφαρμογή χρειάζεται άδεια τοποθεσίας για τη σάρωση Bluetooth και τον σύνδεση σε δίκτυο WiFi</string>
+    <string name="need_storage_permission">Η εφαρμογή απαιτεί πρόσβαση στη μνήμη για την αποθήκευση αρχείων καταγραφής και εξαγωγή των ρυθμίσεων</string>
     <!--       Stats -->
+    <string name="veryLow" comment="below 3.1">Πολύ χαμηλό</string>
     <string name="low" comment="3.1-3.9">Χαμηλό</string>
     <string name="high" comment="10.0-13.9">Υψηλό</string>
+    <string name="veryHigh" comment="above 13.9">Πολύ υψηλό</string>
+    <string name="below" comment="below &quot;in range&quot;">Κάτω του στόχου</string>
+    <string name="in_range">Εντός στόχου</string>
+    <string name="above" comment="above &quot;in range&quot;">Άνω του στόχου</string>
+    <string name="hba1c">Γλυκοζυλιωμένη αιμοσφαιρίνη (HbA1c): </string>
+    <string name="std_deviation">SD: %1$s</string>
+    <string name="detailed_14_days">Λεπτομερή στοιχεία 14 ημερών</string>
+    <string name="day_tir">Στόχος μέρας</string>
+    <string name="night_tir">Στόχος νύχτας</string>
+    <string name="carbs_short" comment="max 6 characters">Υδατάνθρακες</string>
 </resources>

implementation/src/main/res/values-ko-rKR/strings.xml

@@ -4,9 +4,21 @@
     <string name="executing_right_now">명령을 지금 실행합니다.</string>
     <string name="basal_value_below_minimum">Basal값이 최소값 이하입니다. 프로파일이 설정되지 않습니다!</string>
     <string name="permission">권한</string>
+    <string name="need_whitelisting">%1$s를 사용하기 위해서는 배터리 최적화 화이트리스팅이 필요합니다</string>
     <string name="need_location_permission">어플은 BT scan과 WiFi 식별을 위해 \"위치 허용\"이 요구됩니다.</string>
     <string name="need_storage_permission">어플은 로그 파일 저장과 설정 내보내기를 위해 \"저장공간 허용\"이 요구됩니다.</string>
     <!--       Stats -->
+    <string name="veryLow" comment="below 3.1">매우 낮음</string>
     <string name="low" comment="3.1-3.9">저혈당</string>
     <string name="high" comment="10.0-13.9">고혈당</string>
+    <string name="veryHigh" comment="above 13.9">매우 높음</string>
+    <string name="below" comment="below &quot;in range&quot;">이하</string>
+    <string name="in_range">범위 내</string>
+    <string name="above" comment="above &quot;in range&quot;">초과</string>
+    <string name="hba1c">HbA1c: </string>
+    <string name="std_deviation">SD: %1$s</string>
+    <string name="detailed_14_days">상세 14일</string>
+    <string name="day_tir">일 TIR</string>
+    <string name="night_tir">밤 TIR</string>
+    <string name="carbs_short" comment="max 6 characters">탄수화물</string>
 </resources>

insight/src/main/res/values-ko-rKR/strings.xml

@@ -66,4 +66,5 @@
     <string name="min_recovery_duration">최소 재연결 시간 [초]</string>
     <string name="pump_alert">펌프 경고</string>
     <string name="pairing_information">동기화 정보</string>
+    <string name="insight_refresh_button" comment="26 characters max for translation">인사이트 새로 고침 버튼</string>
 </resources>

plugins/aps/src/main/res/values-cs-rCZ/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB provedené pumpou</string>
     <string name="loop_open_mode_min_change">Minimální změna pro výzvu [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Otevřená smyčka vytvoří novou žádost o změnu pouze v případě, že změna je větší než tato hodnota. Výchozí hodnota je 20 %</string>
+    <string name="fallback_smb_no_tdd">Použit algoritmus SMB. Nedostatek dat o CDD.</string>
 </resources>

plugins/aps/src/main/res/values-el-rGR/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB καθορισμένο από την αντλία</string>
     <string name="loop_open_mode_min_change">Ελάχιστο αίτημα για αλλαγή [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Το Ανοιχτό κύκλωμα θα εμφανίσει νέο μήνυμα αλλαγής μόνο αν η αλλαγή είναι μεγαλύτερη από αυτήν την τιμή σε %. Προεπιλεγμένη τιμή 20%</string>
+    <string name="fallback_smb_no_tdd">Επιστροφή στο SMB. Δεν υπάρχουν αρκετά δεδομένα TDD.</string>
 </resources>

plugins/aps/src/main/res/values-es-rES/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB administrado por la bomba</string>
     <string name="loop_open_mode_min_change">Valor mínimo de cambio [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Valor predeterminado 20%. El bucle abierto realizará una petición de cambio, sólo cuando se supere este valor</string>
+    <string name="fallback_smb_no_tdd">Regreso a SMB. No hay suficientes datos de TDD.</string>
 </resources>

plugins/aps/src/main/res/values-ko-rKR/strings.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="dynisf_adjust_sensitivity">감도 및 BG 조정</string>
+    <string name="DynISFAdjust_title" formatted="false">동적ISF 조정 계수 %</string>
+    <string name="DynISFAdjust_summary" formatted="false">동적ISF 에 대한 조정 계수. 더 호전적인 보정 양인 경우 100% 이상으로 설정하고, 덜 호전적인 보정의 경우 100% 미만으로 설정합니다.</string>
     <string name="high_temptarget_raises_sensitivity_title">높은 임시목표는 민감도를 올립니다.</string>
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[임시목표 100이상을 위해 민감도를 올립니다.]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">낮은 임시목표는 민감도를 내립니다.</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[임시목표 100미만을 위해 민감도를 낮춥니다.]]></string>
     <string name="openapssmb">OpenAPS SMB</string>
+    <string name="openaps_smb_dynamic_isf">동적 ISF</string>
     <string name="smb_interval_summary">SMB를 주입하는 빈도 (몇 분마다)</string>
     <string name="resistance_lowers_target_title">저항성이 목표 낮추기</string>
     <string name="resistance_lowers_target_summary">저항성이 감지되면, 목표 혈당을 낮춥니다.</string>
@@ -13,12 +17,14 @@
     <string name="openapsma_disabled">플러그인이 사용불가능 합니다</string>
     <string name="openapsma_no_glucose_data">혈당 데이터 없음</string>
     <string name="openaps_no_as_data">사용할 수 있는 Autosens 데이터가 없습니다.</string>
+    <string name="dynisf_shortname">DYNISF</string>
     <string name="executing">실행중</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">%1$d 요소의 배열.\n실제 값:</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="description_ama">2017년의 알고리즘</string>
     <string name="description_smb">고급사용자를 위한 가장 최신의 알고리즘</string>
+    <string name="description_smb_dynamic_isf">동적/자동 ISF를 사용하는 고급 사용자를 위한 최신 알고리즘</string>
     <string name="openapsama_bolus_snooze_dia_divisor">Bolus snooze DIA 나눗수</string>
     <string name="openapsma_run">지금 실행</string>
     <string name="openapsma_last_run_label">최근 실행</string>
@@ -69,6 +75,8 @@
     <string name="uam_smb_max_minutes_summary">SMB가 UAM에 대해 basal을 제한할 수 있는 최대 시간(분)</string>
     <string name="carbs_req_threshold">제안을 위한 최소 탄수화물 필요량</string>
     <string name="carbs_req_threshold_summary">탄수화물 제안 알림을 보여주는 최소 탄수화물 g수. 이 양보다 적은 경우 탄수화물 제안 알림이 작동하지 않습니다.</string>
+    <string name="lgs_threshold_summary">BG 값이 이하인 경우 인슐린 공급이 중단됩니다. 기본값은 표준 타겟 모델을 사용합니다. 사용자는 60mg/dl (3.3mmol/l)에서 100mg/dl(5.5mmol/l) 사이의 값을 설정할 수 있습니다. 65/3.6 이하의 값은 기본 모델을 사용하게 됩니다.</string>
+    <string name="lgs_threshold_title">BG 값이 이하인 경우 낮은 포도당 공급이 중단됩니다</string>
     <string name="increasing_max_basal">설정이 프로파일에서의 최대 Basal보다 낮은 이유로 최대 Basal을 올립니다</string>
     <string name="max_basal_multiplier">최대 Basal 승수</string>
     <string name="max_daily_basal_multiplier">최대 일 Basal 승수</string>
@@ -80,13 +88,30 @@
     <string name="maxvalueinpreferences">설정에서의 최대값</string>
     <string name="hardlimit">하드한계</string>
     <!--    Autotune   -->
+    <string name="insulin_peak">피크</string>
     <!--    Loop -->
+    <string name="run_now">지금 실행하기</string>
     <string name="smb_frequency_exceeded">최근 3분 이내에 Bolus가 주입되었습니다. SMB를 건너뜁니다.</string>
+    <string name="pump_not_initialized">펌프가 초기화 되지 않았습니다!</string>
     <string name="loop_shortname">LOOP</string>
     <string name="description_loop">Loop를 활성화 혹은 비활성화합니다.</string>
+    <string name="no_aps_selected">APS가 선택되지 않았거나 제공된 결과가 없습니다.</string>
     <string name="ignore5m">5분간 무시하기</string>
     <string name="ignore15m">5분간 무시하기</string>
     <string name="ignore30m">30분간 무시하기</string>
+    <string name="carbs_suggestion">탄수화물 제안</string>
+    <string name="open_loop_new_suggestion">새로운 제안이 있습니다</string>
     <string name="basal_set_correctly">Basal이 정상적으로 설정되었습니다.</string>
+    <string name="last_run_label">마지막 실행</string>
     <string name="loop_aps_label">APS</string>
+    <string name="request_label">요청</string>
+    <string name="loop_constraints_processed_label">제약 적용 후</string>
+    <string name="loop_tbr_request_time_label">임시 basal 요청시간</string>
+    <string name="loop_tbr_execution_time_label">임시 basal 실행 시간</string>
+    <string name="loop_tbr_set_by_pump_label">펌프에 의한 임시 basal 설정</string>
+    <string name="loop_smb_request_time_label">SMB 요청 시간</string>
+    <string name="loop_smb_execution_time_label">SMB 실행 시간</string>
+    <string name="loop_smb_set_by_pump_label">펌프에 의한 SMB 설정</string>
+    <string name="loop_open_mode_min_change">최소 요청 변경 [%]</string>
+    <string name="loop_open_mode_min_change_summary" formatted="false">변경 사항이 %의 값보다 큰 경우에만 열린 루프의 새 변경 요청을 팝업합니다. 기본값은 20%입니다.</string>
 </resources>

plugins/aps/src/main/res/values-lt-rLT/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB nustatyta iš pompos</string>
     <string name="loop_open_mode_min_change">Minimalaus pokyčio užklausa [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Atviras Ciklas parodys naujų pakeitimų užklausą tik tada, kai pokytis bus didesnis nei ši vertė %. Numatytoji vertė yra 20%</string>
+    <string name="fallback_smb_no_tdd">Grįžtama prie SMB. Nepakanka BPD duomenų.</string>
 </resources>

plugins/aps/src/main/res/values-nl-rNL/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB ingesteld door pomp</string>
     <string name="loop_open_mode_min_change">Minimale aanvraag wijziging [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Open Loop zal alleen een wijzigingsverzoek tonen als de verandering groter is dan deze waarde in %. De standaard waarde is 20%</string>
+    <string name="fallback_smb_no_tdd">Terugvallen naar SMB. Niet genoeg TDD gegevens.</string>
 </resources>

plugins/aps/src/main/res/values-no-rNO/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB satt med pumpe</string>
     <string name="loop_open_mode_min_change">Minste endringsforespørsel [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">I åpen Loopmodus vil AAPS be deg utføre en hendelse hvis forandringen er større enn denne verdien i %. Standard verdi er 20%</string>
+    <string name="fallback_smb_no_tdd">Går tilbake til SMB. Ikke nok data om total daglig dose.</string>
 </resources>

plugins/aps/src/main/res/values-pl-rPL/strings.xml

@@ -114,4 +114,5 @@
     <string name="loop_smb_set_by_pump_label">SMB ustawiony przez pompę</string>
     <string name="loop_open_mode_min_change">Minimalna sugerowana zmiana [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Otwarta pętla wyświetli żądanie zmiany tylko w przypadku, gdy obliczona zmiana będzie większa (procentowo) niż to ustawienie. Wartość domyślna to 20%</string>
+    <string name="fallback_smb_no_tdd">Powrót do SMB. Za mało danych o TDD (DDI).</string>
 </resources>

plugins/aps/src/main/res/values-ro-rRO/strings.xml

@@ -91,4 +91,5 @@
     <string name="ignore30m">Ignorați 30min</string>
     <string name="basal_set_correctly">Bazala setată corect</string>
     <string name="loop_aps_label">APS</string>
+    <string name="fallback_smb_no_tdd">Revenire la SMB. Nu există suficiente date TDD.</string>
 </resources>

plugins/aps/src/main/res/values-tr-rTR/strings.xml

@@ -115,4 +115,5 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="loop_smb_set_by_pump_label">Pompa tarafından ayarlanan SMB</string>
     <string name="loop_open_mode_min_change">Minimum istek değişikliği [%]</string>
     <string name="loop_open_mode_min_change_summary" formatted="false">Açık Döngü, yalnızca değişiklik % cinsinden bu değerden büyükse yeni değişiklik isteğini açar. Varsayılan değer %20\'dir</string>
+    <string name="fallback_smb_no_tdd">SMB\'ye dönülüyor. Yeterli günlük doz verisi yok.</string>
 </resources>

plugins/automation/src/main/res/values-ko-rKR/strings.xml

@@ -37,6 +37,9 @@
     <string name="glucoseisnotavailable">혈당을 사용할 수 없습니다.</string>
     <string name="glucosecomparedmgdl">혈당 %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">혈당 %1$s %2$.1f %3$s</string>
+    <string name="notemptarget">임시목표가 존재하지 않습니다</string>
+    <string name="temptargetcomparedmgdl">임시목표 %1$s %2$.0f %3$s</string>
+    <string name="temptargetcomparedmmol">임시목표 %1$s %2$.1f %3$s</string>
     <string name="percentagecompared">프로파일 pct %1$s %2$d</string>
     <string name="iobcompared">IOB %1$s %2$.1f</string>
     <string name="or">또는</string>
@@ -84,10 +87,13 @@
     <string name="latitude_short">위도:</string>
     <string name="longitude_short">경도</string>
     <string name="glucose_u">혈당 [%1$s]:</string>
+    <string name="target_u">목표 [%1$s]:</string>
     <string name="lastboluslabel">마지막 Bolus</string>
     <string name="lastboluscompared">마지막 Bolus 시간 %1$s %2$s 분 전</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
+    <string name="triggerHeartRate">심장 박동</string>
+    <string name="triggerHeartRateDesc">HR %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">거리 [m]:</string>
     <string name="recurringTime">반복 시간</string>
@@ -99,10 +105,20 @@
     <string name="edit_short">편집</string>
     <string name="please_choose_an_action_type">실행 유형을 선택하세요</string>
     <string name="please_choose_a_trigger_type">트리거 유형을 선택하세요</string>
+    <string name="please_choose_a_operation_type">실행 유형을 선택하세요</string>
     <string name="triggers">트리거:</string>
     <string name="preconditions">전제 조건:</string>
     <string name="automation_event">자동화 이벤트</string>
     <string name="reorder_label">정렬</string>
+    <string name="user_action">사용자 동작</string>
+    <string name="remove_automation">자동 설정 제거하기</string>
+    <string name="sort_automation">자동 설정 분류하기</string>
+    <string name="remove_selected_items">선택된 항목 제거하기</string>
+    <string name="count_selected">%1$d 선택됨</string>
+    <string name="system_automation">자동 설정 시스템</string>
+    <string name="run_automations">자동 설정 실행하기</string>
+    <string name="add_automation">규칙 추가하기</string>
+    <string name="stop_processing">처리 중단하기</string>
     <!-- WeekdayPicker -->
     <string name="monday_short">월</string>
     <string name="tuesday_short">화</string>
@@ -112,4 +128,7 @@
     <string name="saturday_short">토</string>
     <string name="sunday_short">일</string>
     <!--    Reminders-->
+    <string name="time_to_eat">식사할 시간입니다! \nBolus 마법사를 켜고 다시 계산하십시오.</string>
+    <string name="time_to_bolus">Bolus 주입할 시간입니다! \nBolus 마법사를 켜고 다시 계산하십시오</string>
+    <string name="error_setting_reminder">향후 경고 설정 중 오류 발생</string>
 </resources>

plugins/configuration/build.gradle

@@ -18,9 +18,8 @@ android {
 dependencies {
     implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
-    implementation project(':core:main')
-    implementation project(':core:graph')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ns-sdk')
     implementation project(':core:utils')
     implementation project(':core:ui')

plugins/configuration/src/main/res/values-el-rGR/strings.xml

@@ -15,42 +15,73 @@
     <string name="low_mark">ΧΑΜΗΛΟ σημείο</string>
     <string name="high_mark">ΥΨΗΛΟ σημείο</string>
     <string name="low_mark_comment">Χαμηλότερη τιμή της περιοχής εντός στόχου (μόνο εμφάνιση)</string>
+    <string name="high_mark_comment">Υψηλότερη τιμή της περιοχής εντός στόχου (μόνο εμφάνιση)</string>
     <string name="permission">Άδεια</string>
+    <string name="need_system_window_permission">Η εφαρμογή χρειάζεται άδεια παραθύρου συστήματος για ειδοποιήσεις</string>
+    <string name="need_location_permission">Η εφαρμογή χρειάζεται άδεια τοποθεσίας για τη σάρωση Bluetooth και τη σύνδεση σε δίκτυο WiFi</string>
+    <string name="need_storage_permission">Η εφαρμογή απαιτεί πρόσβαση στη μνήμη για την αποθήκευση αρχείων καταγραφής και εξαγωγή των ρυθμίσεων</string>
     <string name="askforpermission">Ζητείστε άδεια</string>
+    <string name="need_whitelisting">Το %1$s πρέπει να απενεργοποιήσει τη βελτιστοποίηση της μπαταρίας για βέλτιστη απόδοση</string>
     <string name="storedsettingsfound">Βρέθηκαν αποθηκευμένες ρυθμίσεις</string>
+    <string name="master_password_summary">Ο κύριος κωδικός πρόσβασης χρησιμοποιείται για την κρυπτογράφηση αντιγράφων ασφαλείας και για την αντικατάσταση της ασφάλειας στην εφαρμογή. Θυμηθείτε ή αποθηκεύστε τον σε ασφαλές μέρος.</string>
+    <string name="current_master_password">Τρέχων κύριος κωδικός</string>
+    <string name="common_values">Χρησιμοποιήστε τις τιμές της μέγιστης ποσότητας φαγητού, που τρώτε συνήθως\n</string>
+    <string name="syncinfotext">Συγχρονισμός δεδομένων στο cloud. Μπορείτε να παραλείψετε αυτό το βήμα τώρα, αλλά δε θα είστε σε θέση να περάσετε τα objectives μέχρι να ρυθμίσετε το Nightscout ή το Tidepool client.</string>
     <string name="status">Κατάσταση:</string>
     <string name="patient_name">Όνομα Ασθενή</string>
     <string name="patient_name_summary">Παρακαλώ δώστε όνομα ασθενούς ή ψευδώνυμο για τη διαφοροποίηση μεταξύ πολλαπλών ρυθμίσεων</string>
+    <string name="privacy_settings">Ρυθμίσεις απορρήτου</string>
+    <string name="privacy_summary">Μπορείτε προαιρετικά να παράσχετε διεύθυνση ηλεκτρονικού ταχυδρομείου, αν θέλετε να ειδοποιηθείτε για σφάλματα της εφαρμογής. Αυτή δεν είναι μια αυτοματοποιημένη υπηρεσία. Θα επικοινωνήσετε με προγραμματιστές σε επικίνδυνες καταστάσεις.</string>
     <string name="diawarning">Προσοχή: Τα νέα προφίλ ινσουλίνης απαιτούν DIA τουλάχιστον 5 ωρών. Η DIA 5-6 ώρες στα νέα προφίλ είναι ισοδύναμα με DIA των 3 ωρών στα παλιά προφίλ ινσουλινών.</string>
     <string name="profile">Προφίλ</string>
+    <string name="doprofileswitch">Κάντε αλλαγή προφίλ</string>
     <string name="exitwizard">Παράλειψη του \"Οδηγού εγκατάστασης\"</string>
+    <string name="setupwizard_loop_description">Πατήστε το παρακάτω πλήκτρο για να επιτρέψετε στο AndroidAPS να προτείνει/κάνει αλλαγές στον βασικό ρυθμό</string>
     <string name="setupwizard_sensitivity_description">Η προσθήκη Ευαισθησία χρησιμοποιείται για την ανίχνευση αλλαγών στην ευαισθησία και τον υπολογισμό του COB. Για περισσότερες πληροφορίες εδώ:</string>
+    <string name="setupwizard_sensitivity_url">https://wiki.aaps.app/el/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="setupwizard_aps_description">Επιλέξτε έναν από τους διαθέσιμους αλγόριθμους. Ταξινομούνται από το παλαιότερο στον νεότερο. Ένας νεότερος είναι συνήθως καλύτερος και πιο επιθετικός. Επομένως, αν είστε καινούριος στο κλειστό κύκλωμα, θα πρέπει πρώτα να επιλέξετε μόνο το AMA και όχι το τελευταίο. Μην ξεχάσετε να διαβάσετε το εγχειρίδιο του OpenAPS και να κάνετε τις ρυθμίσεις προτού αρχίσετε να το χρησιμοποιείτε.</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Παρακαλώ ρυθμίστε τις παραμέτρους του RileyLink σας παρακάτω. Μετά την επιλογή ενός RileyLink, θα είναι δυνατόν να συνεχίσετε την εγκατάσταση μόλις η κατάσταση RileyLink είναι \"Συνδεδεμένο\". Αυτό μπορεί να διαρκέσει ένα λεπτό.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Σημείωση:</b> Μπορείτε να συνεχίσετε τη ρύθμιση μόλις η αντλία έχει ρυθμιστεί.\n</string>
     <string name="startobjective">Ξεκινήστε τον πρώτο στόχο</string>
+    <string name="setupwizard_pump_riley_link_status">Κατάσταση RileyLink:</string>
     <string name="readstatus">Κατάσταση ανάγνωσης</string>
     <string name="data_choices">Επιλογές δεδομένων</string>
     <string name="fabric_upload">Αποστολή δεδομένων στο εργοστάσιο</string>
     <string name="allow_automated_crash_reporting">Να επιτρέπεται η αυτόματη αποστολή αναφορών σφάλματος και χαρακτηριστικά χρήσης δεδομένων στους προγραμματιστές μέσω του fabric.io. service.</string>
+    <string name="summary_email_for_crash_report">Αυτή η ταυτότητα θα επισυνάπτεται στις αναφορές κρασαρίσματος ώστε να μπορούμε να επικοινωνήσουμε μαζί σας σε επείγουσες περιπτώσεις.</string>
+    <string name="identification">Ταυτότητα (email, FB ή Discord κλπ)</string>
     <string name="request">Αίτημα</string>
     <string name="apsmode_title">Λειτουργία APS</string>
     <string name="setupwizard_preferred_aps_mode">Προτιμώμενη λειτουργία APS</string>
+    <string name="error_asking_for_permissions">Σφάλμα στην ερώτηση για δικαιώματα</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Αυτή η συσκευή δεν φαίνεται να υποστηρίζει τη λίστα κατάτμησης βελτιστοποίησης μπαταρίας - ενδέχεται να αντιμετωπίσετε προβλήματα απόδοσης.</string>
     <!--    ConfigBuilder-->
     <string name="config_builder">Διαμόρφωση</string>
     <string name="configbuilder_pump">Αντλία</string>
+    <string name="configbuilder_pump_description">Ποια αντλία θα θέλατε να χρησιμοποιήσετε με το AndroidAPS;</string>
     <string name="configbuilder_profile">Προφίλ</string>
+    <string name="configbuilder_profile_description">Ποιο προφίλ πρέπει να χρησιμοποιεί AAPS;</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">Ποιος APS αλγόριθμος πρέπει να κάνει θεραπείες;</string>
     <string name="configbuilder_general">Γενικά</string>
     <string name="configbuilder_general_description">Αυτά είναι μερικά πρόσθετα που μπορεί να βρείτε χρήσιμα.</string>
+    <string name="configbuilder_sync">Συγχρονισμός</string>
+    <string name="configbuilder_sync_description">Πρόσθετα μεταφόρτωσης δεδομένων και συγχρονισμού.</string>
     <string name="configbuilder_constraints_description">Ποιοι περιορισμοί έχουν εφαρμοστεί;</string>
     <string name="configbuilder_loop">Κύκλωμα</string>
+    <string name="configbuilder_loop_description">Χρησιμοποιήστε αυτό για να ενεργοποιήσετε την ενσωμάτωση του κυκλώματος AndroidAPS.</string>
     <string name="configbuilder_insulin_description">Ποιο τύπο ινσουλίνης χρησιμοποιείτε;</string>
     <string name="configbuilder_bgsource">Πηγή BG</string>
+    <string name="configbuilder_bgsource_description">Από πού πρέπει το AndroidAPS να πάρει τα δεδομένα του;</string>
+    <string name="configbuilder_smoothing">Εξομάλυνση</string>
+    <string name="configbuilder_smoothing_description">Επιλέξτε αλγόριθμο εξομάλυνσης</string>
     <string name="configbuilder_sensitivity">Ανίχνευση ευαισθησίας</string>
     <string name="configbuilder_sensitivity_description">Ποιος αλγόριθμος ευαισθησίας να χρησιμοποιηθεί;</string>
     <string name="config_builder_shortname">Διαμόρφωση</string>
     <string name="description_config_builder">Χρησιμοποιείται για ρύθμιση ενεργών συνδέσεων</string>
+    <string name="allow_hardware_pump_text">Προσοχή: Εάν ενεργοποιήσετε και συνδεθείτε με μια αντλία, το AndroidAPS θα αντιγράψει τις ρυθμίσεις βασικού από το προφίλ στην αντλία, αντικαθιστώντας τον υπάρχων βασικό ρυθμό της αντλίας. Βεβαιωθείτε ότι έχετε τον σωστό βασικό ρυθμό στο AndroidAPS. Εάν δεν είστε βέβαιοι ή δεν θέλετε να αντικαταστήσετε τον βασικό ρυθμό στην αντλία σας, πατήστε Άκυρο και επαναλάβετε εναλλαγή προς την αντλία σε μεταγενέστερο χρόνο.</string>
+    <string name="a11y_open_settings">άνοιγμα ρυθμίσεων</string>
+    <string name="nsclient_version_does_not_match">Η έκδοση AAPSClient δεν ταιριάζει με την έκδοση AAPS. Παρακαλούμε ενημερώστε την υπάρχουσα έκδοση.</string>
     <!--ImportExport-->
     <string name="nav_preferences">Επιλογές</string>
     <string name="password_preferences_encrypt_prompt">Θα σας ζητηθεί ο κύριος κωδικός πρόσβασης, ο οποίος θα χρησιμοποιηθεί για να κωδικοποιηθούν οι εξαγώμενες προτιμήσεις.</string>
@@ -77,10 +108,13 @@
     <string name="goto_main_try_again">Επιστρέψτε στην αρχική οθόνη και δοκιμάστε ξανά.</string>
     <string name="restartingapp">Έξοδος από το application για την εφαρμογή των ρυθμίσεων</string>
     <string name="ue_exported">Καταχωρήσεις χρηστών που εξάγονται</string>
+    <string name="protection">Προστασία</string>
+    <string name="master_password_missing">Ο κύριος κωδικός πρόσβασης δεν έχει οριστεί!\n\nΠαρακαλώ ορίστε τον Κύριο κωδικό πρόσβασής σας στις Προτιμήσεις (%1$s &#8594; %2$s)</string>
     <!--    Maintenance-->
     <string name="maintenance">Συντήρηση</string>
     <string name="maintenance_shortname">ΣΥΝΤΗΡ</string>
     <string name="description_maintenance">Παρέχει λειτουργίες συντήρησης (π. χ. αποστολή, καθαρισμό καταγραφής).</string>
+    <string name="database_cleanup">Εκκαθάριση βάσης δεδομένων</string>
     <string name="reset_db_confirm">Θέλετε πραγματικά να επαναφέρετε την βάση δεδομένων;</string>
     <string name="maintenance_settings">Ρυθμίσεις συντήρησης</string>
     <string name="maintenance_email">E-mail</string>
@@ -91,9 +125,30 @@
     <string name="engineering_mode_enabled">Μηχανική λειτουργία ενεργοποιημένη</string>
     <string name="log_files">Αρχεία καταγραφής</string>
     <string name="nav_logsettings">Ρυθμίσεις Αρχείου Καταγραφής</string>
+    <string name="miscellaneous">Διάφορα</string>
     <string name="nav_resetdb">Επαναφορά Βάσεων Δεδομένων</string>
     <string name="resettodefaults">Επαναφορά προεπιλογών</string>
     <!-- Maintenance -->
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">εξαγωγή πριν από %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">εξαγωγή στις %1$s</string>
+    <string name="exported_less_than_hour_ago">η εξαγωγή έγινε από λιγότερο από μία ώρα πριν</string>
+    <string name="in_directory" comment="placeholder is for exported file path">στον φάκελο: %1$s</string>
+    <string name="preferences_import_list_title">Επιλέξτε αρχείο για εισαγωγή</string>
+    <string name="metadata_warning_different_flavour">Οι προτιμήσεις δημιουργήθηκαν με διαφορετική έκδοση του AAPS (%1$s) ενώ έχετε: %2$s.\n\nΟρισμένες ρυθμίσεις ενδέχεται να λείπουν ή να μην είναι έγκυρες - μετά την εισαγωγή παρακαλώ ελέγξτε και ενημερώστε τις προτιμήσεις σας.</string>
+    <string name="metadata_warning_different_device">Οι προτιμήσεις δημιουργήθηκαν σε διαφορετική συσκευή. Είναι εντάξει αν κάνετε εισαγωγή από παλαιότερο/διαφορετικό τηλέφωνο, αλλά βεβαιωθείτε ότι οι εισαγόμενες προτιμήσεις είναι σωστές!</string>
+    <string name="metadata_warning_outdated_format">Χρησιμοποιείτε μια εξαγωγή με την ξεπερασμένη μορφή παλαιού τύπου από παλιές εκδόσεις του AAPS, η οποία δεν είναι ασφαλής! Χρησιμοποιήστε το μόνο ως έσχατη λύση, αν δεν έχετε μια εξαγωγή σε τρέχουσα μορφή JSON.</string>
+    <string name="metadata_warning_old_export">Οι εισαγόμενες προτιμήσεις είναι ήδη %1$s ημέρών! Ίσως έχετε πιο πρόσφατες-ενημερωμένες προτιμήσεις ή επιλέξατε λάθος αρχείο; Θυμηθείτε να εξάγετε τακτικά τις προτιμήσεις σας!</string>
+    <string name="metadata_warning_date_format">Μη έγκυρη μορφή ημερομηνίας-ώρας!</string>
+    <string name="metadata_warning_different_version">Προτιμήσεις από διαφορετική δευτερεύουσα έκδοση της εφαρμογής. Είναι εντάξει αν εισάγετε μετά από αναβάθμιση, αλλά ελέγξτε μετά την εισαγωγή αν οι προτιμήσεις είναι ακόμα σωστές!</string>
+    <string name="metadata_urgent_different_version">Προτιμήσεις από διαφορετική σημαντική έκδοση της εφαρμογής. Οι μεγάλες εκδόσεις διαφέρουν σημαντικά και μπορεί να έχουν μη-συμβατές προτιμήσεις! Βεβαιωθείτε μετά την εισαγωγή ότι οι προτιμήσεις είναι ακόμα σωστές!</string>
+    <string name="prefdecrypt_settings_tampered">Το αρχείο ρυθμίσεων έχει αλλοιωθεί</string>
+    <string name="prefdecrypt_settings_secure">Το αρχείο ρυθμίσεων είναι ασφαλές</string>
+    <string name="prefdecrypt_settings_unencrypted">Χρήση μη ασφαλούς, μη κρυπτογραφημένης μορφής ρυθμίσεων</string>
+    <string name="prefdecrypt_wrong_json">Σφάλμα μορφής JSON, λείπει απαιτούμενο πεδίο (μορφή, περιεχόμενο, μεταδεδομένα ή ασφάλεια)</string>
+    <string name="prefdecrypt_wrong_password">Σφάλμα αποκρυπτογράφησης, ο κωδικός πρόσβασης δεν μπορεί να αποκρυπτογραφήσει το αρχείο</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Λείπει το άθροισμα ελέγχου αρχείου (hash), δεν μπορεί να επαληθεύτεί η αυθεντικότητα των ρυθμίσεων!</string>
+    <string name="prefdecrypt_issue_modified">Το αρχείο τροποποιήθηκε μετά την εξαγωγή!</string>
+    <string name="prefdecrypt_issue_parsing">Σφάλμα αποκρυπτογράφησης, η ανάλυση των προτιμήσεων απέτυχε!</string>
     <string name="prefdecrypt_issue_wrong_pass">Σφάλμα αποκρυπτογράφησης, ο παρεχόμενος κωδικός πρόσβασης δεν είναι έγκυρος ή το αρχείο ρυθμίσεων τροποποιήθηκε! Μπορεί να συμβεί ότι το εισαγόμενο αρχείο εξήχθη με διαφορετικό Κύριο κωδικό πρόσβασης.</string>
     <string name="prefdecrypt_issue_wrong_format">Λείπει η διαμόρφωση κρυπτογράφησης, η μορφή των ρυθμίσεων δεν είναι έγκυρη!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Μη υποστηριζόμενο ή μη καθορισμένος αλγόριθμος κρυπτογράφησης!</string>

plugins/configuration/src/main/res/values-ko-rKR/strings.xml

@@ -6,6 +6,7 @@
     <string name="previous_button">이전</string>
     <string name="nav_setupwizard">설정 마법사</string>
     <string name="setupwizard_finish">완료</string>
+    <string name="welcome">환영합니다</string>
     <string name="welcometosetupwizard">설정 마법사에 오신것을 환영합니다. 설정 마법사가 설정 과정을 안내하여 줄것입니다.</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
@@ -20,10 +21,12 @@
     <string name="need_location_permission">어플은 BT scan과 WiFi 식별을 위해 \"위치 허용\"이 요구됩니다.</string>
     <string name="need_storage_permission">어플은 로그 파일 저장과 설정 내보내기를 위해 \"저장공간 허용\"이 요구됩니다.</string>
     <string name="askforpermission">권한 요청하기</string>
+    <string name="need_whitelisting">%1$s를 사용하기 위해서는 배터리 최적화 화이트리스팅이 필요합니다</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="master_password_summary">마스터 비밀번호는 백업 암호 또는 보안 해제를 위해 사용됩니다. 이를 기억하거나 안전한 곳에 저장해두세요.</string>
     <string name="current_master_password">현재 마스터 비밀번호</string>
     <string name="common_values">평소 섭취하는 가장 많은 양의 탄수화물 값을 사용하세요.\n</string>
+    <string name="syncinfotext">데이터 클라우드에 동기화합니다. 지금 이 부분을 건너뛸 수 있지만 Nightscout 또는 Tidepool 클라이언트를 설정할 때까지목표를 전달할 수 없습니다.</string>
     <string name="status">상태:</string>
     <string name="patient_name">환자 이름</string>
     <string name="patient_name_summary">다양한 설정들을 구별하기 위하여 환자 이름 또는 별명을 입력합니다.</string>
@@ -33,7 +36,9 @@
     <string name="profile">프로파일</string>
     <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="exitwizard">설정 마법사 건너뛰기</string>
+    <string name="setupwizard_loop_description">아래 버튼을 눌러 AAPS가 기본적인 변경을 제안/실행할 수 있도록 합니다</string>
     <string name="setupwizard_sensitivity_description">민감도 플러그인은 민감도감지와 COB 계산을 위해 사용됩니다. 더 많은 정보는 다름 링크를 방문하세요.</string>
+    <string name="setupwizard_sensitivity_url">https://wiki.aaps.app/en/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="setupwizard_aps_description">사용 가능한 알고리즘 중 하나를 선택하세요. 과거부터 최신의 순으로 정렬이 되어 있습니다. 일반적으로 새로운 알고리즘은 보다 강력하고 공격적입니다. 따라서 당신이 신규 사용자라면 최신의 알고리즘보단 AMA로 시작하는것이 나을 수 있습니다. 사용 전에 OpenAPS 문서를 읽어보고 설정하는 것을 잊지마세요.</string>
     <string name="setupwizard_pump_waiting_for_riley_link_connection">하단의 RileyLink를 설정하십시오. RileyLink를 선택한 뒤, RileyLink 상태가 \"연결됨\"이 되고 나면 설정을 계속 할 수 있습니다. 이 작업은 금방 진행됩니다.\n</string>
     <string name="setupwizard_pump_pump_not_initialized"><b>참고:</b> 펌프가 한 번 연동되면 계속 설정할 수 있습니다.\n</string>
@@ -43,27 +48,40 @@
     <string name="data_choices">데이터선택</string>
     <string name="fabric_upload">Fabric 업로드</string>
     <string name="allow_automated_crash_reporting">fabric.io 서비스를 통해 개발자에게 앱 오류 및 특정 데이터를 자동 전송합니다.</string>
+    <string name="summary_email_for_crash_report">긴급 상황에서 사용자에게 연락을 취하기 위해 이 신원 증명을 충돌 보고서에 첨부합니다. 이는 선택사항입니다.</string>
+    <string name="identification">신원 증명 (이메일, FB, 또는 Discord nick 등)</string>
     <string name="request">요청</string>
     <string name="apsmode_title">APS 모드</string>
     <string name="setupwizard_preferred_aps_mode">선호하는 APS 모드</string>
+    <string name="error_asking_for_permissions">사용 권한을 묻는 중 오류가 발생했습니다</string>
     <string name="alert_dialog_permission_battery_optimization_failed">이 장치는 배터리 최적화 화이트리스트를 지원하지 않습니다 - 성능 문제가 발생할 수 있습니다.</string>
     <!--    ConfigBuilder-->
     <string name="config_builder">구성 관리자</string>
     <string name="configbuilder_pump">펌프</string>
+    <string name="configbuilder_pump_description">어떤 펌프를 AAPS에서 사용하시겠습니까?</string>
     <string name="configbuilder_profile">프로파일</string>
+    <string name="configbuilder_profile_description">어떤 프로파일을 AAPS에서 사용하시겠습니까?</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_aps_description">어떤 APS 알고리즘을 사용합니까?</string>
     <string name="configbuilder_general">일반</string>
     <string name="configbuilder_general_description">유용한 여러가지 플러그인</string>
     <string name="configbuilder_sync">동기화</string>
+    <string name="configbuilder_sync_description">데이터 업로드 및 동기화 플러그인.</string>
     <string name="configbuilder_constraints_description">어떤 제약을 적용합니까?</string>
     <string name="configbuilder_loop">Loop</string>
+    <string name="configbuilder_loop_description">AAPS의 루프를 활성하기 위해서 이것을 사용하십시오.</string>
     <string name="configbuilder_insulin_description">어떤 종류의 인슐린을 사용합니까?</string>
     <string name="configbuilder_bgsource">혈당 출처</string>
+    <string name="configbuilder_bgsource_description">AAPS가 어디에서 데이터를 가져옵니까?</string>
+    <string name="configbuilder_smoothing">평탄화</string>
+    <string name="configbuilder_smoothing_description">평탄화 알고리즘을 선택합니다</string>
     <string name="configbuilder_sensitivity">민감도 감지</string>
     <string name="configbuilder_sensitivity_description">어떤 민감도 알고리즘을 사용하겠습니까?</string>
     <string name="config_builder_shortname">CONF</string>
     <string name="description_config_builder">활성화된 플러그인을 구성하는 데 사용됩니다.</string>
+    <string name="allow_hardware_pump_text">주의: 하드웨어 펌프를 활성화하고 연결하면 AAPS가 basal 설정을 프로파일에서 펌프로 복사하여 펌프에 저장된 기존 basal양을 덮어쓰게 될것입니다. AAPS의 basal 설정이 올바른지 확인하십시오. 확실하지 않거나 펌프의 basal 설정을 덮어쓰지 않으려면 취소를 누르고 나중에 펌프로 전환을 연결하십시오.</string>
+    <string name="a11y_open_settings">설정 열기</string>
+    <string name="nsclient_version_does_not_match">AAPS 클라이언트 버전이 AAPS 버전과 일치하지 않습니다. 업데이트 하십시오.</string>
     <!--ImportExport-->
     <string name="nav_preferences">설정</string>
     <string name="password_preferences_encrypt_prompt">내보낸 preferences 암호화 하기 위해 마스터 비밀번호가 필요합니다.</string>
@@ -96,6 +114,7 @@
     <string name="maintenance">정비</string>
     <string name="maintenance_shortname">MAINT</string>
     <string name="description_maintenance">정비를 위한 여러가지 기능을 제공합니다.(예, 로그 전송,로그 삭제 등)</string>
+    <string name="database_cleanup">데이터베이스 정리하기</string>
     <string name="reset_db_confirm">데이터 베이스를 정말 초기화하시겠습니까?</string>
     <string name="maintenance_settings">정비 설정</string>
     <string name="maintenance_email">Email</string>
@@ -104,7 +123,9 @@
     <string name="delete_logs">로그 삭제하기</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
     <string name="engineering_mode_enabled">전문가 모드 사용</string>
+    <string name="log_files">로그 파일</string>
     <string name="nav_logsettings">로그 설정</string>
+    <string name="miscellaneous">기타 설정</string>
     <string name="nav_resetdb">데이터베이스 초기화</string>
     <string name="resettodefaults">기본값으로 초기화</string>
     <!-- Maintenance -->
@@ -132,5 +153,7 @@
     <string name="prefdecrypt_issue_wrong_format">암호화 설정이 누락되었음, 설정 형식이 유효하지 않습니다!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">지원되지 않는 또는 명시되지 않은 암호화 알고리즘!</string>
     <!-- Custom Watchface -->
+    <string name="wear_import_custom_watchface_title">사용자 지정 워치페이스 선택하기</string>
     <!-- Permissions -->
+    <string name="alert_dialog_storage_permission_text">폰을 다시시작하거나 시스템 설정에서 AAPS를 다시 시작하십시오 \n그렇지 않으면 Android APS에 로그 기록이 남지 않습니다 (알고리즘이 올바르게 작동하는지 확인하기 위해 로그가 중요합니다)!</string>
 </resources>