CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-04 23:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge_master_to_develop_nov_11_16

Browse Source
This commit is contained in:
Rachel Fenichel
2016-11-11 16:17:53 -08:00
parent 840ddf146f a65baf9ead
commit d04d8280c7
59 changed files with 2218 additions and 2810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
msg/messages.js
View File

@@ -238,7 +238,6 @@ Blockly.Msg.CONTROLS_IF_ELSEIF_TOOLTIP = 'Add a condition to the if block.';
Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
/// tooltip - Describes the 'else' subblock during [https://github.com/google/blockly/wiki/IfElse#block-modification if block modification].
Blockly.Msg.CONTROLS_IF_ELSE_TOOLTIP = 'Add a final, catch-all condition to the if block.';
/// block text - Evaluates a boolean condition (%1), and will either execute
/// the statements in %2 if true, otherwise execute the statements in %3.
/// The English word "otherwise" would probably be superior to "else", but the