From 2d54a068ad2fa831cabaf81a291f1aa24f0a010c Mon Sep 17 00:00:00 2001
From: warstar2187 <warstar2187@gmail.com>
Date: Fri, 11 Nov 2016 23:07:32 +0900
Subject: [PATCH 1/3] Update strings.xml

---
 app/src/main/res/values-ko/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 2681be63bb..59018292ed 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -183,7 +183,7 @@
     <string name="careportal_newnstreatment_glucosetype">Glucose type</string>
     <string name="noprofile">아직 NS에서 프로파일을 로드하지 못했습니다.</string>
     <string name="overview_tempbasal_button">임시기초주입</string>
-    <string name="overview_extendedbolus_button">확장식사</string>
+    <string name="overview_extendedbolus_button">확장식사주입</string>
     <string name="configbuilder_nsclientversion_label">NSClient 버전:</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
     <string name="send">보내기</string>
@@ -243,7 +243,7 @@
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode" formatted="false">식사주입 %.2fU 을 실행하려면 %s 를 입력하고 답장하세요</string>
-    <string name="bolusfailed">식사주입 실패</string>
+    <string name="bolusfailed">Bolus failed</string>
     <string name="bolusdelivered" formatted="false">Bolus %.2fU delivered successfully</string>
     <string name="bolusdelivering" formatted="false">%.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
@@ -315,10 +315,10 @@
     <string name="remotebasalnotallowed">원격 기초주입설정이 허가되지 않았습니다</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">기초주입 %.2fU/h 을 실행하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalset" formatted="false">Temp basal %.2fU/h for %d min started successfully</string>
-    <string name="smscommunicator_tempbasalfailed">임시기초주입이 실패하였습니다</string>
+    <string name="smscommunicator_tempbasalfailed">Temp basal start failed</string>
     <string name="smscommunicator_basalstopreplywithcode" formatted="false">임시기초주입을 중지하려면 %s 를 입력하고 답장하세요</string>
     <string name="smscommunicator_tempbasalcanceled">Temp basal canceled</string>
-    <string name="smscommunicator_tempbasalcancelfailed">임시기초주입 취소가 실패하였습니다</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Canceling temp basal failed</string>
     <string name="smscommunicator_unknowncommand">알려지지 않은 명령이거나 잘못된 답장입니다</string>
 
     <string name="quickwizard">퀵마법사</string>

From 2365dbac860a8ff6e2dae613addbbd8b2da69568 Mon Sep 17 00:00:00 2001
From: warstar2187 <warstar2187@gmail.com>
Date: Sun, 13 Nov 2016 01:54:28 +0900
Subject: [PATCH 2/3] Update strings.xml

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

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 59018292ed..d81f82769c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -333,4 +333,16 @@
     <string name="correctionbous">Corr</string>
     <string name="ko_lang">한국어</string>
     <string name="actions">액션</string>
+    <string name="androidaps_start">AndroidAPS 시작</string>
+    <string name="ns_upload_only">NS upload only (disabled sync)</string>
+    <string name="ns_upload_only_summary">NS upload only. 로컬소스(xDrip)가 선택되지 않으면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
+    <string name="ns_upload_only_enabled">이 기능을 사용하시려면 "NS upload only"을 비활성화 하세요.</string>
+    <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
+    <string name="primefill">Prime/Fill</string>
+    <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
+    <string name="othersettings_title">Other</string>
+    <string name="fillbolus_title">Fill/Prime standard insulin amounts.</string>
+    <string name="button1">Button 1</string>
+    <string name="button2">Button 2</string>
+    <string name="button3">Button 3</string>    
 </resources>

From 7f97b232da6ad509468b1da7ce175cffe91ea3be Mon Sep 17 00:00:00 2001
From: warstar2187 <warstar2187@gmail.com>
Date: Tue, 29 Nov 2016 12:08:45 +0900
Subject: [PATCH 3/3] Update Treatment.java

---
 app/src/main/java/info/nightscout/androidaps/db/Treatment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
index 3c08789f80..f7a40284d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
@@ -78,7 +78,7 @@ public class Treatment implements DataPointWithLabelInterface {
             } else if (minAgo < end) {
                 Double x2 = (minAgo - 75) / 5;
                 result.iobContrib = this.insulin * (0.001323 * x2 * x2 - 0.054233 * x2 + 0.55556);
-                result.activityContrib = this.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * dia - peak));
+                result.activityContrib = this.insulin * (2 / dia / 60 - (minAgo - peak) * 2 / dia / 60 / (60 * 3 - peak));
             }
         }
         return result;