smalruby-editor 0.2.1 → 0.2.2

data/app/assets/javascripts/blocks/pen.js.coffee.erb

@@ -3,6 +3,7 @@
 <%
   category = 'pen'
   require 'smalruby_editor'
+  require 'smalruby_editor/blockly_message_helper'
   color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
@@ -34,7 +35,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @interpolateMsg(<%= bm('.set_pen_color') %>,
-                    ['COLOUR', ['Colour', '#ff0000'], Blockly.ALIGN_RIGHT],
+                    ['COLOUR', new Blockly.FieldColour('#ff0000')],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)

data/app/assets/javascripts/blocks/ruby.js.coffee.erb

@@ -63,9 +63,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @interpolateMsg('p %1',
-                     ['ARG', null, Blockly.ALIGN_RIGHT],
-                     Blockly.ALIGN_RIGHT)
+    @interpolateMsg(<%= bm('.p') %>,
+                    ['ARG', null, Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
     @setNextStatement(true)

data/app/assets/javascripts/blocks/sensing.js.coffee.erb

@@ -215,10 +215,10 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
-      .appendField(<%= bm('.character_property_middle') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'PROPERTY')
+    @interpolateMsg(<%= bm('.character_property') %>,
+                    ['CHAR', new Smalruby.FieldCharacter()],
+                    ['PROPERTY', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, ['Number', 'String'])
     @setTooltip('')
 
@@ -244,9 +244,9 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.time_now') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'METHOD')
+    @interpolateMsg(<%= bm('.time_now') %>,
+                    ['METHOD', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
 
@@ -261,7 +261,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField('2000年からの日数')
+      .appendField(<%= bm('.days_since_2000') %>)
     @setOutput(true, 'Number')
     @setTooltip('')
 

data/app/assets/javascripts/blocks/sound.js.coffee.erb

@@ -23,7 +23,9 @@ Blockly.Blocks['<%= n %>'] =
     ]
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput().appendField(new Blockly.FieldDropdown(sounds), 'NAME')
+    @interpolateMsg(<%= bm('.preset_sounds') %>,
+                    ['NAME', new Blockly.FieldDropdown(sounds)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, 'String')
     @setTooltip('')
 

data/app/assets/javascripts/fix_blockly.js.erb

@@ -0,0 +1,105 @@
+/**
+ * this program copied from Blockly and modified
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+<%
+  require 'smalruby_editor'
+%>
+
+// blockly/core/toolbox.js
+// HACK: don't close category when clicked twice
+Blockly.Toolbox.TreeNode.prototype.onMouseDown = function(e) {
+  // Expand icon.
+  if (this.hasChildren() && this.isUserCollapsible_) {
+    this.toggle();
+    this.select();
+  } else if (this.isSelected()) {
+    //this.getTree().setSelectedItem(null);
+  } else {
+    this.select();
+  }
+  this.updateRow();
+};
+
+Blockly.Blocks.math.HUE = <%= SmalrubyEditor::COLORS[:operators] %>;
+Blockly.Blocks.texts.HUE = <%= SmalrubyEditor::COLORS[:operators] %>;
+
+// blockly/core/field_textinput.js
+Blockly.FieldTextInput.prototype.showEditorOrig_ =
+  Blockly.FieldTextInput.prototype.showEditor_;
+Blockly.FieldTextInput.prototype.showEditor_ = function(opt_quietInput) {
+  Blockly.FieldTextInput.prototype.showEditorOrig_.apply(this, arguments);
+  var htmlInput = Blockly.FieldTextInput.htmlInput_;
+  htmlInput.onKeyDownWrapper_ =
+      Blockly.bindEvent_(htmlInput, 'keydown', this, this.onHtmlInputChange2_);
+};
+
+Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(e) {
+  var htmlInput = Blockly.FieldTextInput.htmlInput_;
+  if (e.keyCode != 27) {
+    // Update source block.
+    var text = htmlInput.value;
+    if (text !== htmlInput.oldValue_) {
+      htmlInput.oldValue_ = text;
+      this.setText(text);
+      this.validate_();
+    } else if (goog.userAgent.WEBKIT) {
+      // Cursor key.  Render the source block to show the caret moving.
+      // Chrome only (version 26, OS X).
+      this.sourceBlock_.render();
+    }
+  }
+};
+
+Blockly.FieldTextInput.prototype.onHtmlInputChange2_ = function(e) {
+  var htmlInput = Blockly.FieldTextInput.htmlInput_;
+  if (e.keyCode == 13) {
+    // Enter
+    Blockly.WidgetDiv.hide();
+  } else if (e.keyCode == 27) {
+    // Esc
+    this.setText(htmlInput.defaultValue);
+    Blockly.WidgetDiv.hide();
+  }
+};
+
+Blockly.FieldTextInput.prototype.widgetDisposeOrig_ =
+  Blockly.FieldTextInput.prototype.widgetDispose_;
+Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
+  var thisField = this;
+  return function() {
+    Blockly.FieldTextInput.prototype.widgetDisposeOrig_.call(thisField);
+    var htmlInput = Blockly.FieldTextInput.htmlInput_;
+    Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
+  };
+};
+
+// blockly/core/names.js
+Blockly.Names.prototype.safeName_ = function(name) {
+  if (!name) {
+    name = 'unnamed';
+  } else {
+    // Unfortunately names in non-latin characters will look like
+    // _E9_9F_B3_E4_B9_90 which is pretty meaningless.
+    // HACK: Rubyでは日本語の変数名を許可しているためencodeURIを行わない。
+    // また、使えない記号を置換する。
+    name = name.replace(/[ !"#$%&'()=\-~^\\|`@{\[+;*:}\]<>,.?\/]/g, '_')
+    // Most languages don't allow names with leading numbers.
+    if ('0123456789'.indexOf(name[0]) != -1) {
+      name = '_' + name;
+    }
+  }
+  return name;
+};

data/app/assets/javascripts/generators/ruby.js.coffee.erb

@@ -51,6 +51,9 @@ Blockly.Ruby.init = ->
     @definitions_['receiver_stack'] = ['main']
     @definitions_['character_stack'] = []
 
+    if Smalruby.isEnabled('auto_init_hardware')
+      @definitions_['init_hardware'] = 'init_hardware'
+
 Blockly.Ruby.defineCharacter = (c) ->
   name = c.get('name')
   blockName = "character_#{name}"

data/app/assets/javascripts/msg/en_us.js

@@ -16,18 +16,25 @@ Blockly.Msg.COMMON_BACKWARD = 'backward';
 Blockly.Msg.COMMON_TURN_LEFT = 'turn left';
 Blockly.Msg.COMMON_TURN_RIGHT = 'turn right';
 Blockly.Msg.COMMON_STOP = 'stop';
+Blockly.Msg.COMMON_ERROR = 'Error';
 
 
 // colour name
 Blockly.Msg.COLOUR_RED = 'red';
 Blockly.Msg.COLOUR_GREEN = 'green';
+Blockly.Msg.COLOUR_BLUE = 'blue';
+Blockly.Msg.COLOUR_WHITE = 'white';
+
+
+// smalruby.js.coffee
+Blockly.Msg.SMALRUBY_WILL_DISAPPER_YOUR_PROGRAM = 'Disappear your program!';
 
 
 // views/main_menu_view.js.coffee
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LINES = ' Lines';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LETTERS = ' Letters';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_COMMA = ', ';
-
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_CONFIRM_OVERWRITE = 'Are you sure to save?\nBecause you saved as {$filename}, so that will disappear, if you will save!';
 
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_BLOCK_MODE_BLOCKUI_TITLE = 'Converting Program';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_BLOCK_MODE_BLOCKUI_MESSAGE = 'Converting your program to instruction blocks.';
@@ -41,6 +48,40 @@ Blockly.Msg.VIEWS_MAIN_MENU_VIEW_RUN_ERROR_CANCEL_TO_RUN = "Cancel to run your p
 
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_BLOCKUI_TITLE = 'Downloading';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_BLOCKUI_MESSAGE = "Downloading your program.";
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_SUCCEEDED = 'Downloaded.<br>You can run with "ruby {$filename}" on windows or "rsdl {$filename}" on Mac OS X.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_ERROR = "Can't download";
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_CONFIRM = "Your program will disappear, because you didn't save it! Are you sure to load?";
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_ERROR_NO_NAME = 'You must set program name before you save it!';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_TITLE = 'Saving your program';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_MESSAGE = 'Now, saving your program.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_NOTICE = 'Your program name is "{$filename}".<br>It will be saved at home directory.<br>';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_ERROR_MESSAGE = "Can't save your program.";
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_CANCELED = 'Canceled to save.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_SUCCEEDED = 'Saved.';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_TITLE = 'Checking your program';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_MESSAGE = 'Now, checking syntax of your program.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_NOTICE = 'This is only checking syntax, so you will find error when you run it.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_SUCCEEDED = 'Checked.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_SUCCEEDED_NOTICE = 'Your program was checked only syntax, so you will find error when you run it.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_ERROR = "Can't check.";
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SIGNOUT_SUCCEEDED = 'Logouted.';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SIGNOUT_ERROR = "Can't logout.";
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_ERROR = '{$filename}{$error}';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_SUCCEEDED = 'Loaded.';
+
+
+// views/load_modal_view.js.coffee
+Blockly.Msg.VIEWS_LOAD_MODAL_VIEW_ERROR = "Can't load the program.";
+
+
+// views/signin_modal_view.js.coffee
+Blockly.Msg.VIEWS_SIGNIN_MODAL_VIEW_SIGNED_IN = 'Logged in.';
+Blockly.Msg.VIEWS_SIGNIN_MODAL_VIEW_ERROR = "Can't login.";
 
 
 // blocks/motion.js.coffee.erb
@@ -49,13 +90,10 @@ Blockly.Msg.BLOCKS_MOTION_TURN_RIGHT_DEGREES = 'turn right %1 degrees';
 Blockly.Msg.BLOCKS_MOTION_TURN_LEFT_DEGREES = 'turn left %1 degrees';
 Blockly.Msg.BLOCKS_MOTION_POINT_IN_DIRECTION = 'point in direction %1';
 Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_MOUSE = 'point towards mouse-pointer';
-Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_CHARACTER = 'point towards';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_X = 'go to x:';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_Y = 'y:';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_SUFFIX = '';
+Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_CHARACTER = 'point towards %1';
+Blockly.Msg.BLOCKS_MOTION_SET_X_Y = 'go to x: %1 y: %2';
 Blockly.Msg.BLOCKS_MOTION_GO_TO_MOUSE = 'go to mouse-pointer';
-Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER_PREFIX = 'go to ';
-Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER_SUFFIX = '';
+Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER = 'go to %1';
 Blockly.Msg.BLOCKS_MOTION_CHANGE_X_BY = 'change x by %1';
 Blockly.Msg.BLOCKS_MOTION_SET_X = 'set x to %1';
 Blockly.Msg.BLOCKS_MOTION_CHANGE_Y_BY = 'change y by %1';
@@ -64,25 +102,22 @@ Blockly.Msg.BLOCKS_MOTION_TURN_IF_REACH_WALL = 'if reach wall, turn';
 Blockly.Msg.BLOCKS_MOTION_TURN = 'turn';
 Blockly.Msg.BLOCKS_MOTION_TURN_XY_X = '(x) horizontal';
 Blockly.Msg.BLOCKS_MOTION_TURN_XY_Y = '(y) vertical';
-Blockly.Msg.BLOCKS_MOTION_TURN_XY_PREFIX = 'turn to ';
-Blockly.Msg.BLOCKS_MOTION_TURN_XY_SUFFIX = '';
+Blockly.Msg.BLOCKS_MOTION_TURN_XY = 'turn to %1';
+Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE = 'set rotation style %1';
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_LEFT_RIGHT = 'left-right';
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_NONE = "don't rorate";
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_FREE = 'all around';
-Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_PREFIX = 'set rotation style ';
-Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_SUFFIX = '';
 Blockly.Msg.BLOCKS_MOTION_SELF_X = 'x position';
 Blockly.Msg.BLOCKS_MOTION_SELF_Y = 'y position';
 Blockly.Msg.BLOCKS_MOTION_SELF_ANGLE = 'direction';
 
+
 // blocks/events.js.coffee.erb
 Blockly.Msg.BLOCKS_EVENTS_ON_START = 'when Run clicked';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_PREFIX = 'when ';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_MIDDLE = ' key ';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_SUFFIX = '';
+Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN = 'when %1 key %2';
 Blockly.Msg.BLOCKS_EVENTS_ON_CLICK = 'when this sprite clicked';
-Blockly.Msg.BLOCKS_EVENTS_ON_HIT_PREFIX = 'when ';
-Blockly.Msg.BLOCKS_EVENTS_ON_HIT_SUFFIX = ' hit';
+Blockly.Msg.BLOCKS_EVENTS_ON_HIT = 'when %1 hit';
+
 
 // blocks/sensing.js.coffee.erb
 Blockly.Msg.BLOCKS_SENSING_K_UP = 'up arrow';
@@ -118,7 +153,7 @@ Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_COSTUME_INDEX = 'costume #';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_COSTUME = 'contume name';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_SCALE = 'size';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_VOLUME = 'volume';
-Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_MIDDLE = ' of ';
+Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY = '%2 of %1';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_YEAR = 'year';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_MONTH = 'month';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_DAY = 'day';
@@ -127,6 +162,8 @@ Blockly.Msg.BLOCKS_SENSING_TIME_NOW_HOUR = 'hour';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_MIN = 'min';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_SEC = 'sec';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW = 'current ';
+Blockly.Msg.BLOCKS_SENSING_DAYS_SINCE_2000 = 'days since 2000';
+
 
 // blocks/control.js.coffee.erb
 Blockly.Msg.BLOCKS_CONTROL_SLEEP = 'wait %1 secs';
@@ -143,15 +180,20 @@ Blockly.Msg.BLOCKS_CONTROL_AWAIT_UNTIL = 'wait until %1';
 Blockly.Msg.BLOCKS_CONTROL_UNTIL = 'repeat until %1';
 Blockly.Msg.BLOCKS_CONTROL_AWAIT = 'just wait a little';
 
+
 // blocks/ruby.js.coffee.erb
 Blockly.Msg.BLOCKS_RUBY_STATEMENT = 'statement ';
 Blockly.Msg.BLOCKS_RUBY_EXPRESSION = 'expression ';
 Blockly.Msg.BLOCKS_RUBY_COMMENT = 'comment ';
+Blockly.Msg.BLOCKS_RUBY_P = 'p %1';
+
 
 // blocks/field_character.js.coffee.erb
 Blockly.Msg.BLOCKS_FIELD_CHARACTER_NO_CHARACTER = 'no character';
 
+
 // blocks/sound.js.coffee.erb
+Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS = '%1';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO = 'Middle C of piano';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_RE = 'D of piano';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_MI = 'E of piano';
@@ -162,6 +204,7 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'B of piano';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'High C of piano';
 Blockly.Msg.BLOCKS_SOUND_PLAY = 'play sound %1';
 
+
 // blocks/looks.js.coffee.erb
 Blockly.Msg.BLOCKS_LOOKS_SAY = 'say %1';
 Blockly.Msg.BLOCKS_LOOKS_THINK = 'think %1';
@@ -171,6 +214,7 @@ Blockly.Msg.BLOCKS_LOOKS_SHOW = 'show';
 Blockly.Msg.BLOCKS_LOOKS_HIDE = 'hide';
 Blockly.Msg.BLOCKS_LOOKS_VANISH = 'vanish';
 
+
 // blocks/hardware.js.coffee.erb
 Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_ON = 'turn on LED %1';
 Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_OFF = 'turn off LED %1';
@@ -186,6 +230,7 @@ Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_OFF = 'turn off 7 segment disp
 Blockly.Msg.BLOCKS_HARDWARE_LCD_PUTS = 'display %1 on the LCD';
 Blockly.Msg.BLOCKS_HARDWARE_LCD_CLEAR = 'clear LCD';
 Blockly.Msg.BLOCKS_HARDWARE_SERVO_SET_POSITION = 'servo motor %1 set %2 degree (5-180)';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS = '%1';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_FORWARD = 'forward 2WD car %1';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_BACKWARD = 'backward 2WD car %1';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_TURN_LEFT = 'turn left 2WD car %1';
@@ -214,6 +259,10 @@ Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = '%1 Smalrubot v3';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = '%1 Smalrubot v3 for %2 secs';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = 'Smalrubot v3 %1 touch sensor %2 ?';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = 'Smalrubot v3 light sensor value';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '%2 Smalrubot s1 %1 LED';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '%1 Smalrubot s1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '%1 Smalrubot s1 for %2 secs';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = 'Smalrubot s1 %1 IR Photoreflector';
 
 
 // blocks/operators.js.coffee.erb
@@ -252,6 +301,7 @@ Blockly.Msg.BLOCKS_OPERATORS_MATH_METHOD_10_SQUARE = '10 ^';
 Blockly.Msg.BLOCKS_OPERATORS_TRUE = 'true';
 Blockly.Msg.BLOCKS_OPERATORS_FALSE = 'false';
 
+
 // blocks/pen.js.coffee.erb
 Blockly.Msg.BLOCKS_PEN_DOWN_PEN = 'pen down';
 Blockly.Msg.BLOCKS_PEN_UP_PEN = 'pen up';

data/app/assets/javascripts/msg/ja.js

@@ -16,17 +16,25 @@ Blockly.Msg.COMMON_BACKWARD = 'バックさせる';
 Blockly.Msg.COMMON_TURN_LEFT = '左に曲げる';
 Blockly.Msg.COMMON_TURN_RIGHT = '右に曲げる';
 Blockly.Msg.COMMON_STOP = '止める';
+Blockly.Msg.COMMON_ERROR = 'エラー';
 
 
 // colour name
 Blockly.Msg.COLOUR_RED = '赤色';
 Blockly.Msg.COLOUR_GREEN = '緑色';
+Blockly.Msg.COLOUR_BLUE = '青色';
+Blockly.Msg.COLOUR_WHITE = '白色';
+
+
+// smalruby.js.coffee
+Blockly.Msg.SMALRUBY_WILL_DISAPPER_YOUR_PROGRAM = '作成中のプログラムが消えてしまうよ！';
 
 
 // views/main_menu_view.js.coffee
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LINES = '行';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_LETTERS = '文字';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_COMMA = '、';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_COMMON_CONFIRM_OVERWRITE = '前に{$filename}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！';
 
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_BLOCK_MODE_BLOCKUI_TITLE = 'プログラムの変換中';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_BLOCK_MODE_BLOCKUI_MESSAGE = 'プログラムをブロックに変換しています。';
@@ -40,48 +48,76 @@ Blockly.Msg.VIEWS_MAIN_MENU_VIEW_RUN_ERROR_CANCEL_TO_RUN = 'プログラムの
 
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_BLOCKUI_TITLE = 'プログラムのダウンロード中';
 Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_BLOCKUI_MESSAGE = 'プログラムをダウンロードしています。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_SUCCEEDED = 'ダウンロードしました。<br>ダウンロードしたプログラムは、Windowsだと「ruby {$filename}」、Macだと「rsdl {$filename}」で実行できます。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_DOWNLOAD_ERROR = 'ダウンロードできませんでした';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_CONFIRM = 'まだセーブしていないのでロードするとプログラムが消えてしまうよ！\nそれでもロードしますか？';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_ERROR_NO_NAME = 'セーブする前にプログラムに名前をつけてね！';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_TITLE = 'プログラムのセーブ中';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_MESSAGE = 'プログラムをセーブしています。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_BLOCKUI_NOTICE = 'プログラムの名前は「{$filename}」です。<br>プログラムはホームディレクトリにセーブします。<br>';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_ERROR_MESSAGE = 'セーブできませんでした';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_CANCELED = 'セーブをキャンセルしました';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SAVE_SUCCEEDED = 'セーブしました';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_TITLE = 'プログラムのチェック中';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_MESSAGE = 'プログラムの文法をチェックしています。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_BLOCKUI_NOTICE = 'このチェックは簡易的なものですので、<br>プログラムを動かすとエラーが見つかるかもしれません。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_SUCCEEDED = 'チェックしました';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_SUCCEEDED_NOTICE = 'ただし、プログラムを動かすとエラーが見つかるかもしれません。';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_CHECK_ERROR = 'チェックできませんでした';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SIGNOUT_SUCCEEDED = 'ログアウトしました';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_SIGNOUT_ERROR = 'ログアウトに失敗しました';
+
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_ERROR = '{$filename}{$error}';
+Blockly.Msg.VIEWS_MAIN_MENU_VIEW_LOAD_SUCCEEDED = 'ロードしました';
+
+
+// views/load_modal_view.js.coffee
+Blockly.Msg.VIEWS_LOAD_MODAL_VIEW_ERROR = 'ロードに失敗しました';
+
+
+// views/signin_modal_view.js.coffee
+Blockly.Msg.VIEWS_SIGNIN_MODAL_VIEW_SIGNED_IN = 'ログインしました';
+Blockly.Msg.VIEWS_SIGNIN_MODAL_VIEW_ERROR = 'ログインに失敗しました';
 
 
 // blocks/motion.js.coffee.erb
-Blockly.Msg.BLOCKS_MOTION_MOVE = '%1歩動かす';
-Blockly.Msg.BLOCKS_MOTION_TURN_RIGHT_DEGREES = '時計回りに%1度回す';
-Blockly.Msg.BLOCKS_MOTION_TURN_LEFT_DEGREES = '反時計回りに%1度回す';
-Blockly.Msg.BLOCKS_MOTION_POINT_IN_DIRECTION = '%1度に向ける';
-Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_MOUSE = 'マウスポインターへ向ける';
-Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_CHARACTER = 'へ向ける';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_X = 'x座標を';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_Y = '、y座標を';
-Blockly.Msg.BLOCKS_MOTION_SET_X_Y_SUFFIX = 'にする';
-Blockly.Msg.BLOCKS_MOTION_GO_TO_MOUSE = 'マウスポインターへ行く';
-Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER_PREFIX = '';
-Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER_SUFFIX = 'へ行く';
-Blockly.Msg.BLOCKS_MOTION_CHANGE_X_BY = 'x座標を%1ずつ変える';
-Blockly.Msg.BLOCKS_MOTION_SET_X = 'x座標を%1にする';
-Blockly.Msg.BLOCKS_MOTION_CHANGE_Y_BY = 'y座標を%1ずつ変える';
-Blockly.Msg.BLOCKS_MOTION_SET_Y = 'y座標を%1にする';
-Blockly.Msg.BLOCKS_MOTION_TURN_IF_REACH_WALL = 'もし端に着いたら、跳ね返る';
-Blockly.Msg.BLOCKS_MOTION_TURN = '跳ね返る';
+Blockly.Msg.BLOCKS_MOTION_MOVE = '■%1歩動かす';
+Blockly.Msg.BLOCKS_MOTION_TURN_RIGHT_DEGREES = '■時計回りに%1度回す';
+Blockly.Msg.BLOCKS_MOTION_TURN_LEFT_DEGREES = '■反時計回りに%1度回す';
+Blockly.Msg.BLOCKS_MOTION_POINT_IN_DIRECTION = '■%1 度に向ける';
+Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_MOUSE = '■マウスポインターへ向ける';
+Blockly.Msg.BLOCKS_MOTION_POINT_TOWARDS_CHARACTER = '■%1 へ向ける';
+Blockly.Msg.BLOCKS_MOTION_SET_X_Y = '■x座標を %1 、y座標を %2 にする';
+Blockly.Msg.BLOCKS_MOTION_GO_TO_MOUSE = '■マウスポインターへ行く';
+Blockly.Msg.BLOCKS_MOTION_GO_TO_CHARACTER = '■%1 へ行く';
+Blockly.Msg.BLOCKS_MOTION_CHANGE_X_BY = '■x座標を %1 ずつ変える';
+Blockly.Msg.BLOCKS_MOTION_SET_X = '■x座標を %1 にする';
+Blockly.Msg.BLOCKS_MOTION_CHANGE_Y_BY = '■y座標を %1 ずつ変える';
+Blockly.Msg.BLOCKS_MOTION_SET_Y = '■y座標を %1 にする';
+Blockly.Msg.BLOCKS_MOTION_TURN_IF_REACH_WALL = '■もし端に着いたら、跳ね返る';
+Blockly.Msg.BLOCKS_MOTION_TURN = '■跳ね返る';
 Blockly.Msg.BLOCKS_MOTION_TURN_XY_X = '水平(x)';
 Blockly.Msg.BLOCKS_MOTION_TURN_XY_Y = '垂直(y)';
-Blockly.Msg.BLOCKS_MOTION_TURN_XY_PREFIX = '';
-Blockly.Msg.BLOCKS_MOTION_TURN_XY_SUFFIX = '方向に跳ね返る';
+Blockly.Msg.BLOCKS_MOTION_TURN_XY = '■%1 方向に跳ね返る';
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_LEFT_RIGHT = '左右のみ';
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_NONE = '回転しない';
 Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_FREE = '自由に回転';
-Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_PREFIX = '回転方法を';
-Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE_SUFFIX = 'にする';
-Blockly.Msg.BLOCKS_MOTION_SELF_X = 'x座標';
-Blockly.Msg.BLOCKS_MOTION_SELF_Y = 'y座標';
-Blockly.Msg.BLOCKS_MOTION_SELF_ANGLE = '向き';
+Blockly.Msg.BLOCKS_MOTION_SET_ROTATION_STYLE = '■回転方法を %1 にする';
+Blockly.Msg.BLOCKS_MOTION_SELF_X = '■x座標';
+Blockly.Msg.BLOCKS_MOTION_SELF_Y = '■y座標';
+Blockly.Msg.BLOCKS_MOTION_SELF_ANGLE = '■向き';
+
 
 // blocks/events.js.coffee.erb
-Blockly.Msg.BLOCKS_EVENTS_ON_START = '実行ボタンがクリックされたとき';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_PREFIX = 'キーボードの';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_MIDDLE = 'が';
-Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN_SUFFIX = 'とき';
-Blockly.Msg.BLOCKS_EVENTS_ON_CLICK = 'キャラクターがクリックされたとき';
-Blockly.Msg.BLOCKS_EVENTS_ON_HIT_PREFIX = '';
-Blockly.Msg.BLOCKS_EVENTS_ON_HIT_SUFFIX = 'にぶつかったとき';
+Blockly.Msg.BLOCKS_EVENTS_ON_START = '♣実行ボタンがクリックされたとき';
+Blockly.Msg.BLOCKS_EVENTS_ON_KEY_PUSH_OR_DOWN = '♣キーボードの %1 が %2 のとき';
+Blockly.Msg.BLOCKS_EVENTS_ON_CLICK = '♣キャラクターがクリックされたとき';
+Blockly.Msg.BLOCKS_EVENTS_ON_HIT = '♣%1 にぶつかったとき';
+
 
 // blocks/sensing.js.coffee.erb
 Blockly.Msg.BLOCKS_SENSING_K_UP = '↑';
@@ -99,16 +135,16 @@ Blockly.Msg.BLOCKS_SENSING_M_MBUTTON = '中ボタン';
 Blockly.Msg.BLOCKS_SENSING_M_RBUTTON = '右ボタン';
 Blockly.Msg.BLOCKS_SENSING_RELEASED = '離された';
 Blockly.Msg.BLOCKS_SENSING_UP = Blockly.Msg.BLOCKS_SENSING_RELEASED;
-Blockly.Msg.BLOCKS_SENSING_REACH_WALL = '端に触れた';
-Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_PREFIX = 'キーボードの';
+Blockly.Msg.BLOCKS_SENSING_REACH_WALL = '◎端に触れた';
+Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_PREFIX = '◎キーボードの';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_MIDDLE = 'が';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_SUFFIX = '';
-Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_PUSH_OR_DOWN_PREFIX = 'マウスの';
+Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_PUSH_OR_DOWN_PREFIX = '◎マウスの';
 Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_PUSH_OR_DOWN_MIDDLE = 'が';
 Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_PUSH_OR_DOWN_SUFFIX = '';
-Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_POS_X = 'マウスのx座標';
-Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_POS_Y = 'マウスのy座標';
-Blockly.Msg.BLOCKS_SENSING_HIT_PREFIX = '';
+Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_POS_X = '◎マウスのx座標';
+Blockly.Msg.BLOCKS_SENSING_INPUT_MOUSE_POS_Y = '◎マウスのy座標';
+Blockly.Msg.BLOCKS_SENSING_HIT_PREFIX = '◎';
 Blockly.Msg.BLOCKS_SENSING_HIT_SUFFIX = 'に触れた';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_X = 'x座標';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_Y = 'y座標';
@@ -117,7 +153,7 @@ Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_COSTUME_INDEX = 'コスチュー
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_COSTUME = 'コスチューム名';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_SCALE = '大きさ';
 Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_VOLUME = 'ボリューム';
-Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY_MIDDLE = 'の';
+Blockly.Msg.BLOCKS_SENSING_CHARACTER_PROPERTY = '◎%1 の %2';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_YEAR = '年';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_MONTH = '月';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_DAY = '日';
@@ -125,32 +161,39 @@ Blockly.Msg.BLOCKS_SENSING_TIME_NOW_WDAY = '曜日';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_HOUR = '時';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_MIN = '分';
 Blockly.Msg.BLOCKS_SENSING_TIME_NOW_SEC = '秒';
-Blockly.Msg.BLOCKS_SENSING_TIME_NOW = '現在の';
+Blockly.Msg.BLOCKS_SENSING_TIME_NOW = '◎現在の %1';
+Blockly.Msg.BLOCKS_SENSING_DAYS_SINCE_2000 = '◎2000年からの日数';
+
 
 // blocks/control.js.coffee.erb
-Blockly.Msg.BLOCKS_CONTROL_SLEEP = '%1秒待つ';
-Blockly.Msg.BLOCKS_CONTROL_LOOP = 'ずっと';
+Blockly.Msg.BLOCKS_CONTROL_SLEEP = '◆%1秒待つ';
+Blockly.Msg.BLOCKS_CONTROL_LOOP = '◆ずっと';
 Blockly.Msg.BLOCKS_CONTROL_LOOP_END = 'を繰り返す';
-Blockly.Msg.BLOCKS_CONTROL_BREAK = '繰り返しから脱出する';
-Blockly.Msg.BLOCKS_CONTROL_NEXT = '次の繰り返しにジャンプする';
-Blockly.Msg.BLOCKS_CONTROL_REDO = '現在の繰り返しをやり直す';
-Blockly.Msg.BLOCKS_CONTROL_IF = 'もし';
+Blockly.Msg.BLOCKS_CONTROL_BREAK = '◆繰り返しから脱出する';
+Blockly.Msg.BLOCKS_CONTROL_NEXT = '◆以降の処理を飛ばして、次の回の処理を開始する';
+Blockly.Msg.BLOCKS_CONTROL_REDO = '◆以降の処理を飛ばして、もう一度同じ処理をやり直す';
+Blockly.Msg.BLOCKS_CONTROL_IF = '◆もし';
 Blockly.Msg.BLOCKS_CONTROL_THEN = 'ならば';
 Blockly.Msg.BLOCKS_CONTROL_ELSE = 'でなければ';
-Blockly.Msg.BLOCKS_CONTROL_TIMES = '%1回繰り返す';
-Blockly.Msg.BLOCKS_CONTROL_AWAIT_UNTIL = '%1まで待つ';
-Blockly.Msg.BLOCKS_CONTROL_UNTIL = '%1まで';
-Blockly.Msg.BLOCKS_CONTROL_AWAIT = 'ほんの少し待つ';
+Blockly.Msg.BLOCKS_CONTROL_TIMES = '◆%1回繰り返す';
+Blockly.Msg.BLOCKS_CONTROL_AWAIT_UNTIL = '◆%1まで待つ';
+Blockly.Msg.BLOCKS_CONTROL_UNTIL = '◆%1まで';
+Blockly.Msg.BLOCKS_CONTROL_AWAIT = '◆ほんの少し待つ';
+
 
 // blocks/ruby.js.coffee.erb
-Blockly.Msg.BLOCKS_RUBY_STATEMENT = '文';
-Blockly.Msg.BLOCKS_RUBY_EXPRESSION = '式';
-Blockly.Msg.BLOCKS_RUBY_COMMENT = 'コメント';
+Blockly.Msg.BLOCKS_RUBY_STATEMENT = '♠文';
+Blockly.Msg.BLOCKS_RUBY_EXPRESSION = '♠式';
+Blockly.Msg.BLOCKS_RUBY_COMMENT = '♠コメント';
+Blockly.Msg.BLOCKS_RUBY_P = '♠p %1';
+
 
 // blocks/field_character.js.coffee.erb
 Blockly.Msg.BLOCKS_FIELD_CHARACTER_NO_CHARACTER = 'キャラクターなし';
 
+
 // blocks/sound.js.coffee.erb
+Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS = '♪%1';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO = 'ピアノのド';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_RE = 'ピアノのレ';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_MI = 'ピアノのミ';
@@ -159,60 +202,67 @@ Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SO = 'ピアノのソ';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_RA = 'ピアノのラ';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_SI = 'ピアノのシ';
 Blockly.Msg.BLOCKS_SOUND_PRESET_SOUNDS_PIANO_DO_2 = 'ピアノの高いド';
-Blockly.Msg.BLOCKS_SOUND_PLAY = '%1の音を鳴らす';
+Blockly.Msg.BLOCKS_SOUND_PLAY = '♪%1 の音を鳴らす';
+
 
 // blocks/looks.js.coffee.erb
-Blockly.Msg.BLOCKS_LOOKS_SAY = '%1と言う';
-Blockly.Msg.BLOCKS_LOOKS_THINK = '%1と考える';
-Blockly.Msg.BLOCKS_LOOKS_SAY_WITH_SECOND = '%1と%2秒と言う';
-Blockly.Msg.BLOCKS_LOOKS_THINK_WITH_SECOND = '%1と%2秒と考える';
-Blockly.Msg.BLOCKS_LOOKS_SHOW = '表示する';
-Blockly.Msg.BLOCKS_LOOKS_HIDE = '隠す';
-Blockly.Msg.BLOCKS_LOOKS_VANISH = '消滅する';
+Blockly.Msg.BLOCKS_LOOKS_SAY = '★%1 と言う';
+Blockly.Msg.BLOCKS_LOOKS_THINK = '★%1 と考える';
+Blockly.Msg.BLOCKS_LOOKS_SAY_WITH_SECOND = '★%1 と %2 秒と言う';
+Blockly.Msg.BLOCKS_LOOKS_THINK_WITH_SECOND = '★%1 と %2 秒と考える';
+Blockly.Msg.BLOCKS_LOOKS_SHOW = '★表示する';
+Blockly.Msg.BLOCKS_LOOKS_HIDE = '★隠す';
+Blockly.Msg.BLOCKS_LOOKS_VANISH = '★消滅する';
+
 
 // blocks/hardware.js.coffee.erb
-Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_ON = 'LED%1をオンにする';
-Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_OFF = 'LED%1をオフにする';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_ON = '★LED %1 をオンにする';
+Blockly.Msg.BLOCKS_HARDWARE_LED_TURN_OFF = '★LED %1 をオフにする';
 Blockly.Msg.BLOCKS_HARDWARE_ANODE = 'アノード';
 Blockly.Msg.BLOCKS_HARDWARE_CATHODE = 'カソード';
 Blockly.Msg.BLOCKS_HARDWARE_LEFT = ' 左';
 Blockly.Msg.BLOCKS_HARDWARE_RIGHT = '右';
-Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = 'ハードウェアを準備する';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = 'RGB LED%1コモン%2を%3にする';
-Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = 'RGB LED%1コモン%2をオフにする';
-Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = '7セグディスプレイに%1を表示する';
-Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_OFF = '7セグディスプレイをオフにする';
-Blockly.Msg.BLOCKS_HARDWARE_LCD_PUTS = 'LCDに%1を表示する';
-Blockly.Msg.BLOCKS_HARDWARE_LCD_CLEAR = 'LCDをクリアする';
-Blockly.Msg.BLOCKS_HARDWARE_SERVO_SET_POSITION = 'サーボ%1を%2度(5～180)にする';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_FORWARD = '2WD車%1を進める';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_BACKWARD = '2WD車%1をバックさせる';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_TURN_LEFT = '2WD車%1を左に曲げる';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_TURN_RIGHT = '2WD車%1を右に曲げる';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_STOP = '2WD車%1を止める';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_RUN = '2WD車%2を%3秒%1';
+Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = '♠ハードウェアを準備する';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = '★RGB LED %1 コモン %2 を %3 にする';
+Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = '★RGB LED %1 コモン %2 をオフにする';
+Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = '★7セグディスプレイに %1 を表示する';
+Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_OFF = '★7セグディスプレイをオフにする';
+Blockly.Msg.BLOCKS_HARDWARE_LCD_PUTS = '★LCDに %1 を表示する';
+Blockly.Msg.BLOCKS_HARDWARE_LCD_CLEAR = '★LCDをクリアする';
+Blockly.Msg.BLOCKS_HARDWARE_SERVO_SET_POSITION = '■サーボ %1 を %2 度(5～180)にする';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_FORWARD = '■2WD車 %1 を進める';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_BACKWARD = '■2WD車 %1 をバックさせる';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_TURN_LEFT = '■2WD車 %1 を左に曲げる';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_TURN_RIGHT = '■2WD車 %1 を右に曲げる';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_STOP = '■2WD車 %1 を止める';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_RUN = '■2WD車 %2 を %3 秒 %1';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS = '■%1';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS_FORWARD = '進める';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS_BACKWARD = 'バックさせる';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS_TURN_LEFT = '左に曲げる';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS_TURN_RIGHT = '右に曲げる';
 Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_COMMANDS_STOP = '止める';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_SET_SPEED = '2WD車%1の%2の速度(%)を%3にする';
-Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_SPEED = '2WD車%1の%2の速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_SET_SPEED = '■2WD車 %1 の %2 の速度(%)を %3 にする';
+Blockly.Msg.BLOCKS_HARDWARE_TWO_WHEEL_DRIVE_CAR_SPEED = '◎2WD車 %1 の %2 の速度(%)';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_FORWARD = '正転させる';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_BACKWARD = '逆転させる';
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_STOP = '止める';
-Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER = '(モータードライバ%1で)モーターを%2';
-Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SET_SPEED = '(モータードライバ%1の)モーターの速度を%2にする';
-Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = '(モータードライバ%1の)モーターの速度(%)';
-Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = 'ボタン %1 が %2 ？';
-Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = 'センサー %1';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = 'スモウルボットV3の %1 LEDを %2';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = 'スモウルボットV3の %1 モーターの速度(%)';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = 'スモウルボットV3の %1 モーターの速度を %2 (%) にする';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = 'スモウルボットV3を %1';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = 'スモウルボットV3を %2 秒 %1';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = 'スモウルボットV3の %1 のタッチセンサーが %2 ？';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = 'スモウルボットV3の光センサー';
+Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER = '■(モータードライバ %1 で)モーターを %2';
+Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SET_SPEED = '■(モータードライバ %1 の)モーターの速度を %2 にする';
+Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = '◎(モータードライバ %1 の)モーターの速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = '◎ボタン %1 が %2 ？';
+Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = '◎センサー %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = '★スモウルボットV3の %1 LEDを %2';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = '◎スモウルボットV3の %1 モーターの速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = '■スモウルボットV3の %1 モーターの速度を %2 (%) にする';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = '■スモウルボットV3を %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = '■スモウルボットV3を %2 秒 %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = '◎スモウルボットV3の %1 のタッチセンサーが %2 ？';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = '◎スモウルボットV3の光センサー';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '★スモウルボットS1の %1 LEDを %2';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '■スモウルボットS1を %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '■スモウルボットS1を %2 秒 %1';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = '◎スモウルボットS1の %1 のセンサー';
 
 
 // blocks/operators.js.coffee.erb
@@ -232,7 +282,7 @@ Blockly.Msg.BLOCKS_OPERATORS_NOT = '%1ではない';
 Blockly.Msg.BLOCKS_OPERATORS_INDEX_OF = '%1の%2番目';
 Blockly.Msg.BLOCKS_OPERATORS_LENGTH = '%1の長さ';
 Blockly.Msg.BLOCKS_OPERATORS_MODULO = '%1を%2で割った余り';
-Blockly.Msg.BLOCKS_OPERATORS_ROUND = '%1を丸める';
+Blockly.Msg.BLOCKS_OPERATORS_ROUND = '%1を四捨五入';
 Blockly.Msg.BLOCKS_OPERATORS_MATH_METHOD = '%1の%2';
 Blockly.Msg.BLOCKS_OPERATORS_MATH_METHOD_ABS = '絶対値';
 Blockly.Msg.BLOCKS_OPERATORS_MATH_METHOD_FLOOR = '切り上げ';
@@ -251,7 +301,13 @@ Blockly.Msg.BLOCKS_OPERATORS_MATH_METHOD_10_SQUARE = '10 ^';
 Blockly.Msg.BLOCKS_OPERATORS_TRUE = '真';
 Blockly.Msg.BLOCKS_OPERATORS_FALSE = '偽';
 
+
 // blocks/pen.js.coffee.erb
-Blockly.Msg.BLOCKS_PEN_DOWN_PEN = 'ペンを下ろす';
-Blockly.Msg.BLOCKS_PEN_UP_PEN = 'ペンを上げる';
-Blockly.Msg.BLOCKS_PEN_SET_PEN_COLOR = 'ペンの色を%1にする';
+Blockly.Msg.BLOCKS_PEN_DOWN_PEN = '●ペンを下ろす';
+Blockly.Msg.BLOCKS_PEN_UP_PEN = '●ペンを上げる';
+Blockly.Msg.BLOCKS_PEN_SET_PEN_COLOR = '●ペンの色を%1にする';
+
+
+// override blockly's messages
+Blockly.Msg.VARIABLES_SET_TITLE = '☼セット';
+Blockly.Msg.VARIABLES_GET_TITLE = '☼';