Merge branch 'development'

Conflicts:
	blockly/core/tooltip.js

fixed merge conflict.

blockly/core/tooltip.js

@@ -246,7 +246,7 @@ Blockly.Tooltip.show_ = function() {
     var tmp = document.createElement('div');
     tmp.innerHTML = tip;
     var elem = tmp.getElementsByTagName('img')[0];
-    // if elem contains a src attribute I'll guess that it is a valid img
+    // if elem contains a src attribute I'll use it
     if (elem['src']) {
       div.appendChild(elem);
       tooltip_is_image = 1;

blockscad/msg/js/de.js

@@ -46,11 +46,11 @@ Blockscad.Msg.COLOR = "Farbe";
 Blockscad.Msg.COLOR_HSV_TOOLTIP = "Apply a color by specifying the hue, saturation, and value components.  Each value should be between 0 and 100.";
 Blockscad.Msg.COLOR_HUE = "hue";
 Blockscad.Msg.COLOR_RGB_TOOLTIP = "Apply a color by specifying the red, blue, and green components.  Each value should be between 0 and 100.";
-Blockscad.Msg.COLOR_SATURATION = "Sättigung";
+Blockscad.Msg.COLOR_SATURATION = "sättigung";
 Blockscad.Msg.COLOR_TOOLTIP = "Applies the color to the child object, which must be 3D.";
-Blockscad.Msg.COLOR_VALUE = "Wert";
-Blockscad.Msg.CONFIRM_DIALOG_NO = "Cancel";
-Blockscad.Msg.CONFIRM_DIALOG_YES = "Sure";
+Blockscad.Msg.COLOR_VALUE = "wert";
+Blockscad.Msg.CONFIRM_DIALOG_NO = "Abbrechen";
+Blockscad.Msg.CONFIRM_DIALOG_YES = "Ja";
 Blockscad.Msg.CONFIRM_NEW_PASSWORD = "Wiederhohle neues Password";
 Blockscad.Msg.CONTROLS_FOR_TOOLTIP_CHAINHULL = "Return the convex hull of each shape in the loop with the next shape";
 Blockscad.Msg.CONVEX_HULL = "Hülle";
@@ -59,13 +59,13 @@ Blockscad.Msg.CUBE_TOOLTIP = "<img src='imgs/en/cube.svg' width='100px'>";
 Blockscad.Msg.CYLINDER = "Zylinder";
 Blockscad.Msg.CYLINDER_TOOLTIP = "<img src='imgs/en/cylinder.svg' width='90px'>";
 Blockscad.Msg.DELETE_ACCOUNT = "Benutzer löschen";
-Blockscad.Msg.DELETE_ACCOUNT_BUTTON = "Delete Account and Sign Out";
+Blockscad.Msg.DELETE_ACCOUNT_BUTTON = "Lösche dein Konto und melde dich ab";
 Blockscad.Msg.DELETE_ACCOUNT_CONFIRM = "Are you sure you want to delete your BlocksCAD account?";
 Blockscad.Msg.DELETE_ACCOUNT_CONFIRM_PASSWORD = "Enter password to confirm";
 Blockscad.Msg.DELETE_ACCOUNT_INSTRUCTIONS_ONE = "In about 48 hours your account will be permanently deleted.";
 Blockscad.Msg.DELETE_ACCOUNT_INSTRUCTIONS_TWO = "If you change your mind, just sign in to your account within the next 48 hours.";
 Blockscad.Msg.DELETE_PROJECT_CONFIRM = "Are you sure you want to delete *Project_name*?";
-Blockscad.Msg.DIALOG_OR = "or";
+Blockscad.Msg.DIALOG_OR = "oder";
 Blockscad.Msg.DIFFERENCE = "Differenz";
 Blockscad.Msg.DIFFERENCE_TOOLTIP = "Subtracts one or more objects from the first object in the list.";
 Blockscad.Msg.DIRECTION_BACK = "hinten";
@@ -76,7 +76,7 @@ Blockscad.Msg.DIRECTION_LEFT = "links";
 Blockscad.Msg.DIRECTION_RIGHT = "rechts";
 Blockscad.Msg.DIRECTION_TOP = "oben";
 Blockscad.Msg.DISABLE_ALL = "Disable All Blocks";
-Blockscad.Msg.DISCARD_ALL = "Lösche alle %1 Blöcke?";
+Blockscad.Msg.DISCARD_ALL = "Bist du sicher, dass du alle %1 Blöcke löschen?";
 Blockscad.Msg.DOCUMENTATION_LINK = "Dokumentation";
 Blockscad.Msg.EMAIL_FIELD = "E-Mail";
 Blockscad.Msg.ENABLE_ALL = "Enable All Blocks";
@@ -101,8 +101,8 @@ Blockscad.Msg.EXAMPLE_ANTHIAS_FISH = "Anthias Fisch";
 Blockscad.Msg.EXAMPLE_CUBE_WITH_CUTOUTS = "Kubus mit Ausspaarungen";
 Blockscad.Msg.EXAMPLE_LOOP_SINE = "Sinus Funktion mit Wiederhohlungen";
 Blockscad.Msg.EXAMPLE_LOOP_SUN = "Sonne mit Wiederhohlungen";
-Blockscad.Msg.EXAMPLE_PARAMETRIC_BOX = "any size box";
-Blockscad.Msg.EXAMPLE_PARAMETRIC_EQ_KNOT = "knot from parametric equations";
+Blockscad.Msg.EXAMPLE_PARAMETRIC_BOX = "Schachtel";
+Blockscad.Msg.EXAMPLE_PARAMETRIC_EQ_KNOT = "Kleeblattknoten mit Parametern";
 Blockscad.Msg.FACES = "faces";
 Blockscad.Msg.FANCYMIRROR_TOOLTIP = "Mirrors one or more objects across specified plane whose normal vector is from (0,0,0) to the point (x,y,z).";
 Blockscad.Msg.FANCYROTATE_TOOLTIP = "Rotates one or more objects around a vector from the origin (0,0,0) to the point (x,y,z)";
@@ -121,7 +121,7 @@ Blockscad.Msg.IMPORT_STL_MENU = "Importiere STL Datei in dieses Projekt";
 Blockscad.Msg.INTERSECTION = "Schnittpunkt";
 Blockscad.Msg.INTERSECTION_TOOLTIP = "Returns the intersection (area that overlaps) of two or more objects.";
 Blockscad.Msg.LINEAREXTRUDE_TOOLTIP = "Extrudes one or more 2-dimensional objects by a specified height with a specified twist. Shape can be scaled as it extrudes in both x and y. It may optionally be centered around the origin.";
-Blockscad.Msg.LINEAR_EXTRUDE = "linear extrude";
+Blockscad.Msg.LINEAR_EXTRUDE = "lineares Herausziehen";
 Blockscad.Msg.LOAD_BLOCKS_LOCAL = "Lade Blöcke von deinem PC hoch";
 Blockscad.Msg.LOGIN_BUTTON = "Anmelden";
 Blockscad.Msg.LOGIN_IN_PROGRESS = "Melde an...";
@@ -170,7 +170,7 @@ Blockscad.Msg.RENDER_BUTTON = "Render";
 Blockscad.Msg.RENDER_ERROR_EMPTY = "Nichts zum Rendern";
 Blockscad.Msg.RENDER_ERROR_MIXED = "Es sind 2D und 3D Objekte vorhanden. Es darf aber nur eine Art vorhanden sein.";
 Blockscad.Msg.RENDER_IN_PROGRESS = "Rendering...";
-Blockscad.Msg.RESET_PASSWORD = "Reset Password";
+Blockscad.Msg.RESET_PASSWORD = "Passwort zurücksetzen";
 Blockscad.Msg.RESET_PASSWORD_INSTRUCTIONS = "Gib deinen Benutzernamen und deine E-Mailadresse ein und wir senden dir ein E-Mail mit Instruktionen um dein Passwort zurück zu setzen.";
 Blockscad.Msg.RESET_PASSWORD_LINK_BUTTON = "Sende mir einen Link um mein Passwort zurück zu setzen!";
 Blockscad.Msg.RESET_VIEW_BUTTON = "Ansicht zurücksetzen";
@@ -178,7 +178,7 @@ Blockscad.Msg.RGB_COLOR_MODEL = "RGB";
 Blockscad.Msg.ROTATE = "rotieren";
 Blockscad.Msg.ROTATEEXTRUDE_TOOLTIP = "Rotate extrudes one or more 2-dimensional objects around the Z axis with a specified number of sides.";
 Blockscad.Msg.ROTATE_ADVANCED = "fancy rotate";
-Blockscad.Msg.ROTATE_EXTRUDE = "rotate extrude";
+Blockscad.Msg.ROTATE_EXTRUDE = "rotiertes Herausziehen";
 Blockscad.Msg.SAVE_BLOCKS_AS_COPY = "Als Kopie speichern";
 Blockscad.Msg.SAVE_BLOCKS_LOCAL = "Lade Blöcke auf deinen PC herunter";
 Blockscad.Msg.SAVE_BUTTON = "Speichern";
@@ -186,9 +186,9 @@ Blockscad.Msg.SAVE_COMPLETE = "Gespeichert!";
 Blockscad.Msg.SAVE_FAILED = "Speichern fehlgeschlagen.";
 Blockscad.Msg.SAVE_FAILED_PROJECT_NAME = "Bitte benenne dein Projekt und probiere es nochmals.";
 Blockscad.Msg.SAVE_IN_PROGRESS = "Speichere...";
-Blockscad.Msg.SAVE_PROMPT = "Do you want to save your project?";
-Blockscad.Msg.SAVE_PROMPT_NO = "Don't Save";
-Blockscad.Msg.SAVE_PROMPT_YES = "Save";
+Blockscad.Msg.SAVE_PROMPT = "Willst du dein Projekt speichern?";
+Blockscad.Msg.SAVE_PROMPT_NO = "Nicht Speichern";
+Blockscad.Msg.SAVE_PROMPT_YES = "Speichern";
 Blockscad.Msg.SAVE_SCAD_LOCAL = "Lade OpenSCAD code herunter";
 Blockscad.Msg.SCALE = "skalieren";
 Blockscad.Msg.SCALE_TOOLTIP = "Scales one or more objects by a specified amount in dimensions x, y, and z.";
@@ -206,12 +206,12 @@ Blockscad.Msg.TAPER_TOOLTIP = "Scales shape along an axis.  The smallest value a
 Blockscad.Msg.TEXT_DEFAULT_VALUE = "Text ersetzten";
 Blockscad.Msg.TEXT_THICKNESS = "dicke";
 Blockscad.Msg.TORUS = "Torus";
-Blockscad.Msg.TORUS_TOOLTIP = "<img src='imgs/en/torus.svg' width='250px'>";
+Blockscad.Msg.TORUS_TOOLTIP = "<img src='imgs/de/torus.svg' width='250px'>";
 Blockscad.Msg.TRANSLATE = "transformiern";
 Blockscad.Msg.TRANSLATE_TOOLTIP = "Translates (moves) one or more objects in specified dimensions x, y, and z.";
 Blockscad.Msg.TWIST = "verdrehen";
 Blockscad.Msg.UNION = "Vereinigung";
-Blockscad.Msg.UNION_TOOLTIP = "Combines two or more objects into one.";
+Blockscad.Msg.UNION_TOOLTIP = "Kombiniert zwei oder mehr Objekte in einem.";
 Blockscad.Msg.USERNAME_FIELD = "Benutzername";
 Blockscad.Msg.VARIABLES_BUMPED_ONE = "%1 variable blocks were displaced due to type mismatches";
 Blockscad.Msg.VARIABLES_BUMPED_TWO = "variable '%1': type changed from %2 to %3";

blockscad/msg/json/de.json

@@ -59,18 +59,18 @@
 	"DELETE_ACCOUNT_INSTRUCTIONS_ONE": "In about 48 hours your account will be permanently deleted.",
 	"DELETE_ACCOUNT_INSTRUCTIONS_TWO": "If you change your mind, just sign in to your account within the next 48 hours.",
 	"DELETE_ACCOUNT_CONFIRM_PASSWORD": "Enter password to confirm",
-	"DELETE_ACCOUNT_BUTTON": "Delete Account and Sign Out",
+	"DELETE_ACCOUNT_BUTTON": "Lösche dein Konto und melde dich ab",
 	"REACTIVATE_ACCOUNT_TITLE": "Your account will not be deleted",
 	"REACTIVATE_ACCOUNT_EXPLAINED": "Your account has been reactivated - it is no longer scheduled to be deleted.  If you didn't send a delete account request, you should change your password to make sure your account is secure.",
 	"REACTIVATE_BUTTON": "Okay",
 	"DELETE_PROJECT_CONFIRM": "Are you sure you want to delete *Project_name*?",
-	"CONFIRM_DIALOG_YES": "Sure",
-	"CONFIRM_DIALOG_NO": "Cancel",
-	"SAVE_PROMPT": "Do you want to save your project?",
-	"SAVE_PROMPT_YES": "Save",
-	"SAVE_PROMPT_NO": "Don't Save",
-	"RESET_PASSWORD": "Reset Password",
-	"DIALOG_OR": "or",
+	"CONFIRM_DIALOG_YES": "Ja",
+	"CONFIRM_DIALOG_NO": "Abbrechen",
+	"SAVE_PROMPT": "Willst du dein Projekt speichern?",
+	"SAVE_PROMPT_YES": "Speichern",
+	"SAVE_PROMPT_NO": "Nicht Speichern",
+	"RESET_PASSWORD": "Passwort zurücksetzen",
+	"DIALOG_OR": "oder",
 	"RESET_PASSWORD_INSTRUCTIONS": "Gib deinen Benutzernamen und deine E-Mailadresse ein und wir senden dir ein E-Mail mit Instruktionen um dein Passwort zurück zu setzen.",
 	"RESET_PASSWORD_LINK_BUTTON": "Sende mir einen Link um mein Passwort zurück zu setzen!",
 	"RENDER_BUTTON": "Render",
@@ -93,8 +93,8 @@
 	"COLOR": "Farbe",
 	"SIDES": "Seiten",
 	"TAPER": "Kegel/Konus",
-	"LINEAR_EXTRUDE": "linear extrude",
-	"ROTATE_EXTRUDE": "rotate extrude",
+	"LINEAR_EXTRUDE": "lineares Herausziehen",
+	"ROTATE_EXTRUDE": "rotiertes Herausziehen",
 	"HEIGHT": "height",
 	"FACES": "faces",
 	"ACROSS": "gegenüber",
@@ -167,7 +167,7 @@
 	"MOUSEOVER_UNDO": "Rückgänging",
 	"MOUSEOVER_REDO": "Wiederherstllen",
 	"MOUSEOVER_TRASHCAN": "Lösche alle Blöcke",
-	"DISCARD_ALL": "Lösche alle %1 Blöcke?",
+	"DISCARD_ALL": "Bist du sicher, dass du alle %1 Blöcke löschen?",
 	"WARNING_RELOAD_STL": "Warning: re-load your STL file block",
 	"ERROR_MESSAGE": "Fehler",
 	"RENDER_ERROR_EMPTY": "Nichts zum Rendern",
@@ -177,7 +177,7 @@
 	"SPHERE_TOOLTIP": "<img src='imgs/en/sphere.svg' width='65'>",
 	"CUBE_TOOLTIP": "<img src='imgs/en/cube.svg' width='100px'>",
 	"CYLINDER_TOOLTIP": "<img src='imgs/en/cylinder.svg' width='90px'>",
-	"TORUS_TOOLTIP": "<img src='imgs/en/torus.svg' width='250px'>",
+	"TORUS_TOOLTIP": "<img src='imgs/de/torus.svg' width='250px'>",
 	"CIRCLE_TOOLTIP": "<img src='imgs/en/circle.svg' width='65'>",
 	"SQUARE_TOOLTIP": "<img src='imgs/en/square.svg' width='65'>",
 	"TRANSLATE_TOOLTIP": "Translates (moves) one or more objects in specified dimensions x, y, and z.",
@@ -193,7 +193,7 @@
 	"ROTATEEXTRUDE_TOOLTIP": "Rotate extrudes one or more 2-dimensional objects around the Z axis with a specified number of sides.",
 	"FANCYROTATE_TOOLTIP": "Rotates one or more objects around a vector from the origin (0,0,0) to the point (x,y,z)",
 	"FANCYMIRROR_TOOLTIP": "Mirrors one or more objects across specified plane whose normal vector is from (0,0,0) to the point (x,y,z).",
-	"UNION_TOOLTIP": "Combines two or more objects into one.",
+	"UNION_TOOLTIP": "Kombiniert zwei oder mehr Objekte in einem.",
 	"DIFFERENCE_TOOLTIP": "Subtracts one or more objects from the first object in the list.",
 	"INTERSECTION_TOOLTIP": "Returns the intersection (area that overlaps) of two or more objects.",
 	"HULL_TOOLTIP": "Combines one or more objects by 'wrapping' them together in a hull.",
@@ -213,8 +213,8 @@
 	"VARIABLES_BUMPED_TWO": "variable '%1': type changed from %2 to %3",
 	"EXAMPLE_CUBE_WITH_CUTOUTS": "Kubus mit Ausspaarungen",
 	"EXAMPLE_ANTHIAS_FISH": "Anthias Fisch",
-	"EXAMPLE_PARAMETRIC_BOX": "any size box",
+	"EXAMPLE_PARAMETRIC_BOX": "Schachtel",
 	"EXAMPLE_LOOP_SUN": "Sonne mit Wiederhohlungen",
 	"EXAMPLE_LOOP_SINE": "Sinus Funktion mit Wiederhohlungen",
-	"EXAMPLE_PARAMETRIC_EQ_KNOT": "knot from parametric equations"
+	"EXAMPLE_PARAMETRIC_EQ_KNOT": "Kleeblattknoten mit Parametern"
 }

blockscad/msg/messages.js

@@ -19,8 +19,7 @@
  * @fileoverview English strings.
  * @author J. Yoder
  *
- * After modifying this file, either run 'build.py' from the parent directory,
- * or run (from this directory):
+ * After modifying this file, either run (from this directory):
  * js_to_json.py
  * to regenerate json/{en,qqq,synonyms}.json.
  *