merge conflicts from hotfix

.gitignore

@@ -19,6 +19,7 @@ OpenRobertaServer/db-*
 **/*.pyc
 **/*.py~
 **/*.csv
+++/*.map
 dbIptoCountry/
 **/notifications.json
 **/data/test/output/*

OpenRobertaServer/staticResources/blockly/msg/js/ar.js

@@ -1170,6 +1170,8 @@ Blockly.Msg.OLDER_THEN_14 = "I am 16 or older than 16!";  // untranslated
 Blockly.Msg.OMNIDRIVE_TOOLTIP = "Represents an omnidirectional drive system.";  // untranslated
 Blockly.Msg.ON = "on";  // untranslated
 Blockly.Msg.OPTICAL_TOOLTIP = "Represent an optical sensor also called reflected light sensor.";  // untranslated
+Blockly.Msg.OPTION_FILE_DOWNLOAD = "Download your program as a file";  // untranslated
+Blockly.Msg.OPTION_WEBUSB = "Connect your micro:bit device to the computer<br><small>select it in the next popup and click »Connect«</small>";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_CHANGED = "The shared right for user »$« is updated!";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_DELETED = "The shared right for user »$« is deleted!";  // untranslated
 Blockly.Msg.ORA_ACCOUNT_NOT_ACTIVATED_TO_SHARE = "Your are not allowed to share. Please activate your account! <br><a href='https://www.roberta-home.de/index.php?id=138&L=1' target='_blank'>Further information ...</a>";  // untranslated
@@ -1818,10 +1820,39 @@ Blockly.Msg.SSID = "SSID";  // untranslated
 Blockly.Msg.START = "start";  // untranslated
 Blockly.Msg.START_ACTIVITY = "activity";  // untranslated
 Blockly.Msg.START_ACTIVITY_TOOLTIP = "Starts additional activity.";  // untranslated
+Blockly.Msg.START_ALL_ROBOTS = "All systems and filter options";  // untranslated
+Blockly.Msg.START_CONNECT_HEADLINE = "Connect your robot";  // untranslated
+Blockly.Msg.START_CONNECT_TEXT = "You can directly connect your robot. The suitable NEPO program opens automatically.";  // untranslated
+Blockly.Msg.START_FAQ = "Find answers to questions about the Open Roberta Lab that we have been asked so far or that we have already asked ourselves.";  // untranslated
+Blockly.Msg.START_FAQ_HEADLINE = "Find answers to important questions";  // untranslated
+Blockly.Msg.START_FEATURES = "Features";  // untranslated
+Blockly.Msg.START_FIRST_HELP = "First time here? Find support and helpful information.";  // untranslated
+Blockly.Msg.START_FOOTER_FRAUNHOFER = "Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS";  // untranslated
+Blockly.Msg.START_FOOTER_INFORMATION = "<strong>Information</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_RESSOURCES = "<strong>Resources</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_ROBERTA_IAIS = "Part of the Roberta Initiative<sup>®</sup> of Fraunhofer IAIS";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_FOUR = "Boards";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_ONE = "Program";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_THREE = "Robots &";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_TWO = "your";  // untranslated
+Blockly.Msg.START_IMPORT_HEADLINE = "Import your NEPO program";  // untranslated
+Blockly.Msg.START_IMPORT_TEXT = "Upload your XML file to our lab and continue where you left off.";  // untranslated
+Blockly.Msg.START_LOGIN_HEADLINE = "Sign in";  // untranslated
+Blockly.Msg.START_LOGIN_TEXT = "Log in and have access to your saved programs and settings.";  // untranslated
+Blockly.Msg.START_NN = "Neural networks";  // untranslated
+Blockly.Msg.START_POPULAR_ROBOTS = "Popular systems";  // untranslated
+Blockly.Msg.START_PROGLANG = "Programming languages";  // untranslated
 Blockly.Msg.START_PROGRAM = "start";  // untranslated
 Blockly.Msg.START_PROGRAM_AUTOMOMOUSLIFE = "autonomous behaviour";  // untranslated
 Blockly.Msg.START_PROGRAM_DEBUG = "show sensor data";  // untranslated
+Blockly.Msg.START_SIMULATION = "Simulation";  // untranslated
+Blockly.Msg.START_START = "get started";  // untranslated
+Blockly.Msg.START_TEASER = "Our open source platform »Open Roberta Lab« let you create your very own programs in no time at all using drag and drop. The graphical programming language <span class='nepo'>(NEPO)</span> will support you.";  // untranslated
 Blockly.Msg.START_TOOLTIP = "The starting point for the main program.";  // untranslated
+Blockly.Msg.START_TOUR_HEADLINE = "Take an interactive tour";  // untranslated
+Blockly.Msg.START_WIKI_HEADLINE = "Take a look at our wiki";  // untranslated
+Blockly.Msg.START_YOUTUBE_HEADLINE = "Visit us on YouTube";  // untranslated
+Blockly.Msg.START_YOUTUBE_TEXT = "On our YouTube channel you will find tutorials, experiments and mini-clips about programming with Open Roberta and robotics in education.";  // untranslated
 Blockly.Msg.STEPMOTOR_TOOLTIP = "Represents a step motor.";  // untranslated
 Blockly.Msg.STEPS_PER_REVOLUTION = "steps per revolution";  // untranslated
 Blockly.Msg.STEP_MOTOR = "step motor";  // untranslated
@@ -1909,6 +1940,8 @@ Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP = "Gets the current reading from the timer."
 Blockly.Msg.TIMER_RESET_TOOLTIP = "Resets the timer.";  // untranslated
 Blockly.Msg.TIMER_SET_TOOLTIP = "Sets the timer to defined period in milliseconds.";  // untranslated
 Blockly.Msg.TITLE = "title";  // untranslated
+Blockly.Msg.TITLE_GOAL = "Learning objective";  // untranslated
+Blockly.Msg.TITLE_PREVIOUS = "Previous knowledge";  // untranslated
 Blockly.Msg.TO = "to";  // untranslated
 Blockly.Msg.TODAY = "اليوم";
 Blockly.Msg.TOOLBOX_ACTION = "Action";  // untranslated

OpenRobertaServer/staticResources/blockly/msg/js/az.js

@@ -1170,6 +1170,8 @@ Blockly.Msg.OLDER_THEN_14 = "I am 16 or older than 16!";  // untranslated
 Blockly.Msg.OMNIDRIVE_TOOLTIP = "Represents an omnidirectional drive system.";  // untranslated
 Blockly.Msg.ON = "on";  // untranslated
 Blockly.Msg.OPTICAL_TOOLTIP = "Represent an optical sensor also called reflected light sensor.";  // untranslated
+Blockly.Msg.OPTION_FILE_DOWNLOAD = "Download your program as a file";  // untranslated
+Blockly.Msg.OPTION_WEBUSB = "Connect your micro:bit device to the computer<br><small>select it in the next popup and click »Connect«</small>";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_CHANGED = "The shared right for user »$« is updated!";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_DELETED = "The shared right for user »$« is deleted!";  // untranslated
 Blockly.Msg.ORA_ACCOUNT_NOT_ACTIVATED_TO_SHARE = "Your are not allowed to share. Please activate your account! <br><a href='https://www.roberta-home.de/index.php?id=138&L=1' target='_blank'>Further information ...</a>";  // untranslated
@@ -1818,10 +1820,39 @@ Blockly.Msg.SSID = "SSID";  // untranslated
 Blockly.Msg.START = "start";  // untranslated
 Blockly.Msg.START_ACTIVITY = "activity";  // untranslated
 Blockly.Msg.START_ACTIVITY_TOOLTIP = "Starts additional activity.";  // untranslated
+Blockly.Msg.START_ALL_ROBOTS = "All systems and filter options";  // untranslated
+Blockly.Msg.START_CONNECT_HEADLINE = "Connect your robot";  // untranslated
+Blockly.Msg.START_CONNECT_TEXT = "You can directly connect your robot. The suitable NEPO program opens automatically.";  // untranslated
+Blockly.Msg.START_FAQ = "Find answers to questions about the Open Roberta Lab that we have been asked so far or that we have already asked ourselves.";  // untranslated
+Blockly.Msg.START_FAQ_HEADLINE = "Find answers to important questions";  // untranslated
+Blockly.Msg.START_FEATURES = "Features";  // untranslated
+Blockly.Msg.START_FIRST_HELP = "First time here? Find support and helpful information.";  // untranslated
+Blockly.Msg.START_FOOTER_FRAUNHOFER = "Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS";  // untranslated
+Blockly.Msg.START_FOOTER_INFORMATION = "<strong>Information</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_RESSOURCES = "<strong>Resources</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_ROBERTA_IAIS = "Part of the Roberta Initiative<sup>®</sup> of Fraunhofer IAIS";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_FOUR = "Boards";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_ONE = "Program";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_THREE = "Robots &";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_TWO = "your";  // untranslated
+Blockly.Msg.START_IMPORT_HEADLINE = "Import your NEPO program";  // untranslated
+Blockly.Msg.START_IMPORT_TEXT = "Upload your XML file to our lab and continue where you left off.";  // untranslated
+Blockly.Msg.START_LOGIN_HEADLINE = "Sign in";  // untranslated
+Blockly.Msg.START_LOGIN_TEXT = "Log in and have access to your saved programs and settings.";  // untranslated
+Blockly.Msg.START_NN = "Neural networks";  // untranslated
+Blockly.Msg.START_POPULAR_ROBOTS = "Popular systems";  // untranslated
+Blockly.Msg.START_PROGLANG = "Programming languages";  // untranslated
 Blockly.Msg.START_PROGRAM = "start";  // untranslated
 Blockly.Msg.START_PROGRAM_AUTOMOMOUSLIFE = "autonomous behaviour";  // untranslated
 Blockly.Msg.START_PROGRAM_DEBUG = "show sensor data";  // untranslated
+Blockly.Msg.START_SIMULATION = "Simulation";  // untranslated
+Blockly.Msg.START_START = "get started";  // untranslated
+Blockly.Msg.START_TEASER = "Our open source platform »Open Roberta Lab« let you create your very own programs in no time at all using drag and drop. The graphical programming language <span class='nepo'>(NEPO)</span> will support you.";  // untranslated
 Blockly.Msg.START_TOOLTIP = "The starting point for the main program.";  // untranslated
+Blockly.Msg.START_TOUR_HEADLINE = "Take an interactive tour";  // untranslated
+Blockly.Msg.START_WIKI_HEADLINE = "Take a look at our wiki";  // untranslated
+Blockly.Msg.START_YOUTUBE_HEADLINE = "Visit us on YouTube";  // untranslated
+Blockly.Msg.START_YOUTUBE_TEXT = "On our YouTube channel you will find tutorials, experiments and mini-clips about programming with Open Roberta and robotics in education.";  // untranslated
 Blockly.Msg.STEPMOTOR_TOOLTIP = "Represents a step motor.";  // untranslated
 Blockly.Msg.STEPS_PER_REVOLUTION = "steps per revolution";  // untranslated
 Blockly.Msg.STEP_MOTOR = "step motor";  // untranslated
@@ -1909,6 +1940,8 @@ Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP = "Gets the current reading from the timer."
 Blockly.Msg.TIMER_RESET_TOOLTIP = "Resets the timer.";  // untranslated
 Blockly.Msg.TIMER_SET_TOOLTIP = "Sets the timer to defined period in milliseconds.";  // untranslated
 Blockly.Msg.TITLE = "title";  // untranslated
+Blockly.Msg.TITLE_GOAL = "Learning objective";  // untranslated
+Blockly.Msg.TITLE_PREVIOUS = "Previous knowledge";  // untranslated
 Blockly.Msg.TO = "to";  // untranslated
 Blockly.Msg.TODAY = "Bugün";
 Blockly.Msg.TOOLBOX_ACTION = "Action";  // untranslated

OpenRobertaServer/staticResources/blockly/msg/js/ba.js

@@ -1170,6 +1170,8 @@ Blockly.Msg.OLDER_THEN_14 = "I am 16 or older than 16!";  // untranslated
 Blockly.Msg.OMNIDRIVE_TOOLTIP = "Represents an omnidirectional drive system.";  // untranslated
 Blockly.Msg.ON = "on";  // untranslated
 Blockly.Msg.OPTICAL_TOOLTIP = "Represent an optical sensor also called reflected light sensor.";  // untranslated
+Blockly.Msg.OPTION_FILE_DOWNLOAD = "Download your program as a file";  // untranslated
+Blockly.Msg.OPTION_WEBUSB = "Connect your micro:bit device to the computer<br><small>select it in the next popup and click »Connect«</small>";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_CHANGED = "The shared right for user »$« is updated!";  // untranslated
 Blockly.Msg.ORA_ACCESS_RIGHT_DELETED = "The shared right for user »$« is deleted!";  // untranslated
 Blockly.Msg.ORA_ACCOUNT_NOT_ACTIVATED_TO_SHARE = "Your are not allowed to share. Please activate your account! <br><a href='https://www.roberta-home.de/index.php?id=138&L=1' target='_blank'>Further information ...</a>";  // untranslated
@@ -1818,10 +1820,39 @@ Blockly.Msg.SSID = "SSID";  // untranslated
 Blockly.Msg.START = "start";  // untranslated
 Blockly.Msg.START_ACTIVITY = "activity";  // untranslated
 Blockly.Msg.START_ACTIVITY_TOOLTIP = "Starts additional activity.";  // untranslated
+Blockly.Msg.START_ALL_ROBOTS = "All systems and filter options";  // untranslated
+Blockly.Msg.START_CONNECT_HEADLINE = "Connect your robot";  // untranslated
+Blockly.Msg.START_CONNECT_TEXT = "You can directly connect your robot. The suitable NEPO program opens automatically.";  // untranslated
+Blockly.Msg.START_FAQ = "Find answers to questions about the Open Roberta Lab that we have been asked so far or that we have already asked ourselves.";  // untranslated
+Blockly.Msg.START_FAQ_HEADLINE = "Find answers to important questions";  // untranslated
+Blockly.Msg.START_FEATURES = "Features";  // untranslated
+Blockly.Msg.START_FIRST_HELP = "First time here? Find support and helpful information.";  // untranslated
+Blockly.Msg.START_FOOTER_FRAUNHOFER = "Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS";  // untranslated
+Blockly.Msg.START_FOOTER_INFORMATION = "<strong>Information</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_RESSOURCES = "<strong>Resources</strong>";  // untranslated
+Blockly.Msg.START_FOOTER_ROBERTA_IAIS = "Part of the Roberta Initiative<sup>®</sup> of Fraunhofer IAIS";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_FOUR = "Boards";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_ONE = "Program";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_THREE = "Robots &";  // untranslated
+Blockly.Msg.START_HEADLINE_PART_TWO = "your";  // untranslated
+Blockly.Msg.START_IMPORT_HEADLINE = "Import your NEPO program";  // untranslated
+Blockly.Msg.START_IMPORT_TEXT = "Upload your XML file to our lab and continue where you left off.";  // untranslated
+Blockly.Msg.START_LOGIN_HEADLINE = "Sign in";  // untranslated
+Blockly.Msg.START_LOGIN_TEXT = "Log in and have access to your saved programs and settings.";  // untranslated
+Blockly.Msg.START_NN = "Neural networks";  // untranslated
+Blockly.Msg.START_POPULAR_ROBOTS = "Popular systems";  // untranslated
+Blockly.Msg.START_PROGLANG = "Programming languages";  // untranslated
 Blockly.Msg.START_PROGRAM = "start";  // untranslated
 Blockly.Msg.START_PROGRAM_AUTOMOMOUSLIFE = "autonomous behaviour";  // untranslated
 Blockly.Msg.START_PROGRAM_DEBUG = "show sensor data";  // untranslated
+Blockly.Msg.START_SIMULATION = "Simulation";  // untranslated
+Blockly.Msg.START_START = "get started";  // untranslated
+Blockly.Msg.START_TEASER = "Our open source platform »Open Roberta Lab« let you create your very own programs in no time at all using drag and drop. The graphical programming language <span class='nepo'>(NEPO)</span> will support you.";  // untranslated
 Blockly.Msg.START_TOOLTIP = "The starting point for the main program.";  // untranslated
+Blockly.Msg.START_TOUR_HEADLINE = "Take an interactive tour";  // untranslated
+Blockly.Msg.START_WIKI_HEADLINE = "Take a look at our wiki";  // untranslated
+Blockly.Msg.START_YOUTUBE_HEADLINE = "Visit us on YouTube";  // untranslated
+Blockly.Msg.START_YOUTUBE_TEXT = "On our YouTube channel you will find tutorials, experiments and mini-clips about programming with Open Roberta and robotics in education.";  // untranslated
 Blockly.Msg.STEPMOTOR_TOOLTIP = "Represents a step motor.";  // untranslated
 Blockly.Msg.STEPS_PER_REVOLUTION = "steps per revolution";  // untranslated
 Blockly.Msg.STEP_MOTOR = "step motor";  // untranslated
@@ -1909,6 +1940,8 @@ Blockly.Msg.TIMER_GETSAMPLE_TOOLTIP = "Gets the current reading from the timer."
 Blockly.Msg.TIMER_RESET_TOOLTIP = "Resets the timer.";  // untranslated
 Blockly.Msg.TIMER_SET_TOOLTIP = "Sets the timer to defined period in milliseconds.";  // untranslated
 Blockly.Msg.TITLE = "title";  // untranslated
+Blockly.Msg.TITLE_GOAL = "Learning objective";  // untranslated
+Blockly.Msg.TITLE_PREVIOUS = "Previous knowledge";  // untranslated
 Blockly.Msg.TO = "to";  // untranslated
 Blockly.Msg.TODAY = "Бөгөн";
 Blockly.Msg.TOOLBOX_ACTION = "Action";  // untranslated