Merge branch 'master' into libraries

README.md

@@ -9,7 +9,7 @@ inspired by Scratch
 written by Jens Mönig and Brian Harvey
 jens@moenig.org, bh@cs.berkeley.edu
 
-Copyright (C) 2016 by Jens Mönig and Brian Harvey
+Copyright (C) 2017 by Jens Mönig and Brian Harvey
 
 Snap! is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as

gui.js

@@ -75,7 +75,7 @@ isRetinaSupported, SliderMorph, Animation*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2017-October-17';
+modules.gui = '2017-October-20';
 
 // Declarations
 
@@ -3347,8 +3347,8 @@ IDE_Morph.prototype.popupMediaImportDialog = function (folderName, items) {
             myself.getURL(
                 url,
                 function (txt) {
-                    img.src = 'data:image/svg+xml;utf8,' +
+                    img.src = 'data:image/svg+xml;base64,' +
-                        encodeURIComponent(txt);
+                         window.btoa(txt);
                 }
             );
         } else {

history.txt

@@ -3713,6 +3713,11 @@ Fixes:
 * German translation update
 * GUI, Objects: double-clicking a corral sprite icon flashes the sprite onstage
 
+171020
+------
+* fixed SVG encoding, thanks, Joan for the contribution!
+* German translation update
+
 
 v4.1 Features:
 * polymorphic sprite-local custom blocks
@@ -3765,3 +3770,4 @@ Fixes:
 * limited sprites' direction and coordinates to finite numbers
 * made block vars transient for block libraries
 * keep “undo” and “redo” buttons at the same location
+* fixed SVG encoding for exporting vector costumes

lang-de.js

@@ -185,7 +185,7 @@ SnapTranslator.dict.de = {
     'translator_e-mail':
         'jens@moenig.org', // optional
     'last_changed':
-        '2017-10-17', // this, too, will appear in the Translators tab
+        '2017-10-20', // this, too, will appear in the Translators tab
 
     // GUI
     // control bar:
@@ -999,6 +999,8 @@ SnapTranslator.dict.de = {
         'Setzen des letzten Blocks\nwiderrufen',
     'redrop':
         'Wiederherstellen',
+    'use the keyboard\nto enter blocks':
+    	'Blöcke per Tastatur\neingeben',
     'scripts pic...':
         'Bild aller Skripte...',
     'open a new window\nwith a picture of all scripts':

locale.js

@@ -42,7 +42,7 @@
 
 /*global modules, contains*/
 
-modules.locale = '2017-October-17';
+modules.locale = '2017-October-20';
 
 // Global stuff
 
@@ -160,7 +160,7 @@ SnapTranslator.dict.de = {
     'translator_e-mail':
         'jens@moenig.org',
     'last_changed':
-        '2017-10-17'
+        '2017-10-20'
 };
 
 SnapTranslator.dict.it = {

threads.js

@@ -61,7 +61,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
 isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph,
 TableFrameMorph, ColorSlotMorph, isSnapObject*/
 
-modules.threads = '2017-October-17';
+modules.threads = '2017-October-20';
 
 var ThreadManager;
 var Process;
@@ -2270,7 +2270,7 @@ Process.prototype.reportURL = function (url) {
     var response;
     if (!this.httpRequest) {
         // use the location protocol unless the user specifies otherwise
-        if (url.indexOf('//') < 0) {
+        if (url.indexOf('//') < 0 || url.indexOf('//') > 8) {
             if (location.protocol === 'file:') {
                 // allow requests from locally loaded sources
                 url = 'https://' + url;