Merge branch 'development' into feat/senseBoxConnect

2021-11-23 11:55:15 +01:00
parent faaabf907b 56c39e9a9d
commit d167d883b1
26 changed files with 11231 additions and 8820 deletions
@@ -1,11 +1,10 @@
 export const FAQ = {
-    /**
-     * FAQ
-     */
+  /**
+   * FAQ
+   */

-
-    faq_q1_question: `How can I copy my program to the senseBox?`,
-    faq_q1_answer: `To copy programs to the senseBox, connect it to the computer with the Micro USB cable. Then double click on the red reset button on the senseBox MCU. The senseBox will now be recognized as a removable disk on your computer and the previously created programs can be copied via drag & drop. After each change of the program code the program must be recompiled and transferred again.
+  faq_q1_question: `How can I copy my program to the senseBox?`,
+  faq_q1_answer: `To copy programs to the senseBox, connect it to the computer with the Micro USB cable. Then double click on the red reset button on the senseBox MCU. The senseBox will now be recognized as a removable disk on your computer and the previously created programs can be copied via drag & drop. After each change of the program code the program must be recompiled and transferred again.
 #### Activate learning mode of the MCU
 <iframe width="560" height="315" src="https://www.youtube.com/embed/jzlOJ7Zuqqw" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

@@ -15,15 +14,15 @@ Copying programs under MacOS does not work via the Finder, but there are still t
 - [muCommander](https://www.mucommander.com/)
 `,

-    faq_q2_question: `With which senseBox is the programming environment compatible?`,
-    faq_q2_answer: `
+  faq_q2_question: `With which senseBox is the programming environment compatible?`,
+  faq_q2_answer: `
 Basically the programming environment can be used with any senseBox with senseBox MCU. 
 `,

-
-    faq_q3_question: `I found an error or something is not working. Where can I report it?`,
-    faq_q3_answer: `
+  faq_q3_question: `I found an error or something is not working. Where can I report it?`,
+  faq_q3_answer: `
 The best way to do this is to create an issue on [Github](https://github.com/sensebox/React-Ardublockly/issues). Alternatively you can send us an email to info(at)sensebox.de
 `,
-
-}
+  faq_tablet_question: `Can I program the senseBox with a tablet?`,
+  faq_tablet_answer: `Yes! Install the senseBox Connect app from the App Store and call up the learning and programming environment in your browser on the tablet. Detailed information on how to use the app can be found at [https://sensebox.de/app](https://sensebox.de/app)`,
+};
@@ -1,45 +1,45 @@
 export const LED = {
+  senseBox_led: "LED connected to",
+  senseBox_led_tip: "simple LED. Don't forget the resistor",

+  senseBox_rgb_led: "RGB-LED",
+  senseBox_rgb_led_tip: "RGB-LED",

+  /**
+   * WS2818 RGB LED
+   */
+  senseBox_ws2818_rgb_led: "Set RGB-LED at",
+  senseBox_ws2818_rgb_led_init: "Initialise RGB LED (WS2818)",
+  senseBox_ws2818_rgb_led_position: "Position",
+  senseBox_ws2818_rgb_led_brightness: "Brightness",
+  senseBox_ws2818_rgb_led_tooltip:
+    "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
+  senseBox_ws2818_rgb_led_init_tooltip:
+    "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
+  senseBox_ws2818_rgb_led_color: "Color",
+  senseBox_ws2818_rgb_led_number: "Number",

-    senseBox_led: "LED connected to digital",
-    senseBox_led_tip: "simple LED. Don't forget the resistor",
+  /**
+   * Color
+   */

-    senseBox_rgb_led: "RGB-LED",
-    senseBox_rgb_led_tip: "RGB-LED",
-
-    /**
-     * WS2818 RGB LED
-     */
-    senseBox_ws2818_rgb_led: "Set RGB-LED at",
-    senseBox_ws2818_rgb_led_init: "Initialise RGB LED (WS2818)",
-    senseBox_ws2818_rgb_led_position: "Position",
-    senseBox_ws2818_rgb_led_brightness: "Brightness",
-    senseBox_ws2818_rgb_led_tooltip: "Change the color of your RGB LED with this block. Link a block for the color. If multiple RGB LEDs are chained together you can use the position to determine which LED is controlled.",
-    senseBox_ws2818_rgb_led_init_tooltip: "Connect the RGB LED to one of the three **digital/analog ports**. If multiple RGB LEDs are daisy-chained together you can determine which LED is controlled by position.",
-    senseBox_ws2818_rgb_led_color: "Color",
-    senseBox_ws2818_rgb_led_number: "Number",
-
-    /**
-     * Color
-     */
-
-    COLOUR_BLEND_COLOUR1: "colour 1",
-    COLOUR_BLEND_COLOUR2: "colour 2",
-    COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
-    COLOUR_BLEND_RATIO: "ratio",
-    COLOUR_BLEND_TITLE: "blend",
-    COLOUR_BLEND_TOOLTIP: "Blends two colours together with a given ratio (0.0 - 1.0).",
-    COLOUR_PICKER_HELPURL: "https://en.wikipedia.org/wiki/Color",
-    COLOUR_PICKER_TOOLTIP: "Choose a colour from the palette.",
-    COLOUR_RANDOM_HELPURL: "http://randomcolour.com",
-    COLOUR_RANDOM_TITLE: "random colour",
-    COLOUR_RANDOM_TOOLTIP: "Choose a colour at random.",
-    COLOUR_RGB_BLUE: "blue",
-    COLOUR_RGB_GREEN: "green",
-    COLOUR_RGB_HELPURL: "http://www.december.com/html/spec/colorper.html",
-    COLOUR_RGB_RED: "red",
-    COLOUR_RGB_TITLE: "colour with",
-    COLOUR_RGB_TOOLTIP: "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
-
-}
+  COLOUR_BLEND_COLOUR1: "colour 1",
+  COLOUR_BLEND_COLOUR2: "colour 2",
+  COLOUR_BLEND_HELPURL: "http://meyerweb.com/eric/tools/color-blend/",
+  COLOUR_BLEND_RATIO: "ratio",
+  COLOUR_BLEND_TITLE: "blend",
+  COLOUR_BLEND_TOOLTIP:
+    "Blends two colours together with a given ratio (0.0 - 1.0).",
+  COLOUR_PICKER_HELPURL: "https://en.wikipedia.org/wiki/Color",
+  COLOUR_PICKER_TOOLTIP: "Choose a colour from the palette.",
+  COLOUR_RANDOM_HELPURL: "http://randomcolour.com",
+  COLOUR_RANDOM_TITLE: "random colour",
+  COLOUR_RANDOM_TOOLTIP: "Choose a colour at random.",
+  COLOUR_RGB_BLUE: "blue",
+  COLOUR_RGB_GREEN: "green",
+  COLOUR_RGB_HELPURL: "http://www.december.com/html/spec/colorper.html",
+  COLOUR_RGB_RED: "red",
+  COLOUR_RGB_TITLE: "colour with",
+  COLOUR_RGB_TOOLTIP:
+    "Create a colour with the specified amount of red, green, and blue. All values must be between 0 and 255.",
+};
@@ -49,6 +49,14 @@ export const UI = {
  tooltip_project_title: "Project title",
  tooltip_check_solution: "Check solution",
  tooltip_copy_code: "Copy Code to clipboard",
+  tooltip_statistics_current: "Number of current blocks",
+  tooltip_statistics_new: "Number of new blocks",
+  tooltip_statistics_changed: "Number of changed blocks",
+  tooltip_statistics_moved: "Number of moved blocks",
+  tooltip_statistics_deleted: "Number of deleted blocks",
+  tooltip_statistics_remaining: "Remaining blocks",
+  tooltip_statistics_show: "Show statistics",
+  tooltip_start_tour: "start Tour",

  /**
   * Messages
@@ -183,7 +191,7 @@ export const UI = {
  /**
   * Tutorials
   */
-
+  tutorials_home_head: "Tutorials",
  tutorials_assessment_task: "Task",
  tutorials_hardware_head:
    "For the implementation you need the following hardware:",
@@ -196,7 +204,9 @@ export const UI = {
  /**
   * Tutorial Builder
   */
-
+  uilder_createNew: "create new Tutorial",
+  builder_changeExisting: "change existing Tutorial",
+  builder_deleteExisting: "remove existing Tutorial",
  builder_solution: "Solution",
  builder_solution_submit: "Submit Solution",
  builder_example_submit: "Submit example",