Merge branch 'master' into develop

core/block_svg.js

@@ -609,14 +609,7 @@ Blockly.BlockSvg.prototype.onMouseUp_ = function(e) {
     if (trashcan) {
       goog.Timer.callOnce(trashcan.close, 100, trashcan);
     }
-    // Save the block's workspace temporarily so we can resize the
-    // contents once the block is disposed.
-    var selectedWorkspace = Blockly.selected.workspace;
     Blockly.selected.dispose(false, true);
-    // Dropping a block on the trash can will usually cause the workspace to
-    // resize to contain the newly positioned block.  Force a second resize
-    // now that the block has been deleted.
-    Blockly.resizeSvgContents(selectedWorkspace);
   }
   if (Blockly.highlightedConnection_) {
     Blockly.highlightedConnection_.unhighlight();
@@ -985,6 +978,9 @@ Blockly.BlockSvg.prototype.getSvgRoot = function() {
 Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
   Blockly.Tooltip.hide();
   Blockly.Field.startCache();
+  // Save the block's workspace temporarily so we can resize the
+  // contents once the block is disposed.
+  var blockWorkspace = this.workspace;
   // If this block is being dragged, unlink the mouse events.
   if (Blockly.selected == this) {
     this.unselect();
@@ -1011,6 +1007,7 @@ Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
   Blockly.BlockSvg.superClass_.dispose.call(this, healStack);
 
   goog.dom.removeNode(this.svgGroup_);
+  Blockly.resizeSvgContents(blockWorkspace);
   // Sever JavaScript to DOM connections.
   this.svgGroup_ = null;
   this.svgPath_ = null;

msg/json/be-tarask.json

@@ -279,6 +279,7 @@
 	"LISTS_SORT_ORDER_ASCENDING": "па павелічэньні",
 	"LISTS_SORT_ORDER_DESCENDING": "па зьмяншэньні",
 	"LISTS_SORT_TYPE_NUMERIC": "як лікі",
+	"LISTS_SORT_TYPE_TEXT": "паводле альфабэту",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "стварыць сьпіс з тэксту",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "стварыць тэкст са сьпісу",
 	"LISTS_SPLIT_WITH_DELIMITER": "з падзяляльнікам",

msg/json/cs.json

@@ -8,7 +8,8 @@
 			"Utar",
 			"Clon",
 			"Koo6",
-			"Vtmarvin"
+			"Vtmarvin",
+			"Dvorapa"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "položka",
@@ -291,9 +292,13 @@
 	"LISTS_GET_SUBLIST_END_LAST": "jako poslední",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Vytvoří kopii určené části seznamu.",
 	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "seřadit %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Seřadit kopii seznamu.",
 	"LISTS_SORT_ORDER_ASCENDING": "vzestupně",
 	"LISTS_SORT_ORDER_DESCENDING": "sestupně",
 	"LISTS_SORT_TYPE_NUMERIC": "číselné",
+	"LISTS_SORT_TYPE_TEXT": "abecedně",
+	"LISTS_SORT_TYPE_IGNORECASE": "abecedně, na velikosti písmen nezáleží",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "udělat z textu seznam",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "udělat ze seznamu text",
 	"LISTS_SPLIT_WITH_DELIMITER": "s oddělovačem",

msg/json/zh-hans.json

@@ -8,7 +8,8 @@
 			"Xiaomingyan",
 			"Yfdyh000",
 			"아라",
-			"Hudafu"
+			"Hudafu",
+			"Shatteredwind"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "项目",
@@ -204,7 +205,7 @@
 	"TEXT_GET_SUBSTRING_TOOLTIP": "返回指定的部分文本。",
 	"TEXT_GET_SUBSTRING_INPUT_IN_TEXT": "自文本",
 	"TEXT_GET_SUBSTRING_START_FROM_START": "取得一段字串自#",
-	"TEXT_GET_SUBSTRING_START_FROM_END": "取得一段字串自#到末尾",
+	"TEXT_GET_SUBSTRING_START_FROM_END": "取得一段字串自倒数第#个字符",
 	"TEXT_GET_SUBSTRING_START_FIRST": "取得一段字串自第一个字符",
 	"TEXT_GET_SUBSTRING_END_FROM_START": "到字符#",
 	"TEXT_GET_SUBSTRING_END_FROM_END": "到倒数第#个字符",