Merge pull request #221 from entrylabs/develop

2.1.26 add

Author: Tnks2U

src/renderer/resources/lang/en.json

@@ -831,12 +831,28 @@
         "ARDUINO_open_connector": "Open Connector",
         "ARDUINO_download_source": "• Entry Arduino code",
         "ARDUINO_reconnect": "Connect Hardware",
-        "arduino_noti_text": "Mobile devices will be\n    supported later on.",
         "ROBOT_reconnect": "Connect Robot",
         "ARDUINO_program": "Run the program",
         "ARDUINO_cloud_pc_connector": "Connect to Cloud PC",
         "ARDUINO_connected": "Hardware connected",
         "ARDUINO_connect": "* Connect hardware",
+        "hardware_connect_helper": "Help (Korean Only)",
+        "hardware_noti_installed": "When using connection program",
+        "hardware_noti_not_installed": "When using web browser",
+        "hardware_program_download": "Download program",
+        "hardware_device_name_title": "Name:",
+        "hardware_device_name_title_robot": "Name:",
+        "hardware_device_name_content": "None",
+        "hardware_connected_noti": "Please check connection program.",
+        "arduino_lite_connect": "Connect through web",
+        "arduino_lite_connected_noti": "Please save the project\nwith the device selected.",
+        "arduino_lite_disconnect": "Cancel",
+        "arduino_lite_download_driver": "Download driver",
+        "arduino_lite_download_firmware": "Download firmware",
+        "arduino_lite_reconnect": "Retry",
+        "arduino_lite_guide": "• connection guide",
+        "arduino_noti_text": "",
+        "robot_noti_text": "",
         "ARDUINO_arduino_get_number_1": "number result of signal",
         "ARDUINO_arduino_get_number_2": "",
         "ARDUINO_arduino_get_sensor_number_0": "0",
@@ -6757,6 +6773,7 @@
         "expansion_behaviorConductDisaster_description": "It is a collection of blocks about behavior-guidelines that the public should follow when natural disasters occur. (Provided by MPSS)",
         "expansion_behaviorConductLifeSafety_description": "It is a collection of blocks about basic behavior-guidelines that the public should follow for safty in life. (Provided by MPSS)",
         "expansion_emergencyActionGuidelines_description": "It is a collection of blocks about emergency action guidelines for citizens to follow in order to stay safe during natural and social disasters, as well as in everyday life.",
+        "expansion_disasterAlert_description": "It is a collection of blocks for disaster alerts, which deliver various information and notifications to protect the safety of the public.",
         "ai_utilize_tts_description": "It is a collection of blocks that can read text in a variety of voice using the Clova.",
         "hardware_need_update_title": "Entry HW update",
         "hardware_need_update_content": "Please update to the latest version,\nif you are using below version.\nEntry website only supported v1.9.0 or later.\nPlease remove the web browser cache,\nif any block doesn't appear after updating.",
@@ -7377,6 +7394,7 @@
         "repeat_inf": "Repeats the blocks inside infinitely.",
         "repeat_while_true": "Repeats the blocks inside until/while the condition is True/False. ",
         "stop_repeat": "Stops the closest block that encloses this block.\n It works with various C-shaped blocks like 'repeat' block.",
+        "continue_repeat": "Skip this repeat and run it from the beginning of the next repeat.",
         "_if": "If the condition is True/False, run the blocks inside.",
         "if_else": "If the condition is True/False, run the blocks inside the 'if' section.\nIf not, run the blocks inside the 'else' section.",
         "restart_project": "The project restarts.",
@@ -8746,6 +8764,7 @@
         "hidden_loop": "Repeat   %1 times %2",
         "repeat_inf": "Repeat infinitely %1",
         "stop_repeat": "Stop repeat %1",
+        "continue_repeat": "Skip this repeat %1",
         "wait_until_true": "Wait until %1 %2",
         "_if": "If %1 then %2",
         "if_else": "If %1 then %2 %3 else",
@@ -8856,6 +8875,7 @@
         "behaviorConductLifeSafety_title": "%1",
         "count_lifeSafety_behavior": "%1 %2 behavior-guidelines's number",
         "get_lifeSafety_behavior": "value of item %3 of %1 how to %2",
+        "disaster_alert_title_text": "Disaster alert",
         "count_disaster_alert": "number of %1 disaster alerts today",
         "get_disaster_alert": "%3 of %2 th disaster alert in %1 today",
         "check_disaster_alert": "was %1 disaster alert sent today?",

src/renderer/resources/lang/ko.json

@@ -2482,6 +2482,7 @@
         "repeat_inf": "감싸고 있는 블록들을 계속해서 반복 실행합니다.",
         "repeat_while_true": "판단값에 따라 블록의 반복여부를 결정합니다.\n이 될 때까지: 판단이 참이 될 때까지 감싸고 있는 블록들을 반복 실행합니다.\n인 동안: 판단이 참인 동안 감싸고 있는 블록들을 반복 실행합니다.",
         "stop_repeat": "이 블록을 감싸는 가장 가까운 블록을 멈춥니다.\n '반복하기'블록과 같이 ㄷ자 모양으로 다른 블록을 감싼 블록에 조립해 사용할 수 있습니다.",
+        "continue_repeat": "이 블록을 감싸는 가장 가까운 반복 블록의 이번 반복을 건너뛰고 다음 반복의 처음부터 실행합니다.",
         "_if": "만일 판단이 참이라면, 감싸고 있는 블록들을 실행합니다.",
         "if_else": "만일 판단이 참이라면 첫 번째 감싸고 있는 블록들을 실행하고, 거짓이면 두 번째 감싸고 있는 블록들을 실행합니다.",
         "wait_until_true": "판단이 참이 될 때까지 실행을 멈추고 기다립니다.",

yarn.lock

@@ -5233,7 +5233,7 @@ entities@^2.0.0:
 
 "entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.26":
   version "4.0.17"
-  resolved "git+https://github.com/entrylabs/entryjs.git#b7c366e449783ab374cf3fb20b4ff863ea52fc39"
+  resolved "git+https://github.com/entrylabs/entryjs.git#aaff5f2ad983dd0401d16e107111ec86fa1c8a75"
   dependencies:
     uid "^0.0.2"
     "@entrylabs/event" "^1.0.3"