Merge branch 'master' into manual-2

blocks.js

@@ -156,7 +156,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2015-July-30';
+modules.blocks = '2015-August-14';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -11312,8 +11312,8 @@ ScriptFocusMorph.prototype.trigger = function () {
             delete this.fps;
             delete this.step;
             this.hide();
-            current.contents().edit();
             this.world().onNextStep = function () {
+                current.contents().edit();
                 current.contents().selectAll();
             };
         } else if (current.choices) {

history.txt

@@ -2554,3 +2554,17 @@ ______
 150730
 ------
 * Blocks: improve keyboard editing for embedded rings
+
+150806
+------
+* Polish & German translation updates
+
+=== Release v4.0.2 ===
+
+150809
+------
+* Interlingua support, yay!! thanks, Ken Dickey!
+
+150814
+------
+* Blocks: fixed #907

lang-de.js

@@ -185,7 +185,7 @@ SnapTranslator.dict.de = {
     'translator_e-mail':
         'jens@moenig.org', // optional
     'last_changed':
-        '2015-02-23', // this, too, will appear in the Translators tab
+        '2015-08-06', // this, too, will appear in the Translators tab
 
     // GUI
     // control bar:
@@ -780,6 +780,10 @@ SnapTranslator.dict.de = {
         'ausschalten, um Skripte\nnormal auszuf\u00fchren',
     'check to enable\nIDE animations':
         'einschalten um IDE-\nAnimationen zu erlauben',
+    'Flat design':
+        'Helles Design',
+    'Keyboard Editing':
+        'Tastaturunterstützung',
     'Thread safe scripts':
         'Threadsicherheit',
     'uncheck to allow\nscript reentrance':
@@ -798,6 +802,8 @@ SnapTranslator.dict.de = {
         'einschalten f\u00fcr flache\nPinselstrichenden',
     'uncheck for round ends of lines':
         'auschalten f\u00fcr runde\nPinselstrichenden',
+    'Inheritance support':
+        'Prototypische Vererbung',
 
     // inputs
     'with inputs':

lang-pl.js

@@ -190,7 +190,7 @@ SnapTranslator.dict.pl = {
     'translator_e-mail':
         'witek@oeiizk.waw.pl', // optional
     'last_changed':
-        '2013-08-05', // this, too, will appear in the Translators tab
+        '2015-08-06', // this, too, will appear in the Translators tab
 
     // GUI
     // control bar:
@@ -421,8 +421,18 @@ SnapTranslator.dict.pl = {
         'kiedy klikni\u0119to %greenflag',
     'when %keyHat key pressed':
         'kiedy klawisz %keyHat naci\u015Bni\u0119ty',
-    'when I am clicked':
+    'when I am %interaction':
-        'kiedy duszek klikni\u0119ty',
+        'kiedy zostanę %interaction',
+    'clicked':
+        'kliknięty',
+    'pressed':
+        'naciśnięty',
+    'dropped':
+        'upuszczony',
+    'mouse-entered':
+        'najechany przez kursor myszy',
+    'mouse-departed':
+        'opuszczony przez kursor myszy',
     'when I receive %msgHat':
         'kiedy otrzymam %msgHat',
     'broadcast %msg':

lang-pt.js

@@ -185,7 +185,7 @@ SnapTranslator.dict.pt = {
     'translator_e-mail':
         'mmsequeira@gmail.com',
     'last_changed':
-        '2015-05-04',
+        '2015-08-02',
 
     // GUI
     // control bar:
@@ -1702,5 +1702,17 @@ SnapTranslator.dict.pt = {
             + 'nomes para os parâmetros (ignorando os nomes mostrados).',
     'Enter code that corresponds to the block\'s operation (usually a single\nfunction invocation). Use <#n> to reference actual arguments as shown.':
         'Introduza o código que corresponda à operação do bloco (normalmente uma simples\n'
-            + 'invocação de rotina). Use <#n> para referenciar os argumentos tal como mostrado'
+            + 'invocação de rotina). Use <#n> para referenciar os argumentos tal como mostrado',
+    'Keyboard Editing':
+        'Edição usando o teclado',
+    'uncheck to disable\nkeyboard editing support':
+        'Desassinalar para desactivar\na edição usando o teclado.',
+    'check to enable\nkeyboard editing support':
+        'Assinalar para activar\na edição usando o teclado.',
+    'Inheritance support':
+        'Suporte para herança',
+    'uncheck to disable\nsprite inheritance features':
+        'Desassinalar para desactivar\nfuncionalidades de herança de actores.',
+    'check for sprite\ninheritance features':
+        'Assinalar para activar\nfuncionalidades de herança de actores.'
 };

locale.js

@@ -42,7 +42,7 @@
 
 /*global modules, contains*/
 
-modules.locale = '2015-July-27';
+modules.locale = '2015-August-06';
 
 // Global stuff
 
@@ -149,7 +149,7 @@ SnapTranslator.dict.de = {
     'translator_e-mail':
         'jens@moenig.org',
     'last_changed':
-        '2015-02-23'
+        '2015-08-06'
 };
 
 SnapTranslator.dict.it = {
@@ -209,7 +209,7 @@ SnapTranslator.dict.pt = {
     'translator_e-mail':
         'mmsequeira@gmail.com',
     'last_changed':
-        '2015-05-04'
+        '2015-08-02'
 };
 
 SnapTranslator.dict.cs = {
@@ -317,7 +317,7 @@ SnapTranslator.dict.pl = {
     'translator_e-mail':
         'witek@oeiizk.waw.pl',
     'last_changed':
-        '2013-08-05'
+        '2015-08-06'
 };
 
 SnapTranslator.dict.tw = {
@@ -500,3 +500,14 @@ SnapTranslator.dict.hu = {
         '2015-07-27'
 };
 
+SnapTranslator.dict.ia = {
+    // translations meta information
+    'language_name':
+        'Interlingua',
+    'language_translator':
+        'Ken Dickey',
+    'translator_e-mail':
+        'Ken.Dickey@whidbey.com',
+    'last_changed':
+        '2015-08-09'
+};