From 879cacbb8d2be161b74f47e2aa846b3274dde27f Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 9 Oct 2015 19:22:22 -0700
Subject: [PATCH] Add 'clean up blocks' command to workspace menu.

---
 blockly_compressed.js | 10 +++++-----
 core/block_svg.js     | 15 +++++++--------
 core/workspace_svg.js | 29 +++++++++++++++++++++++++++--
 msg/js/ar.js          |  1 +
 msg/js/az.js          |  1 +
 msg/js/bcc.js         |  1 +
 msg/js/be-tarask.js   |  1 +
 msg/js/bg.js          |  1 +
 msg/js/bn.js          |  1 +
 msg/js/br.js          |  1 +
 msg/js/ca.js          |  1 +
 msg/js/cs.js          |  1 +
 msg/js/da.js          |  1 +
 msg/js/de.js          |  1 +
 msg/js/el.js          |  1 +
 msg/js/en.js          |  1 +
 msg/js/es.js          |  1 +
 msg/js/fa.js          |  1 +
 msg/js/fi.js          |  1 +
 msg/js/fr.js          |  1 +
 msg/js/he.js          |  1 +
 msg/js/hi.js          |  1 +
 msg/js/hrx.js         |  1 +
 msg/js/hu.js          |  1 +
 msg/js/ia.js          |  1 +
 msg/js/id.js          |  1 +
 msg/js/is.js          |  1 +
 msg/js/it.js          |  1 +
 msg/js/ja.js          |  1 +
 msg/js/ko.js          |  1 +
 msg/js/lb.js          |  1 +
 msg/js/lrc.js         |  1 +
 msg/js/lt.js          |  1 +
 msg/js/mk.js          |  1 +
 msg/js/ms.js          |  1 +
 msg/js/nb.js          |  1 +
 msg/js/nl.js          |  1 +
 msg/js/oc.js          |  1 +
 msg/js/pl.js          |  1 +
 msg/js/pms.js         |  1 +
 msg/js/pt-br.js       |  1 +
 msg/js/pt.js          |  1 +
 msg/js/ro.js          |  1 +
 msg/js/ru.js          |  1 +
 msg/js/sc.js          |  1 +
 msg/js/shn.js         |  1 +
 msg/js/sk.js          |  1 +
 msg/js/sq.js          |  1 +
 msg/js/sr.js          |  1 +
 msg/js/sv.js          |  1 +
 msg/js/ta.js          |  1 +
 msg/js/th.js          |  1 +
 msg/js/tl.js          |  1 +
 msg/js/tlh.js         |  1 +
 msg/js/tr.js          |  1 +
 msg/js/uk.js          |  1 +
 msg/js/vi.js          |  1 +
 msg/js/zh-hans.js     |  1 +
 msg/js/zh-hant.js     |  1 +
 msg/json/en.json      |  3 ++-
 msg/json/qqq.json     | 12 +++---------
 msg/messages.js       |  6 ++++--
 62 files changed, 104 insertions(+), 27 deletions(-)

diff --git a/blockly_compressed.js b/blockly_compressed.js
index b185dcb30..d6a5478ff 100644
--- a/blockly_compressed.js
+++ b/blockly_compressed.js
@@ -999,9 +999,9 @@ Blockly.WorkspaceSvg.prototype.isDeleteArea=function(a){a=Blockly.mouseToSvg(a,B
 Blockly.WorkspaceSvg.prototype.onMouseDown_=function(a){this.markFocused();Blockly.isTargetInput_(a)||(Blockly.svgResize(this),Blockly.terminateDrag_(),Blockly.hideChaff(),a.target&&a.target.nodeName&&("svg"==a.target.nodeName.toLowerCase()||a.target==this.svgBackground_)&&Blockly.selected&&!this.options.readOnly&&Blockly.selected.unselect(),Blockly.isRightButton(a)?this.showContextMenu_(a):this.scrollbar&&(Blockly.removeAllRanges(),this.isScrolling=!0,this.startDragMouseX=a.clientX,this.startDragMouseY=
 a.clientY,this.startDragMetrics=this.getMetrics(),this.startScrollX=this.scrollX,this.startScrollY=this.scrollY,"mouseup"in Blockly.bindEvent_.TOUCH_MAP&&(Blockly.onTouchUpWrapper_=Blockly.bindEvent_(document,"mouseup",null,Blockly.onMouseUp_)),Blockly.onMouseMoveWrapper_=Blockly.bindEvent_(document,"mousemove",null,Blockly.onMouseMove_)),a.stopPropagation())};
 Blockly.WorkspaceSvg.prototype.startDrag=function(a,b,c){a=Blockly.mouseToSvg(a,this.options.svg);a.x/=this.scale;a.y/=this.scale;this.dragDeltaX_=b-a.x;this.dragDeltaY_=c-a.y};Blockly.WorkspaceSvg.prototype.moveDrag=function(a){a=Blockly.mouseToSvg(a,this.options.svg);a.x/=this.scale;a.y/=this.scale;return new goog.math.Coordinate(this.dragDeltaX_+a.x,this.dragDeltaY_+a.y)};
-Blockly.WorkspaceSvg.prototype.onMouseWheel_=function(a){Blockly.terminateDrag_();var b=0<a.deltaY?-1:1,c=Blockly.mouseToSvg(a,this.options.svg);this.zoom(c.x,c.y,b);a.preventDefault()};
-Blockly.WorkspaceSvg.prototype.showContextMenu_=function(a){if(!this.options.readOnly){var b=[];if(this.options.collapse){for(var c=!1,d=!1,e=this.getTopBlocks(!0),f=0;f<e.length;f++)for(var g=e[f];g;)g.isCollapsed()?c=!0:d=!0,g=g.getNextBlock();var h=function(a){for(var b=0,c=0;c<e.length;c++)for(var d=e[c];d;)setTimeout(d.setCollapsed.bind(d,a),b),d=d.getNextBlock(),b+=10},d={enabled:d};d.text=Blockly.Msg.COLLAPSE_ALL;d.callback=function(){h(!0)};b.push(d);c={enabled:c};c.text=Blockly.Msg.EXPAND_ALL;
-c.callback=function(){h(!1)};b.push(c)}Blockly.ContextMenu.show(a,b,this.RTL)}};Blockly.WorkspaceSvg.prototype.loadAudio_=function(a,b){if(a.length){try{var c=new window.Audio}catch(h){return}for(var d,e=0;e<a.length;e++){var f=a[e],g=f.match(/\.(\w+)$/);if(g&&c.canPlayType("audio/"+g[1])){d=new window.Audio(f);break}}d&&d.play&&(this.SOUNDS_[b]=d)}};
+Blockly.WorkspaceSvg.prototype.onMouseWheel_=function(a){Blockly.terminateDrag_();var b=0<a.deltaY?-1:1,c=Blockly.mouseToSvg(a,this.options.svg);this.zoom(c.x,c.y,b);a.preventDefault()};Blockly.WorkspaceSvg.prototype.cleanUp_=function(){for(var a=this.getTopBlocks(!0),b=0,c=0,d;d=a[c];c++){var e=d.getRelativeToSurfaceXY();d.moveBy(-e.x,b-e.y);b+=d.getHeightWidth().height;b+=Blockly.BlockSvg.MIN_BLOCK_Y;d.snapToGrid()}Blockly.fireUiEvent(window,"resize");this.fireChangeEvent()};
+Blockly.WorkspaceSvg.prototype.showContextMenu_=function(a){if(!this.options.readOnly){var b=[],c=this.getTopBlocks(!0),d={};d.text=Blockly.Msg.CLEAN_UP;d.enabled=1<c.length;d.callback=this.cleanUp_.bind(this);b.push(d);if(this.options.collapse){for(var e=d=!1,f=0;f<c.length;f++)for(var g=c[f];g;)g.isCollapsed()?d=!0:e=!0,g=g.getNextBlock();var h=function(a){for(var b=0,d=0;d<c.length;d++)for(var e=c[d];e;)setTimeout(e.setCollapsed.bind(e,a),b),e=e.getNextBlock(),b+=10},e={enabled:e};e.text=Blockly.Msg.COLLAPSE_ALL;
+e.callback=function(){h(!0)};b.push(e);d={enabled:d};d.text=Blockly.Msg.EXPAND_ALL;d.callback=function(){h(!1)};b.push(d)}Blockly.ContextMenu.show(a,b,this.RTL)}};Blockly.WorkspaceSvg.prototype.loadAudio_=function(a,b){if(a.length){try{var c=new window.Audio}catch(h){return}for(var d,e=0;e<a.length;e++){var f=a[e],g=f.match(/\.(\w+)$/);if(g&&c.canPlayType("audio/"+g[1])){d=new window.Audio(f);break}}d&&d.play&&(this.SOUNDS_[b]=d)}};
 Blockly.WorkspaceSvg.prototype.preloadAudio_=function(){for(var a in this.SOUNDS_){var b=this.SOUNDS_[a];b.volume=.01;b.play();b.pause();if(goog.userAgent.IPAD||goog.userAgent.IPHONE)break}};
 Blockly.WorkspaceSvg.prototype.playAudio=function(a,b){var c=this.SOUNDS_[a];c?(c=goog.userAgent.DOCUMENT_MODE&&9===goog.userAgent.DOCUMENT_MODE||goog.userAgent.IPAD||goog.userAgent.ANDROID?c:c.cloneNode(),c.volume=void 0===b?1:b,c.play()):this.options.parentWorkspace&&this.options.parentWorkspace.playAudio(a,b)};
 Blockly.WorkspaceSvg.prototype.updateToolbox=function(a){if(a=Blockly.parseToolboxTree_(a)){if(!this.options.languageTree)throw"Existing toolbox is null.  Can't create new toolbox.";if(this.options.hasCategories){if(!this.toolbox_)throw"Existing toolbox has no categories.  Can't change mode.";this.options.languageTree=a;this.toolbox_.populate_(a)}else{if(!this.flyout_)throw"Existing toolbox has categories.  Can't change mode.";this.options.languageTree=a;this.flyout_.show(a.childNodes)}}else if(this.options.languageTree)throw"Can't nullify an existing toolbox.";
@@ -1070,10 +1070,10 @@ Blockly.BlockSvg.prototype.initSvg=function(){goog.asserts.assert(this.workspace
 Blockly.BlockSvg.prototype.unselect=function(){Blockly.selected=null;this.removeSelect();Blockly.fireUiEvent(this.workspace.getCanvas(),"blocklySelectChange")};Blockly.BlockSvg.prototype.mutator=null;Blockly.BlockSvg.prototype.comment=null;Blockly.BlockSvg.prototype.warning=null;Blockly.BlockSvg.prototype.getIcons=function(){var a=[];this.mutator&&a.push(this.mutator);this.comment&&a.push(this.comment);this.warning&&a.push(this.warning);return a};Blockly.BlockSvg.onMouseUpWrapper_=null;
 Blockly.BlockSvg.onMouseMoveWrapper_=null;
 Blockly.BlockSvg.terminateDrag_=function(){Blockly.BlockSvg.disconnectUiStop_();Blockly.BlockSvg.onMouseUpWrapper_&&(Blockly.unbindEvent_(Blockly.BlockSvg.onMouseUpWrapper_),Blockly.BlockSvg.onMouseUpWrapper_=null);Blockly.BlockSvg.onMouseMoveWrapper_&&(Blockly.unbindEvent_(Blockly.BlockSvg.onMouseMoveWrapper_),Blockly.BlockSvg.onMouseMoveWrapper_=null);var a=Blockly.selected;if(2==Blockly.dragMode_&&a){var b=a.getRelativeToSurfaceXY(),b=goog.math.Coordinate.difference(b,a.dragStartXY_);a.moveConnections_(b.x,
-b.y);delete a.draggedBubbles_;a.setDragging_(!1);a.render();a.workspace&&a.workspace.options.gridOptions&&a.workspace.options.gridOptions.snap&&goog.Timer.callOnce(a.snapToGrid_,Blockly.BUMP_DELAY/2,a);goog.Timer.callOnce(a.bumpNeighbours_,Blockly.BUMP_DELAY,a);Blockly.fireUiEvent(window,"resize");a.workspace.fireChangeEvent()}Blockly.dragMode_=0;Blockly.Css.setCursor(Blockly.Css.Cursor.OPEN)};
+b.y);delete a.draggedBubbles_;a.setDragging_(!1);a.render();goog.Timer.callOnce(a.snapToGrid,Blockly.BUMP_DELAY/2,a);goog.Timer.callOnce(a.bumpNeighbours_,Blockly.BUMP_DELAY,a);Blockly.fireUiEvent(window,"resize");a.workspace.fireChangeEvent()}Blockly.dragMode_=0;Blockly.Css.setCursor(Blockly.Css.Cursor.OPEN)};
 Blockly.BlockSvg.prototype.setParent=function(a){var b=this.getSvgRoot();if(this.parentBlock_&&b){var c=this.getRelativeToSurfaceXY();this.workspace.getCanvas().appendChild(b);b.setAttribute("transform","translate("+c.x+","+c.y+")")}Blockly.Field.startCache();Blockly.BlockSvg.superClass_.setParent.call(this,a);Blockly.Field.stopCache();a&&(c=this.getRelativeToSurfaceXY(),a.getSvgRoot().appendChild(b),a=this.getRelativeToSurfaceXY(),this.moveConnections_(a.x-c.x,a.y-c.y))};
 Blockly.BlockSvg.prototype.getRelativeToSurfaceXY=function(){var a=0,b=0,c=this.getSvgRoot();if(c){do var d=Blockly.getRelativeXY_(c),a=a+d.x,b=b+d.y,c=c.parentNode;while(c&&c!=this.workspace.getCanvas())}return new goog.math.Coordinate(a,b)};Blockly.BlockSvg.prototype.moveBy=function(a,b){var c=this.getRelativeToSurfaceXY();this.getSvgRoot().setAttribute("transform","translate("+(c.x+a)+","+(c.y+b)+")");this.moveConnections_(a,b);Blockly.Realtime.blockChanged(this)};
-Blockly.BlockSvg.prototype.snapToGrid_=function(){if(this.workspace&&0==Blockly.dragMode_&&!this.getParent()&&!this.isInFlyout){var a=this.workspace.options.gridOptions.spacing,b=a/2,c=this.getRelativeToSurfaceXY(),d=Math.round((c.x-b)/a)*a+b-c.x,a=Math.round((c.y-b)/a)*a+b-c.y,d=Math.round(d),a=Math.round(a);0==d&&0==a||this.moveBy(d,a)}};
+Blockly.BlockSvg.prototype.snapToGrid=function(){if(this.workspace&&0==Blockly.dragMode_&&!this.getParent()&&!this.isInFlyout&&this.workspace.options.gridOptions&&this.workspace.options.gridOptions.snap){var a=this.workspace.options.gridOptions.spacing,b=a/2,c=this.getRelativeToSurfaceXY(),d=Math.round((c.x-b)/a)*a+b-c.x,a=Math.round((c.y-b)/a)*a+b-c.y,d=Math.round(d),a=Math.round(a);0==d&&0==a||this.moveBy(d,a)}};
 Blockly.BlockSvg.prototype.getHeightWidth=function(){var a=this.height,b=this.width,c=this.getNextBlock();c?(c=c.getHeightWidth(),a+=c.height-4,b=Math.max(b,c.width)):this.nextConnection||this.outputConnection||(a+=2);return{height:a,width:b}};
 Blockly.BlockSvg.prototype.setCollapsed=function(a){if(this.collapsed_!=a){for(var b=[],c=0,d;d=this.inputList[c];c++)b.push.apply(b,d.setVisible(!a));if(a){d=this.getIcons();for(c=0;c<d.length;c++)d[c].setVisible(!1);c=this.toString(Blockly.COLLAPSE_CHARS);this.appendDummyInput("_TEMP_COLLAPSED_INPUT").appendField(c).init()}else this.removeInput("_TEMP_COLLAPSED_INPUT"),this.setWarningText(null);Blockly.BlockSvg.superClass_.setCollapsed.call(this,a);b.length||(b[0]=this);if(this.rendered)for(c=0;a=
 b[c];c++)a.render();this.workspace.fireChangeEvent()}};
diff --git a/core/block_svg.js b/core/block_svg.js
index b614ff608..1045f37e1 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -207,12 +207,8 @@ Blockly.BlockSvg.terminateDrag_ = function() {
       delete selected.draggedBubbles_;
       selected.setDragging_(false);
       selected.render();
-      if (selected.workspace &&
-          selected.workspace.options.gridOptions &&
-          selected.workspace.options.gridOptions['snap']) {
-        goog.Timer.callOnce(
-            selected.snapToGrid_, Blockly.BUMP_DELAY / 2, selected);
-      }
+      goog.Timer.callOnce(
+          selected.snapToGrid, Blockly.BUMP_DELAY / 2, selected);
       goog.Timer.callOnce(
           selected.bumpNeighbours_, Blockly.BUMP_DELAY, selected);
       // Fire an event to allow scrollbars to resize.
@@ -286,9 +282,8 @@ Blockly.BlockSvg.prototype.moveBy = function(dx, dy) {
 
 /**
  * Snap this block to the nearest grid point.
- * @private
  */
-Blockly.BlockSvg.prototype.snapToGrid_ = function() {
+Blockly.BlockSvg.prototype.snapToGrid = function() {
   if (!this.workspace) {
     return;  // Deleted block.
   }
@@ -301,6 +296,10 @@ Blockly.BlockSvg.prototype.snapToGrid_ = function() {
   if (this.isInFlyout) {
     return;  // Don't move blocks around in a flyout.
   }
+  if (!this.workspace.options.gridOptions ||
+      !this.workspace.options.gridOptions['snap']) {
+    return;  // Config says no snapping.
+  }
   var spacing = this.workspace.options.gridOptions['spacing'];
   var half = spacing / 2;
   var xy = this.getRelativeToSurfaceXY();
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 9e5d1e2ba..d2e3a510a 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -648,6 +648,25 @@ Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
   e.preventDefault();
 };
 
+/**
+ * Clean up the workspace by ordering all the blocks in a column.
+ * @private
+ */
+Blockly.WorkspaceSvg.prototype.cleanUp_ = function() {
+  var topBlocks = this.getTopBlocks(true);
+  var cursorY = 0;
+  for (var i = 0, block; block = topBlocks[i]; i++) {
+    var xy = block.getRelativeToSurfaceXY();
+    block.moveBy(-xy.x, cursorY - xy.y);
+    cursorY += block.getHeightWidth().height;
+    cursorY += Blockly.BlockSvg.MIN_BLOCK_Y;
+    block.snapToGrid();
+  }
+  // Fire an event to allow scrollbars to resize.
+  Blockly.fireUiEvent(window, 'resize');
+  this.fireChangeEvent();
+};
+
 /**
  * Show the context menu for the workspace.
  * @param {!Event} e Mouse event.
@@ -658,13 +677,19 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
     return;
   }
   var menuOptions = [];
+  var topBlocks = this.getTopBlocks(true);
+  // Option to clean up blocks.
+  var cleanOption = {};
+  cleanOption.text = Blockly.Msg.CLEAN_UP;
+  cleanOption.enabled = topBlocks.length > 1;
+  cleanOption.callback = this.cleanUp_.bind(this);
+  menuOptions.push(cleanOption);
+
   // Add a little animation to collapsing and expanding.
   var COLLAPSE_DELAY = 10;
-
   if (this.options.collapse) {
     var hasCollapsedBlocks = false;
     var hasExpandedBlocks = false;
-    var topBlocks = this.getTopBlocks(true);
     for (var i = 0; i < topBlocks.length; i++) {
       var block = topBlocks[i];
       while (block) {
diff --git a/msg/js/ar.js b/msg/js/ar.js
index 684c0cc81..fb332b0e0 100644
--- a/msg/js/ar.js
+++ b/msg/js/ar.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "اضافة تعليق";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "تغيير قيمة:";
 Blockly.Msg.CHAT = "دردش مع زملائك بالكتابة في هذا الصندوق!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "إخفاء القطع";
 Blockly.Msg.COLLAPSE_BLOCK = "إخفاء القطعة";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "اللون 1";
diff --git a/msg/js/az.js b/msg/js/az.js
index 65819be13..9a2c4581c 100644
--- a/msg/js/az.js
+++ b/msg/js/az.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Şərh əlavə et";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Qiyməti dəyiş:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Blokları yığ";
 Blockly.Msg.COLLAPSE_BLOCK = "Bloku yığ";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "rəng 1";
diff --git a/msg/js/bcc.js b/msg/js/bcc.js
index 2df97478d..ac8dad1b8 100644
--- a/msg/js/bcc.js
+++ b/msg/js/bcc.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "افزودن نظر";
 Blockly.Msg.AUTH = "لطفا این اپلیکیشن را ثبت کنید و آثارتان را فعال کنید تا ذخیره شود و اجازهٔ اشتراک‌گذاری توسط شما داده شود.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "تغییر مقدار:";
 Blockly.Msg.CHAT = "با همکارتان با نوشتن در این کادر چت کنید!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "فروپاشی بلوک‌ها";
 Blockly.Msg.COLLAPSE_BLOCK = "فروپاشی بلوک";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "رنگ ۱";
diff --git a/msg/js/be-tarask.js b/msg/js/be-tarask.js
index 3d6bc1cca..411d163c6 100644
--- a/msg/js/be-tarask.js
+++ b/msg/js/be-tarask.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Дадаць камэнтар";
 Blockly.Msg.AUTH = "Калі ласка, аўтарызуйце гэтае прыкладаньне, каб можна было захоўваць Вашую працу і мець магчымасьць дзяліцца ёю.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Зьмяніць значэньне:";
 Blockly.Msg.CHAT = "Стасуйцеся са сваім калегам, набіраючы тэкст у гэтым полі!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Згарнуць блёкі";
 Blockly.Msg.COLLAPSE_BLOCK = "Згарнуць блёк";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "колер 1";
diff --git a/msg/js/bg.js b/msg/js/bg.js
index 67688a2b6..b619bd914 100644
--- a/msg/js/bg.js
+++ b/msg/js/bg.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Добави коментар";
 Blockly.Msg.AUTH = "Позволи на приложението да записва и споделя работата ти.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Промени стойността:";
 Blockly.Msg.CHAT = "Говори с колега, като пишеш в това поле!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Скрий блокове";
 Blockly.Msg.COLLAPSE_BLOCK = "Скрий блок";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "цвят 1";
diff --git a/msg/js/bn.js b/msg/js/bn.js
index aabe1827e..482424bc5 100644
--- a/msg/js/bn.js
+++ b/msg/js/bn.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "মন্তব্য যোগ করুন";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "মান পরিবর্তন করুন:";
 Blockly.Msg.CHAT = "এই বাক্সে লিখার মাধ্যমে আপনার সহযোগীর সাথে আলাপ করুন!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Collapse Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_BLOCK = "Collapse Block";  // untranslated
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "রং ১";
diff --git a/msg/js/br.js b/msg/js/br.js
index ac5a09408..29da61315 100644
--- a/msg/js/br.js
+++ b/msg/js/br.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Ouzhpennañ un evezhiadenn";
 Blockly.Msg.AUTH = "Roit aotre, mar plij, d'an arload-mañ evit gallout saveteiñ ho labour ha reiñ aotre dezhañ da rannañ ho labour ganimp.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Kemmañ an dalvoudenn :";
 Blockly.Msg.CHAT = "Flapañ gant ho kenlabourer en ur skrivañ er voest-se !";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Bihanaat ar bloc'hoù";
 Blockly.Msg.COLLAPSE_BLOCK = "Bihanaat ar bloc'h";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "liv 1";
diff --git a/msg/js/ca.js b/msg/js/ca.js
index 1fc4d3704..7701eef47 100644
--- a/msg/js/ca.js
+++ b/msg/js/ca.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Afegeix un comentari";
 Blockly.Msg.AUTH = "Si us plau, autoritzeu que aquesta aplicació pugui desar la vostra feina i que la pugueu compartir.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Canvia valor:";
 Blockly.Msg.CHAT = "Xateja amb el teu col·laborador escrivint en aquest quadre!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Contraure blocs";
 Blockly.Msg.COLLAPSE_BLOCK = "Contraure bloc";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "color 1";
diff --git a/msg/js/cs.js b/msg/js/cs.js
index 125c00d80..e27e3804c 100644
--- a/msg/js/cs.js
+++ b/msg/js/cs.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Přidat komentář";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Změna hodnoty:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Skrýt bloky";
 Blockly.Msg.COLLAPSE_BLOCK = "Skrýt blok";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "barva 1";
diff --git a/msg/js/da.js b/msg/js/da.js
index 7c893262e..2cc02841a 100644
--- a/msg/js/da.js
+++ b/msg/js/da.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Tilføj kommentar";
 Blockly.Msg.AUTH = "Tillad venligst at denne app muliggør at du kan gemme dit arbejde og at du kan dele det.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Skift værdi:";
 Blockly.Msg.CHAT = "Chat med din samarbejdspartner ved at skrive i denne boks!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Fold blokkene sammen";
 Blockly.Msg.COLLAPSE_BLOCK = "Fold blokken sammen";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "farve 1";
diff --git a/msg/js/de.js b/msg/js/de.js
index 96739046e..6a65248bc 100644
--- a/msg/js/de.js
+++ b/msg/js/de.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Kommentar hinzufügen";
 Blockly.Msg.AUTH = "Bitte autorisiere diese App zum Aktivieren der Speicherung deiner Arbeit und zum Teilen.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Wert ändern:";
 Blockly.Msg.CHAT = "Chatte mit unserem Mitarbeiter durch Eingeben von Text in diesen Kasten!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Alle Blöcke zusammenfalten";
 Blockly.Msg.COLLAPSE_BLOCK = "Block zusammenfalten";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Farbe 1";
diff --git a/msg/js/el.js b/msg/js/el.js
index 1fa701bf4..532e5ede9 100644
--- a/msg/js/el.js
+++ b/msg/js/el.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Πρόσθεσε Σχόλιο";
 Blockly.Msg.AUTH = "Παρακαλώ κάνε έγκριση της εφαρμογής για να επιτρέπεται  η αποθήκευση και κοινοποίηση της εργασίας σου.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Άλλαξε την τιμή:";
 Blockly.Msg.CHAT = "Μπορείς να μιλήσεις με τον συνεργάτη σου πληκτρολογώντας σ'αυτό το πλαίσιο!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Σύμπτυξτε Όλα Τα Μπλοκ";
 Blockly.Msg.COLLAPSE_BLOCK = "Σύμπτυξε Το Μπλοκ";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "χρώμα 1";
diff --git a/msg/js/en.js b/msg/js/en.js
index a278affc0..afbf89b4f 100644
--- a/msg/js/en.js
+++ b/msg/js/en.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Add Comment";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Change value:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";
 Blockly.Msg.COLLAPSE_ALL = "Collapse Blocks";
 Blockly.Msg.COLLAPSE_BLOCK = "Collapse Block";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "colour 1";
diff --git a/msg/js/es.js b/msg/js/es.js
index cec20c5bc..a27711ddf 100644
--- a/msg/js/es.js
+++ b/msg/js/es.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Añadir comentario";
 Blockly.Msg.AUTH = "Autoriza a esta aplicación para guardar tu trabajo y permitir que lo compartas.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Cambiar el valor:";
 Blockly.Msg.CHAT = "¡Chatea con tu colaborador escribiendo en este cuadro!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Contraer bloques";
 Blockly.Msg.COLLAPSE_BLOCK = "Contraer bloque";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "color 1";
diff --git a/msg/js/fa.js b/msg/js/fa.js
index fd26ee733..acb08e787 100644
--- a/msg/js/fa.js
+++ b/msg/js/fa.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "افزودن نظر";
 Blockly.Msg.AUTH = "لطفا این اپلیکیشن را ثبت کنید و آثارتان را فعال کنید تا ذخیره شود و اجازهٔ اشتراک‌گذاری توسط شما داده شود.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "تغییر مقدار:";
 Blockly.Msg.CHAT = "با همکارتان با نوشتن در این کادر چت کنید!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "فروپاشی بلوک‌ها";
 Blockly.Msg.COLLAPSE_BLOCK = "فروپاشی بلوک";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "رنگ ۱";
diff --git a/msg/js/fi.js b/msg/js/fi.js
index 59d77a019..7dfe3260a 100644
--- a/msg/js/fi.js
+++ b/msg/js/fi.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Lisää kommentti";
 Blockly.Msg.AUTH = "Valtuuta tämä ohjelma jotta voit tallettaa työsi ja jakaa sen.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Muuta arvoa:";
 Blockly.Msg.CHAT = "Keskustele yhteistyökumppanisi kanssa tässä laatikossa!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Sulje lohkot";
 Blockly.Msg.COLLAPSE_BLOCK = "Sulje lohko";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "väri 1";
diff --git a/msg/js/fr.js b/msg/js/fr.js
index 3bad95232..69f318457 100644
--- a/msg/js/fr.js
+++ b/msg/js/fr.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Ajouter un commentaire";
 Blockly.Msg.AUTH = "Veuillez autoriser cette application à permettre la sauvegarde de votre travail et à l’autoriser à la partager.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Modifier la valeur :";
 Blockly.Msg.CHAT = "Discuter avec votre collaborateur en tapant dans cette zone !";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Réduire les blocs";
 Blockly.Msg.COLLAPSE_BLOCK = "Réduire le bloc";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "couleur 1";
diff --git a/msg/js/he.js b/msg/js/he.js
index 08cdc7807..b8673cae2 100644
--- a/msg/js/he.js
+++ b/msg/js/he.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "הוסף תגובה";
 Blockly.Msg.AUTH = "בבקשה נא לאשר את היישום הזה כדי לאפשר לעבודה שלך להישמר וכדי לאפשר את השיתוף על ידיך.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "שנה ערך:";
 Blockly.Msg.CHAT = "שוחח עם משתף פעולה שלך על-ידי הקלדה בתיבה זו!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "צמצם קטעי קוד";
 Blockly.Msg.COLLAPSE_BLOCK = "צמצם קטע קוד";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "צבע 1";
diff --git a/msg/js/hi.js b/msg/js/hi.js
index cb95a66cb..de94cdd80 100644
--- a/msg/js/hi.js
+++ b/msg/js/hi.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "टिप्पणी छोड़ें";
 Blockly.Msg.AUTH = "अपने कार्य को सहेजना सक्षम करने और अपने साथ इसे साझा करने हेतु कृपया इस एप्प को अधिकृत करें।";
 Blockly.Msg.CHANGE_VALUE_TITLE = "मान परिवर्तित करें:";
 Blockly.Msg.CHAT = "इस सन्दूक में लिखकर हमारे सहयोगी के साथ बातचीत करें!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "ब्लॉक संक्षिप्त करें";
 Blockly.Msg.COLLAPSE_BLOCK = "ब्लॉक को संक्षिप्त करें";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "रंग 1";
diff --git a/msg/js/hrx.js b/msg/js/hrx.js
index c1e98c12b..4aee762d9 100644
--- a/msg/js/hrx.js
+++ b/msg/js/hrx.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Kommentar hinzufüche";
 Blockly.Msg.AUTH = "Weart ännre:";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Neie Variable...";
 Blockly.Msg.CHAT = "Sprech mit unsrem Mitoorweiter doorrich renschreiwe von Text hier in den Kaste!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Blocke zusammerfalte";
 Blockly.Msg.COLLAPSE_BLOCK = "Block zusammerfalte";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Farreb 1";
diff --git a/msg/js/hu.js b/msg/js/hu.js
index 851c3b82a..89488fcc0 100644
--- a/msg/js/hu.js
+++ b/msg/js/hu.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Megjegyzés hozzáadása";
 Blockly.Msg.AUTH = "Kérjük, engedélyezd az alkalmazásnak munkád elmentését és megosztását.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Érték módosítása:";
 Blockly.Msg.CHAT = "Ebben a mezőben tudsz a közreműködőkkel beszélgetni!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Blokkok összecsukása";
 Blockly.Msg.COLLAPSE_BLOCK = "Blokk összecsukása";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "szín 1";
diff --git a/msg/js/ia.js b/msg/js/ia.js
index d5b6aa923..2eccaf32e 100644
--- a/msg/js/ia.js
+++ b/msg/js/ia.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Adder commento";
 Blockly.Msg.AUTH = "Per favor autorisa iste application pro permitter de salveguardar tu travalio e pro permitter que tu lo divide con alteres.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Cambiar valor:";
 Blockly.Msg.CHAT = "Conversa con tu collaborator scribente in iste quadro!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Plicar blocos";
 Blockly.Msg.COLLAPSE_BLOCK = "Plicar bloco";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "color 1";
diff --git a/msg/js/id.js b/msg/js/id.js
index 28dba542c..050574433 100644
--- a/msg/js/id.js
+++ b/msg/js/id.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Tambahkan sebuah comment";
 Blockly.Msg.AUTH = "Silakan mengotorisasi aplikasi ini untuk memungkinkan pekerjaan Anda dapat disimpan dan digunakan bersama.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Ubah nilai:";
 Blockly.Msg.CHAT = "Chatting dengan kolaborator anda dengan mengetikkan di kotak ini!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Ciutkan Blok";
 Blockly.Msg.COLLAPSE_BLOCK = "Ciutkan Blok";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Warna 1";
diff --git a/msg/js/is.js b/msg/js/is.js
index 596c68561..9ab93ab48 100644
--- a/msg/js/is.js
+++ b/msg/js/is.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Skrifa skýringu";
 Blockly.Msg.AUTH = "Vinsamlegast heimilaðu þetta forrit svo að hægt sé að vista verk þitt og svo að þú megir deila því";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Breyta gildi:";
 Blockly.Msg.CHAT = "Spjallaðu við félaga með því að skrifa í þennan reit!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Loka kubbum";
 Blockly.Msg.COLLAPSE_BLOCK = "Loka kubbi";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "litur 1";
diff --git a/msg/js/it.js b/msg/js/it.js
index 53cfb8925..ab2ce575a 100644
--- a/msg/js/it.js
+++ b/msg/js/it.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Aggiungi commento";
 Blockly.Msg.AUTH = "Autorizza questa applicazione per consentire di salvare il tuo lavoro e per essere condiviso.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Modifica valore:";
 Blockly.Msg.CHAT = "Chatta con il tuo collaboratore scrivendo in questo box!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Comprimi blocchi";
 Blockly.Msg.COLLAPSE_BLOCK = "Comprimi blocco";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "colore 1";
diff --git a/msg/js/ja.js b/msg/js/ja.js
index ddae8c907..d6e6aa7cb 100644
--- a/msg/js/ja.js
+++ b/msg/js/ja.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "コメントを追加";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "値を変更します。";
 Blockly.Msg.CHAT = "このボックスに入力して共同編集者とチャットしよう！";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "ブロックを折りたたむ";
 Blockly.Msg.COLLAPSE_BLOCK = "ブロックを折りたたむ";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "色 1";
diff --git a/msg/js/ko.js b/msg/js/ko.js
index 0a6406db3..2befbb747 100644
--- a/msg/js/ko.js
+++ b/msg/js/ko.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "댓글 추가";
 Blockly.Msg.AUTH = "당신의 작업을 저장하고 다른 사람과 공유할 수 있도록 이 애플리케이션을 인증해 주십시오.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "값 바꾸기:";
 Blockly.Msg.CHAT = "이 상자에 입력하여 당신의 동료와 채팅하세요!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "블록 축소";
 Blockly.Msg.COLLAPSE_BLOCK = "블록 축소";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "색 1";
diff --git a/msg/js/lb.js b/msg/js/lb.js
index ae93e3d22..af1e27338 100644
--- a/msg/js/lb.js
+++ b/msg/js/lb.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Bemierkung derbäisetzen";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Wäert änneren:";
 Blockly.Msg.CHAT = "Mat ärem Mataarbechter chatten an deem Dir an dës Këscht tippt!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Collapse Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_BLOCK = "Block zesummeklappen";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Faarf 1";
diff --git a/msg/js/lrc.js b/msg/js/lrc.js
index e915b8ee5..0639113af 100644
--- a/msg/js/lrc.js
+++ b/msg/js/lrc.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "نظرتونه اضاف بکید";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "ارزشت آلشت کو:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "کوچک کردن برشتیا";
 Blockly.Msg.COLLAPSE_BLOCK = "کوچک کردن برشت";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "رن 1";
diff --git a/msg/js/lt.js b/msg/js/lt.js
index afac96532..abf953312 100644
--- a/msg/js/lt.js
+++ b/msg/js/lt.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Pridėti komentarą";
 Blockly.Msg.AUTH = "Norint išsaugoti (ir dalintis) savo sukurtas programas, reikia prisijungti (autorizuotis).";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Keisti reikšmę:";
 Blockly.Msg.CHAT = "Galite susirašinėti su projekto bendradarbiais.";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Suskleisti blokus";
 Blockly.Msg.COLLAPSE_BLOCK = "Suskleisti bloką";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "1 spalva";
diff --git a/msg/js/mk.js b/msg/js/mk.js
index 14ee1d9e1..6a5613066 100644
--- a/msg/js/mk.js
+++ b/msg/js/mk.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Додај коментар:";
 Blockly.Msg.AUTH = "Овластете го извршников за да можете да ја зачувате вашата работа и да можете да ја споделувате.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Смена на вредност:";
 Blockly.Msg.CHAT = "Разговарајте со вашиот соработник во ова поле!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Собери блокови";
 Blockly.Msg.COLLAPSE_BLOCK = "Собери блок";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "боја 1";
diff --git a/msg/js/ms.js b/msg/js/ms.js
index 41de54e69..0cf42bc5e 100644
--- a/msg/js/ms.js
+++ b/msg/js/ms.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Berikan Komen";
 Blockly.Msg.AUTH = "Sila benarkan aplikasi ini untuk membolehkan hasil kerja anda disimpan, malah dikongsikan oleh anda.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Ubah nilai:";
 Blockly.Msg.CHAT = "Bersembang dengan rakan kerjasama anda dengan menaip di dalam petak ini!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Lipat Blok²";
 Blockly.Msg.COLLAPSE_BLOCK = "Lipat Blok";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "warna 1";
diff --git a/msg/js/nb.js b/msg/js/nb.js
index ee0142b1e..67562f477 100644
--- a/msg/js/nb.js
+++ b/msg/js/nb.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Legg til kommentar";
 Blockly.Msg.AUTH = "Vennligst godkjenn at denne appen gjør det mulig for deg å lagre arbeidet slik at du kan dele det.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Bytt verdi:";
 Blockly.Msg.CHAT = "Chat med din medarbeider ved å skrive i dette feltet!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Skjul blokker";
 Blockly.Msg.COLLAPSE_BLOCK = "Skjul blokk";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "farge 1";
diff --git a/msg/js/nl.js b/msg/js/nl.js
index f020a0d70..9f12e70bd 100644
--- a/msg/js/nl.js
+++ b/msg/js/nl.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Reactie toevoegen";
 Blockly.Msg.AUTH = "Sta deze app toe om uw werk op te slaan het uw werk te delen.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Waarde wijzigen:";
 Blockly.Msg.CHAT = "Chat met iemand die ook aan het werk is via dit venster!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Blokken inklappen";
 Blockly.Msg.COLLAPSE_BLOCK = "Blok inklappen";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "kleur 1";
diff --git a/msg/js/oc.js b/msg/js/oc.js
index 3a0c7e601..c6dd8b767 100644
--- a/msg/js/oc.js
+++ b/msg/js/oc.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Apondre un comentari";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Modificar la valor :";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Redusir los blòts";
 Blockly.Msg.COLLAPSE_BLOCK = "Redusir lo blòt";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "color 1";
diff --git a/msg/js/pl.js b/msg/js/pl.js
index c26b816f5..b008a5f13 100644
--- a/msg/js/pl.js
+++ b/msg/js/pl.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Dodaj komentarz";
 Blockly.Msg.AUTH = "Proszę autoryzować ten program, aby można było zapisać swoją pracę i umożliwić dzielenie się nią przez ciebie.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Zmień wartość:";
 Blockly.Msg.CHAT = "Rozmawiaj z swoim współpracownikiem, pisząc w tym polu!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Zwiń bloki";
 Blockly.Msg.COLLAPSE_BLOCK = "Zwiń blok";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "kolor 1";
diff --git a/msg/js/pms.js b/msg/js/pms.js
index 9cb63f22c..8d3ac63d5 100644
--- a/msg/js/pms.js
+++ b/msg/js/pms.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Gionté un coment";
 Blockly.Msg.AUTH = "Për piasì, ch'a autorisa costa aplicassion a përmëtte ëd salvé sò travaj e a autoriselo a esse partagià da chiel.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Modifiché ël valor:";
 Blockly.Msg.CHAT = "Ch'a ciaciara con sò colaborator an scrivend an costa casela!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Arduve ij blòch";
 Blockly.Msg.COLLAPSE_BLOCK = "Arduve ël blòch";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "color 1";
diff --git a/msg/js/pt-br.js b/msg/js/pt-br.js
index c113baafb..5b45dfeef 100644
--- a/msg/js/pt-br.js
+++ b/msg/js/pt-br.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Adicionar comentário";
 Blockly.Msg.AUTH = "Por favor autorize este aplicativo para permitir que o seu trabalho seja gravado e que ele seja compartilhado por você.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Mudar valor:";
 Blockly.Msg.CHAT = "Converse com o seu colaborador digitando nesta caixa!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Recolher blocos";
 Blockly.Msg.COLLAPSE_BLOCK = "Recolher bloco";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "cor 1";
diff --git a/msg/js/pt.js b/msg/js/pt.js
index e0888db52..8f2e84c07 100644
--- a/msg/js/pt.js
+++ b/msg/js/pt.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Adicionar Comentário";
 Blockly.Msg.AUTH = "Por favor autorize esta aplicação para permitir que o seu trabalho seja gravado e que o possa partilhar.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Alterar valor:";
 Blockly.Msg.CHAT = "Converse com o seu colaborador, ao digitar nesta caixa!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Recolher Blocos";
 Blockly.Msg.COLLAPSE_BLOCK = "Colapsar Bloco";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "cor 1";
diff --git a/msg/js/ro.js b/msg/js/ro.js
index 3d185ab84..005a19bdd 100644
--- a/msg/js/ro.js
+++ b/msg/js/ro.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Adaugă un comentariu";
 Blockly.Msg.AUTH = "Va rugăm să autorizați această aplicație să permită salvarea activității dumneavoastră și să permită distribuirea acesteia de către dumneavoastră.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Schimbaţi valoarea:";
 Blockly.Msg.CHAT = "Discută cu colaboratorul tău tastând în cadrul acestei zone!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Restrange blocurile";
 Blockly.Msg.COLLAPSE_BLOCK = "Restrange blocul";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "culoare 1";
diff --git a/msg/js/ru.js b/msg/js/ru.js
index d2f2279f5..c0084a55e 100644
--- a/msg/js/ru.js
+++ b/msg/js/ru.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Добавить комментарий";
 Blockly.Msg.AUTH = "Пожалуйста, авторизуйте это приложение, чтоб можно было сохранять вашу работу и чтобы дать возможность вам делиться ей.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Измените значение:";
 Blockly.Msg.CHAT = "Общайтесь со своим коллегой, печатая в этом поле!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Свернуть блоки";
 Blockly.Msg.COLLAPSE_BLOCK = "Свернуть блок";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "цвет 1";
diff --git a/msg/js/sc.js b/msg/js/sc.js
index 2e8434f0c..00d7a9eca 100644
--- a/msg/js/sc.js
+++ b/msg/js/sc.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Agiunghe unu cumentu";
 Blockly.Msg.AUTH = "Permiti a custa app de sarvare su traballu tuo e de ti lu fàghere cumpartzire.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Muda valori:";
 Blockly.Msg.CHAT = "Faedda cun su cumpàngiu tuo iscriende inoghe!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Serra e astringhe Boocos";
 Blockly.Msg.COLLAPSE_BLOCK = "Serra e astringhe Blocu";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "colori 1";
diff --git a/msg/js/shn.js b/msg/js/shn.js
index 14fb29241..1f14ed0e0 100644
--- a/msg/js/shn.js
+++ b/msg/js/shn.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "သႂ်ႇၶေႃႈၵႂၢမ်း";
 Blockly.Msg.AUTH = "ၶွပ်ႈၸႂ် ပၼ်ၶႂၢင်ႉႁပ်ႉဢဝ် ဢႅပ်ႉၼႆႉ တီႈၼႂ်းၵၢၼ်ၸဝ်ႈၵဝ်ႇသေယဝ်ႉ ၸဝ်ႈၵဝ်ႇ ႁႂ်ႈလႆႈသိမ်း ႁႂ်ႈလႆႈပိုၼ်ပၼ်သေၵမ်း";
 Blockly.Msg.CHANGE_VALUE_TITLE = "လႅၵ်ႈလၢႆႈၼမ်ႉၵတ်ႉ";
 Blockly.Msg.CHAT = "​ပေႃႉလိၵ်ႈ ၼႂ်းလွၵ်းၼႆႉသေ ၶျၢတ်ႉၸူး ၵေႃႉႁူမ်ႈႁဵတ်းႁူမ်ႈသၢင်ႈ ၸဝ်ႈၵဝ်ႇ";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "ပလွၵ်ႉတင်းၼမ် လႅဝ်";
 Blockly.Msg.COLLAPSE_BLOCK = "ပလွၵ်ႉလႅဝ်";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "သီ 1";
diff --git a/msg/js/sk.js b/msg/js/sk.js
index e9635b88b..f127d8db1 100644
--- a/msg/js/sk.js
+++ b/msg/js/sk.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Pridať komentár";
 Blockly.Msg.AUTH = "Autorizujte prosím túto aplikáciu, aby ste mohli uložiť a zdieľať vašu prácu.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Zmeniť hodnotu:";
 Blockly.Msg.CHAT = "Písaním do tohto políčka komunikujte so spolupracovníkmi!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Zvinúť bloky";
 Blockly.Msg.COLLAPSE_BLOCK = "Zvinúť blok";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "farba 1";
diff --git a/msg/js/sq.js b/msg/js/sq.js
index becdba3df..79ccfbcfe 100644
--- a/msg/js/sq.js
+++ b/msg/js/sq.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Vendos nje Koment";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Ndrysho Vlerat:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Mbyll blloqet";
 Blockly.Msg.COLLAPSE_BLOCK = "Mbyll bllokun";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Ngjyra 1";
diff --git a/msg/js/sr.js b/msg/js/sr.js
index 03fe113bd..e903b755c 100644
--- a/msg/js/sr.js
+++ b/msg/js/sr.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Додај коментар";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "Промените вредност:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Скупи блокове";
 Blockly.Msg.COLLAPSE_BLOCK = "Скупи блок";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "боја 1";
diff --git a/msg/js/sv.js b/msg/js/sv.js
index 57b6f4b6e..52e1d98c3 100644
--- a/msg/js/sv.js
+++ b/msg/js/sv.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Lägg till kommentar";
 Blockly.Msg.AUTH = "Var god godkänn denna app för att du ska kunna spara och dela den.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Ändra värde:";
 Blockly.Msg.CHAT = "Chatta med din medarbetare genom att skriva i detta fält.";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Fäll ihop block";
 Blockly.Msg.COLLAPSE_BLOCK = "Fäll ihop block";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "färg 1";
diff --git a/msg/js/ta.js b/msg/js/ta.js
index d303b112e..2e3e7458e 100644
--- a/msg/js/ta.js
+++ b/msg/js/ta.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "கருத்தை சேர்";
 Blockly.Msg.AUTH = "தயவுச்செய்து இச்செயலியை அங்கீகரித்து உங்கள் வேலையைச் சேமித்து பகிரரும்படி அனுமதிக்கவும்.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "மதிப்பை மாற்றவும்:";
 Blockly.Msg.CHAT = "இந்தப் பெட்டியில் தட்டச்சு செய்வதன் மூலம் கூட்டுப்பணியாளருடன் உரையாடலாம்!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "உறுப்புகளை மரை";
 Blockly.Msg.COLLAPSE_BLOCK = "உறுப்பை மரை";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "நிறம் 1";
diff --git a/msg/js/th.js b/msg/js/th.js
index 15538043a..74657e856 100644
--- a/msg/js/th.js
+++ b/msg/js/th.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "ใส่คำอธิบาย";
 Blockly.Msg.AUTH = "กรุณาอนุญาตแอปนี้เพื่อเปิดใช้งาน การบันทึกงานของคุณ และยินยอมให้คุณแบ่งปันงานของคุณได้";
 Blockly.Msg.CHANGE_VALUE_TITLE = "เปลี่ยนค่า:";
 Blockly.Msg.CHAT = "คุยกับผู้ร่วมงานของคุณโดยพิมพ์ลงในกล่องนี้!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "ย่อบล็อก";
 Blockly.Msg.COLLAPSE_BLOCK = "ย่อบล็อก";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "สีที่ 1";
diff --git a/msg/js/tl.js b/msg/js/tl.js
index f1923182b..1ba08222b 100644
--- a/msg/js/tl.js
+++ b/msg/js/tl.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Dagdag komento";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "pagbago ng value:";
 Blockly.Msg.CHAT = "Chat with your collaborator by typing in this box!";  // untranslated
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "bloke";
 Blockly.Msg.COLLAPSE_BLOCK = "bloke";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "kulay 1";
diff --git a/msg/js/tlh.js b/msg/js/tlh.js
index bc229ef0c..ff985695e 100644
--- a/msg/js/tlh.js
+++ b/msg/js/tlh.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "QInHom chel";
 Blockly.Msg.AUTH = "ngogh nablIj DapollaHmeH qoj latlhvaD DangeHlaHmeH chaw' yInob.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "choH:";
 Blockly.Msg.CHAT = "beqpu'lI'vaD bIjawmeH naDev yIrI'!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "ngoghmey DejmoH";
 Blockly.Msg.COLLAPSE_BLOCK = "ngogh DejmoH";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "rItlh wa'";
diff --git a/msg/js/tr.js b/msg/js/tr.js
index d4cc501b2..d9bf89e95 100644
--- a/msg/js/tr.js
+++ b/msg/js/tr.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Yorum Ekle";
 Blockly.Msg.AUTH = "Çalışmanızın kaydedilmesi ve sizinle paylaşılmasına izin verilmesi için lütfen bu uygulamaya yetki verin.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Değeri değiştir:";
 Blockly.Msg.CHAT = "Bu kutuya yazarak iş birlikçin ile sohbet et!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Blokları Daralt";
 Blockly.Msg.COLLAPSE_BLOCK = "Blok'u Daralt";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "renk 1";
diff --git a/msg/js/uk.js b/msg/js/uk.js
index fd5da2346..49bb9a396 100644
--- a/msg/js/uk.js
+++ b/msg/js/uk.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Додати коментар";
 Blockly.Msg.AUTH = "Будь ласка, авторизуйте цю програму, аби можна було зберігати вашу роботу і для надання можливості вам поширювати її.";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Змінити значення:";
 Blockly.Msg.CHAT = "Спілкуйтеся з вашими співавторами, набираючи у цьому полі!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Згорнути блоки";
 Blockly.Msg.COLLAPSE_BLOCK = "Згорнути блок";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "колір 1";
diff --git a/msg/js/vi.js b/msg/js/vi.js
index 0ee89982d..ba07eddae 100644
--- a/msg/js/vi.js
+++ b/msg/js/vi.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "Thêm Chú Giải";
 Blockly.Msg.AUTH = "Vui lòng cho phép ứng dụng được lưu dữ liệu của bạn và tự động chia sẻ bằng tên của bạn";
 Blockly.Msg.CHANGE_VALUE_TITLE = "Thay giá trị thành:";
 Blockly.Msg.CHAT = "Trò chuyện với cộng tác viên của bạn bằng cách gõ vào hộp này!";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "Thu Nhỏ Mọi Mảnh";
 Blockly.Msg.COLLAPSE_BLOCK = "Thu Nhỏ Mảnh";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "màu 1";
diff --git a/msg/js/zh-hans.js b/msg/js/zh-hans.js
index 2ffe9250b..9a02fc725 100644
--- a/msg/js/zh-hans.js
+++ b/msg/js/zh-hans.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "添加注释";
 Blockly.Msg.AUTH = "请授权这个应用程序以保存您的作品并共享。";
 Blockly.Msg.CHANGE_VALUE_TITLE = "更改值：";
 Blockly.Msg.CHAT = "通过在此框输入与您的合作者沟通！";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "折叠块";
 Blockly.Msg.COLLAPSE_BLOCK = "折叠块";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "颜色1";
diff --git a/msg/js/zh-hant.js b/msg/js/zh-hant.js
index 983637aed..db7090e82 100644
--- a/msg/js/zh-hant.js
+++ b/msg/js/zh-hant.js
@@ -10,6 +10,7 @@ Blockly.Msg.ADD_COMMENT = "加入註解";
 Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved and to allow it to be shared by you.";  // untranslated
 Blockly.Msg.CHANGE_VALUE_TITLE = "修改值:";
 Blockly.Msg.CHAT = "與您的合作者洽談藉由在此框輸入！";
+Blockly.Msg.CLEAN_UP = "Clean up Blocks";  // untranslated
 Blockly.Msg.COLLAPSE_ALL = "收合積木";
 Blockly.Msg.COLLAPSE_BLOCK = "收合積木";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "顏色 1";
diff --git a/msg/json/en.json b/msg/json/en.json
index cede51a9c..a57b6fecc 100644
--- a/msg/json/en.json
+++ b/msg/json/en.json
@@ -1,7 +1,7 @@
 {
 	"@metadata": {
 		"author": "Ellen Spertus <ellen.spertus@gmail.com>",
-		"lastupdated": "2015-09-11 21:45:05.472664",
+		"lastupdated": "2015-10-09 19:19:49.745918",
 		"locale": "en",
 		"messagedocumentation" : "qqq"
 	},
@@ -14,6 +14,7 @@
 	"INLINE_INPUTS": "Inline Inputs",
 	"DELETE_BLOCK": "Delete Block",
 	"DELETE_X_BLOCKS": "Delete %1 Blocks",
+	"CLEAN_UP": "Clean up Blocks",
 	"COLLAPSE_BLOCK": "Collapse Block",
 	"COLLAPSE_ALL": "Collapse Blocks",
 	"EXPAND_BLOCK": "Expand Block",
diff --git a/msg/json/qqq.json b/msg/json/qqq.json
index 4624b2cf6..efb73e05b 100644
--- a/msg/json/qqq.json
+++ b/msg/json/qqq.json
@@ -1,11 +1,4 @@
 {
-	"@metadata": {
-		"authors": [
-			"Espertus",
-			"Liuxinyu970226",
-			"Shirayuki"
-		]
-	},
 	"VARIABLES_DEFAULT_NAME": "default name - A simple, general default name for a variable, preferably short. For more context, see [[Translating:Blockly#infrequent_message_types]].\n{{Identical|Item}}",
 	"TODAY": "button text - Botton that sets a calendar to today's date.\n{{Identical|Today}}",
 	"DUPLICATE_BLOCK": "context menu - Make a copy of the selected block (and any blocks it contains).\n{{Identical|Duplicate}}",
@@ -15,10 +8,11 @@
 	"INLINE_INPUTS": "context menu - Change from 'internal' to 'external' mode for displaying blocks used as inputs to the selected block.  See [[Translating:Blockly#context_menus]].",
 	"DELETE_BLOCK": "context menu - Permanently delete the selected block.",
 	"DELETE_X_BLOCKS": "context menu - Permanently delete the %1 selected blocks.\n\nParameters:\n* %1 - an integer greater than 1.",
+	"CLEAN_UP": "context menu - Reposition all the blocks so that they form a neat line.",
 	"COLLAPSE_BLOCK": "context menu - Make the appearance of the selected block smaller by hiding some information about it.",
-	"COLLAPSE_ALL": "context menu - Make the appearance of the selected blocks smaller by hiding some information about it.  Use the same terminology as in the previous message.",
+	"COLLAPSE_ALL": "context menu - Make the appearance of all blocks smaller by hiding some information about it.  Use the same terminology as in the previous message.",
 	"EXPAND_BLOCK": "context menu - Restore the appearance of the selected block by showing information about it that was hidden (collapsed) earlier.",
-	"EXPAND_ALL": "context menu - Restore the appearance of the selected block by showing information about it that was hidden (collapsed) earlier.  Use the same terminology as in the previous message.",
+	"EXPAND_ALL": "context menu - Restore the appearance of all blocks by showing information about it that was hidden (collapsed) earlier.  Use the same terminology as in the previous message.",
 	"DISABLE_BLOCK": "context menu - Make the selected block have no effect (unless reenabled).",
 	"ENABLE_BLOCK": "context menu - Make the selected block have effect (after having been disabled earlier).",
 	"HELP": "context menu - Provide helpful information about the selected block.\n{{Identical|Help}}",
diff --git a/msg/messages.js b/msg/messages.js
index 8d4b380a0..47fb47773 100644
--- a/msg/messages.js
+++ b/msg/messages.js
@@ -70,13 +70,15 @@ Blockly.Msg.INLINE_INPUTS = 'Inline Inputs';
 Blockly.Msg.DELETE_BLOCK = 'Delete Block';
 /// context menu - Permanently delete the %1 selected blocks.\n\nParameters:\n* %1 - an integer greater than 1.
 Blockly.Msg.DELETE_X_BLOCKS = 'Delete %1 Blocks';
+/// context menu - Reposition all the blocks so that they form a neat line.
+Blockly.Msg.CLEAN_UP = 'Clean up Blocks';
 /// context menu - Make the appearance of the selected block smaller by hiding some information about it.
 Blockly.Msg.COLLAPSE_BLOCK = 'Collapse Block';
-/// context menu - Make the appearance of the selected blocks smaller by hiding some information about it.  Use the same terminology as in the previous message.
+/// context menu - Make the appearance of all blocks smaller by hiding some information about it.  Use the same terminology as in the previous message.
 Blockly.Msg.COLLAPSE_ALL = 'Collapse Blocks';
 /// context menu - Restore the appearance of the selected block by showing information about it that was hidden (collapsed) earlier.
 Blockly.Msg.EXPAND_BLOCK = 'Expand Block';
-/// context menu - Restore the appearance of the selected block by showing information about it that was hidden (collapsed) earlier.  Use the same terminology as in the previous message.
+/// context menu - Restore the appearance of all blocks by showing information about it that was hidden (collapsed) earlier.  Use the same terminology as in the previous message.
 Blockly.Msg.EXPAND_ALL = 'Expand Blocks';
 /// context menu - Make the selected block have no effect (unless reenabled).
 Blockly.Msg.DISABLE_BLOCK = 'Disable Block';