From e162a6236ac6908819b2af3099f71fd3e0289cdc Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 15 Apr 2016 23:23:06 -0700
Subject: [PATCH] Merge branch 'pr/260'

# Conflicts:
#	core/workspace_svg.js
---
 msg/js/zh-hant.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/msg/js/zh-hant.js b/msg/js/zh-hant.js
index 0a58f600b..1f5552a86 100644
--- a/msg/js/zh-hant.js
+++ b/msg/js/zh-hant.js
@@ -38,7 +38,7 @@ Blockly.Msg.CONTROLS_FLOW_STATEMENTS_TOOLTIP_CONTINUE = "跳過這個迴圈的
 Blockly.Msg.CONTROLS_FLOW_STATEMENTS_WARNING = "警告： 此積木僅可用於迴圈內。";
 Blockly.Msg.CONTROLS_FOREACH_HELPURL = "https://github.com/google/blockly/wiki/Loops#for-each";  // untranslated
 Blockly.Msg.CONTROLS_FOREACH_TITLE = "取出每個 %1 自列表 %2";
-Blockly.Msg.CONTROLS_FOREACH_TOOLTIP = "遍歷每個列表中的項目，將變量  '%1' 設定到該項目中，然後執行某些語句";
+Blockly.Msg.CONTROLS_FOREACH_TOOLTIP = "遍歷每個列表中的項目，將變數  '%1' 設定到該項目中，然後執行某些語句";
 Blockly.Msg.CONTROLS_FOR_HELPURL = "https://github.com/google/blockly/wiki/Loops#count-with";  // untranslated
 Blockly.Msg.CONTROLS_FOR_TITLE = "使用 %1 從範圍 %2 到 %3 每隔 %4";
 Blockly.Msg.CONTROLS_FOR_TOOLTIP = "從起始數到結尾數中取出變數 \"%1\" 的值，按指定的時間間隔，執行指定的積木。";
@@ -185,7 +185,7 @@ Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_MULTIPLY = "返回兩個數字的乘積。";
 Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_POWER = "返回第二個數字的指數的第一個數字。";
 Blockly.Msg.MATH_CHANGE_HELPURL = "https://zh.wikipedia.org/wiki/加法";
 Blockly.Msg.MATH_CHANGE_TITLE = "修改 %1 自 %2";
-Blockly.Msg.MATH_CHANGE_TOOLTIP = "將數字添加到變量 '%1'。";
+Blockly.Msg.MATH_CHANGE_TOOLTIP = "將數字添加到變數 '%1'。";
 Blockly.Msg.MATH_CONSTANT_HELPURL = "https://zh.wikipedia.org/wiki/數學常數";
 Blockly.Msg.MATH_CONSTANT_TOOLTIP = "返回一個的常見常量： π (3.141......)，e (2.718...)、 φ (1.618...)、 開方(2) (1.414......)、 開方(½) (0.707......) 或 ∞ （無窮大）。";
 Blockly.Msg.MATH_CONSTRAIN_HELPURL = "https://en.wikipedia.org/wiki/Clamping_%28graphics%29";  // untranslated
@@ -260,8 +260,8 @@ Blockly.Msg.MATH_TRIG_TOOLTIP_COS = "返回指定角度的餘弦值(非弧度）
 Blockly.Msg.MATH_TRIG_TOOLTIP_SIN = "返回指定角度的正弦值(非弧度）。";
 Blockly.Msg.MATH_TRIG_TOOLTIP_TAN = "返回指定角度的正切值(非弧度）。";
 Blockly.Msg.ME = "我";
-Blockly.Msg.NEW_VARIABLE = "新變量...";
-Blockly.Msg.NEW_VARIABLE_TITLE = "新變量名稱:";
+Blockly.Msg.NEW_VARIABLE = "新變數...";
+Blockly.Msg.NEW_VARIABLE_TITLE = "新變數名稱:";
 Blockly.Msg.ORDINAL_NUMBER_SUFFIX = "";  // untranslated
 Blockly.Msg.PROCEDURES_ALLOW_STATEMENTS = "允許語句";
 Blockly.Msg.PROCEDURES_BEFORE_PARAMS = "與：";
@@ -285,18 +285,18 @@ Blockly.Msg.PROCEDURES_HIGHLIGHT_DEF = "反白顯示函式定義";
 Blockly.Msg.PROCEDURES_IFRETURN_HELPURL = "http://c2.com/cgi/wiki?GuardClause";  // untranslated
 Blockly.Msg.PROCEDURES_IFRETURN_TOOLTIP = "如果值為 真，則返回第二個值。";
 Blockly.Msg.PROCEDURES_IFRETURN_WARNING = "警告: 此積木僅可在定義函式時使用。";
-Blockly.Msg.PROCEDURES_MUTATORARG_TITLE = "變量:";
+Blockly.Msg.PROCEDURES_MUTATORARG_TITLE = "變數:";
 Blockly.Msg.PROCEDURES_MUTATORARG_TOOLTIP = "添加函數輸入。";
 Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TITLE = "參數";
 Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TOOLTIP = "添加、刪除或重新排列此函數的輸入。";
 Blockly.Msg.REDO = "重試";
 Blockly.Msg.REMOVE_COMMENT = "移除註解";
-Blockly.Msg.RENAME_VARIABLE = "重新命名變量...";
-Blockly.Msg.RENAME_VARIABLE_TITLE = "將所有 \"%1\" 變量重新命名為:";
+Blockly.Msg.RENAME_VARIABLE = "重新命名變數...";
+Blockly.Msg.RENAME_VARIABLE_TITLE = "將所有 \"%1\" 變數重新命名為:";
 Blockly.Msg.TEXT_APPEND_APPENDTEXT = "後加入文字";
 Blockly.Msg.TEXT_APPEND_HELPURL = "https://github.com/google/blockly/wiki/Text#text-modification";  // untranslated
 Blockly.Msg.TEXT_APPEND_TO = "在";
-Blockly.Msg.TEXT_APPEND_TOOLTIP = "將一些文字追加到變量 '%1'。";
+Blockly.Msg.TEXT_APPEND_TOOLTIP = "將一些文字追加到變數 '%1'。";
 Blockly.Msg.TEXT_CHANGECASE_HELPURL = "https://github.com/google/blockly/wiki/Text#adjusting-text-case";  // untranslated
 Blockly.Msg.TEXT_CHANGECASE_OPERATOR_LOWERCASE = "轉成 小寫";
 Blockly.Msg.TEXT_CHANGECASE_OPERATOR_TITLECASE = "轉成 首字母大寫";
@@ -356,14 +356,14 @@ Blockly.Msg.TEXT_TRIM_OPERATOR_RIGHT = "消除右側空格";
 Blockly.Msg.TEXT_TRIM_TOOLTIP = "複製這段文字的同時刪除兩端多餘的空格。";
 Blockly.Msg.TODAY = "今天";
 Blockly.Msg.UNDO = "還原";
-Blockly.Msg.VARIABLES_DEFAULT_NAME = "變量";
+Blockly.Msg.VARIABLES_DEFAULT_NAME = "變數";
 Blockly.Msg.VARIABLES_GET_CREATE_SET = "建立 '設定 %1'";
 Blockly.Msg.VARIABLES_GET_HELPURL = "https://github.com/google/blockly/wiki/Variables#get";  // untranslated
-Blockly.Msg.VARIABLES_GET_TOOLTIP = "返回此變量的值。";
+Blockly.Msg.VARIABLES_GET_TOOLTIP = "返回此變數的值。";
 Blockly.Msg.VARIABLES_SET = "賦值 %1 到 %2";
 Blockly.Msg.VARIABLES_SET_CREATE_GET = "建立 '取得 %1'";
 Blockly.Msg.VARIABLES_SET_HELPURL = "https://github.com/google/blockly/wiki/Variables#set";  // untranslated
-Blockly.Msg.VARIABLES_SET_TOOLTIP = "設定此變量，好和輸入值相等。";
+Blockly.Msg.VARIABLES_SET_TOOLTIP = "設定此變數，好和輸入值相等。";
 Blockly.Msg.PROCEDURES_DEFRETURN_TITLE = Blockly.Msg.PROCEDURES_DEFNORETURN_TITLE;
 Blockly.Msg.CONTROLS_IF_IF_TITLE_IF = Blockly.Msg.CONTROLS_IF_MSG_IF;
 Blockly.Msg.CONTROLS_WHILEUNTIL_INPUT_DO = Blockly.Msg.CONTROLS_REPEAT_INPUT_DO;
@@ -383,4 +383,4 @@ Blockly.Msg.LISTS_CREATE_WITH_ITEM_TITLE = Blockly.Msg.VARIABLES_DEFAULT_NAME;
 Blockly.Msg.TEXT_APPEND_VARIABLE = Blockly.Msg.VARIABLES_DEFAULT_NAME;
 Blockly.Msg.TEXT_CREATE_JOIN_ITEM_TITLE_ITEM = Blockly.Msg.VARIABLES_DEFAULT_NAME;
 Blockly.Msg.LISTS_INDEX_OF_INPUT_IN_LIST = Blockly.Msg.LISTS_INLIST;
-Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT = Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT;
\ No newline at end of file
+Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT = Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT;