Merge branch 'master' into develop

2026-01-13 11:57:10 +01:00 · 2016-05-13 23:37:02 -07:00
parent 4de98b9f83 5f1568ef60
commit 15e1deacbd
12 changed files with 79 additions and 7 deletions
--- a/core/generator.js
+++ b/core/generator.js
@@ -77,7 +77,7 @@ Blockly.Generator.prototype.INDENT = '  ';
 */
 Blockly.Generator.prototype.workspaceToCode = function(workspace) {
  if (!workspace) {
-    // Backwards compatability from before there could be multiple workspaces.
+    // Backwards compatibility from before there could be multiple workspaces.
    console.warn('No workspace specified in workspaceToCode call.  Guessing.');
    workspace = Blockly.getMainWorkspace();
  }
--- a/msg/json/de.json
+++ b/msg/json/de.json
@@ -302,6 +302,14 @@
 	"LISTS_GET_SUBLIST_END_LAST": "bis zum Ende",
 	"LISTS_GET_SUBLIST_TAIL": "",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Erstellt eine Kopie mit dem angegebenen Abschnitt der Liste.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "%1 %2 %3 sortieren",
+	"LISTS_SORT_TOOLTIP": "Eine Kopie einer Liste sortieren.",
+	"LISTS_SORT_ORDER_ASCENDING": "aufsteigend",
+	"LISTS_SORT_ORDER_DESCENDING": "absteigend",
+	"LISTS_SORT_TYPE_NUMERIC": "numerisch",
+	"LISTS_SORT_TYPE_TEXT": "alphabetisch",
+	"LISTS_SORT_TYPE_IGNORECASE": "alphabetisch, Schreibung ignorieren",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "Liste aus Text erstellen",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "Text aus Liste erstellen",
--- a/msg/json/es.json
+++ b/msg/json/es.json
@@ -4,7 +4,10 @@
 			"Fitoschido",
 			"VegaDark",
 			"WeSiToS",
-			"Macofe"
+			"Macofe",
+			"Codynguyen1116",
+			"Indiralena",
+			"Rubentl134"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "elemento",
@@ -276,6 +279,14 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "hasta # del final",
 	"LISTS_GET_SUBLIST_END_LAST": "hasta el último",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Crea una copia de la parte especificada de una lista.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "tipo %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Ordenar una copia de una lista.",
+	"LISTS_SORT_ORDER_ASCENDING": "ascendente",
+	"LISTS_SORT_ORDER_DESCENDING": "descendente",
+	"LISTS_SORT_TYPE_NUMERIC": "numérico",
+	"LISTS_SORT_TYPE_TEXT": "alfabético",
+	"LISTS_SORT_TYPE_IGNORECASE": "alfabético, ignorar tamaño",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "hacer lista a partir de texto",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "hacer texto a partir de lista",
--- a/msg/json/fr.json
+++ b/msg/json/fr.json
@@ -283,6 +283,14 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "jusqu’à # depuis la fin",
 	"LISTS_GET_SUBLIST_END_LAST": "jusqu’à la fin",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Crée une copie de la partie spécifiée d’une liste.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "trier %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Trier une copie d’une liste.",
+	"LISTS_SORT_ORDER_ASCENDING": "croissant",
+	"LISTS_SORT_ORDER_DESCENDING": "décroissant",
+	"LISTS_SORT_TYPE_NUMERIC": "numérique",
+	"LISTS_SORT_TYPE_TEXT": "alphabétique",
+	"LISTS_SORT_TYPE_IGNORECASE": "alphabétique, en ignorant la casse",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "créer une liste depuis le texte",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "créer un texte depuis la liste",
--- a/msg/json/he.json
+++ b/msg/json/he.json
@@ -10,7 +10,8 @@
 			"Dvb",
 			"LaG roiL",
 			"아라",
-			"Elyashiv"
+			"Elyashiv",
+			"Guycn2"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "פריט",
@@ -241,6 +242,11 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "ל # מהסוף",
 	"LISTS_GET_SUBLIST_END_LAST": "לאחרון",
 	"LISTS_GET_SUBLIST_TOOLTIP": "יוצרת עותק של חלק מסוים מהרשימה.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_ORDER_ASCENDING": "סדר עולה",
+	"LISTS_SORT_ORDER_DESCENDING": "סדר יורד",
+	"LISTS_SORT_TYPE_TEXT": "סדר אלפביתי",
+	"LISTS_SORT_TYPE_IGNORECASE": "סדר אלפביתי, לא תלוי רישיות",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "יצירת רשימה מטקסט",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "יצירת טקסט מרשימה",
 	"VARIABLES_GET_TOOLTIP": "להחזיר את הערך של משתנה זה.",
--- a/msg/json/it.json
+++ b/msg/json/it.json
@@ -277,6 +277,13 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "da # dalla fine",
 	"LISTS_GET_SUBLIST_END_LAST": "dagli ultimi",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Crea una copia della porzione specificata di una lista.",
+	"LISTS_SORT_TITLE": "ordinamento %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Ordina una copia di un elenco.",
+	"LISTS_SORT_ORDER_ASCENDING": "crescente",
+	"LISTS_SORT_ORDER_DESCENDING": "decrescente",
+	"LISTS_SORT_TYPE_NUMERIC": "numerico",
+	"LISTS_SORT_TYPE_TEXT": "alfabetico",
+	"LISTS_SORT_TYPE_IGNORECASE": "alfabetico, ignorare differenze maiuscole e minuscole",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "crea lista da testo",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "crea testo da lista",
 	"LISTS_SPLIT_WITH_DELIMITER": "con delimitatore",
--- a/msg/json/pms.json
+++ b/msg/json/pms.json
@@ -272,6 +272,10 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "fin-a a # da la fin",
 	"LISTS_GET_SUBLIST_END_LAST": "fin-a a l'ùltim",
 	"LISTS_GET_SUBLIST_TOOLTIP": "A crea na còpia dël tòch ëspessificà ëd na lista.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "ordiné %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Ordiné na còpia ëd na lista.",
+	"LISTS_SORT_ORDER_ASCENDING": "chërsent",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "fé na lista da 'n test",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "fé 'n test da na lista",
--- a/msg/json/qqq.json
+++ b/msg/json/qqq.json
@@ -1,4 +1,11 @@
 {
+	"@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 - Button 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}}",
@@ -96,7 +103,7 @@
 	"LOGIC_BOOLEAN_FALSE": "block text - The word for the [https://en.wikipedia.org/wiki/Truth_value logical value] ''false''.\n{{Identical|False}}",
 	"LOGIC_BOOLEAN_TOOLTIP": "tooltip - Indicates that the block returns either of the two possible [https://en.wikipedia.org/wiki/Truth_value logical values].",
 	"LOGIC_NULL_HELPURL": "url - Provide a link to the translation of [https://en.wikipedia.org/wiki/Nullable_type https://en.wikipedia.org/wiki/Nullable_type], if it exists in your language; otherwise, do not worry about translating this advanced concept.",
-	"LOGIC_NULL": "block text - In computer languages, ''null'' is a special value that indicates that no value has been set.  You may use your language's word for 'nothing' or 'invalid'.",
+	"LOGIC_NULL": "block text - In computer languages, ''null'' is a special value that indicates that no value has been set.  You may use your language's word for 'nothing' or 'invalid'.\n{{Identical|Null}}",
 	"LOGIC_NULL_TOOLTIP": "tooltip - This should use the word from the previous message.",
 	"LOGIC_TERNARY_HELPURL": "url - Describes the programming language operator known as the ''ternary'' or ''conditional'' operator.  It is recommended that you use the translation of [https://en.wikipedia.org/wiki/%3F: https://en.wikipedia.org/wiki/%3F:] if it exists.",
 	"LOGIC_TERNARY_CONDITION": "block input text - Label for the input whose value determines which of the other two inputs is returned.  In some programming languages, this is called a ''''predicate''''.",
@@ -320,8 +327,8 @@
 	"LISTS_SORT_HELPURL": "url - Information describing sorting a list.",
 	"LISTS_SORT_TITLE": "Sort as type %1 (numeric or alphabetic) in order %2 (ascending or descending) a list of items %3.",
 	"LISTS_SORT_TOOLTIP": "tooltip - See [https://github.com/google/blockly/wiki/Lists#sorting-a-list].",
-	"LISTS_SORT_ORDER_ASCENDING": "sorting order or direction from low to high value for numeric, or A-Z for alphabetic.",
-	"LISTS_SORT_ORDER_DESCENDING": "sorting order or direction from high to low value for numeric, or Z-A for alphabetic.",
+	"LISTS_SORT_ORDER_ASCENDING": "sorting order or direction from low to high value for numeric, or A-Z for alphabetic.\n{{Identical|Ascending}}",
+	"LISTS_SORT_ORDER_DESCENDING": "sorting order or direction from high to low value for numeric, or Z-A for alphabetic.\n{{Identical|Descending}}",
 	"LISTS_SORT_TYPE_NUMERIC": "sort by treating each item as a number.",
 	"LISTS_SORT_TYPE_TEXT": "sort by treating each item alphabetically, case-sensitive.",
 	"LISTS_SORT_TYPE_IGNORECASE": "sort by treating each item alphabetically, ignoring differences in case.",
--- a/msg/json/ru.json
+++ b/msg/json/ru.json
@@ -277,6 +277,11 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "по № с конца",
 	"LISTS_GET_SUBLIST_END_LAST": "по последний",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Создаёт копию указанной части списка.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "сортировать %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Сортировать копию списка.",
+	"LISTS_SORT_ORDER_ASCENDING": "по возрастанию",
+	"LISTS_SORT_ORDER_DESCENDING": "по убыванию",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "сделать список из текста",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "собрать текст из списка",
--- a/msg/json/sv.json
+++ b/msg/json/sv.json
@@ -293,6 +293,14 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "till # från slutet",
 	"LISTS_GET_SUBLIST_END_LAST": "till sista",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Skapar en kopia av den specificerade delen av en lista.",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "sortera %1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "Sortera en kopia av en lista.",
+	"LISTS_SORT_ORDER_ASCENDING": "stigande",
+	"LISTS_SORT_ORDER_DESCENDING": "fallande",
+	"LISTS_SORT_TYPE_NUMERIC": "numeriskt",
+	"LISTS_SORT_TYPE_TEXT": "alfabetiskt",
+	"LISTS_SORT_TYPE_IGNORECASE": "alfabetiskt, ignorera skiftläge",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "skapa lista från text",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "skapa text från lista",
--- a/msg/json/zh-hans.json
+++ b/msg/json/zh-hans.json
@@ -288,6 +288,14 @@
 	"LISTS_GET_SUBLIST_END_LAST": "到最后",
 	"LISTS_GET_SUBLIST_TAIL": "空白",
 	"LISTS_GET_SUBLIST_TOOLTIP": "复制列表中指定的部分。",
+	"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
+	"LISTS_SORT_TITLE": "排序%1 %2 %3",
+	"LISTS_SORT_TOOLTIP": "排序一个列表的拷贝。",
+	"LISTS_SORT_ORDER_ASCENDING": "升序",
+	"LISTS_SORT_ORDER_DESCENDING": "降序",
+	"LISTS_SORT_TYPE_NUMERIC": "按数字排序",
+	"LISTS_SORT_TYPE_TEXT": "按字母排序",
+	"LISTS_SORT_TYPE_IGNORECASE": "按字母排序，忽略大小写",
 	"LISTS_SPLIT_HELPURL": "https://github.com/google/blockly/wiki/Lists#splitting-strings-and-joining-lists",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "从文本制作列表",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "从列表拆出文本",
--- a/msg/json/zh-hant.json
+++ b/msg/json/zh-hant.json
@@ -120,7 +120,7 @@
 	"MATH_SINGLE_TOOLTIP_LOG10": "返回指定數字的對數。",
 	"MATH_SINGLE_TOOLTIP_EXP": "返回指定數字指數的 e",
 	"MATH_SINGLE_TOOLTIP_POW10": "返回指定數字指數的10的冪次。",
-	"MATH_TRIG_HELPURL": "https://en.wikipedia.org/wiki/Trigonometric_functions",
+	"MATH_TRIG_HELPURL": "https://zh.wikipedia.org/wiki/三角函數",
 	"MATH_TRIG_TOOLTIP_SIN": "返回指定角度的正弦值(非弧度）。",
 	"MATH_TRIG_TOOLTIP_COS": "返回指定角度的餘弦值(非弧度）。",
 	"MATH_TRIG_TOOLTIP_TAN": "返回指定角度的正切值(非弧度）。",