Merge branch 'master' into develop

2026-01-07 00:50:27 +01:00 · 2017-01-04 11:02:14 -08:00
parent eb64921da5 7f4e21f388
commit 700e284a57
8 changed files with 36 additions and 13 deletions
--- a/msg/json/da.json
+++ b/msg/json/da.json
@@ -4,7 +4,8 @@
 			"Christian List",
 			"RickiRunge",
 			"MGA73",
-			"Mads Haupt"
+			"Mads Haupt",
+			"Tjernobyl"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "element",
@@ -267,6 +268,10 @@
 	"LISTS_GET_SUBLIST_END_FROM_END": "til # fra slutningen",
 	"LISTS_GET_SUBLIST_END_LAST": "til sidste",
 	"LISTS_GET_SUBLIST_TOOLTIP": "Opretter en kopi af den angivne del af en liste.",
+	"LISTS_SORT_ORDER_ASCENDING": "stigende",
+	"LISTS_SORT_ORDER_DESCENDING": "faldende",
+	"LISTS_SORT_TYPE_NUMERIC": "nummerorden",
+	"LISTS_SORT_TYPE_TEXT": "alfabetisk",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "lav tekst til liste",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "lav liste til tekst",
 	"LISTS_SPLIT_WITH_DELIMITER": "med skilletegn",
--- a/msg/json/diq.json
+++ b/msg/json/diq.json
@@ -3,7 +3,8 @@
 		"authors": [
 			"Kumkumuk",
 			"Marmase",
-			"Mirzali"
+			"Mirzali",
+			"Gırd"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "unsur",
@@ -167,6 +168,6 @@
 	"PROCEDURES_DEFRETURN_TOOLTIP": "Yew fonksiyono çap daye vırazeno",
 	"PROCEDURES_ALLOW_STATEMENTS": "Çıyan rê mısafe bıd",
 	"PROCEDURES_MUTATORCONTAINER_TITLE": "cıkewtışi",
-	"PROCEDURES_MUTATORARG_TITLE": "nameyê cıkewtışi:",
+	"PROCEDURES_MUTATORARG_TITLE": "namey cıkewtışi:",
 	"PROCEDURES_CREATE_DO": "'%1' vıraze"
 }
--- a/msg/json/fi.json
+++ b/msg/json/fi.json
@@ -39,6 +39,8 @@
 	"NEW_VARIABLE": "Luo muuttuja...",
 	"NEW_VARIABLE_TITLE": "Uuden muuttujan nimi:",
 	"VARIABLE_ALREADY_EXISTS": "Muuttuja nimeltään '%1' jo olemassa.",
+	"DELETE_VARIABLE_CONFIRMATION": "Poistetaanko %1 käyttöä muuttujalta '%2'?",
+	"DELETE_VARIABLE": "Poista muuttuja '%1'",
 	"COLOUR_PICKER_HELPURL": "https://fi.wikipedia.org/wiki/V%C3%A4ri",
 	"COLOUR_PICKER_TOOLTIP": "Valitse väri paletista.",
 	"COLOUR_RANDOM_TITLE": "satunnainen väri",
--- a/msg/json/hi.json
+++ b/msg/json/hi.json
@@ -4,7 +4,8 @@
 			"Bl707",
 			"संजीव कुमार",
 			"Phoenix303",
-			"Sfic"
+			"Sfic",
+			"Earlyengineers"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "आइटम",
@@ -23,11 +24,14 @@
 	"DISABLE_BLOCK": "ब्लॉक को अक्षम करें",
 	"ENABLE_BLOCK": "ब्लॉक को सक्षम करें",
 	"HELP": "सहायता",
+	"UNDO": "पूर्ववत करें",
+	"REDO": "फिर से करें",
 	"CHANGE_VALUE_TITLE": "मान परिवर्तित करें:",
 	"RENAME_VARIABLE": "चर का नाम बदलें...",
 	"RENAME_VARIABLE_TITLE": "सभी '%1' चरों के नाम बदलें:",
-	"NEW_VARIABLE": "नया चर...",
+	"NEW_VARIABLE": "चर बनाएँ...",
 	"NEW_VARIABLE_TITLE": "नए चर का नाम:",
+	"VARIABLE_ALREADY_EXISTS": "प्राचल नाम '%1' पहले से मौजूद है।",
 	"COLOUR_PICKER_HELPURL": "https://en.wikipedia.org/wiki/Color",
 	"COLOUR_PICKER_TOOLTIP": "पैलेट से एक रंग चुनें।",
 	"COLOUR_RANDOM_TITLE": "रैन्डम रंग",
--- a/msg/json/ja.json
+++ b/msg/json/ja.json
@@ -6,7 +6,8 @@
 			"아라",
 			"Otokoume",
 			"Sujiniku",
-			"Sgk"
+			"Sgk",
+			"TAKAHASHI Shuuji"
 		]
 	},
 	"VARIABLES_DEFAULT_NAME": "項目",
@@ -34,6 +35,9 @@
 	"RENAME_VARIABLE_TITLE": "%1の変数すべてを名前変更します。",
 	"NEW_VARIABLE": "新しい変数",
 	"NEW_VARIABLE_TITLE": "新しい変数の、名前",
+	"VARIABLE_ALREADY_EXISTS": "変数名 '%1' は既に存在しています。",
+	"DELETE_VARIABLE_CONFIRMATION": "%1 ヶ所で使われている変数 '%2' を削除しますか？",
+	"DELETE_VARIABLE": "変数 '%1' を削除",
 	"COLOUR_PICKER_HELPURL": "https://ja.wikipedia.org/wiki/色",
 	"COLOUR_PICKER_TOOLTIP": "パレットから色を選んでください。",
 	"COLOUR_RANDOM_TITLE": "ランダムな色",
--- a/msg/json/nl.json
+++ b/msg/json/nl.json
@@ -214,7 +214,7 @@
 	"TEXT_ISEMPTY_TITLE": "%1 is leeg",
 	"TEXT_ISEMPTY_TOOLTIP": "Geeft \"waar\" terug, als de opgegeven tekst leeg is.",
 	"TEXT_INDEXOF_HELPURL": "https://github.com/google/blockly/wiki/Text#finding-text",
-	"TEXT_INDEXOF_TOOLTIP": "Geeft de index terug van de eerste/laatste aanwezigheid van de eerste tekst in de tweede tekst. Geeft %1 terug als de tekst niet gevonden is.",
+	"TEXT_INDEXOF_TOOLTIP": "Geeft de index terug van het eerste of laatste voorkomen van de eerste tekst in de tweede tekst. Geeft %1 terug als de tekst niet gevonden is.",
 	"TEXT_INDEXOF_INPUT_INTEXT": "in tekst",
 	"TEXT_INDEXOF_OPERATOR_FIRST": "zoek eerste voorkomen van tekst",
 	"TEXT_INDEXOF_OPERATOR_LAST": "zoek het laatste voorkomen van tekst",
@@ -300,7 +300,7 @@
 	"LISTS_SET_INDEX_SET": "stel in",
 	"LISTS_SET_INDEX_INSERT": "tussenvoegen op",
 	"LISTS_SET_INDEX_INPUT_TO": "als",
-	"LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Stelt het item op de opgegeven positie in de lijst in.",
+	"LISTS_SET_INDEX_TOOLTIP_SET_FROM": "Zet het item op de opgegeven positie in de lijst.",
 	"LISTS_SET_INDEX_TOOLTIP_SET_FIRST": "Stelt het eerste item in een lijst in.",
 	"LISTS_SET_INDEX_TOOLTIP_SET_LAST": "Stelt het laatste item van een lijst in.",
 	"LISTS_SET_INDEX_TOOLTIP_SET_RANDOM": "Stelt een willekeurig item uit de lijst in.",
@@ -321,8 +321,8 @@
 	"LISTS_SORT_TOOLTIP": "Sorteer een kopie van een lijst.",
 	"LISTS_SORT_ORDER_ASCENDING": "oplopend",
 	"LISTS_SORT_ORDER_DESCENDING": "aflopend",
-	"LISTS_SORT_TYPE_NUMERIC": "numerieke",
-	"LISTS_SORT_TYPE_TEXT": "in alfabetische volgorde",
+	"LISTS_SORT_TYPE_NUMERIC": "numeriek",
+	"LISTS_SORT_TYPE_TEXT": "alfabetisch",
 	"LISTS_SORT_TYPE_IGNORECASE": "alfabetisch, negeer hoofd-/kleine letters",
 	"LISTS_SPLIT_LIST_FROM_TEXT": "lijst maken van tekst",
 	"LISTS_SPLIT_TEXT_FROM_LIST": "tekst maken van lijst",
--- 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}}",
@@ -314,7 +321,7 @@
 	"LISTS_GET_SUBLIST_END_LAST": "dropdown - Indicates that the '''last''' item in the given list should be [https://github.com/google/blockly/wiki/Lists#getting-a-sublist the end of the selected sublist]. [[File:Blockly-get-sublist.png]]",
 	"LISTS_GET_SUBLIST_TAIL": "block text - This appears in the rightmost position ('tail') of the sublist block, as described at [https://github.com/google/blockly/wiki/Lists#getting-a-sublist https://github.com/google/blockly/wiki/Lists#getting-a-sublist]. In English and most other languages, this is the empty string. [[File:Blockly-get-sublist.png]]",
 	"LISTS_GET_SUBLIST_TOOLTIP": "tooltip - See [https://github.com/google/blockly/wiki/Lists#getting-a-sublist https://github.com/google/blockly/wiki/Lists#getting-a-sublist] for more information. [[File:Blockly-get-sublist.png]]",
-	"LISTS_SORT_HELPURL": "url - Information describing sorting a list.",
+	"LISTS_SORT_HELPURL": "{{optional}}\nurl - 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.\n{{Identical|Sort}}",
 	"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.\n{{Identical|Ascending}}",
@@ -360,6 +367,6 @@
 	"PROCEDURES_HIGHLIGHT_DEF": "context menu - This appears on the context menu for function calls.  Selecting it causes the corresponding function definition to be highlighted (as shown at [[Translating:Blockly#context_menus]].",
 	"PROCEDURES_CREATE_DO": "context menu - This appears on the context menu for function definitions. Selecting it creates a block to call the function.\n\nParameters:\n* %1 - the name of the function.\n{{Identical|Create}}",
 	"PROCEDURES_IFRETURN_TOOLTIP": "tooltip - If the first value is true, this causes the second value to be returned immediately from the enclosing function.",
-	"PROCEDURES_IFRETURN_HELPURL": "url - Information about guard clauses.",
+	"PROCEDURES_IFRETURN_HELPURL": "{{optional}}\nurl - Information about guard clauses.",
 	"PROCEDURES_IFRETURN_WARNING": "warning - This appears if the user tries to use this block outside of a function definition."
 }
--- a/msg/json/zh-hans.json
+++ b/msg/json/zh-hans.json
@@ -141,7 +141,7 @@
 	"MATH_IS_NEGATIVE": "为负",
 	"MATH_IS_DIVISIBLE_BY": "可被整除",
 	"MATH_IS_TOOLTIP": "如果数字是偶数、奇数、非负整数、正数、负数或如果它可被某数字整除，则返回真或假。",
-	"MATH_CHANGE_HELPURL": "https://zh.wikipedia.org/wiki/%E5%8A%A0%E6%B3%95",
+	"MATH_CHANGE_HELPURL": "https://zh.wikipedia.org/wiki/加法",
 	"MATH_CHANGE_TITLE": "更改 %1 由 %2",
 	"MATH_CHANGE_TOOLTIP": "将一个数添加到变量“%1”。",
 	"MATH_ROUND_HELPURL": "https://zh.wikipedia.org/wiki/数值修约",