Merge branch 'develop'

Author: extracold1209

build/entryx64.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.0.19"
+!define PRODUCT_VERSION "2.0.20"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

build/entryx86.nsi

@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.0.19"
+!define PRODUCT_VERSION "2.0.20"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

package.json

@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.0.19",
+    "version": "2.0.20",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {

src/main/constants.ts

@@ -9,7 +9,7 @@ export default class {
                 let result = fileUrl.replace(/%5C/gi, '\\'); // 1.6.x 버전 대응
                 if (result.startsWith('./bower_components')) { // 웹 기본 오브젝트 대응
                     result = result
-                        .replace('./bower_components', '../node_modules')
+                        .replace('./bower_components', '../../../node_modules')
                         .replace('entryjs', 'entry-js'); // 과거 웹 WS 대응
                 } else if (result.indexOf('temp') > -1) { // 일반 오브젝트 대응
                     result = result.substring(result.indexOf('temp'));
@@ -34,10 +34,10 @@ export default class {
 
                 // 웹 업로드시 bower 에서 받던 구조 그대로 사용할 것이므로, 그 사이에 혼동을 주지 않기 위해
                 // node_modules 로 링크되는 구조를 과거 로직으로 재치환 하여 export 함
-                if (result.startsWith('../node_modules')) {
-                    result = result.replace('../node_modules','./bower_components');
+                if (result.startsWith('../../../node_modules')) {
+                    result = result.replace('../../../node_modules','./bower_components');
                 }
-                
+
                 return result.substring(result.indexOf('temp'))
                     .replace(/\\/gi, '/')
                     .replace(/.*\/\//, ''); // 외부 접속 프로토콜 스키마 보안 대응
@@ -47,8 +47,8 @@ export default class {
                 result = result.replace(/.*\/\//, ''); // 외부 접속 프로토콜 스키마 보안 대응
                 if (result.startsWith('renderer')) {
                     result = result.replace('renderer', '.');
-                } else if (result.startsWith('../node_modules')) {
-                    result = result.replace('../node_modules','./bower_components');
+                } else if (result.startsWith('../../../node_modules')) {
+                    result = result.replace('../../../node_modules','./bower_components');
                 } else {
                     result = undefined;
                 }

src/renderer/helper/entry/entryPatcher.ts

@@ -130,7 +130,4 @@ export default function() {
             }
         });
     };
-
-    // @ts-ignore
-    Entry.AI_UTILIZE_BLOCK.tts.api = `https://playentry.org${Entry.AI_UTILIZE_BLOCK.tts.api}`;
 }

src/renderer/resources/lang/code.json

@@ -422,6 +422,11 @@
         "EXPANSION_FESTIVAL_coordinate": "coordinate",
         "EXPANSION_FESTIVAL_overview": "overview",
         "EXPANSION_FESTIVAL_homepage": "homepage",
+        "learn_type_image": "이미지",
+        "learn_type_sound": "사운드",
+        "learn_type_text": "글자",
+        "learn_popup_title": "Input Data",
+        "learn_no_result": "인식된 결과가 없습니다.",
         "no_data": "No Information",
         "no_sentence": "No sentence",
         "sentence_over_20_charactor": "Only 20 characters can be entered.",
@@ -1874,9 +1879,12 @@
         "video_transparency": "transparency",
         "video_left_right": "horizontally",
         "video_top_bottom": "vertically",
-        "video_human": "people",
-        "video_face": "face",
+        "video_human": "Human",
+        "video_face": "Face",
         "video_object": "object",
+        "video_pose_model": "Human model",
+        "video_face_model": "Face model",
+        "video_object_model": "object model",
         "video_start": "Start",
         "video_end": "Stop",
         "video_gender": "gender",
@@ -1903,8 +1911,8 @@
         "right_mouth": "Right Mouth",
         "upper_lip": "Upper Lip",
         "lower_lip": "Lower Lip",
-        "face": "face",
-        "neck": "face",
+        "face": "Face",
+        "neck": "Neck",
         "left_ear": "left ear",
         "right_ear": "right ear",
         "left_shoulder": "left shoulder",
@@ -1920,6 +1928,7 @@
         "right_knee": "right knee",
         "right_ankle": "right ankle"
     },
+    "video_gender": { "male": "Male", "female": "Female" },
     "video_emotion_params": {
         "angry": "Anger",
         "disgusted": "Disgust",
@@ -2909,7 +2918,7 @@
         "driving_elec_car": "Driving Electric Car",
         "age_13": "Age 13+",
         "travel_space": "Traveling Space",
-        "people": "People",
+        "people": "Person",
         "all": "All",
         "life": "Life",
         "nature": "Nature",
@@ -4417,15 +4426,26 @@
         "group_add_course_3": "'Learn > Open Lessons > Courseware",
         "group_add_course_4": "Browse courseware",
         "hw_main_title": "Download Program",
+        "ai_banner_title": "AI Blocks",
+        "ai_banner_headline1": "Artificial Intelligence",
+        "ai_banner_headline2": "in everyday life",
+        "ai_banner_text1": "AI is all around us.",
+        "ai_banner_text2": "From AI blocks to model training, try it yourself!",
+        "rv_banner_title": "Real-time Variable/List",
+        "rv_banner_headline1": "Information that can be lost,",
+        "rv_banner_headline2": "information that cannot be lost",
+        "rv_banner_text1": "AI is all around us.",
+        "rv_banner_text2": "use information real time!",
         "datablock_contest_title": "Data Analysis Block",
         "datablock_content_head": "Process and Represent the Data",
         "datablock_content_body1": "Find meaning by charting various data in your life",
         "datablock_content_body2": "and solve real-life problems with it!",
-        "campaign_contest_title": "Let's make a beautiful internet world",
-        "campaign_content_head": "Entry Project Contest",
-        "campaign_content_body1": "Create an originative project about 'internet ethics'",
-        "campaign_content_body2": "and apply for the contest!",
-        "campaign_content_button": "View details",
+        "campaign_contest_title": "Let's overcome Corona19",
+        "campaign_content_head": "",
+        "campaign_content_body1": "Come share your projects that will help everyone.",
+        "campaign_content_body2": "Best projects will be chosen every week,",
+        "campaign_content_body3": "Feel free to encourage others for beating Corona19!",
+        "campaign_content_button": "View Campaigns",
         "code_management_1": "Entry campaign #1 How to manage code",
         "code_management_2": "My Storage and Memo",
         "code_management_3": "Code management secret using my storage and memo!",
@@ -4621,8 +4641,11 @@
         "draw_new_table_ques_2": "Do you want to move to enter data?"
     },
     "Msgs": {
+        "video_model_load_success": "Load Success",
+        "video_model_load_completed": "Video sensing enabled",
         "microbit_led_erase_all": "Reset",
-        "loading_plz_wait": "Now Loading. Please Wait",
+        "loading_plz_wait": "Now Loading. Please Wait.",
+        "ai_utilize_video_loading": "video sensing block is now loading.<br/> It takes up to 1 minute",
         "ai_utilize_audio_listening": "Listening",
         "upload_error_title": "File rejected",
         "upload_error_content": "Files not complying with the entry usage policy are excluded",
@@ -4732,7 +4755,7 @@
         "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.",
         "ai_utilize_audio_description": "It is a collection of blocks related to speech to text functionalities.",
-        "ai_utilize_video_description": "It is a collection of blocks that can recognize movement, direction and object to be shot by using camera."
+        "ai_utilize_video_description": "It is a collection of blocks that can recognize movement, direction and object to be shot by using camera. (IE / iOS Not Supported)"
     },
     "Users": {
         "auth_failed": "Authentication failed",
@@ -4818,7 +4841,8 @@
         "cannot_save_running_project": "Can not save while running a project.",
         "character_gen": "Make an avarta",
         "check_runtime_error": "Please check the block marked with red.",
-        "check_browser_error": "This block is not compatible to IE/Safari",
+        "check_browser_error": "This block is not compatible to IE/Safari/iOS",
+        "check_browser_error_video": "This block is not compatible to IE / iOS.",
         "check_microphone_error": "There is no microphone connected to the computer",
         "check_webcam_error": "There is no camera connected to the computer",
         "context_download": "Download to PC",
@@ -5631,17 +5655,19 @@
         "speech_to_text_convert": "Converts voice input into the microphone into text.",
         "get_microphone_volume": "Reports the volume of sound input to the microphone.",
         "speech_to_text_get_value": "Reports the value that converted speech to text. If no voice is input or an error occurs during voice recognition, it will have 0 value.",
-        "video_draw_webcam": "Show or hide the video screen.",
-        "video_check_webcam": "Check whether video is connected with the computer.",
-        "video_set_camera_option": "Set the selected effect to the video screen by the input value.",
-        "video_flip_camera": "Flips the video screen horizontally or vertically.",
-        "video_toggle_model": "Start or stop the selected recognition model. Face Recognition: Recognizes a person's face to know where the eyes, nose, mouth, and ear are located, or the expected gender, age, and emotion. Human Recognition: Recognizes a person's body to know where each part is located Object Recognition: Shows the recognized object type. (Person or thing)",
-        "video_toggle_ind": "Show location and index of the detected humans / faces / objects on the screen.",
-        "video_number_detect": "Reports number of people / faces /objects detected on the video screen.",
-        "video_detected_face_info": "Reports the estimated value of the selected face area among the faces in the input order. If it is not recognized, it is outputted as 0 unconditionally. (Gender, Age, Emotion)",
-        "video_motion_value": "Reports the motion or direction value detected on the selected object or screen.",
-        "video_face_part_coord": "Reports the position value of the selected face area among the faces in the input order. If it is not recognized, it is outputted as 0 unconditionally. (Left eye, Right eye, Nose, Left mouse, Right mouse, Upper Lip, Lower Lip)",
-        "video_body_part_coord": "Reports number of human detected on the video screen. (Face, Right shoulder, Right elbow, Right wrist, Left shoulder, Left elbow, Left wrist, Right hip, Right knee, Right ankle, Left hip, Left knee, Left ankle)",
+        "video_draw_webcam": "Show or hide the video screen. (IE / iOS Not Supported)",
+        "video_check_webcam": "Check whether video is connected with the computer. (IE / iOS Not Supported)",
+        "video_set_camera_opacity_option": "Set the transparency effect to the video screen by the input value.(IE / iOS Not Supported)",
+        "video_flip_camera": "Flips the video screen horizontally or vertically. (IE / iOS Not Supported)",
+        "video_toggle_model": "Start or stop the selected recognition model. Face Recognition: Recognizes a person's face to know where the eyes, nose, mouth, and ear are located, or the expected gender, age, and emotion. Human Recognition: Recognizes a person's body to know where each part is located Object Recognition: Shows the recognized object type. (Person or thing) (IE / iOS Not Supported)",
+        "video_toggle_ind": "Show location and index of the detected humans/faces/objects on the screen. (IE / iOS Not Supported)",
+        "video_number_detect": "Reports number of humans/faces/objects detected on the video screen. (IE / iOS Not Supported)",
+        "video_object_detected": "Check whether selected object is recognized. (IE / iOS Not Supported)",
+        "video_is_model_loaded": "Check whether human/face/object is detected. (IE / iOS Not Supported)",
+        "video_detected_face_info": "Reports the estimated value of the selected face area among the faces in the input order. If it is not recognized, it is outputted as 0 unconditionally. (Gender, Age, Emotion)  (IE / iOS Not Supported)",
+        "video_motion_value": "Reports the motion or direction value detected on the selected object or screen.  (IE / iOS Not Supported)",
+        "video_face_part_coord": "Reports the position value of the selected face area among the faces in the input order. If it is not recognized, it is outputted as 0 unconditionally. (Left eye, Right eye, Nose, Left mouse, Right mouse, Top Lip, Bottom Lip)  (IE / iOS Not Supported)",
+        "video_body_part_coord": "Reports number of human detected on the video screen. (Face, Right shoulder, Right elbow, Right wrist, Left shoulder, Left elbow, Left wrist, Right hip, Right knee, Right ankle, Left hip, Left knee, Left ankle)  (IE / iOS Not Supported)",
         "append_row_to_table": "Adds a row(col) to the end location of the selected table.",
         "insert_row_to_table": "Inserts a row(col) to the location of the input value on the selected table.",
         "delete_row_from_table": "Deletes the row(col) at the location of input value from the selected table.",
@@ -5650,7 +5676,11 @@
         "get_value_from_table": "Reports the value of selected attribute at the location of the input value from the selected table.",
         "calc_values_from_table": "Reports calculated value of the selected attributes in the selected table. (sum, maximum, minimum, average, standard deviation)",
         "open_table_chart": "Open the chart of the selected table.",
-        "close_table_chart": "Close the table chart."
+        "close_table_chart": "Close the table chart.",
+        "insert_data_for_test": "Enter data and recognize it as a trained model.",
+        "test_result": "The value of the result that the model recognizes the data entered. The value is expressed by the class name (text) of the model.",
+        "accuracy_of_result": "The reliability value for the selected class of the data entered. The value is expressed as a probability (number).",
+        "is_group": "Determine 'True' if the recognition result of the data entered is the selected class."
     },
     "Category": {
         "entrybot_friends": "Entrybot friends",
@@ -6093,6 +6123,11 @@
         "weather_title_text": "weather",
         "translate_title_text": "translate",
         "festival_title_text": "festival",
+        "learning_title": "%1",
+        "insert_data_for_test": "Recognize %1 with trained model %2",
+        "test_result": "Recognition result",
+        "accuracy_of_result": "Reliability of %1",
+        "is_group": "Is the recognition result %1?",
         "audio_title_text": "Audio Sensing",
         "check_microphone": "Connected with microphone?",
         "get_microphone_volume": "Microphone volume",
@@ -6106,6 +6141,8 @@
         "video_toggle_model": "%1 recognition %2 %3",
         "video_toggle_ind": "%2 detected %1 %3",
         "video_number_detect": "Number of detected %1",
+        "video_object_detected": "Is %1 recognized among objects?",
+        "video_is_model_loaded": "detected %1?",
         "video_detected_face_info": "%2 of %1 th face",
         "video_motion_value": "Video %2 value on %1",
         "video_face_part_coord": "%3 coordinate of %2 in %1 th face",
@@ -6728,7 +6765,8 @@
         "funboard_get_touch_button_value": "%1 touch button value",
         "funboard_set_digital_buzzer": "Play tone octave %1 note %2 beat %3 %4",
         "funboard_what_button_pressed": "%1 button pressed.",
-        "funboard_what_touch_button_pressed": "%1 touch button pressed."
+        "funboard_what_touch_button_pressed": "%1 touch button pressed.",
+        "learning_title_text": "Training model"
     },
     "TextCoding": {
         "block_name": "Block Name",
@@ -7380,7 +7418,10 @@
         "data": "Data Analysis",
         "add_table": "Add Table",
         "show_chart": "Show Chart",
-        "legend": "Legend",
+        "legend": "Value",
+        "summary": "Summary",
+        "column_name": "Column Name",
+        "total": "Total",
         "dashboard": "Dashboard",
         "table": "Table",
         "chart": "Chart",
@@ -7420,11 +7461,11 @@
         "line": "line",
         "pie": "pie",
         "scatter": "scatter",
-        "select_x_axis": "Select the horizontal axis.",
-        "x_axis": "Horiz. axis",
-        "y_axis": "Ver. axis",
-        "select_y_axis": "Select the vertical axis.",
-        "select_y_axis_or_legend": "Select the vertical axis or legends.",
+        "select_x_axis": "Select the x-axis.",
+        "x_axis": "x-axis",
+        "y_axis": "y-axis",
+        "select_y_axis": "Select the y-axis.",
+        "select_y_axis_or_legend": "Select the y-axis or legends.",
         "select_legend": "Select the legends.",
         "cell": "Cell",
         "unable_to_express_chart": "This cannot be expressed in charts.",
@@ -7437,7 +7478,14 @@
         "saved_table_content": "The information of table and charts was successfully saved.",
         "empty_table_name_content": "Table's name can't be space.",
         "do_not_delete_row": "The row cannot be deleted.",
-        "rows_cannot_less_one": "Tables must have at least one row."
+        "rows_cannot_less_one": "Tables must have at least one row.",
+        "and": "and",
+        "other": "other(s)",
+        "stop": "Project Stop",
+        "restart": "Project Resume",
+        "pause": "Project Pause",
+        "max_row_count_error_title": "Caution",
+        "max_row_count_error": "If the table has more than 5000 rows, When you edit a table or add a chart, your browser might stop.\nIf there is a problem, please adjust the number of rows."
     },
     "SharePolicy": { "title": "Entry Project/Post share Guide" }
 }