From 2d696aa731e9847a8ccfeeffb8464b99a2fcbe1b Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 8 Apr 2016 22:56:42 -0700
Subject: [PATCH] Normalize order of languages.

---
 demos/blockfactory/index.html |  2 +-
 demos/code/index.html         | 10 ++++-----
 demos/index.html              |  2 +-
 msg/js/lb.js                  | 28 ++++++++++++------------
 tests/generators/index.html   | 34 ++++++++++++++---------------
 tests/playground.html         | 40 +++++++++++++++++------------------
 6 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html
index a0ba9616e..0377bc587 100644
--- a/demos/blockfactory/index.html
+++ b/demos/blockfactory/index.html
@@ -160,8 +160,8 @@
                   <option value="JavaScript">JavaScript</option>
                   <option value="Python">Python</option>
                   <option value="PHP">PHP</option>
-                  <option value="Dart">Dart</option>
                   <option value="Lua">Lua</option>
+                  <option value="Dart">Dart</option>
                 </select>
               </h3>
             </td>
diff --git a/demos/code/index.html b/demos/code/index.html
index 25ecf6864..97cc27369 100644
--- a/demos/code/index.html
+++ b/demos/code/index.html
@@ -11,8 +11,8 @@
   <script src="../../javascript_compressed.js"></script>
   <script src="../../python_compressed.js"></script>
   <script src="../../php_compressed.js"></script>
-  <script src="../../dart_compressed.js"></script>
   <script src="../../lua_compressed.js"></script>
+  <script src="../../dart_compressed.js"></script>
   <script src="code.js"></script>
 </head>
 <body>
@@ -40,10 +40,10 @@
             <td class="tabmin">&nbsp;</td>
             <td id="tab_php" class="taboff">PHP</td>
             <td class="tabmin">&nbsp;</td>
-            <td id="tab_dart" class="taboff">Dart</td>
-            <td class="tabmin">&nbsp;</td>
             <td id="tab_lua" class="taboff">Lua</td>
             <td class="tabmin">&nbsp;</td>
+            <td id="tab_dart" class="taboff">Dart</td>
+            <td class="tabmin">&nbsp;</td>
             <td id="tab_xml" class="taboff">XML</td>
             <td class="tabmax">
               <button id="trashButton" class="notext" title="...">
@@ -67,10 +67,10 @@
   </table>
   <div id="content_blocks" class="content"></div>
   <pre id="content_javascript" class="content"></pre>
-  <pre id="content_php" class="content"></pre>
   <pre id="content_python" class="content"></pre>
-  <pre id="content_dart" class="content"></pre>
+  <pre id="content_php" class="content"></pre>
   <pre id="content_lua" class="content"></pre>
+  <pre id="content_dart" class="content"></pre>
   <textarea id="content_xml" class="content" wrap="off"></textarea>
 
   <xml id="toolbox" style="display: none">
diff --git a/demos/index.html b/demos/index.html
index f9f9833e7..8208beff8 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -180,7 +180,7 @@
       </td>
       <td>
         <div><a href="code/index.html">Code Editor</a></div>
-        <div>Export a Blockly program into JavaScript, Python, PHP, Dart, Lua or XML.</div>
+        <div>Export a Blockly program into JavaScript, Python, PHP, Lua, Dart, or XML.</div>
       </td>
     </tr>
 
diff --git a/msg/js/lb.js b/msg/js/lb.js
index 226c85cb3..dcac899f4 100644
--- a/msg/js/lb.js
+++ b/msg/js/lb.js
@@ -11,7 +11,7 @@ Blockly.Msg.AUTH = "Please authorize this app to enable your work to be saved an
 Blockly.Msg.CHANGE_VALUE_TITLE = "Wäert änneren:";
 Blockly.Msg.CHAT = "Mat ärem Mataarbechter chatten an deem Dir an dës Këscht tippt!";
 Blockly.Msg.CLEAN_UP = "Bléck opraumen";
-Blockly.Msg.COLLAPSE_ALL = "Collapse Blocks";  // untranslated
+Blockly.Msg.COLLAPSE_ALL = "Bléck zesummeklappen";
 Blockly.Msg.COLLAPSE_BLOCK = "Block zesummeklappen";
 Blockly.Msg.COLOUR_BLEND_COLOUR1 = "Faarf 1";
 Blockly.Msg.COLOUR_BLEND_COLOUR2 = "Faarf 2";
@@ -20,7 +20,7 @@ Blockly.Msg.COLOUR_BLEND_RATIO = "ratio";
 Blockly.Msg.COLOUR_BLEND_TITLE = "mëschen";
 Blockly.Msg.COLOUR_BLEND_TOOLTIP = "Blends two colours together with a given ratio (0.0 - 1.0).";  // untranslated
 Blockly.Msg.COLOUR_PICKER_HELPURL = "https://en.wikipedia.org/wiki/Color";  // untranslated
-Blockly.Msg.COLOUR_PICKER_TOOLTIP = "Wielt eng Faarf vun der Palette.";
+Blockly.Msg.COLOUR_PICKER_TOOLTIP = "Sicht eng Faarf an der Palette eraus.";
 Blockly.Msg.COLOUR_RANDOM_HELPURL = "http://randomcolour.com";  // untranslated
 Blockly.Msg.COLOUR_RANDOM_TITLE = "zoufälleg Faarf";
 Blockly.Msg.COLOUR_RANDOM_TOOLTIP = "Eng zoufälleg Faarf eraussichen.";
@@ -40,7 +40,7 @@ Blockly.Msg.CONTROLS_FOREACH_HELPURL = "https://github.com/google/blockly/wiki/L
 Blockly.Msg.CONTROLS_FOREACH_TITLE = "fir all Element %1 an der Lëscht %2";
 Blockly.Msg.CONTROLS_FOREACH_TOOLTIP = "For each item in a list, set the variable '%1' to the item, and then do some statements.";  // untranslated
 Blockly.Msg.CONTROLS_FOR_HELPURL = "https://github.com/google/blockly/wiki/Loops#count-with";  // untranslated
-Blockly.Msg.CONTROLS_FOR_TITLE = "count with %1 from %2 to %3 by %4";  // untranslated
+Blockly.Msg.CONTROLS_FOR_TITLE = "zielt mat %1 vun %2 bis %3 mat %4";
 Blockly.Msg.CONTROLS_FOR_TOOLTIP = "Have the variable '%1' take on the values from the start number to the end number, counting by the specified interval, and do the specified blocks.";  // untranslated
 Blockly.Msg.CONTROLS_IF_ELSEIF_TOOLTIP = "Add a condition to the if block.";  // untranslated
 Blockly.Msg.CONTROLS_IF_ELSE_TOOLTIP = "Add a final, catch-all condition to the if block.";  // untranslated
@@ -54,19 +54,19 @@ Blockly.Msg.CONTROLS_IF_TOOLTIP_2 = "If a value is true, then do the first block
 Blockly.Msg.CONTROLS_IF_TOOLTIP_3 = "If the first value is true, then do the first block of statements. Otherwise, if the second value is true, do the second block of statements.";  // untranslated
 Blockly.Msg.CONTROLS_IF_TOOLTIP_4 = "If the first value is true, then do the first block of statements. Otherwise, if the second value is true, do the second block of statements. If none of the values are true, do the last block of statements.";  // untranslated
 Blockly.Msg.CONTROLS_REPEAT_HELPURL = "https://en.wikipedia.org/wiki/For_loop";  // untranslated
-Blockly.Msg.CONTROLS_REPEAT_INPUT_DO = "maachen";
-Blockly.Msg.CONTROLS_REPEAT_TITLE = "%1 mol widderhuelen";
+Blockly.Msg.CONTROLS_REPEAT_INPUT_DO = "maach";
+Blockly.Msg.CONTROLS_REPEAT_TITLE = "%1-mol widderhuelen";
 Blockly.Msg.CONTROLS_REPEAT_TOOLTIP = "Do some statements several times.";  // untranslated
 Blockly.Msg.CONTROLS_WHILEUNTIL_HELPURL = "https://github.com/google/blockly/wiki/Loops#repeat";  // untranslated
 Blockly.Msg.CONTROLS_WHILEUNTIL_OPERATOR_UNTIL = "widderhuele bis";
-Blockly.Msg.CONTROLS_WHILEUNTIL_OPERATOR_WHILE = "repeat while";  // untranslated
-Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL = "While a value is false, then do some statements.";  // untranslated
-Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_WHILE = "While a value is true, then do some statements.";  // untranslated
+Blockly.Msg.CONTROLS_WHILEUNTIL_OPERATOR_WHILE = "Widderhuel soulaang";
+Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_UNTIL = "Féiert d'Uweisungen aus, soulaang wéi de Wäert falsch ass.";
+Blockly.Msg.CONTROLS_WHILEUNTIL_TOOLTIP_WHILE = "Féiert d'Uweisungen aus, soulaang wéi de Wäert richteg ass";
 Blockly.Msg.DELETE_ALL_BLOCKS = "Delete all %1 blocks?";  // untranslated
 Blockly.Msg.DELETE_BLOCK = "Block läschen";
 Blockly.Msg.DELETE_X_BLOCKS = "%1 Bléck läschen";
 Blockly.Msg.DISABLE_BLOCK = "Block desaktivéieren";
-Blockly.Msg.DUPLICATE_BLOCK = "Duplizéieren";
+Blockly.Msg.DUPLICATE_BLOCK = "Eng Kopie maachen";
 Blockly.Msg.ENABLE_BLOCK = "Block aktivéieren";
 Blockly.Msg.EXPAND_ALL = "Bléck opklappen";
 Blockly.Msg.EXPAND_BLOCK = "Block opklappen";
@@ -171,14 +171,14 @@ Blockly.Msg.LOGIC_OPERATION_HELPURL = "https://github.com/google/blockly/wiki/Lo
 Blockly.Msg.LOGIC_OPERATION_OR = "oder";
 Blockly.Msg.LOGIC_OPERATION_TOOLTIP_AND = "Return true if both inputs are true.";  // untranslated
 Blockly.Msg.LOGIC_OPERATION_TOOLTIP_OR = "Return true if at least one of the inputs is true.";  // untranslated
-Blockly.Msg.LOGIC_TERNARY_CONDITION = "test";
+Blockly.Msg.LOGIC_TERNARY_CONDITION = "Test";
 Blockly.Msg.LOGIC_TERNARY_HELPURL = "https://en.wikipedia.org/wiki/%3F:";
 Blockly.Msg.LOGIC_TERNARY_IF_FALSE = "wa falsch";
 Blockly.Msg.LOGIC_TERNARY_IF_TRUE = "wa wouer";
 Blockly.Msg.LOGIC_TERNARY_TOOLTIP = "Check the condition in 'test'. If the condition is true, returns the 'if true' value; otherwise returns the 'if false' value.";  // untranslated
 Blockly.Msg.MATH_ADDITION_SYMBOL = "+";  // untranslated
 Blockly.Msg.MATH_ARITHMETIC_HELPURL = "https://en.wikipedia.org/wiki/Arithmetic";  // untranslated
-Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_ADD = "Gëtt d'Zomme vun zwou Zuelen.";
+Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_ADD = "D'Produkt vun den zwou Zuelen zréckginn.";
 Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_DIVIDE = "Return the quotient of the two numbers.";  // untranslated
 Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_MINUS = "Return the difference of the two numbers.";  // untranslated
 Blockly.Msg.MATH_ARITHMETIC_TOOLTIP_MULTIPLY = "D'Produkt vun den zwou Zuelen zréckginn.";
@@ -195,7 +195,7 @@ Blockly.Msg.MATH_DIVISION_SYMBOL = "÷";  // untranslated
 Blockly.Msg.MATH_IS_DIVISIBLE_BY = "is divisible by";  // untranslated
 Blockly.Msg.MATH_IS_EVEN = "ass gerued";
 Blockly.Msg.MATH_IS_NEGATIVE = "ass negativ";
-Blockly.Msg.MATH_IS_ODD = "ass net gerued";
+Blockly.Msg.MATH_IS_ODD = "ass ongerued";
 Blockly.Msg.MATH_IS_POSITIVE = "ass positiv";
 Blockly.Msg.MATH_IS_PRIME = "ass eng Primzuel";
 Blockly.Msg.MATH_IS_TOOLTIP = "Check if a number is an even, odd, prime, whole, positive, negative, or if it is divisible by certain number. Returns true or false.";  // untranslated
@@ -235,7 +235,7 @@ Blockly.Msg.MATH_ROUND_OPERATOR_ROUND = "opronnen";
 Blockly.Msg.MATH_ROUND_OPERATOR_ROUNDDOWN = "ofronnen";
 Blockly.Msg.MATH_ROUND_OPERATOR_ROUNDUP = "opronnen";
 Blockly.Msg.MATH_ROUND_TOOLTIP = "Eng Zuel op- oder ofronnen.";
-Blockly.Msg.MATH_SINGLE_HELPURL = "https://en.wikipedia.org/wiki/Square_root";
+Blockly.Msg.MATH_SINGLE_HELPURL = "https://lb.wikipedia.org/wiki/Racine carrée";
 Blockly.Msg.MATH_SINGLE_OP_ABSOLUTE = "absolut";
 Blockly.Msg.MATH_SINGLE_OP_ROOT = "Quadratwuerzel";
 Blockly.Msg.MATH_SINGLE_TOOLTIP_ABS = "Return the absolute value of a number.";  // untranslated
@@ -290,7 +290,7 @@ Blockly.Msg.PROCEDURES_MUTATORARG_TOOLTIP = "Add an input to the function.";  //
 Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TITLE = "inputs";  // untranslated
 Blockly.Msg.PROCEDURES_MUTATORCONTAINER_TOOLTIP = "Add, remove, or reorder inputs to this function.";  // untranslated
 Blockly.Msg.REDO = "Widderhuelen";
-Blockly.Msg.REMOVE_COMMENT = "Bemierkunge ewechhuelen";
+Blockly.Msg.REMOVE_COMMENT = "Bemierkung ewechhuelen";
 Blockly.Msg.RENAME_VARIABLE = "Variabel ëmbenennen...";
 Blockly.Msg.RENAME_VARIABLE_TITLE = "All '%1' Variabelen ëmbenennen op:";
 Blockly.Msg.TEXT_APPEND_APPENDTEXT = "Text drunhänken";
diff --git a/tests/generators/index.html b/tests/generators/index.html
index e168a326a..fcff572e8 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -38,17 +38,6 @@
 <script src="../../generators/php/variables.js"></script>
 <script src="../../generators/php/procedures.js"></script>
 
-<script src="../../generators/dart.js"></script>
-<script src="unittest_dart.js"></script>
-<script src="../../generators/dart/logic.js"></script>
-<script src="../../generators/dart/loops.js"></script>
-<script src="../../generators/dart/math.js"></script>
-<script src="../../generators/dart/text.js"></script>
-<script src="../../generators/dart/lists.js"></script>
-<script src="../../generators/dart/colour.js"></script>
-<script src="../../generators/dart/variables.js"></script>
-<script src="../../generators/dart/procedures.js"></script>
-
 <script src="../../generators/lua.js"></script>
 <script src="unittest_lua.js"></script>
 <script src="../../generators/lua/logic.js"></script>
@@ -60,6 +49,16 @@
 <script src="../../generators/lua/variables.js"></script>
 <script src="../../generators/lua/procedures.js"></script>
 
+<script src="../../generators/dart.js"></script>
+<script src="unittest_dart.js"></script>
+<script src="../../generators/dart/logic.js"></script>
+<script src="../../generators/dart/loops.js"></script>
+<script src="../../generators/dart/math.js"></script>
+<script src="../../generators/dart/text.js"></script>
+<script src="../../generators/dart/lists.js"></script>
+<script src="../../generators/dart/colour.js"></script>
+<script src="../../generators/dart/variables.js"></script>
+<script src="../../generators/dart/procedures.js"></script>
 
 <script src="unittest.js"></script>
 <script src="../../msg/messages.js"></script>
@@ -78,7 +77,8 @@ var workspace = null;
 
 function start() {
   workspace = Blockly.inject('blocklyDiv',
-      {media: '../../media/', toolbox: document.getElementById('toolbox')});
+      {media: '../../media/',
+       toolbox: document.getElementById('toolbox')});
 }
 
 function loadXml() {
@@ -161,13 +161,13 @@ function toPhp() {
   setOutput(code);
 }
 
-function toDart() {
-  var code = Blockly.Dart.workspaceToCode(workspace);
+function toLua() {
+  var code = Blockly.Lua.workspaceToCode(workspace);
   setOutput(code);
 }
 
-function toLua() {
-  var code = Blockly.Lua.workspaceToCode(workspace);
+function toDart() {
+  var code = Blockly.Dart.workspaceToCode(workspace);
   setOutput(code);
 }
 </script>
@@ -303,8 +303,8 @@ h1 {
       <input type="button" value="JavaScript" onclick="toJavaScript()">
       <input type="button" value="Python" onclick="toPython()">
       <input type="button" value="PHP" onclick="toPhp()">
-      <input type="button" value="Dart" onclick="toDart()">
       <input type="button" value="Lua" onclick="toLua()">
+      <input type="button" value="Dart" onclick="toDart()">
     </p>
   </td></tr><tr><td height="99%">
     <textarea id="importExport" readonly="readonly" wrap="off"></textarea>
diff --git a/tests/playground.html b/tests/playground.html
index 3e5863deb..f6ac446c2 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -13,15 +13,6 @@
 <script src="../generators/javascript/colour.js"></script>
 <script src="../generators/javascript/variables.js"></script>
 <script src="../generators/javascript/procedures.js"></script>
-<script src="../generators/php.js"></script>
-<script src="../generators/php/logic.js"></script>
-<script src="../generators/php/loops.js"></script>
-<script src="../generators/php/math.js"></script>
-<script src="../generators/php/text.js"></script>
-<script src="../generators/php/lists.js"></script>
-<script src="../generators/php/colour.js"></script>
-<script src="../generators/php/variables.js"></script>
-<script src="../generators/php/procedures.js"></script>
 <script src="../generators/python.js"></script>
 <script src="../generators/python/logic.js"></script>
 <script src="../generators/python/loops.js"></script>
@@ -31,15 +22,15 @@
 <script src="../generators/python/colour.js"></script>
 <script src="../generators/python/variables.js"></script>
 <script src="../generators/python/procedures.js"></script>
-<script src="../generators/dart.js"></script>
-<script src="../generators/dart/logic.js"></script>
-<script src="../generators/dart/loops.js"></script>
-<script src="../generators/dart/math.js"></script>
-<script src="../generators/dart/text.js"></script>
-<script src="../generators/dart/lists.js"></script>
-<script src="../generators/dart/colour.js"></script>
-<script src="../generators/dart/variables.js"></script>
-<script src="../generators/dart/procedures.js"></script>
+<script src="../generators/php.js"></script>
+<script src="../generators/php/logic.js"></script>
+<script src="../generators/php/loops.js"></script>
+<script src="../generators/php/math.js"></script>
+<script src="../generators/php/text.js"></script>
+<script src="../generators/php/lists.js"></script>
+<script src="../generators/php/colour.js"></script>
+<script src="../generators/php/variables.js"></script>
+<script src="../generators/php/procedures.js"></script>
 <script src="../generators/lua.js"></script>
 <script src="../generators/lua/logic.js"></script>
 <script src="../generators/lua/loops.js"></script>
@@ -49,6 +40,15 @@
 <script src="../generators/lua/colour.js"></script>
 <script src="../generators/lua/variables.js"></script>
 <script src="../generators/lua/procedures.js"></script>
+<script src="../generators/dart.js"></script>
+<script src="../generators/dart/logic.js"></script>
+<script src="../generators/dart/loops.js"></script>
+<script src="../generators/dart/math.js"></script>
+<script src="../generators/dart/text.js"></script>
+<script src="../generators/dart/lists.js"></script>
+<script src="../generators/dart/colour.js"></script>
+<script src="../generators/dart/variables.js"></script>
+<script src="../generators/dart/procedures.js"></script>
 <script src="../msg/messages.js"></script>
 <script src="../blocks/logic.js"></script>
 <script src="../blocks/loops.js"></script>
@@ -578,9 +578,9 @@ h1 {
     &nbsp;
     <input type="button" value="To PHP" onclick="toCode('PHP')">
     &nbsp;
-    <input type="button" value="To Dart" onclick="toCode('Dart')">
-    &nbsp;
     <input type="button" value="To Lua" onclick="toCode('Lua')">
+    &nbsp;
+    <input type="button" value="To Dart" onclick="toCode('Dart')">
     <br>
     <textarea id="importExport" style="width: 26%; height: 12em"
       onchange="taChange();" onkeyup="taChange()"></textarea>
