Merge branch 'master' into merge_master_to_develop_nov_11_16

This commit is contained in:
Rachel Fenichel
2016-11-11 16:17:53 -08:00
59 changed files with 2218 additions and 2810 deletions

View File

@@ -9,7 +9,8 @@
"Alex00728",
"Kurousagi",
"Lemondoge",
"Ykhwong"
"Ykhwong",
"Jerrykim306"
]
},
"VARIABLES_DEFAULT_NAME": "항목",
@@ -38,6 +39,7 @@
"NEW_VARIABLE": "변수 만들기...",
"NEW_VARIABLE_TITLE": "새 변수 이름:",
"VARIABLE_ALREADY_EXISTS": "'%1' 변수는 이미 존재합니다.",
"DELETE_VARIABLE_CONFIRMATION": "'%2' 변수에서 %1을(를) 삭제하시겠습니까?",
"DELETE_VARIABLE": "'%1' 변수를 삭제합니다",
"COLOUR_PICKER_HELPURL": "https://ko.wikipedia.org/wiki/색",
"COLOUR_PICKER_TOOLTIP": "팔레트에서 색을 고릅니다",

View File

@@ -35,8 +35,11 @@
"CHANGE_VALUE_TITLE": "Waarde wijzigen:",
"RENAME_VARIABLE": "Variabele hernoemen...",
"RENAME_VARIABLE_TITLE": "Alle variabelen \"%1\" hernoemen naar:",
"NEW_VARIABLE": "Nieuwe variabele...",
"NEW_VARIABLE": "Variabele maken...",
"NEW_VARIABLE_TITLE": "Nieuwe variabelenaam:",
"VARIABLE_ALREADY_EXISTS": "Er bestaat al een variabele met de naam \"%1\".",
"DELETE_VARIABLE_CONFIRMATION": "%1 gebruiken van de variabele \"%2\" verwijderen?",
"DELETE_VARIABLE": "Verwijder de variabele \"%1\"",
"COLOUR_PICKER_HELPURL": "https://nl.wikipedia.org/wiki/Kleur",
"COLOUR_PICKER_TOOLTIP": "Kies een kleur in het palet.",
"COLOUR_RANDOM_TITLE": "willekeurige kleur",

View File

@@ -5,6 +5,7 @@
]
},
"VARIABLES_DEFAULT_NAME": "element",
"TODAY": "Uèi",
"DUPLICATE_BLOCK": "Duplicar",
"ADD_COMMENT": "Apondre un comentari",
"REMOVE_COMMENT": "Suprimir un comentari",
@@ -13,6 +14,7 @@
"DELETE_BLOCK": "Suprimir lo blòt",
"DELETE_X_BLOCKS": "Suprimir %1 blòts",
"DELETE_ALL_BLOCKS": "Suprimir totes los %1 blòts?",
"CLEAN_UP": "Netejar los blòts",
"COLLAPSE_BLOCK": "Redusir lo blòt",
"COLLAPSE_ALL": "Redusir los blòts",
"EXPAND_BLOCK": "Desvolopar lo blòt",
@@ -20,8 +22,11 @@
"DISABLE_BLOCK": "Desactivar lo blòt",
"ENABLE_BLOCK": "Activar lo blòt",
"HELP": "Ajuda",
"UNDO": "Anullar",
"REDO": "Refar",
"CHANGE_VALUE_TITLE": "Modificar la valor :",
"RENAME_VARIABLE": "Renomenar la variabla…",
"RENAME_VARIABLE_TITLE": "Renomenar totas las variablas '%1' a :",
"NEW_VARIABLE": "Crear una variabla...",
"NEW_VARIABLE_TITLE": "Nom de la novèla variabla :",
"COLOUR_PICKER_HELPURL": "https://oc.wikipedia.org/wiki/Color",
@@ -76,6 +81,7 @@
"MATH_ONLIST_OPERATOR_MAX": "maximum de la lista",
"MATH_ONLIST_OPERATOR_AVERAGE": "mejana de la lista",
"MATH_ONLIST_OPERATOR_MEDIAN": "mediana de la lista",
"TEXT_CREATE_JOIN_TITLE_JOIN": "jónher",
"TEXT_APPEND_TO": "a",
"TEXT_APPEND_APPENDTEXT": "apondre lo tèxte",
"TEXT_LENGTH_TITLE": "longor de %1",
@@ -109,6 +115,10 @@
"LISTS_GET_SUBLIST_END_FROM_START": "fins a #",
"LISTS_GET_SUBLIST_END_FROM_END": "fins a # dempuèi la fin",
"LISTS_GET_SUBLIST_END_LAST": "fins a la fin",
"LISTS_SORT_ORDER_ASCENDING": "creissent",
"LISTS_SORT_ORDER_DESCENDING": "descreissent",
"LISTS_SORT_TYPE_NUMERIC": "numeric",
"LISTS_SORT_TYPE_TEXT": "alfabetic",
"VARIABLES_GET_CREATE_SET": "Crear 'fixar %1'",
"VARIABLES_SET": "fixar %1 a %2",
"PROCEDURES_DEFNORETURN_TITLE": "a",

View File

@@ -11,7 +11,8 @@
"Expert3222",
"Cirasean",
"Fringoo",
"Chrumps"
"Chrumps",
"Woytecr"
]
},
"VARIABLES_DEFAULT_NAME": "element",
@@ -37,8 +38,9 @@
"CHANGE_VALUE_TITLE": "Zmień wartość:",
"RENAME_VARIABLE": "Zmień nazwę zmiennej...",
"RENAME_VARIABLE_TITLE": "Zmień nazwy wszystkich '%1' zmiennych na:",
"NEW_VARIABLE": "Nowa zmienna...",
"NEW_VARIABLE": "Stwórz zmienną...",
"NEW_VARIABLE_TITLE": "Nowa nazwa zmiennej:",
"VARIABLE_ALREADY_EXISTS": "Zmienna o nazwie '%1' już istnieje.",
"COLOUR_PICKER_HELPURL": "https://en.wikipedia.org/wiki/Color",
"COLOUR_PICKER_TOOLTIP": "Wybierz kolor z palety.",
"COLOUR_RANDOM_TITLE": "losowy kolor",

View File

@@ -3,7 +3,8 @@
"authors": [
"Jaroslav.micek",
"Marian.stano",
"Mark"
"Mark",
"Kusavica"
]
},
"VARIABLES_DEFAULT_NAME": "prvok",
@@ -24,11 +25,14 @@
"DISABLE_BLOCK": "Vypnúť blok",
"ENABLE_BLOCK": "Povoliť blok",
"HELP": "Pomoc",
"UNDO": "Späť",
"REDO": "Znova",
"CHANGE_VALUE_TITLE": "Zmeniť hodnotu:",
"RENAME_VARIABLE": "Premenovať premennú...",
"RENAME_VARIABLE_TITLE": "Premenovať všetky premenné '%1' na:",
"NEW_VARIABLE": "Nová premenná...",
"NEW_VARIABLE": "Vytvoriť premennú...",
"NEW_VARIABLE_TITLE": "Názov novej premennej:",
"VARIABLE_ALREADY_EXISTS": "Premenná s názvom %1 už existuje.",
"COLOUR_PICKER_HELPURL": "https://en.wikipedia.org/wiki/Color",
"COLOUR_PICKER_TOOLTIP": "Zvoľte farbu z palety.",
"COLOUR_RANDOM_TITLE": "náhodná farba",

View File

@@ -6,7 +6,8 @@
"Igor Zavadsky",
"Lxlalexlxl",
"아라",
"Visem"
"Visem",
"Piramidion"
]
},
"VARIABLES_DEFAULT_NAME": "елемент",
@@ -32,8 +33,11 @@
"CHANGE_VALUE_TITLE": "Змінити значення:",
"RENAME_VARIABLE": "Перейменувати змінну...",
"RENAME_VARIABLE_TITLE": "Перейменувати усі змінні \"%1\" до:",
"NEW_VARIABLE": "Нова змінна...",
"NEW_VARIABLE": "Створити змінну...",
"NEW_VARIABLE_TITLE": "Нова назва змінної:",
"VARIABLE_ALREADY_EXISTS": "Змінна з назвою '%1' вже існує.",
"DELETE_VARIABLE_CONFIRMATION": "Вилучити %1 використання змінної '%2'?",
"DELETE_VARIABLE": "Вилучити змінну '%1'",
"COLOUR_PICKER_HELPURL": "https://uk.wikipedia.org/wiki/Колір",
"COLOUR_PICKER_TOOLTIP": "Вибрати колір з палітри.",
"COLOUR_RANDOM_TITLE": "випадковий колір",

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