Merge branch 'master' into develop

This commit is contained in:
Neil Fraser
2016-06-09 17:30:45 -07:00
5 changed files with 20 additions and 4 deletions

View File

@@ -569,7 +569,7 @@ Blockly.Flyout.prototype.show = function(xmlList) {
this.layoutBlocks_(blocks, gaps);
// IE 11 is an incompetant browser that fails to fire mouseout events.
// IE 11 is an incompetent browser that fails to fire mouseout events.
// When the mouse is over the background, deselect all blocks.
var deselectAll = function() {
var topBlocks = this.workspace_.getTopBlocks(false);
@@ -806,7 +806,7 @@ Blockly.Flyout.prototype.onMouseMoveBlock_ = function(e) {
Safari Mobile 6.0 and Chrome for Android 18.0 fire rogue mousemove events
on certain touch actions. Ignore events with these signatures.
This may result in a one-pixel blind spot in other browsers,
but this shouldn't be noticable. */
but this shouldn't be noticeable. */
e.stopPropagation();
return;
}

View File

@@ -276,6 +276,9 @@
"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_SPLIT_LIST_FROM_TEXT": "стварыць сьпіс з тэксту",
"LISTS_SPLIT_TEXT_FROM_LIST": "стварыць тэкст са сьпісу",
"LISTS_SPLIT_WITH_DELIMITER": "з падзяляльнікам",

View File

@@ -7,7 +7,8 @@
"Macofe",
"Codynguyen1116",
"Indiralena",
"Rubentl134"
"Rubentl134",
"Martineduardo"
]
},
"VARIABLES_DEFAULT_NAME": "elemento",
@@ -138,7 +139,7 @@
"MATH_IS_DIVISIBLE_BY": "es divisible por",
"MATH_IS_TOOLTIP": "Comprueba si un número es par, impar, primo, entero, positivo, negativo, o si es divisible por un número determinado. Devuelve verdadero o falso.",
"MATH_CHANGE_HELPURL": "https://en.wikipedia.org/wiki/Programming_idiom#Incrementing_a_counter",
"MATH_CHANGE_TITLE": "cambiar %1 por %2",
"MATH_CHANGE_TITLE": "añadir %2 a %1",
"MATH_CHANGE_TOOLTIP": "Añadir un número a la variable «%1».",
"MATH_ROUND_HELPURL": "https://es.wikipedia.org/wiki/Redondeo",
"MATH_ROUND_TOOLTIP": "Redondear un número hacia arriba o hacia abajo.",

View File

@@ -143,12 +143,15 @@
"MATH_IS_POSITIVE": "חיובי",
"MATH_IS_NEGATIVE": "שלילי",
"MATH_IS_DIVISIBLE_BY": "מתחלק ב",
"MATH_CHANGE_TITLE": "שינוי %1 על־ידי %2",
"MATH_CHANGE_TOOLTIP": "הוסף מספר למשתנה '%1'.",
"MATH_ROUND_HELPURL": "https://he.wikipedia.org/wiki/עיגול_(אריתמטיקה)",
"MATH_ROUND_TOOLTIP": "עיגול מספר למעלה או למטה.",
"MATH_ROUND_OPERATOR_ROUND": "עיגול",
"MATH_ROUND_OPERATOR_ROUNDUP": "עיגול למעלה",
"MATH_ROUND_OPERATOR_ROUNDDOWN": "עיגול למטה",
"MATH_ONLIST_OPERATOR_SUM": "סכום של רשימה",
"MATH_ONLIST_TOOLTIP_SUM": "החזרת הסכום של המספרים ברשימה.",
"MATH_ONLIST_OPERATOR_MIN": "מינימום של רשימה",
"MATH_ONLIST_TOOLTIP_MIN": "תחזיר את המספר הקטן ביותר ברשימה.",
"MATH_ONLIST_OPERATOR_MAX": "מקסימום של רשימה",
@@ -157,6 +160,7 @@
"MATH_ONLIST_OPERATOR_MEDIAN": "חציון של רשימה",
"MATH_ONLIST_TOOLTIP_MEDIAN": "תחזיר את המספר החיצוני ביותר ברשימה.",
"MATH_ONLIST_OPERATOR_MODE": "שכיחי הרשימה",
"MATH_ONLIST_TOOLTIP_MODE": "החזרת רשימה של הפריטים הנפוצים ביותר ברשימה",
"MATH_ONLIST_OPERATOR_RANDOM": "פריט אקראי מרשימה",
"MATH_ONLIST_TOOLTIP_RANDOM": "תחזיר רכיב אקראי מרשימה.",
"MATH_MODULO_TITLE": "שארית החילוק %1 ÷ %2",

View File

@@ -290,6 +290,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": "сортувати %3 %1 %2",
"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_LIST_FROM_TEXT": "зробити з тексту список",
"LISTS_SPLIT_TEXT_FROM_LIST": "зробити зі списку текст",
"LISTS_SPLIT_WITH_DELIMITER": "з розділювачем",