diff --git a/demos/plane/README.txt b/demos/plane/README.txt
index 38bbc0313..944448fd6 100644
--- a/demos/plane/README.txt
+++ b/demos/plane/README.txt
@@ -13,11 +13,11 @@ This generates xlf/extracted_msgs.xlf, which may then be used by any
 XLIFF-compatible translation console to generate a set of files with the
 translated strings.  These should be placed in the xlf directory.
 
-Finally, generate all the language versions wih this command:
+Finally, generate all the language versions with this command:
 
 java -jar soy/SoyToJsSrcCompiler.jar --locales ar,be-tarask,br,ca,da,de,el,en,es,fa,fr,he,hrx,hu,ia,is,it,ja,ko,ms,nb,nl,pl,pms,pt-br,ro,ru,sc,sv,th,tr,uk,vi,zh-hans,zh-hant --messageFilePathFormat xlf/translated_msgs_{LOCALE}.xlf --outputPathFormat "generated/{LOCALE}.js" template.soy
 
-This is the process that Google uses for maintaining Blockly Games in 40+
+This is the process that Google uses for maintaining Blockly Games in 50+
 languages.  The XLIFF format is simple enough that it is trivial to write a
 Python script to reformat it into some other format (such as JSON) for
 compatibility with other translation consoles.
diff --git a/demos/plane/generated/ar.js b/demos/plane/generated/ar.js
index 131094904..ac760fb11 100644
--- a/demos/plane/generated/ar.js
+++ b/demos/plane/generated/ar.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">الصفوف: %1</span><span id="Plane_getRows">الصفوف (%1)</span><span id="Plane_rows1">صفوف الطبقة الأولى: %1</span><span id="Plane_getRows1">صفوف الطبقة الأولى (%1)</span><span id="Plane_rows2">صفوف الفئة الثانية: %1</span><span id="Plane_getRows2">صفوف الفئة الثانية: (%1)</span><span id="Plane_seats">المقاعد: %1</span><span id="Plane_placeholder">؟</span><span id="Plane_setSeats">المقاعد =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u0627\u0644\u0635\u0641\u0648\u0641: %1</span><span id="Plane_getRows">\u0627\u0644\u0635\u0641\u0648\u0641 (%1)</span><span id="Plane_rows1">\u0635\u0641\u0648\u0641 \u0627\u0644\u0637\u0628\u0642\u0629 \u0627\u0644\u0623\u0648\u0644\u0649: %1</span><span id="Plane_getRows1">\u0635\u0641\u0648\u0641 \u0627\u0644\u0637\u0628\u0642\u0629 \u0627\u0644\u0623\u0648\u0644\u0649 (%1)</span><span id="Plane_rows2">\u0635\u0641\u0648\u0641 \u0627\u0644\u0641\u0626\u0629 \u0627\u0644\u062B\u0627\u0646\u064A\u0629: %1</span><span id="Plane_getRows2">\u0635\u0641\u0648\u0641 \u0627\u0644\u0641\u0626\u0629 \u0627\u0644\u062B\u0627\u0646\u064A\u0629: (%1)</span><span id="Plane_seats">\u0627\u0644\u0645\u0642\u0627\u0639\u062F: %1</span><span id="Plane_placeholder">\u061F</span><span id="Plane_setSeats">\u0627\u0644\u0645\u0642\u0627\u0639\u062F =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">آلة حاسبة لمقعد الطائرة</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u0622\u0644\u0629 \u062D\u0627\u0633\u0628\u0629 \u0644\u0645\u0642\u0639\u062F \u0627\u0644\u0637\u0627\u0626\u0631\u0629</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'هنالك طائرة تحتوي على عدد من صفوف مقاعد الركاب. كل صف يحتوي على أربعة مقاعد.';
+      output += '\u0647\u0646\u0627\u0644\u0643 \u0637\u0627\u0626\u0631\u0629 \u062A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0639\u062F\u062F \u0645\u0646 \u0635\u0641\u0648\u0641 \u0645\u0642\u0627\u0639\u062F \u0627\u0644\u0631\u0643\u0627\u0628. \u0643\u0644 \u0635\u0641 \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0623\u0631\u0628\u0639\u0629 \u0645\u0642\u0627\u0639\u062F.';
       break;
     case 2:
-      output += 'طائرة بمقعدين في مقطورة الطيّار (للطيار ومساعده) وعدد من الصفوف يحتوي كل صف على أربعة مقاعد.';
+      output += '\u0637\u0627\u0626\u0631\u0629 \u0628\u0645\u0642\u0639\u062F\u064A\u0646 \u0641\u064A \u0645\u0642\u0637\u0648\u0631\u0629 \u0627\u0644\u0637\u064A\u0651\u0627\u0631 (\u0644\u0644\u0637\u064A\u0627\u0631 \u0648\u0645\u0633\u0627\u0639\u062F\u0647) \u0648\u0639\u062F\u062F \u0645\u0646 \u0627\u0644\u0635\u0641\u0648\u0641 \u064A\u062D\u062A\u0648\u064A \u0643\u0644 \u0635\u0641 \u0639\u0644\u0649 \u0623\u0631\u0628\u0639\u0629 \u0645\u0642\u0627\u0639\u062F.';
       break;
     case 3:
-      output += 'طائرة بمقعدين في مقطورة الطيّار (للطيار ومساعده) وعدد من المقاعد في صفوف الدرجة الأولى والثانية. كل صف من صفوف الدرجة الأولى يحتوي على أربعة مقاعد. ويحتوي كل صف في الدرجة الثانية على خمسة مقاعد.';
+      output += '\u0637\u0627\u0626\u0631\u0629 \u0628\u0645\u0642\u0639\u062F\u064A\u0646 \u0641\u064A \u0645\u0642\u0637\u0648\u0631\u0629 \u0627\u0644\u0637\u064A\u0651\u0627\u0631 (\u0644\u0644\u0637\u064A\u0627\u0631 \u0648\u0645\u0633\u0627\u0639\u062F\u0647) \u0648\u0639\u062F\u062F \u0645\u0646 \u0627\u0644\u0645\u0642\u0627\u0639\u062F \u0641\u064A \u0635\u0641\u0648\u0641 \u0627\u0644\u062F\u0631\u062C\u0629 \u0627\u0644\u0623\u0648\u0644\u0649 \u0648\u0627\u0644\u062B\u0627\u0646\u064A\u0629. \u0643\u0644 \u0635\u0641 \u0645\u0646 \u0635\u0641\u0648\u0641 \u0627\u0644\u062F\u0631\u062C\u0629 \u0627\u0644\u0623\u0648\u0644\u0649 \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0623\u0631\u0628\u0639\u0629 \u0645\u0642\u0627\u0639\u062F. \u0648\u064A\u062D\u062A\u0648\u064A \u0643\u0644 \u0635\u0641 \u0641\u064A \u0627\u0644\u062F\u0631\u062C\u0629 \u0627\u0644\u062B\u0627\u0646\u064A\u0629 \u0639\u0644\u0649 \u062E\u0645\u0633\u0629 \u0645\u0642\u0627\u0639\u062F.';
       break;
   }
-  output += '</p><p>لبناء صيغة (أدناه) تقوم بحساب إجمالي عدد المقاعد في الطائرة عند تغيير الصفوف (أعلاه).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u0644\u0628\u0646\u0627\u0621 \u0635\u064A\u063A\u0629 (\u0623\u062F\u0646\u0627\u0647) \u062A\u0642\u0648\u0645 \u0628\u062D\u0633\u0627\u0628 \u0625\u062C\u0645\u0627\u0644\u064A \u0639\u062F\u062F \u0627\u0644\u0645\u0642\u0627\u0639\u062F \u0641\u064A \u0627\u0644\u0637\u0627\u0626\u0631\u0629 \u0639\u0646\u062F \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0635\u0641\u0648\u0641 (\u0623\u0639\u0644\u0627\u0647).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/be-tarask.js b/demos/plane/generated/be-tarask.js
index ba60f45e9..9fee77823 100644
--- a/demos/plane/generated/be-tarask.js
+++ b/demos/plane/generated/be-tarask.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Радкоў: %1</span><span id="Plane_getRows">радкоў (%1)</span><span id="Plane_rows1">Радкі першага клясу: %1</span><span id="Plane_getRows1">радкі першага клясу (%1)</span><span id="Plane_rows2">Радкі другога клясу: %1</span><span id="Plane_getRows2">радкі другога клясу (%1)</span><span id="Plane_seats">Месцаў: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">месцаў =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u0420\u0430\u0434\u043A\u043E\u045E: %1</span><span id="Plane_getRows">\u0440\u0430\u0434\u043A\u043E\u045E (%1)</span><span id="Plane_rows1">\u0420\u0430\u0434\u043A\u0456 \u043F\u0435\u0440\u0448\u0430\u0433\u0430 \u043A\u043B\u044F\u0441\u0443: %1</span><span id="Plane_getRows1">\u0440\u0430\u0434\u043A\u0456 \u043F\u0435\u0440\u0448\u0430\u0433\u0430 \u043A\u043B\u044F\u0441\u0443 (%1)</span><span id="Plane_rows2">\u0420\u0430\u0434\u043A\u0456 \u0434\u0440\u0443\u0433\u043E\u0433\u0430 \u043A\u043B\u044F\u0441\u0443: %1</span><span id="Plane_getRows2">\u0440\u0430\u0434\u043A\u0456 \u0434\u0440\u0443\u0433\u043E\u0433\u0430 \u043A\u043B\u044F\u0441\u0443 (%1)</span><span id="Plane_seats">\u041C\u0435\u0441\u0446\u0430\u045E: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u043C\u0435\u0441\u0446\u0430\u045E =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Калькулятар месцаў у самалёце</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u041A\u0430\u043B\u044C\u043A\u0443\u043B\u044F\u0442\u0430\u0440 \u043C\u0435\u0441\u0446\u0430\u045E \u0443 \u0441\u0430\u043C\u0430\u043B\u0451\u0446\u0435</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Самалёт мае некалькі шэрагаў пасажырскіх сядзеньняў. Кожная шэраг утрымлівае чатыры месцы.';
+      output += '\u0421\u0430\u043C\u0430\u043B\u0451\u0442 \u043C\u0430\u0435 \u043D\u0435\u043A\u0430\u043B\u044C\u043A\u0456 \u0448\u044D\u0440\u0430\u0433\u0430\u045E \u043F\u0430\u0441\u0430\u0436\u044B\u0440\u0441\u043A\u0456\u0445 \u0441\u044F\u0434\u0437\u0435\u043D\u044C\u043D\u044F\u045E. \u041A\u043E\u0436\u043D\u0430\u044F \u0448\u044D\u0440\u0430\u0433 \u0443\u0442\u0440\u044B\u043C\u043B\u0456\u0432\u0430\u0435 \u0447\u0430\u0442\u044B\u0440\u044B \u043C\u0435\u0441\u0446\u044B.';
       break;
     case 2:
-      output += 'Самалёт мае два месцы ў кабіне экіпажа (пілот і другі пілот), і некалькі шэрагаў пасажырскіх сядзеньняў. Кожны шэраг утрымлівае чатыры месцы.';
+      output += '\u0421\u0430\u043C\u0430\u043B\u0451\u0442 \u043C\u0430\u0435 \u0434\u0432\u0430 \u043C\u0435\u0441\u0446\u044B \u045E \u043A\u0430\u0431\u0456\u043D\u0435 \u044D\u043A\u0456\u043F\u0430\u0436\u0430 (\u043F\u0456\u043B\u043E\u0442 \u0456 \u0434\u0440\u0443\u0433\u0456 \u043F\u0456\u043B\u043E\u0442), \u0456 \u043D\u0435\u043A\u0430\u043B\u044C\u043A\u0456 \u0448\u044D\u0440\u0430\u0433\u0430\u045E \u043F\u0430\u0441\u0430\u0436\u044B\u0440\u0441\u043A\u0456\u0445 \u0441\u044F\u0434\u0437\u0435\u043D\u044C\u043D\u044F\u045E. \u041A\u043E\u0436\u043D\u044B \u0448\u044D\u0440\u0430\u0433 \u0443\u0442\u0440\u044B\u043C\u043B\u0456\u0432\u0430\u0435 \u0447\u0430\u0442\u044B\u0440\u044B \u043C\u0435\u0441\u0446\u044B.';
       break;
     case 3:
-      output += 'Самалёт мае два месцы ў кабіне экіпажа (пілот і другі пілот), і некалькі пасажырскіх шэрагаў месцаў 1-га кляса і 2-га кляса. Кожны шэраг 1-га кляса утрымлівае чатыры месцы. Кожны шэраг 2-га кляса ўтрымлівае пяць месцаў.';
+      output += '\u0421\u0430\u043C\u0430\u043B\u0451\u0442 \u043C\u0430\u0435 \u0434\u0432\u0430 \u043C\u0435\u0441\u0446\u044B \u045E \u043A\u0430\u0431\u0456\u043D\u0435 \u044D\u043A\u0456\u043F\u0430\u0436\u0430 (\u043F\u0456\u043B\u043E\u0442 \u0456 \u0434\u0440\u0443\u0433\u0456 \u043F\u0456\u043B\u043E\u0442), \u0456 \u043D\u0435\u043A\u0430\u043B\u044C\u043A\u0456 \u043F\u0430\u0441\u0430\u0436\u044B\u0440\u0441\u043A\u0456\u0445 \u0448\u044D\u0440\u0430\u0433\u0430\u045E \u043C\u0435\u0441\u0446\u0430\u045E 1-\u0433\u0430 \u043A\u043B\u044F\u0441\u0430 \u0456 2-\u0433\u0430 \u043A\u043B\u044F\u0441\u0430. \u041A\u043E\u0436\u043D\u044B \u0448\u044D\u0440\u0430\u0433 1-\u0433\u0430 \u043A\u043B\u044F\u0441\u0430 \u0443\u0442\u0440\u044B\u043C\u043B\u0456\u0432\u0430\u0435 \u0447\u0430\u0442\u044B\u0440\u044B \u043C\u0435\u0441\u0446\u044B. \u041A\u043E\u0436\u043D\u044B \u0448\u044D\u0440\u0430\u0433 2-\u0433\u0430 \u043A\u043B\u044F\u0441\u0430 \u045E\u0442\u0440\u044B\u043C\u043B\u0456\u0432\u0430\u0435 \u043F\u044F\u0446\u044C \u043C\u0435\u0441\u0446\u0430\u045E.';
       break;
   }
-  output += '</p><p>Пабудаваць формулу (ніжэй), якая падлічвае агульную колькасьць месцаў у самалёце пры зьмене радоў (гл. вышэй).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u041F\u0430\u0431\u0443\u0434\u0430\u0432\u0430\u0446\u044C \u0444\u043E\u0440\u043C\u0443\u043B\u0443 (\u043D\u0456\u0436\u044D\u0439), \u044F\u043A\u0430\u044F \u043F\u0430\u0434\u043B\u0456\u0447\u0432\u0430\u0435 \u0430\u0433\u0443\u043B\u044C\u043D\u0443\u044E \u043A\u043E\u043B\u044C\u043A\u0430\u0441\u044C\u0446\u044C \u043C\u0435\u0441\u0446\u0430\u045E \u0443 \u0441\u0430\u043C\u0430\u043B\u0451\u0446\u0435 \u043F\u0440\u044B \u0437\u044C\u043C\u0435\u043D\u0435 \u0440\u0430\u0434\u043E\u045E (\u0433\u043B. \u0432\u044B\u0448\u044D\u0439).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/br.js b/demos/plane/generated/br.js
index 84c2fae88..9722c6ea2 100644
--- a/demos/plane/generated/br.js
+++ b/demos/plane/generated/br.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Renkennadoù : %1</span><span id="Plane_getRows">renkennadoù (%1)</span><span id="Plane_rows1">Renkennadoù kentañ klas : %1</span><span id="Plane_getRows1">Renkennadoù kentañ klas (%1)</span><span id="Plane_rows2">Renkennadoù eil klas : %1</span><span id="Plane_getRows2">Renkennadoù eil klas (%1)</span><span id="Plane_seats">Azezennoù : %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">azezennoù =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Renkennado\u00F9 : %1</span><span id="Plane_getRows">renkennado\u00F9 (%1)</span><span id="Plane_rows1">Renkennado\u00F9 kenta\u00F1 klas : %1</span><span id="Plane_getRows1">Renkennado\u00F9 kenta\u00F1 klas (%1)</span><span id="Plane_rows2">Renkennado\u00F9 eil klas : %1</span><span id="Plane_getRows2">Renkennado\u00F9 eil klas (%1)</span><span id="Plane_seats">Azezenno\u00F9 : %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">azezenno\u00F9 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Jederez azezenn nijerez</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Un nijerez he deus un toullad renkennadoù azezennoù evit ar veajourien. Peder azezenn a zo e pep renkennad.';
+      output += 'Un nijerez he deus un toullad renkennado\u00F9 azezenno\u00F9 evit ar veajourien. Peder azezenn a zo e pep renkennad.';
       break;
     case 2:
-      output += 'En un nijerez ez eus div azezenn el logell leviañ(evit al loman hag an eil loman), hag ur toullad renkennadoù azezennoù evit an dremenidi. Peder azezenn zo e pep renkennad.';
+      output += 'En un nijerez ez eus div azezenn el logell levia\u00F1(evit al loman hag an eil loman), hag ur toullad renkennado\u00F9 azezenno\u00F9 evit an dremenidi. Peder azezenn zo e pep renkennad.';
       break;
     case 3:
-      output += 'En un nijerez ez eus div azezenn el logell leviañ(evit al loman hag an eil loman), hag un toullad renkennadoù azezennoù tremenidi kentañ hag eil klas. Peder azezenn zo e pep renkennad kentañ klas. Pemp azezenn zo e pemp renkennad eil klas.';
+      output += 'En un nijerez ez eus div azezenn el logell levia\u00F1(evit al loman hag an eil loman), hag un toullad renkennado\u00F9 azezenno\u00F9 tremenidi kenta\u00F1 hag eil klas. Peder azezenn zo e pep renkennad kenta\u00F1 klas. Pemp azezenn zo e pemp renkennad eil klas.';
       break;
   }
-  output += '</p><p>Sevel ur formulenn (amañ dindan) evit jediñ an niver a azezennoù en holl en nijerez pa vez kemmet an niver a renkennadoù (amañ a-us).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Sevel ur formulenn (ama\u00F1 dindan) evit jedi\u00F1 an niver a azezenno\u00F9 en holl en nijerez pa vez kemmet an niver a renkennado\u00F9 (ama\u00F1 a-us).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ca.js b/demos/plane/generated/ca.js
index 0b45f3ebe..9f2808c68 100644
--- a/demos/plane/generated/ca.js
+++ b/demos/plane/generated/ca.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Files: %1</span><span id="Plane_getRows">files (%1)</span><span id="Plane_rows1">files de primera classe: %1</span><span id="Plane_getRows1">files de primera classe (%1)</span><span id="Plane_rows2">files de segona classe: %1</span><span id="Plane_getRows2">files de segona classe (%1)</span><span id="Plane_seats">Seients: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">seients =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de seients d\'avió</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de seients d\'avi\u00F3</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Un avió té un nombre de files de seients de passatgers.  Cada fila conté quatre seients.';
+      output += 'Un avi\u00F3 t\u00E9 un nombre de files de seients de passatgers.  Cada fila cont\u00E9 quatre seients.';
       break;
     case 2:
-      output += 'Un avió té dos seients en la cabina de vol (pel pilot i pel copilot) i un nombre de files de seients de passatgers. Cada fila conté quatre seients.';
+      output += 'Un avi\u00F3 t\u00E9 dos seients en la cabina de vol (pel pilot i pel copilot) i un nombre de files de seients de passatgers. Cada fila cont\u00E9 quatre seients.';
       break;
     case 3:
-      output += 'Un avió té dos seients en la cabina de vol (pel pilot i copilot) i un nombre de files per seients de passatgers de primera classe i de segona classe. Cada fila de primera classe conté quatre seients. Cada fila de segona classe conté cinc seients.';
+      output += 'Un avi\u00F3 t\u00E9 dos seients en la cabina de vol (pel pilot i copilot) i un nombre de files per seients de passatgers de primera classe i de segona classe. Cada fila de primera classe cont\u00E9 quatre seients. Cada fila de segona classe cont\u00E9 cinc seients.';
       break;
   }
-  output += '</p><p>Construïu una fórmula (a sota) que calculi el nombre total de seients de l\'avió a mida que canviïn les files (a dalt).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Constru\u00EFu una f\u00F3rmula (a sota) que calculi el nombre total de seients de l\'avi\u00F3 a mida que canvi\u00EFn les files (a dalt).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/da.js b/demos/plane/generated/da.js
index 2c7965025..beed51a55 100644
--- a/demos/plane/generated/da.js
+++ b/demos/plane/generated/da.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rækker: %1</span><span id="Plane_getRows">rækker (%1)</span><span id="Plane_rows1">1. klasse rækker: %1</span><span id="Plane_getRows1">1. klasse rækker (%1)</span><span id="Plane_rows2">2. klasse rækker: %1</span><span id="Plane_getRows2">2. klasse rækker (%1)</span><span id="Plane_seats">Sæder: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sæder =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">R\u00E6kker: %1</span><span id="Plane_getRows">r\u00E6kker (%1)</span><span id="Plane_rows1">1. klasse r\u00E6kker: %1</span><span id="Plane_getRows1">1. klasse r\u00E6kker (%1)</span><span id="Plane_rows2">2. klasse r\u00E6kker: %1</span><span id="Plane_getRows2">2. klasse r\u00E6kker (%1)</span><span id="Plane_seats">S\u00E6der: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">s\u00E6der =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flysædelommeregner</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flys\u00E6delommeregner</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Et fly har et antal rækker af passagersæder. Hver række indeholder fire sæder.';
+      output += 'Et fly har et antal r\u00E6kker af passagers\u00E6der. Hver r\u00E6kke indeholder fire s\u00E6der.';
       break;
     case 2:
-      output += 'Et fly har to pladser i cockpittet (til pilot og med-pilot), og et antal rækker af passagersæder. Hver række indeholder fire sæder.';
+      output += 'Et fly har to pladser i cockpittet (til pilot og med-pilot), og et antal r\u00E6kker af passagers\u00E6der. Hver r\u00E6kke indeholder fire s\u00E6der.';
       break;
     case 3:
-      output += 'Et fly har to pladser i cockpittet (til pilot og med-pilot), og et antal rækker af 1. klasses og 2. klasses passagersæder. Hver 1. klasses række indeholder fire sæder. Hver 2. klasses række indeholder fem sæder.';
+      output += 'Et fly har to pladser i cockpittet (til pilot og med-pilot), og et antal r\u00E6kker af 1. klasses og 2. klasses passagers\u00E6der. Hver 1. klasses r\u00E6kke indeholder fire s\u00E6der. Hver 2. klasses r\u00E6kke indeholder fem s\u00E6der.';
       break;
   }
-  output += '</p><p>Opbyg en formel (nedenfor), der beregner det samlede antal pladser på flyet, hvis antal rækker ændres (ovenfor).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Opbyg en formel (nedenfor), der beregner det samlede antal pladser p\u00E5 flyet, hvis antal r\u00E6kker \u00E6ndres (ovenfor).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/de.js b/demos/plane/generated/de.js
index d28d31869..edff1dc36 100644
--- a/demos/plane/generated/de.js
+++ b/demos/plane/generated/de.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Reihen: %1</span><span id="Plane_getRows">Reihen (%1)</span><span id="Plane_rows1">Reihen der 1. Klasse: %1</span><span id="Plane_getRows1">Reihen der 1. Klasse (%1)</span><span id="Plane_rows2">Reihen der 2. Klasse: %1</span><span id="Plane_getRows2">Reihen der 2. Klasse (%1)</span><span id="Plane_seats">Sitze: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">Sitze =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flugzeugsitzrechner</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Ein Flugzeug hat eine Anzahl an Reihen mit Passagiersitzen. Jede Reihe enthält vier Sitze.';
+      output += 'Ein Flugzeug hat eine Anzahl an Reihen mit Passagiersitzen. Jede Reihe enth\u00E4lt vier Sitze.';
       break;
     case 2:
-      output += 'Ein Flugzeug hat zwei Sitze im Pilotenstand (für den Piloten und Co-Piloten) und eine Anzahl an Reihen mit Passagiersitzen. Jede Reihe enthält vier Sitze.';
+      output += 'Ein Flugzeug hat zwei Sitze im Pilotenstand (f\u00FCr den Piloten und Co-Piloten) und eine Anzahl an Reihen mit Passagiersitzen. Jede Reihe enth\u00E4lt vier Sitze.';
       break;
     case 3:
-      output += 'Ein Flugzeug hat zwei Sitze im Pilotenstand (für den Piloten und Co-Piloten) und eine Anzahl an Reihen mit Passagiersitzen der 1. und 2. Klasse. Jede 1.-Klasse-Reihe enthält vier Sitze. Jede 2.-Klasse-Reihe enthält fünf Sitze.';
+      output += 'Ein Flugzeug hat zwei Sitze im Pilotenstand (f\u00FCr den Piloten und Co-Piloten) und eine Anzahl an Reihen mit Passagiersitzen der 1. und 2. Klasse. Jede 1.-Klasse-Reihe enth\u00E4lt vier Sitze. Jede 2.-Klasse-Reihe enth\u00E4lt f\u00FCnf Sitze.';
       break;
   }
-  output += '</p><p>Erstelle eine Formel (unten), die die gesamte Anzahl an Sitzen im Flugzeug berechnet, wenn die Reihen (oben) geändert werden.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Erstelle eine Formel (unten), die die gesamte Anzahl an Sitzen im Flugzeug berechnet, wenn die Reihen (oben) ge\u00E4ndert werden.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/el.js b/demos/plane/generated/el.js
index f8219c86a..451d5e57a 100644
--- a/demos/plane/generated/el.js
+++ b/demos/plane/generated/el.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Σειρές: %1</span><span id="Plane_getRows">σειρές (%1)</span><span id="Plane_rows1">Σειρές 1ης θέσης: %1</span><span id="Plane_getRows1">Σειρές 1ης θέσης (%1)</span><span id="Plane_rows2">Σειρές 2ης θέσης: %1</span><span id="Plane_getRows2">Σειρές 2ης θέσης (%1)</span><span id="Plane_seats">Καθίσματα: %1</span><span id="Plane_placeholder">;</span><span id="Plane_setSeats">καθίσματα =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u03A3\u03B5\u03B9\u03C1\u03AD\u03C2: %1</span><span id="Plane_getRows">\u03C3\u03B5\u03B9\u03C1\u03AD\u03C2 (%1)</span><span id="Plane_rows1">\u03A3\u03B5\u03B9\u03C1\u03AD\u03C2 1\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2: %1</span><span id="Plane_getRows1">\u03A3\u03B5\u03B9\u03C1\u03AD\u03C2 1\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2 (%1)</span><span id="Plane_rows2">\u03A3\u03B5\u03B9\u03C1\u03AD\u03C2 2\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2: %1</span><span id="Plane_getRows2">\u03A3\u03B5\u03B9\u03C1\u03AD\u03C2 2\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2 (%1)</span><span id="Plane_seats">\u039A\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1: %1</span><span id="Plane_placeholder">;</span><span id="Plane_setSeats">\u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Υπολογισμός Θέσεων Σε Αεροπλάνο</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u03A5\u03C0\u03BF\u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03CC\u03C2 \u0398\u03AD\u03C3\u03B5\u03C9\u03BD \u03A3\u03B5 \u0391\u03B5\u03C1\u03BF\u03C0\u03BB\u03AC\u03BD\u03BF</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Ένα αεροπλάνο έχει έναν συγκεκριμένο αριθμό σειρών καθισμάτων επιβατών. Κάθε σειρά έχει τέσσερα καθίσματα.';
+      output += '\u0388\u03BD\u03B1 \u03B1\u03B5\u03C1\u03BF\u03C0\u03BB\u03AC\u03BD\u03BF \u03AD\u03C7\u03B5\u03B9 \u03AD\u03BD\u03B1\u03BD \u03C3\u03C5\u03B3\u03BA\u03B5\u03BA\u03C1\u03B9\u03BC\u03AD\u03BD\u03BF \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC \u03C3\u03B5\u03B9\u03C1\u03CE\u03BD \u03BA\u03B1\u03B8\u03B9\u03C3\u03BC\u03AC\u03C4\u03C9\u03BD \u03B5\u03C0\u03B9\u03B2\u03B1\u03C4\u03CE\u03BD. \u039A\u03AC\u03B8\u03B5 \u03C3\u03B5\u03B9\u03C1\u03AC \u03AD\u03C7\u03B5\u03B9 \u03C4\u03AD\u03C3\u03C3\u03B5\u03C1\u03B1 \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1.';
       break;
     case 2:
-      output += 'Ένα αεροπλάνο έχει δύο καθίσματα στον θάλαμο διακυβέρνησης (για τον κυβερνήτη και τον συγκυβερνήτη), καθώς και έναν αριθμό από σειρές καθισμάτων επιβατών.  Κάθε σειρά έχει τέσσερα καθίσματα.';
+      output += '\u0388\u03BD\u03B1 \u03B1\u03B5\u03C1\u03BF\u03C0\u03BB\u03AC\u03BD\u03BF \u03AD\u03C7\u03B5\u03B9 \u03B4\u03CD\u03BF \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1 \u03C3\u03C4\u03BF\u03BD \u03B8\u03AC\u03BB\u03B1\u03BC\u03BF \u03B4\u03B9\u03B1\u03BA\u03C5\u03B2\u03AD\u03C1\u03BD\u03B7\u03C3\u03B7\u03C2 (\u03B3\u03B9\u03B1 \u03C4\u03BF\u03BD \u03BA\u03C5\u03B2\u03B5\u03C1\u03BD\u03AE\u03C4\u03B7 \u03BA\u03B1\u03B9 \u03C4\u03BF\u03BD \u03C3\u03C5\u03B3\u03BA\u03C5\u03B2\u03B5\u03C1\u03BD\u03AE\u03C4\u03B7), \u03BA\u03B1\u03B8\u03CE\u03C2 \u03BA\u03B1\u03B9 \u03AD\u03BD\u03B1\u03BD \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC \u03B1\u03C0\u03CC \u03C3\u03B5\u03B9\u03C1\u03AD\u03C2 \u03BA\u03B1\u03B8\u03B9\u03C3\u03BC\u03AC\u03C4\u03C9\u03BD \u03B5\u03C0\u03B9\u03B2\u03B1\u03C4\u03CE\u03BD.  \u039A\u03AC\u03B8\u03B5 \u03C3\u03B5\u03B9\u03C1\u03AC \u03AD\u03C7\u03B5\u03B9 \u03C4\u03AD\u03C3\u03C3\u03B5\u03C1\u03B1 \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1.';
       break;
     case 3:
-      output += 'Ένα αεροπλάνο έχει δύο καθίσματα στον θάλαμο διακυβέρνησης (για τον κυβερνήτη και τον συγκυβερνήτη), καθώς και έναν αριθμό σειρών καθισμάτων για την 1η και 2η θέση. Κάθε σειρά της 1ης θέσης έχει τέσσερα καθίσματα και κάθε σειρά της 2ης θέσης έχει πέντε καθίσματα.';
+      output += '\u0388\u03BD\u03B1 \u03B1\u03B5\u03C1\u03BF\u03C0\u03BB\u03AC\u03BD\u03BF \u03AD\u03C7\u03B5\u03B9 \u03B4\u03CD\u03BF \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1 \u03C3\u03C4\u03BF\u03BD \u03B8\u03AC\u03BB\u03B1\u03BC\u03BF \u03B4\u03B9\u03B1\u03BA\u03C5\u03B2\u03AD\u03C1\u03BD\u03B7\u03C3\u03B7\u03C2 (\u03B3\u03B9\u03B1 \u03C4\u03BF\u03BD \u03BA\u03C5\u03B2\u03B5\u03C1\u03BD\u03AE\u03C4\u03B7 \u03BA\u03B1\u03B9 \u03C4\u03BF\u03BD \u03C3\u03C5\u03B3\u03BA\u03C5\u03B2\u03B5\u03C1\u03BD\u03AE\u03C4\u03B7), \u03BA\u03B1\u03B8\u03CE\u03C2 \u03BA\u03B1\u03B9 \u03AD\u03BD\u03B1\u03BD \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC \u03C3\u03B5\u03B9\u03C1\u03CE\u03BD \u03BA\u03B1\u03B8\u03B9\u03C3\u03BC\u03AC\u03C4\u03C9\u03BD \u03B3\u03B9\u03B1 \u03C4\u03B7\u03BD 1\u03B7 \u03BA\u03B1\u03B9 2\u03B7 \u03B8\u03AD\u03C3\u03B7. \u039A\u03AC\u03B8\u03B5 \u03C3\u03B5\u03B9\u03C1\u03AC \u03C4\u03B7\u03C2 1\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03C4\u03AD\u03C3\u03C3\u03B5\u03C1\u03B1 \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1 \u03BA\u03B1\u03B9 \u03BA\u03AC\u03B8\u03B5 \u03C3\u03B5\u03B9\u03C1\u03AC \u03C4\u03B7\u03C2 2\u03B7\u03C2 \u03B8\u03AD\u03C3\u03B7\u03C2 \u03AD\u03C7\u03B5\u03B9 \u03C0\u03AD\u03BD\u03C4\u03B5 \u03BA\u03B1\u03B8\u03AF\u03C3\u03BC\u03B1\u03C4\u03B1.';
       break;
   }
-  output += '</p><p>Φτιάξε έναν τύπο (κάτω) που θα υπολογίζει τον συνολικό αριθμό καθισμάτων του αεροπλάνου καθώς αλλάζουν οι σειρές (πάνω).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u03A6\u03C4\u03B9\u03AC\u03BE\u03B5 \u03AD\u03BD\u03B1\u03BD \u03C4\u03CD\u03C0\u03BF (\u03BA\u03AC\u03C4\u03C9) \u03C0\u03BF\u03C5 \u03B8\u03B1 \u03C5\u03C0\u03BF\u03BB\u03BF\u03B3\u03AF\u03B6\u03B5\u03B9 \u03C4\u03BF\u03BD \u03C3\u03C5\u03BD\u03BF\u03BB\u03B9\u03BA\u03CC \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC \u03BA\u03B1\u03B8\u03B9\u03C3\u03BC\u03AC\u03C4\u03C9\u03BD \u03C4\u03BF\u03C5 \u03B1\u03B5\u03C1\u03BF\u03C0\u03BB\u03AC\u03BD\u03BF\u03C5 \u03BA\u03B1\u03B8\u03CE\u03C2 \u03B1\u03BB\u03BB\u03AC\u03B6\u03BF\u03C5\u03BD \u03BF\u03B9 \u03C3\u03B5\u03B9\u03C1\u03AD\u03C2 (\u03C0\u03AC\u03BD\u03C9).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/en.js b/demos/plane/generated/en.js
index 1cbfc40ef..016b84436 100644
--- a/demos/plane/generated/en.js
+++ b/demos/plane/generated/en.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Rows: %1</span><span id="Plane_getRows">rows (%1)</span><span id="Plane_rows1">1st class rows: %1</span><span id="Plane_getRows1">1st class rows (%1)</span><span id="Plane_rows2">2nd class rows: %1</span><span id="Plane_getRows2">2nd class rows (%1)</span><span id="Plane_seats">Seats: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">seats =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Plane Seat Calculator</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -30,8 +37,14 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   output += '</p><p>Build a formula (below) that calculates the total number of seats on the airplane as the rows are changed (above).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/es.js b/demos/plane/generated/es.js
index 0a3b7812d..a565218c8 100644
--- a/demos/plane/generated/es.js
+++ b/demos/plane/generated/es.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Filas: %1</span><span id="Plane_getRows">filas (%1)</span><span id="Plane_rows1">Filas de primera clase: %1</span><span id="Plane_getRows1">Filas de primera clase: (%1)</span><span id="Plane_rows2">Filas de segunda clase: %1</span><span id="Plane_getRows2">Filas de segunda clase: (%1)</span><span id="Plane_seats">Asientos: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">asientos =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de asientos de avión</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de asientos de avi\u00F3n</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Un avión  tiene un número de filas de asientos de pasajeros. Cada fila contiene cuatro asientos.';
+      output += 'Un avi\u00F3n\u00A0 tiene un n\u00FAmero de filas de asientos de pasajeros. Cada fila contiene cuatro asientos.';
       break;
     case 2:
-      output += 'Un avión tiene dos asientos en la cabina de vuelo (para el piloto y co-piloto), y un número de filas de asientos de pasajeros. Cada fila contiene cuatro asientos.';
+      output += 'Un avi\u00F3n tiene dos asientos en la cabina de vuelo (para el piloto y co-piloto), y un n\u00FAmero de filas de asientos de pasajeros. Cada fila contiene cuatro asientos.';
       break;
     case 3:
-      output += 'Un avión tiene dos asientos en la cabina de vuelo (para el piloto y co-piloto), y un número de filas de asientos para pasajeros de primera y segunda clase. Cada fila de la primera clase contiene cuatro asientos. Cada fila de la segunda clase contiene cinco asientos.';
+      output += 'Un avi\u00F3n tiene dos asientos en la cabina de vuelo (para el piloto y co-piloto), y un n\u00FAmero de filas de asientos para pasajeros de primera y segunda clase. Cada fila de la primera clase contiene cuatro asientos. Cada fila de la segunda clase contiene cinco asientos.';
       break;
   }
-  output += '</p><p>Construir una fórmula (abajo) que calcule el número total de asientos en el avión cuando las filas sean cambiadas (arriba).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Construir una f\u00F3rmula (abajo) que calcule el n\u00FAmero total de asientos en el avi\u00F3n cuando las filas sean cambiadas (arriba).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/fa.js b/demos/plane/generated/fa.js
index 8f31707b8..d29a9db97 100644
--- a/demos/plane/generated/fa.js
+++ b/demos/plane/generated/fa.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">ردیف: %1</span><span id="Plane_getRows">ردیف\u200Cها (%1)</span><span id="Plane_rows1">اولین ردیف کلاس: %1</span><span id="Plane_getRows1">اولین کلاس ردیف\u200Cها (%1)</span><span id="Plane_rows2">دومین کلاس ردیف: %1</span><span id="Plane_getRows2">دومین کلاس ردیف\u200Cها (%1)</span><span id="Plane_seats">صندلی\u200Cها: %1</span><span id="Plane_placeholder">؟</span><span id="Plane_setSeats">صندلی\u200Cها =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u0631\u062F\u06CC\u0641: %1</span><span id="Plane_getRows">\u0631\u062F\u06CC\u0641\u200C\u0647\u0627 (%1)</span><span id="Plane_rows1">\u0627\u0648\u0644\u06CC\u0646 \u0631\u062F\u06CC\u0641 \u06A9\u0644\u0627\u0633: %1</span><span id="Plane_getRows1">\u0627\u0648\u0644\u06CC\u0646 \u06A9\u0644\u0627\u0633 \u0631\u062F\u06CC\u0641\u200C\u0647\u0627 (%1)</span><span id="Plane_rows2">\u062F\u0648\u0645\u06CC\u0646 \u06A9\u0644\u0627\u0633 \u0631\u062F\u06CC\u0641: %1</span><span id="Plane_getRows2">\u062F\u0648\u0645\u06CC\u0646 \u06A9\u0644\u0627\u0633 \u0631\u062F\u06CC\u0641\u200C\u0647\u0627 (%1)</span><span id="Plane_seats">\u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627: %1</span><span id="Plane_placeholder">\u061F</span><span id="Plane_setSeats">\u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">محاسبه\u200Cگر صندلی\u200Cهای هواپیما</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u0645\u062D\u0627\u0633\u0628\u0647\u200C\u06AF\u0631 \u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627\u06CC \u0647\u0648\u0627\u067E\u06CC\u0645\u0627</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'یک هواپیما تعداد از صندلی\u200Cهای مسافرین را دارد. هر ردیف شمال چهار صندلی است.';
+      output += '\u06CC\u06A9 \u0647\u0648\u0627\u067E\u06CC\u0645\u0627 \u062A\u0639\u062F\u0627\u062F \u0627\u0632 \u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627\u06CC \u0645\u0633\u0627\u0641\u0631\u06CC\u0646 \u0631\u0627 \u062F\u0627\u0631\u062F. \u0647\u0631 \u0631\u062F\u06CC\u0641 \u0634\u0645\u0627\u0644 \u0686\u0647\u0627\u0631 \u0635\u0646\u062F\u0644\u06CC \u0627\u0633\u062A.';
       break;
     case 2:
-      output += 'یک هواپیما دو صندلی در عرشهٔ پرواز دارد (برای خلبان و کمک خلبان) و تعدادی صندلی مسافرین.  هر ردیف شامل چهار صندلی است.';
+      output += '\u06CC\u06A9 \u0647\u0648\u0627\u067E\u06CC\u0645\u0627 \u062F\u0648 \u0635\u0646\u062F\u0644\u06CC \u062F\u0631 \u0639\u0631\u0634\u0647\u0654 \u067E\u0631\u0648\u0627\u0632 \u062F\u0627\u0631\u062F (\u0628\u0631\u0627\u06CC \u062E\u0644\u0628\u0627\u0646 \u0648 \u06A9\u0645\u06A9 \u062E\u0644\u0628\u0627\u0646) \u0648 \u062A\u0639\u062F\u0627\u062F\u06CC \u0635\u0646\u062F\u0644\u06CC \u0645\u0633\u0627\u0641\u0631\u06CC\u0646.  \u0647\u0631 \u0631\u062F\u06CC\u0641 \u0634\u0627\u0645\u0644 \u0686\u0647\u0627\u0631 \u0635\u0646\u062F\u0644\u06CC \u0627\u0633\u062A.';
       break;
     case 3:
-      output += 'یک هواپیما دو صندلی در کابین خلبان دارد (برای خلبان و کمک خلبان) و تهداد از صندلی\u200Cها مسافرین درجه یک و درجه دو.  هر ردیف درجه یک شامل چهار صندلی است. هر ردیف درجه دو شامل پنج صندلی است.';
+      output += '\u06CC\u06A9 \u0647\u0648\u0627\u067E\u06CC\u0645\u0627 \u062F\u0648 \u0635\u0646\u062F\u0644\u06CC \u062F\u0631 \u06A9\u0627\u0628\u06CC\u0646 \u062E\u0644\u0628\u0627\u0646 \u062F\u0627\u0631\u062F (\u0628\u0631\u0627\u06CC \u062E\u0644\u0628\u0627\u0646 \u0648 \u06A9\u0645\u06A9 \u062E\u0644\u0628\u0627\u0646) \u0648 \u062A\u0647\u062F\u0627\u062F \u0627\u0632 \u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627 \u0645\u0633\u0627\u0641\u0631\u06CC\u0646 \u062F\u0631\u062C\u0647 \u06CC\u06A9 \u0648 \u062F\u0631\u062C\u0647 \u062F\u0648.  \u0647\u0631 \u0631\u062F\u06CC\u0641 \u062F\u0631\u062C\u0647 \u06CC\u06A9 \u0634\u0627\u0645\u0644 \u0686\u0647\u0627\u0631 \u0635\u0646\u062F\u0644\u06CC \u0627\u0633\u062A. \u0647\u0631 \u0631\u062F\u06CC\u0641 \u062F\u0631\u062C\u0647 \u062F\u0648 \u0634\u0627\u0645\u0644 \u067E\u0646\u062C \u0635\u0646\u062F\u0644\u06CC \u0627\u0633\u062A.';
       break;
   }
-  output += '</p><p>یک فرمول بسازید (پایین) که تعداد کل صندلی\u200Cهای هواپیما با تغییر ردیف را حساب کند (بالا).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u06CC\u06A9 \u0641\u0631\u0645\u0648\u0644 \u0628\u0633\u0627\u0632\u06CC\u062F (\u067E\u0627\u06CC\u06CC\u0646) \u06A9\u0647 \u062A\u0639\u062F\u0627\u062F \u06A9\u0644 \u0635\u0646\u062F\u0644\u06CC\u200C\u0647\u0627\u06CC \u0647\u0648\u0627\u067E\u06CC\u0645\u0627 \u0628\u0627 \u062A\u063A\u06CC\u06CC\u0631 \u0631\u062F\u06CC\u0641 \u0631\u0627 \u062D\u0633\u0627\u0628 \u06A9\u0646\u062F (\u0628\u0627\u0644\u0627).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/fr.js b/demos/plane/generated/fr.js
index 29b17e98e..df3ae46fd 100644
--- a/demos/plane/generated/fr.js
+++ b/demos/plane/generated/fr.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rangées : %1</span><span id="Plane_getRows">rangées (%1)</span><span id="Plane_rows1">rangées de première classe : %1</span><span id="Plane_getRows1">rangées de première classe (%1)</span><span id="Plane_rows2">rangées de seconde classe : %1</span><span id="Plane_getRows2">rangées de seconde classe (%1)</span><span id="Plane_seats">Sièges : %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sièges =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Rang\u00E9es : %1</span><span id="Plane_getRows">rang\u00E9es (%1)</span><span id="Plane_rows1">rang\u00E9es de premi\u00E8re classe : %1</span><span id="Plane_getRows1">rang\u00E9es de premi\u00E8re classe (%1)</span><span id="Plane_rows2">rang\u00E9es de seconde classe : %1</span><span id="Plane_getRows2">rang\u00E9es de seconde classe (%1)</span><span id="Plane_seats">Si\u00E8ges : %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">si\u00E8ges =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculateur de sièges d’avion</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculateur de si\u00E8ges d\u2019avion</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Un avion a un nombre de rangées de sièges passager. Chaque rangée contient quatre sièges.';
+      output += 'Un avion a un nombre de rang\u00E9es de si\u00E8ges passager. Chaque rang\u00E9e contient quatre si\u00E8ges.';
       break;
     case 2:
-      output += 'Un avion a deux sièges dans le poste de pilotage (pour le pilote et le copilote), et un certain nombre de rangées de sièges passager. Chaque rangée contient quatre sièges.';
+      output += 'Un avion a deux si\u00E8ges dans le poste de pilotage (pour le pilote et le copilote), et un certain nombre de rang\u00E9es de si\u00E8ges passager. Chaque rang\u00E9e contient quatre si\u00E8ges.';
       break;
     case 3:
-      output += 'Un avion a deux sièges dans la cabine de pilotage (pour le pilote et le copilote), et un certain nombre de rangées de sièges passager de première et seconde classes. Chaque rangée de première classe contient quatre sièges. Chaque rangée de seconde classe contient cinq sièges.';
+      output += 'Un avion a deux si\u00E8ges dans la cabine de pilotage (pour le pilote et le copilote), et un certain nombre de rang\u00E9es de si\u00E8ges passager de premi\u00E8re et seconde classes. Chaque rang\u00E9e de premi\u00E8re classe contient quatre si\u00E8ges. Chaque rang\u00E9e de seconde classe contient cinq si\u00E8ges.';
       break;
   }
-  output += '</p><p>Construire une formule (ci-dessous) qui calcule le nombre total de sièges dans l’avion quand le nombre de rangées est modifié (ci-dessus).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Construire une formule (ci-dessous) qui calcule le nombre total de si\u00E8ges dans l\u2019avion quand le nombre de rang\u00E9es est modifi\u00E9 (ci-dessus).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/he.js b/demos/plane/generated/he.js
index 40d73a554..1a4050b0f 100644
--- a/demos/plane/generated/he.js
+++ b/demos/plane/generated/he.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">שורות: %1</span><span id="Plane_getRows">שורות (%1)</span><span id="Plane_rows1">שורות במחלקה ראשונה: %1</span><span id="Plane_getRows1">שורות במחלקה ראשונה (%1)</span><span id="Plane_rows2">שורות במחלקה שנייה: %1</span><span id="Plane_getRows2">שורות במחלקה שנייה: (%1)</span><span id="Plane_seats">מושבים: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">מושבים =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u05E9\u05D5\u05E8\u05D5\u05EA: %1</span><span id="Plane_getRows">\u05E9\u05D5\u05E8\u05D5\u05EA (%1)</span><span id="Plane_rows1">\u05E9\u05D5\u05E8\u05D5\u05EA \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05E8\u05D0\u05E9\u05D5\u05E0\u05D4: %1</span><span id="Plane_getRows1">\u05E9\u05D5\u05E8\u05D5\u05EA \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05E8\u05D0\u05E9\u05D5\u05E0\u05D4 (%1)</span><span id="Plane_rows2">\u05E9\u05D5\u05E8\u05D5\u05EA \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05E9\u05E0\u05D9\u05D9\u05D4: %1</span><span id="Plane_getRows2">\u05E9\u05D5\u05E8\u05D5\u05EA \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05E9\u05E0\u05D9\u05D9\u05D4: (%1)</span><span id="Plane_seats">\u05DE\u05D5\u05E9\u05D1\u05D9\u05DD: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u05DE\u05D5\u05E9\u05D1\u05D9\u05DD =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">מחשבון מושב במטוס</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u05DE\u05D7\u05E9\u05D1\u05D5\u05DF \u05DE\u05D5\u05E9\u05D1 \u05D1\u05DE\u05D8\u05D5\u05E1</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'במטוס יש מספר שורות עם מושבי נוסעים. בכל שורה יש ארבעה מושבים.';
+      output += '\u05D1\u05DE\u05D8\u05D5\u05E1 \u05D9\u05E9 \u05DE\u05E1\u05E4\u05E8 \u05E9\u05D5\u05E8\u05D5\u05EA \u05E2\u05DD \u05DE\u05D5\u05E9\u05D1\u05D9 \u05E0\u05D5\u05E1\u05E2\u05D9\u05DD. \u05D1\u05DB\u05DC \u05E9\u05D5\u05E8\u05D4 \u05D9\u05E9 \u05D0\u05E8\u05D1\u05E2\u05D4 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD.';
       break;
     case 2:
-      output += 'במטוס יש שני מושבים עבור הצוות (בשביל הטייס וטייס המשנה), ומספר שורות עם מושבי נוסעים. בכל שורה יש ארבעה מושבים.';
+      output += '\u05D1\u05DE\u05D8\u05D5\u05E1 \u05D9\u05E9 \u05E9\u05E0\u05D9 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD \u05E2\u05D1\u05D5\u05E8 \u05D4\u05E6\u05D5\u05D5\u05EA (\u05D1\u05E9\u05D1\u05D9\u05DC \u05D4\u05D8\u05D9\u05D9\u05E1 \u05D5\u05D8\u05D9\u05D9\u05E1 \u05D4\u05DE\u05E9\u05E0\u05D4), \u05D5\u05DE\u05E1\u05E4\u05E8 \u05E9\u05D5\u05E8\u05D5\u05EA \u05E2\u05DD \u05DE\u05D5\u05E9\u05D1\u05D9 \u05E0\u05D5\u05E1\u05E2\u05D9\u05DD. \u05D1\u05DB\u05DC \u05E9\u05D5\u05E8\u05D4 \u05D9\u05E9 \u05D0\u05E8\u05D1\u05E2\u05D4 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD.';
       break;
     case 3:
-      output += 'במטוס יש שני מושבים עבור הצוות (בשביל הטייס וטייס המשנה), ומספר שורות מושבים במחלקת הנוסעים הראשונה ובמחלקת הנוסעים השנייה. כל שורה במחלקה הראשונה מכילה ארבעה מושבים. כל שורה במחלקה השנייה מכילה חמישה מושבים.';
+      output += '\u05D1\u05DE\u05D8\u05D5\u05E1 \u05D9\u05E9 \u05E9\u05E0\u05D9 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD \u05E2\u05D1\u05D5\u05E8 \u05D4\u05E6\u05D5\u05D5\u05EA (\u05D1\u05E9\u05D1\u05D9\u05DC \u05D4\u05D8\u05D9\u05D9\u05E1 \u05D5\u05D8\u05D9\u05D9\u05E1 \u05D4\u05DE\u05E9\u05E0\u05D4), \u05D5\u05DE\u05E1\u05E4\u05E8 \u05E9\u05D5\u05E8\u05D5\u05EA \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD \u05D1\u05DE\u05D7\u05DC\u05E7\u05EA \u05D4\u05E0\u05D5\u05E1\u05E2\u05D9\u05DD \u05D4\u05E8\u05D0\u05E9\u05D5\u05E0\u05D4 \u05D5\u05D1\u05DE\u05D7\u05DC\u05E7\u05EA \u05D4\u05E0\u05D5\u05E1\u05E2\u05D9\u05DD \u05D4\u05E9\u05E0\u05D9\u05D9\u05D4. \u05DB\u05DC \u05E9\u05D5\u05E8\u05D4 \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05D4\u05E8\u05D0\u05E9\u05D5\u05E0\u05D4 \u05DE\u05DB\u05D9\u05DC\u05D4 \u05D0\u05E8\u05D1\u05E2\u05D4 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD. \u05DB\u05DC \u05E9\u05D5\u05E8\u05D4 \u05D1\u05DE\u05D7\u05DC\u05E7\u05D4 \u05D4\u05E9\u05E0\u05D9\u05D9\u05D4 \u05DE\u05DB\u05D9\u05DC\u05D4 \u05D7\u05DE\u05D9\u05E9\u05D4 \u05DE\u05D5\u05E9\u05D1\u05D9\u05DD.';
       break;
   }
-  output += '</p><p>בנה נוסחה (למטה) אשר תחשב את סך כל המושבים במטוס בהתאם לשינוי מספר השורות (למעלה).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u05D1\u05E0\u05D4 \u05E0\u05D5\u05E1\u05D7\u05D4 (\u05DC\u05DE\u05D8\u05D4) \u05D0\u05E9\u05E8 \u05EA\u05D7\u05E9\u05D1 \u05D0\u05EA \u05E1\u05DA \u05DB\u05DC \u05D4\u05DE\u05D5\u05E9\u05D1\u05D9\u05DD \u05D1\u05DE\u05D8\u05D5\u05E1 \u05D1\u05D4\u05EA\u05D0\u05DD \u05DC\u05E9\u05D9\u05E0\u05D5\u05D9 \u05DE\u05E1\u05E4\u05E8 \u05D4\u05E9\u05D5\u05E8\u05D5\u05EA (\u05DC\u05DE\u05E2\u05DC\u05D4).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/hrx.js b/demos/plane/generated/hrx.js
index 6e356147f..981fa7197 100644
--- a/demos/plane/generated/hrx.js
+++ b/demos/plane/generated/hrx.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Reihe: %1</span><span id="Plane_getRows">Reihe (%1)</span><span id="Plane_rows1">Reihe von der 1. Klasse: %1</span><span id="Plane_getRows1">Reihe von der 1. Klasse (%1)</span><span id="Plane_rows2">Reihe von der 2. Klasse: %1</span><span id="Plane_getRows2">Reihe von der 2. Klasse (%1)</span><span id="Plane_seats">Sitz: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">Sitze =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Fluchzeichsitzrechner</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'En Fluchzeich hot en Oonzohl an Reihe mit Passagiersitze. Jede Reih enthält vier Sitze.';
+      output += 'En Fluchzeich hot en Oonzohl an Reihe mit Passagiersitze. Jede Reih enth\u00E4lt vier Sitze.';
       break;
     case 2:
-      output += 'En Fluchzeich hot zwooi Sitze im Pilotestand (für den Pilot und Co-Pilot) und en Oonzohl an Reihe mit Passagiersitze. Jede Reih enthält vier Sitze.';
+      output += 'En Fluchzeich hot zwooi Sitze im Pilotestand (f\u00FCr den Pilot und Co-Pilot) und en Oonzohl an Reihe mit Passagiersitze. Jede Reih enth\u00E4lt vier Sitze.';
       break;
     case 3:
-      output += 'En Fluchzeich hot zwooi Sitze im Pilotstand (für den Pilot und Co-Pilot) und en Oonzohl an Reihe mit Passagiersitze der 1. und 2. Klasse. Jede 1.-Klasse-Reih enthält vier Sitze. Jede 2.-Klasse-Reih enthält fünf Sitze.';
+      output += 'En Fluchzeich hot zwooi Sitze im Pilotstand (f\u00FCr den Pilot und Co-Pilot) und en Oonzohl an Reihe mit Passagiersitze der 1. und 2. Klasse. Jede 1.-Klasse-Reih enth\u00E4lt vier Sitze. Jede 2.-Klasse-Reih enth\u00E4lt f\u00FCnf Sitze.';
       break;
   }
-  output += '</p><p>Erstell en Formel (unne), die die gesamte Oonzohl an Sitze im Fluchzeich berechnet, wenn die Reihe (uwe) geännert sin.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Erstell en Formel (unne), die die gesamte Oonzohl an Sitze im Fluchzeich berechnet, wenn die Reihe (uwe) ge\u00E4nnert sin.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/hu.js b/demos/plane/generated/hu.js
index 67181e76e..9717cdee7 100644
--- a/demos/plane/generated/hu.js
+++ b/demos/plane/generated/hu.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Sorok száma: %1</span><span id="Plane_getRows">Sorok száma (%1)</span><span id="Plane_rows1">1. osztály: %1 sor</span><span id="Plane_getRows1">1. osztály sorai (%1)</span><span id="Plane_rows2">2. osztály: %1 sor</span><span id="Plane_getRows2">2. osztály sorai (%1)</span><span id="Plane_seats">Ülések száma összesen: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">Ülések száma =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Sorok sz\u00E1ma: %1</span><span id="Plane_getRows">Sorok sz\u00E1ma (%1)</span><span id="Plane_rows1">1. oszt\u00E1ly: %1 sor</span><span id="Plane_getRows1">1. oszt\u00E1ly sorai (%1)</span><span id="Plane_rows2">2. oszt\u00E1ly: %1 sor</span><span id="Plane_getRows2">2. oszt\u00E1ly sorai (%1)</span><span id="Plane_seats">\u00DCl\u00E9sek sz\u00E1ma \u00F6sszesen: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u00DCl\u00E9sek sz\u00E1ma =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Repülőgép alkalmazás</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Rep\u00FCl\u0151g\u00E9p alkalmaz\u00E1s</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Egy repülőgépen az utasok több sorban ülnek az utastérben.  Az utastér minden sorában négy szék van.';
+      output += 'Egy rep\u00FCl\u0151g\u00E9pen az utasok t\u00F6bb sorban \u00FClnek az utast\u00E9rben.  Az utast\u00E9r minden sor\u00E1ban n\u00E9gy sz\u00E9k van.';
       break;
     case 2:
-      output += 'Egy repülőgépnek 2 ülése van a pilótafülkében (a pilótának és a másodpilótának), az utasok több sorban ülnek az utastérben.  Az utastér minden sorában négy szék van.';
+      output += 'Egy rep\u00FCl\u0151g\u00E9pnek 2 \u00FCl\u00E9se van a pil\u00F3taf\u00FClk\u00E9ben (a pil\u00F3t\u00E1nak \u00E9s a m\u00E1sodpil\u00F3t\u00E1nak), az utasok t\u00F6bb sorban \u00FClnek az utast\u00E9rben.  Az utast\u00E9r minden sor\u00E1ban n\u00E9gy sz\u00E9k van.';
       break;
     case 3:
-      output += 'Egy repülőgépnek 2 ülése van a pilótafülkében (a pilótának és a másodpilótának), az utasok 1. és 2. osztályon utazhatnak. Az 1. osztályon négy szék van egy sorban. A 2. osztályon öt szék van egy sorban.';
+      output += 'Egy rep\u00FCl\u0151g\u00E9pnek 2 \u00FCl\u00E9se van a pil\u00F3taf\u00FClk\u00E9ben (a pil\u00F3t\u00E1nak \u00E9s a m\u00E1sodpil\u00F3t\u00E1nak), az utasok 1. \u00E9s 2. oszt\u00E1lyon utazhatnak. Az 1. oszt\u00E1lyon n\u00E9gy sz\u00E9k van egy sorban. A 2. oszt\u00E1lyon \u00F6t sz\u00E9k van egy sorban.';
       break;
   }
-  output += '</p><p>Készítsd el a képletet (lent) amivel kiszámolható, hogy hány ülés van összesen a repülőgépen annak függvényében, ahogy (fent) állítod a sorok számát.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>K\u00E9sz\u00EDtsd el a k\u00E9pletet (lent) amivel kisz\u00E1molhat\u00F3, hogy h\u00E1ny \u00FCl\u00E9s van \u00F6sszesen a rep\u00FCl\u0151g\u00E9pen annak f\u00FCggv\u00E9ny\u00E9ben, ahogy (fent) \u00E1ll\u00EDtod a sorok sz\u00E1m\u00E1t.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ia.js b/demos/plane/generated/ia.js
index 50b6dc859..b80ad6e16 100644
--- a/demos/plane/generated/ia.js
+++ b/demos/plane/generated/ia.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Filas: %1</span><span id="Plane_getRows">filas (%1)</span><span id="Plane_rows1">Filas de prime classe: %1</span><span id="Plane_getRows1">filas de prime classe (%1)</span><span id="Plane_rows2">Filas de secunde classe: %1</span><span id="Plane_getRows2">filas de secunde classe (%1)</span><span id="Plane_seats">Sedes: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sedes =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculator de sedias de avion</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -30,8 +37,14 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   output += '</p><p>Construe un formula (ci infra) que calcula le numero total de sedes in le avion quando le numero de filas es cambiate (ci supra).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/is.js b/demos/plane/generated/is.js
index e221c97fe..695f299e8 100644
--- a/demos/plane/generated/is.js
+++ b/demos/plane/generated/is.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Raðir: %1</span><span id="Plane_getRows">raðir (%1)</span><span id="Plane_rows1">Raðir 1. farrými: %1</span><span id="Plane_getRows1">raðir 1. farrými (%1)</span><span id="Plane_rows2">Raðir 2. farrými: %1</span><span id="Plane_getRows2">raðir 2. farrými (%1)</span><span id="Plane_seats">Sæti: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sæti =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Ra\u00F0ir: %1</span><span id="Plane_getRows">ra\u00F0ir (%1)</span><span id="Plane_rows1">Ra\u00F0ir 1. farr\u00FDmi: %1</span><span id="Plane_getRows1">ra\u00F0ir 1. farr\u00FDmi (%1)</span><span id="Plane_rows2">Ra\u00F0ir 2. farr\u00FDmi: %1</span><span id="Plane_getRows2">ra\u00F0ir 2. farr\u00FDmi (%1)</span><span id="Plane_seats">S\u00E6ti: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">s\u00E6ti =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flugsætareiknir</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flugs\u00E6tareiknir</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Flugvél er með einhvern fjölda sætaraða fyrir farþega. Í hverri röð eru fjögur sæti.';
+      output += 'Flugv\u00E9l er me\u00F0 einhvern fj\u00F6lda s\u00E6tara\u00F0a fyrir far\u00FEega. \u00CD hverri r\u00F6\u00F0 eru fj\u00F6gur s\u00E6ti.';
       break;
     case 2:
-      output += 'Flugvél er með tvö sæti í stjórnklefa (fyrir flugmanninn og aðstoðarflugmanninn) og einhvern fjölda sætaraða fyrir farþega. Hver sætaröð hefur fjögur sæti.';
+      output += 'Flugv\u00E9l er me\u00F0 tv\u00F6 s\u00E6ti \u00ED stj\u00F3rnklefa (fyrir flugmanninn og a\u00F0sto\u00F0arflugmanninn) og einhvern fj\u00F6lda s\u00E6tara\u00F0a fyrir far\u00FEega. Hver s\u00E6tar\u00F6\u00F0 hefur fj\u00F6gur s\u00E6ti.';
       break;
     case 3:
-      output += 'Flugvél er með tvö sæti í stjórnklefa (fyrir flugmanninn og aðstoðarflugmanninn) og einhvern fjölda sætaraða fyrir farþega á 1. og 2. farrými. Hver sætaröð á 1. farrými hefur fjögur sæti. Hver sætaröð á 2. farrými hefur fimm sæti.';
+      output += 'Flugv\u00E9l er me\u00F0 tv\u00F6 s\u00E6ti \u00ED stj\u00F3rnklefa (fyrir flugmanninn og a\u00F0sto\u00F0arflugmanninn) og einhvern fj\u00F6lda s\u00E6tara\u00F0a fyrir far\u00FEega \u00E1 1. og 2. farr\u00FDmi. Hver s\u00E6tar\u00F6\u00F0 \u00E1 1. farr\u00FDmi hefur fj\u00F6gur s\u00E6ti. Hver s\u00E6tar\u00F6\u00F0 \u00E1 2. farr\u00FDmi hefur fimm s\u00E6ti.';
       break;
   }
-  output += '</p><p>Búðu til formúlu (hér fyrir neðan) sem reiknar heildarfjölda sæta í flugvélinni eftir því sem röðunum er breytt (hér fyrir ofan).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>B\u00FA\u00F0u til form\u00FAlu (h\u00E9r fyrir ne\u00F0an) sem reiknar heildarfj\u00F6lda s\u00E6ta \u00ED flugv\u00E9linni eftir \u00FEv\u00ED sem r\u00F6\u00F0unum er breytt (h\u00E9r fyrir ofan).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/it.js b/demos/plane/generated/it.js
index 4a7133716..246448111 100644
--- a/demos/plane/generated/it.js
+++ b/demos/plane/generated/it.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">File: %1</span><span id="Plane_getRows">file (%1)</span><span id="Plane_rows1">File 1ª classe: %1</span><span id="Plane_getRows1">file 1ª classe (%1)</span><span id="Plane_rows2">File 2ª classe: %1</span><span id="Plane_getRows2">File 2ª classe (%1)</span><span id="Plane_seats">Sedili: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sedili =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">File: %1</span><span id="Plane_getRows">file (%1)</span><span id="Plane_rows1">File 1\u00AA classe: %1</span><span id="Plane_getRows1">file 1\u00AA classe (%1)</span><span id="Plane_rows2">File 2\u00AA classe: %1</span><span id="Plane_getRows2">File 2\u00AA classe (%1)</span><span id="Plane_seats">Sedili: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sedili =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calcolo posti aereo</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -27,11 +34,17 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
       output += 'Un aereo ha due posti nella cabina di pilotaggio (per il pilota e il co-pilota), e un numero di file in prima e seconda classe, con i posti a sedere dei passeggeri. Ogni fila della prima classe contiene quattro posti. Quelle invece della seconda classe, ne contengono cinque.';
       break;
   }
-  output += '</p><p>Costruisci una formula (sotto) che calcola il numero totale di posti a sedere su un aeroplano, così come cambiano le file di posti (sopra).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Costruisci una formula (sotto) che calcola il numero totale di posti a sedere su un aeroplano, cos\u00EC come cambiano le file di posti (sopra).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ja.js b/demos/plane/generated/ja.js
index 86bac971e..c5e96ee91 100644
--- a/demos/plane/generated/ja.js
+++ b/demos/plane/generated/ja.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">列の数: %1</span><span id="Plane_getRows">列の数 (%1)</span><span id="Plane_rows1">ファーストクラスの列数: %1</span><span id="Plane_getRows1">ファーストクラスの列数 (%1)</span><span id="Plane_rows2">セカンドクラスの列数: %1</span><span id="Plane_getRows2">セカンドクラスの列数 (%1)</span><span id="Plane_seats">座席の数: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">座席の数 =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u5217\u306E\u6570: %1</span><span id="Plane_getRows">\u5217\u306E\u6570 (%1)</span><span id="Plane_rows1">\u30D5\u30A1\u30FC\u30B9\u30C8\u30AF\u30E9\u30B9\u306E\u5217\u6570: %1</span><span id="Plane_getRows1">\u30D5\u30A1\u30FC\u30B9\u30C8\u30AF\u30E9\u30B9\u306E\u5217\u6570 (%1)</span><span id="Plane_rows2">\u30BB\u30AB\u30F3\u30C9\u30AF\u30E9\u30B9\u306E\u5217\u6570: %1</span><span id="Plane_getRows2">\u30BB\u30AB\u30F3\u30C9\u30AF\u30E9\u30B9\u306E\u5217\u6570 (%1)</span><span id="Plane_seats">\u5EA7\u5E2D\u306E\u6570: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u5EA7\u5E2D\u306E\u6570 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">飛行機座席計算機</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u98DB\u884C\u6A5F\u5EA7\u5E2D\u8A08\u7B97\u6A5F</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += '飛行機に乗客の座席の列があります。それぞれの列に 4 つの座席があります。';
+      output += '\u98DB\u884C\u6A5F\u306B\u4E57\u5BA2\u306E\u5EA7\u5E2D\u306E\u5217\u304C\u3042\u308A\u307E\u3059\u3002\u305D\u308C\u305E\u308C\u306E\u5217\u306B 4 \u3064\u306E\u5EA7\u5E2D\u304C\u3042\u308A\u307E\u3059\u3002';
       break;
     case 2:
-      output += '飛行機には、操縦室の 2 つの座席 (操縦士と副操縦士) と、乗客の座席の列があります。それぞれの列に 4 つの座席があります。';
+      output += '\u98DB\u884C\u6A5F\u306B\u306F\u3001\u64CD\u7E26\u5BA4\u306E 2 \u3064\u306E\u5EA7\u5E2D (\u64CD\u7E26\u58EB\u3068\u526F\u64CD\u7E26\u58EB) \u3068\u3001\u4E57\u5BA2\u306E\u5EA7\u5E2D\u306E\u5217\u304C\u3042\u308A\u307E\u3059\u3002\u305D\u308C\u305E\u308C\u306E\u5217\u306B 4 \u3064\u306E\u5EA7\u5E2D\u304C\u3042\u308A\u307E\u3059\u3002';
       break;
     case 3:
-      output += '飛行機には、操縦室の 2 つの座席 (操縦士と副操縦士) と、ファーストクラスとセカンドクラスの乗客の座席の列があります。それぞれの列に、ファーストクラスでは 4 つの座席、セカンドクラスでは 5 つの座席があります。';
+      output += '\u98DB\u884C\u6A5F\u306B\u306F\u3001\u64CD\u7E26\u5BA4\u306E 2 \u3064\u306E\u5EA7\u5E2D (\u64CD\u7E26\u58EB\u3068\u526F\u64CD\u7E26\u58EB) \u3068\u3001\u30D5\u30A1\u30FC\u30B9\u30C8\u30AF\u30E9\u30B9\u3068\u30BB\u30AB\u30F3\u30C9\u30AF\u30E9\u30B9\u306E\u4E57\u5BA2\u306E\u5EA7\u5E2D\u306E\u5217\u304C\u3042\u308A\u307E\u3059\u3002\u305D\u308C\u305E\u308C\u306E\u5217\u306B\u3001\u30D5\u30A1\u30FC\u30B9\u30C8\u30AF\u30E9\u30B9\u3067\u306F 4 \u3064\u306E\u5EA7\u5E2D\u3001\u30BB\u30AB\u30F3\u30C9\u30AF\u30E9\u30B9\u3067\u306F 5 \u3064\u306E\u5EA7\u5E2D\u304C\u3042\u308A\u307E\u3059\u3002';
       break;
   }
-  output += '</p><p>飛行機の座席の数を計算する式を、上で列の数を変更しても正しくなるように、下に入力してください。</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u98DB\u884C\u6A5F\u306E\u5EA7\u5E2D\u306E\u6570\u3092\u8A08\u7B97\u3059\u308B\u5F0F\u3092\u3001\u4E0A\u3067\u5217\u306E\u6570\u3092\u5909\u66F4\u3057\u3066\u3082\u6B63\u3057\u304F\u306A\u308B\u3088\u3046\u306B\u3001\u4E0B\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ko.js b/demos/plane/generated/ko.js
index 464f63ff6..2e746ef5f 100644
--- a/demos/plane/generated/ko.js
+++ b/demos/plane/generated/ko.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">행 수: %1</span><span id="Plane_getRows">행 수 (%1)</span><span id="Plane_rows1">1등석 행 수: %1</span><span id="Plane_getRows1">1등석 행 수 (%1)</span><span id="Plane_rows2">2등석 행 수: %1</span><span id="Plane_getRows2">2등석 행 수 (%1)</span><span id="Plane_seats">좌석 수: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">좌석수 =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\uD589 \uC218: %1</span><span id="Plane_getRows">\uD589 \uC218 (%1)</span><span id="Plane_rows1">1\uB4F1\uC11D \uD589 \uC218: %1</span><span id="Plane_getRows1">1\uB4F1\uC11D \uD589 \uC218 (%1)</span><span id="Plane_rows2">2\uB4F1\uC11D \uD589 \uC218: %1</span><span id="Plane_getRows2">2\uB4F1\uC11D \uD589 \uC218 (%1)</span><span id="Plane_seats">\uC88C\uC11D \uC218: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\uC88C\uC11D\uC218 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">비행기 좌석 계산기</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\uBE44\uD589\uAE30 \uC88C\uC11D \uACC4\uC0B0\uAE30</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += '비행기는 승객 좌석의 행 수가 있습니다. 각 행에는 시트 네 개가 포함되어 있습니다.';
+      output += '\uBE44\uD589\uAE30\uB294 \uC2B9\uAC1D \uC88C\uC11D\uC758 \uD589 \uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uAC01 \uD589\uC5D0\uB294 \uC2DC\uD2B8 \uB124 \uAC1C\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.';
       break;
     case 2:
-      output += '비행기는 비행 갑판(조종사와 부조종사용)에서 좌석 두 개가 있고, 승객 좌석의 행 수가 있습니다. 각 행에는 시트 네 개가 포함되어 있습니다.';
+      output += '\uBE44\uD589\uAE30\uB294 \uBE44\uD589 \uAC11\uD310(\uC870\uC885\uC0AC\uC640 \uBD80\uC870\uC885\uC0AC\uC6A9)\uC5D0\uC11C \uC88C\uC11D \uB450 \uAC1C\uAC00 \uC788\uACE0, \uC2B9\uAC1D \uC88C\uC11D\uC758 \uD589 \uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uAC01 \uD589\uC5D0\uB294 \uC2DC\uD2B8 \uB124 \uAC1C\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.';
       break;
     case 3:
-      output += '비행기는 비행 갑판(조종사와 부조종사용)에서 좌석 두 개가 있고, 1등석과 2등석 승객 좌석의 행 수가 있습니다. 각 1등석 행에는 시트 네 개가 포함되어 있습니다. 각 2등석 행에는 시트 다섯 개가 포함되어 있습니다.';
+      output += '\uBE44\uD589\uAE30\uB294 \uBE44\uD589 \uAC11\uD310(\uC870\uC885\uC0AC\uC640 \uBD80\uC870\uC885\uC0AC\uC6A9)\uC5D0\uC11C \uC88C\uC11D \uB450 \uAC1C\uAC00 \uC788\uACE0, 1\uB4F1\uC11D\uACFC 2\uB4F1\uC11D \uC2B9\uAC1D \uC88C\uC11D\uC758 \uD589 \uC218\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uAC01 1\uB4F1\uC11D \uD589\uC5D0\uB294 \uC2DC\uD2B8 \uB124 \uAC1C\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uAC01 2\uB4F1\uC11D \uD589\uC5D0\uB294 \uC2DC\uD2B8 \uB2E4\uC12F \uAC1C\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4.';
       break;
   }
-  output += '</p><p>행이 바뀐(위) 비행기에 좌석의 총 수를 계산하는 공식(아래)을 구축하세요.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\uD589\uC774 \uBC14\uB010(\uC704) \uBE44\uD589\uAE30\uC5D0 \uC88C\uC11D\uC758 \uCD1D \uC218\uB97C \uACC4\uC0B0\uD558\uB294 \uACF5\uC2DD(\uC544\uB798)\uC744 \uAD6C\uCD95\uD558\uC138\uC694.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ms.js b/demos/plane/generated/ms.js
index 1a9a447da..d2a292554 100644
--- a/demos/plane/generated/ms.js
+++ b/demos/plane/generated/ms.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Baris: %1</span><span id="Plane_getRows">baris (%1)</span><span id="Plane_rows1">Baris kelas pertama: %1</span><span id="Plane_getRows1">baris kelas pertama (%1)</span><span id="Plane_rows2">Baris kelas kedua: %1</span><span id="Plane_getRows2">baris kelas kedua (%1)</span><span id="Plane_seats">Tempat duduk: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">tempat duduk =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Pengira Tempat Duduk Kapal Terbang</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -30,8 +37,14 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   output += '</p><p>Wujudkan formula (di bawah) yang mengira jumlah tempat duduk di dalam kapal terbang sedangkan baris-barisnya diubah (di atas).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/nb.js b/demos/plane/generated/nb.js
index c71cba543..1fc338756 100644
--- a/demos/plane/generated/nb.js
+++ b/demos/plane/generated/nb.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rader: %1</span><span id="Plane_getRows">rader (%1)</span><span id="Plane_rows1">Rader i første klasse: %1</span><span id="Plane_getRows1">Rader i første klasse (%1)</span><span id="Plane_rows2">Rader i andre klasse: %1</span><span id="Plane_getRows2">Rader i andre klasse (%1)</span><span id="Plane_seats">Seter: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">seter =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Rader: %1</span><span id="Plane_getRows">rader (%1)</span><span id="Plane_rows1">Rader i f\u00F8rste klasse: %1</span><span id="Plane_getRows1">Rader i f\u00F8rste klasse (%1)</span><span id="Plane_rows2">Rader i andre klasse: %1</span><span id="Plane_getRows2">Rader i andre klasse (%1)</span><span id="Plane_seats">Seter: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">seter =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Flysetekalkulator</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -24,14 +31,20 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
       output += 'Et fly har to seter i cockpit (for piloten og andrepiloten), og et antall rader med passasjerseter. Hver rad inneholder fire seter.';
       break;
     case 3:
-      output += 'Et fly har to seter i cockpit (for piloten og andrepiloten), og et antall rader med passasjerseter på første og andre klasse. Hver av radene på første klasse har fire seter. Hver av radene på andre klasse har fem seter.';
+      output += 'Et fly har to seter i cockpit (for piloten og andrepiloten), og et antall rader med passasjerseter p\u00E5 f\u00F8rste og andre klasse. Hver av radene p\u00E5 f\u00F8rste klasse har fire seter. Hver av radene p\u00E5 andre klasse har fem seter.';
       break;
   }
-  output += '</p><p>Bygg en formel (under) som beregner det totale antall seter på flyet etter hvert som radene endres (over).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Bygg en formel (under) som beregner det totale antall seter p\u00E5 flyet etter hvert som radene endres (over).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/nl.js b/demos/plane/generated/nl.js
index edad19f6d..779022042 100644
--- a/demos/plane/generated/nl.js
+++ b/demos/plane/generated/nl.js
@@ -1,19 +1,26 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Rijen: %1</span><span id="Plane_getRows">rijen (%1)</span><span id="Plane_rows1">Rijen 1e klas: %1</span><span id="Plane_getRows1">Rijen 1e klas (%1)</span><span id="Plane_rows2">Rijen 2e klas: %1</span><span id="Plane_getRows2">Rijen 2e klas (%1)</span><span id="Plane_seats">Zitplaatsen: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">stoelen=</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Vliegtuigstoelencalculator</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
@@ -30,8 +37,14 @@ planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   output += '</p><p>Maak hieronder een formule die het totale aantal stoelen in het vliegtuig berekent als het aantal rijen hierboven wordt aangepast.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/pl.js b/demos/plane/generated/pl.js
index 14b5ee6a1..0cf1830ea 100644
--- a/demos/plane/generated/pl.js
+++ b/demos/plane/generated/pl.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rzędów: %1</span><span id="Plane_getRows">rzędów (%1)</span><span id="Plane_rows1">Rzędów w pierwszej klasie: %1</span><span id="Plane_getRows1">Rzędów w pierwszej klasie (%1)</span><span id="Plane_rows2">Rzędów w drugiej klasie: %1</span><span id="Plane_getRows2">Rzędów w drugiej klasie (%1)</span><span id="Plane_seats">Siedzeń: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">siedzeń =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Rz\u0119d\u00F3w: %1</span><span id="Plane_getRows">rz\u0119d\u00F3w (%1)</span><span id="Plane_rows1">Rz\u0119d\u00F3w w pierwszej klasie: %1</span><span id="Plane_getRows1">Rz\u0119d\u00F3w w pierwszej klasie (%1)</span><span id="Plane_rows2">Rz\u0119d\u00F3w w drugiej klasie: %1</span><span id="Plane_getRows2">Rz\u0119d\u00F3w w drugiej klasie (%1)</span><span id="Plane_seats">Siedze\u0144: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">siedze\u0144 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Kalkulator miejsc w samolocie.</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Samolot ma kilka rzędów siedzeń pasażerów. Każdy rząd zawiera cztery miejsca.';
+      output += 'Samolot ma kilka rz\u0119d\u00F3w siedze\u0144 pasa\u017Cer\u00F3w. Ka\u017Cdy rz\u0105d zawiera cztery miejsca.';
       break;
     case 2:
-      output += 'Samolot ma dwa miejsca w kabinie pilotów (dla pierwszego i drugiego pilota) oraz rzędy siedzeń dla pasażerów. Każdy taki rząd składa się z czterech siedzeń.';
+      output += 'Samolot ma dwa miejsca w kabinie pilot\u00F3w (dla pierwszego i drugiego pilota) oraz rz\u0119dy siedze\u0144 dla pasa\u017Cer\u00F3w. Ka\u017Cdy taki rz\u0105d sk\u0142ada si\u0119 z czterech siedze\u0144.';
       break;
     case 3:
-      output += 'Samolot ma dwa miejsca w kabinie pilotów (dla pierwszego i drugiego pilota) oraz rzędy siedzeń dla pasażerów pierwszej i drugiej klasy. Każdy rząd pierwszej klasy składa się z czterech siedzeń. Każdy rząd drugiej klasy składa się z pięciu siedzeń.';
+      output += 'Samolot ma dwa miejsca w kabinie pilot\u00F3w (dla pierwszego i drugiego pilota) oraz rz\u0119dy siedze\u0144 dla pasa\u017Cer\u00F3w pierwszej i drugiej klasy. Ka\u017Cdy rz\u0105d pierwszej klasy sk\u0142ada si\u0119 z czterech siedze\u0144. Ka\u017Cdy rz\u0105d drugiej klasy sk\u0142ada si\u0119 z pi\u0119ciu siedze\u0144.';
       break;
   }
-  output += '</p><p>Zbuduj wzór (poniżej), który pozwala obliczyć łączną liczbę siedzeń w samolocie w funkcji zmieniającej się liczby rzędów (powyżej).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Zbuduj wz\u00F3r (poni\u017Cej), kt\u00F3ry pozwala obliczy\u0107 \u0142\u0105czn\u0105 liczb\u0119 siedze\u0144 w samolocie w funkcji zmieniaj\u0105cej si\u0119 liczby rz\u0119d\u00F3w (powy\u017Cej).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/pms.js b/demos/plane/generated/pms.js
index df45f2277..eb35bacca 100644
--- a/demos/plane/generated/pms.js
+++ b/demos/plane/generated/pms.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Linie: %1</span><span id="Plane_getRows">linie (%1)</span><span id="Plane_rows1">linie ëd prima classa: %1</span><span id="Plane_getRows1">linie ëd prima classa (%1)</span><span id="Plane_rows2">linie ëd seconda classa: %1</span><span id="Plane_getRows2">linie ëd seconda classa (%1)</span><span id="Plane_seats">Sedij: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sedij =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Linie: %1</span><span id="Plane_getRows">linie (%1)</span><span id="Plane_rows1">linie \u00EBd prima classa: %1</span><span id="Plane_getRows1">linie \u00EBd prima classa (%1)</span><span id="Plane_rows2">linie \u00EBd seconda classa: %1</span><span id="Plane_getRows2">linie \u00EBd seconda classa (%1)</span><span id="Plane_seats">Sedij: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">sedij =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calcolator ëd sedij d\'avion</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calcolator \u00EBd sedij d\'avion</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'N\'avion a l\'ha un nùmer ëd file ëd sedij da passëgé. Minca fila a l\'ha quatr sedij.';
+      output += 'N\'avion a l\'ha un n\u00F9mer \u00EBd file \u00EBd sedij da pass\u00EBg\u00E9. Minca fila a l\'ha quatr sedij.';
       break;
     case 2:
-      output += 'N\'avion a l\'ha doi sedij ant la cabin-a ëd pilotage (për ël pilòta e ël cò-pilòta), e un chèich nùmer ëd file ëd sedij pr\'ij passagé. Minca fila a conten quatr sedij.';
+      output += 'N\'avion a l\'ha doi sedij ant la cabin-a \u00EBd pilotage (p\u00EBr \u00EBl pil\u00F2ta e \u00EBl c\u00F2-pil\u00F2ta), e un ch\u00E8ich n\u00F9mer \u00EBd file \u00EBd sedij pr\'ij passag\u00E9. Minca fila a conten quatr sedij.';
       break;
     case 3:
-      output += 'N\'avion a l\'ha doi sedij ant la cabin-a ëd pilotage (për ël pilòta e ël cò-pilòta) e un chèich nùmer ëd file ëd sedij pr\'ij passagé ëd prima e sconda classa. Minca fila ëd prima classa a conten quatr sedij. Minca fila ëd seconda classa a conten sinch sedij.';
+      output += 'N\'avion a l\'ha doi sedij ant la cabin-a \u00EBd pilotage (p\u00EBr \u00EBl pil\u00F2ta e \u00EBl c\u00F2-pil\u00F2ta) e un ch\u00E8ich n\u00F9mer \u00EBd file \u00EBd sedij pr\'ij passag\u00E9 \u00EBd prima e sconda classa. Minca fila \u00EBd prima classa a conten quatr sedij. Minca fila \u00EBd seconda classa a conten sinch sedij.';
       break;
   }
-  output += '</p><p>Fabriché na fórmola (sì-sota) ch\'a fa \'l cont dël nùmer total ëd sedij ant l\'avion cand che ël nùmer dle file a cangia (sì-dzora).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Fabrich\u00E9 na f\u00F3rmola (s\u00EC-sota) ch\'a fa \'l cont d\u00EBl n\u00F9mer total \u00EBd sedij ant l\'avion cand che \u00EBl n\u00F9mer dle file a cangia (s\u00EC-dzora).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/pt-br.js b/demos/plane/generated/pt-br.js
index 2e96d38ee..821bdbe4f 100644
--- a/demos/plane/generated/pt-br.js
+++ b/demos/plane/generated/pt-br.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Filas: %1</span><span id="Plane_getRows">filas (%1)</span><span id="Plane_rows1">filas na primeira classe: %1</span><span id="Plane_getRows1">filas na primeira classe (%1)</span><span id="Plane_rows2">filas na segunda classe: %1</span><span id="Plane_getRows2">filas na segunda classe (%1)</span><span id="Plane_seats">Assentos: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">assentos =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de Assentos em Avião</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculadora de Assentos em Avi\u00E3o</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Um avião tem um número de filas de assentos para os passageiros. Cada fila contém quatro assentos.';
+      output += 'Um avi\u00E3o tem um n\u00FAmero de filas de assentos para os passageiros. Cada fila cont\u00E9m quatro assentos.';
       break;
     case 2:
-      output += 'Um avião tem dois assentos na cabine de comando (para o piloto e o copiloto) e um número de filas de assentos para os passageiros. Cada fila contém quatro assentos.';
+      output += 'Um avi\u00E3o tem dois assentos na cabine de comando (para o piloto e o copiloto) e um n\u00FAmero de filas de assentos para os passageiros. Cada fila cont\u00E9m quatro assentos.';
       break;
     case 3:
-      output += 'Um avião tem dois assentos na cabine de comando (para o piloto e o copiloto) e um número de filas de assentos na primeira e na segunda classe. Cada fila da primeira classe contém quatro assentos. Cada fila da segunda classe contém cinco assentos.';
+      output += 'Um avi\u00E3o tem dois assentos na cabine de comando (para o piloto e o copiloto) e um n\u00FAmero de filas de assentos na primeira e na segunda classe. Cada fila da primeira classe cont\u00E9m quatro assentos. Cada fila da segunda classe cont\u00E9m cinco assentos.';
       break;
   }
-  output += '</p><p>Elabore uma fórmula (abaixo) que calcule o número total de assentos no avião a medida que as filas são alteradas (acima).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Elabore uma f\u00F3rmula (abaixo) que calcule o n\u00FAmero total de assentos no avi\u00E3o a medida que as filas s\u00E3o alteradas (acima).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ro.js b/demos/plane/generated/ro.js
index 426a571fc..6454c94bc 100644
--- a/demos/plane/generated/ro.js
+++ b/demos/plane/generated/ro.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rânduri: %1</span><span id="Plane_getRows">rânduri (%1)</span><span id="Plane_rows1">rânduri de clasa I: %1</span><span id="Plane_getRows1">rânduri de clasa I (%1)</span><span id="Plane_rows2">rânduri de clasa a II-a: %1</span><span id="Plane_getRows2">rânduri de clasa a II-a (%1)</span><span id="Plane_seats">Scaune: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">scaune =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">R\u00E2nduri: %1</span><span id="Plane_getRows">r\u00E2nduri (%1)</span><span id="Plane_rows1">r\u00E2nduri de clasa I: %1</span><span id="Plane_getRows1">r\u00E2nduri de clasa I (%1)</span><span id="Plane_rows2">r\u00E2nduri de clasa a II-a: %1</span><span id="Plane_getRows2">r\u00E2nduri de clasa a II-a (%1)</span><span id="Plane_seats">Scaune: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">scaune =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
   var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Calculator pentru locurile dintr-un avion</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Un avion are un număr de rânduri cu scaune pentru pasageri. Fiecare rând conține patru scaune.';
+      output += 'Un avion are un num\u0103r de r\u00E2nduri cu scaune pentru pasageri. Fiecare r\u00E2nd con\u021Bine patru scaune.';
       break;
     case 2:
-      output += 'Un avion are două scaune în carlingă (pentru pilot și copilot) și un număr de rânduri cu scaune pentru pasageri. Fiecare rând conține patru scaune.';
+      output += 'Un avion are dou\u0103 scaune \u00EEn carling\u0103 (pentru pilot \u0219i copilot) \u0219i un num\u0103r de r\u00E2nduri cu scaune pentru pasageri. Fiecare r\u00E2nd con\u021Bine patru scaune.';
       break;
     case 3:
-      output += 'Un avion are două scaune în carlingă (pentru pilot și copilot) și un număr de rânduri cu scaune de clasa I și clasa a II-a pentru pasageri. Fiecare rând de clasa I conține patru scaune. Fiecare rând de clasa a II-a conține cinci scaune.';
+      output += 'Un avion are dou\u0103 scaune \u00EEn carling\u0103 (pentru pilot \u0219i copilot) \u0219i un num\u0103r de r\u00E2nduri cu scaune de clasa I \u0219i clasa a II-a pentru pasageri. Fiecare r\u00E2nd de clasa I con\u021Bine patru scaune. Fiecare r\u00E2nd de clasa a II-a con\u021Bine cinci scaune.';
       break;
   }
-  output += '</p><p>Construiește o formulă (mai jos) care calculează numărul total de locuri dintr-un avion în timp ce rândurile se schimbă (mai sus).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Construie\u0219te o formul\u0103 (mai jos) care calculeaz\u0103 num\u0103rul total de locuri dintr-un avion \u00EEn timp ce r\u00E2ndurile se schimb\u0103 (mai sus).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/ru.js b/demos/plane/generated/ru.js
index 78f384b46..9e6ee4a20 100644
--- a/demos/plane/generated/ru.js
+++ b/demos/plane/generated/ru.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Рядов: %1</span><span id="Plane_getRows">ряды (%1)</span><span id="Plane_rows1">Рядов 1-го класса: %1</span><span id="Plane_getRows1">ряды 1-го класса (%1)</span><span id="Plane_rows2">Рядов 2-го класса: %1</span><span id="Plane_getRows2">ряды 2-го класса (%1)</span><span id="Plane_seats">Мест: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">места =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u0420\u044F\u0434\u043E\u0432: %1</span><span id="Plane_getRows">\u0440\u044F\u0434\u044B (%1)</span><span id="Plane_rows1">\u0420\u044F\u0434\u043E\u0432 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430: %1</span><span id="Plane_getRows1">\u0440\u044F\u0434\u044B 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430 (%1)</span><span id="Plane_rows2">\u0420\u044F\u0434\u043E\u0432 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430: %1</span><span id="Plane_getRows2">\u0440\u044F\u0434\u044B 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430 (%1)</span><span id="Plane_seats">\u041C\u0435\u0441\u0442: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u043C\u0435\u0441\u0442\u0430 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Калькулятор посадочных мест в самолёте</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u041A\u0430\u043B\u044C\u043A\u0443\u043B\u044F\u0442\u043E\u0440 \u043F\u043E\u0441\u0430\u0434\u043E\u0447\u043D\u044B\u0445 \u043C\u0435\u0441\u0442 \u0432 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0435</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'В самолёте несколько рядов с пассажирскими местами. В каждом ряду 4 места.';
+      output += '\u0412 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0435 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u044F\u0434\u043E\u0432 \u0441 \u043F\u0430\u0441\u0441\u0430\u0436\u0438\u0440\u0441\u043A\u0438\u043C\u0438 \u043C\u0435\u0441\u0442\u0430\u043C\u0438. \u0412 \u043A\u0430\u0436\u0434\u043E\u043C \u0440\u044F\u0434\u0443 4 \u043C\u0435\u0441\u0442\u0430.';
       break;
     case 2:
-      output += 'В самолёте 2 места для пилота и его помощника, а также несколько рядов с пассажирскими местами. В каждом ряду 4 места.';
+      output += '\u0412 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0435 2 \u043C\u0435\u0441\u0442\u0430 \u0434\u043B\u044F \u043F\u0438\u043B\u043E\u0442\u0430 \u0438 \u0435\u0433\u043E \u043F\u043E\u043C\u043E\u0449\u043D\u0438\u043A\u0430, \u0430 \u0442\u0430\u043A\u0436\u0435 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u044F\u0434\u043E\u0432 \u0441 \u043F\u0430\u0441\u0441\u0430\u0436\u0438\u0440\u0441\u043A\u0438\u043C\u0438 \u043C\u0435\u0441\u0442\u0430\u043C\u0438. \u0412 \u043A\u0430\u0436\u0434\u043E\u043C \u0440\u044F\u0434\u0443 4 \u043C\u0435\u0441\u0442\u0430.';
       break;
     case 3:
-      output += 'В самолёте 2 места для пилота и его помощника, несколько рядов с пассажирскими местами первого класса, а также несколько рядов с пассажирскими местами второго класса. В каждом ряду первого класса 4 места. В каждом ряду второго класса 5 мест.';
+      output += '\u0412 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0435 2 \u043C\u0435\u0441\u0442\u0430 \u0434\u043B\u044F \u043F\u0438\u043B\u043E\u0442\u0430 \u0438 \u0435\u0433\u043E \u043F\u043E\u043C\u043E\u0449\u043D\u0438\u043A\u0430, \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u044F\u0434\u043E\u0432 \u0441 \u043F\u0430\u0441\u0441\u0430\u0436\u0438\u0440\u0441\u043A\u0438\u043C\u0438 \u043C\u0435\u0441\u0442\u0430\u043C\u0438 \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430, \u0430 \u0442\u0430\u043A\u0436\u0435 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u044F\u0434\u043E\u0432 \u0441 \u043F\u0430\u0441\u0441\u0430\u0436\u0438\u0440\u0441\u043A\u0438\u043C\u0438 \u043C\u0435\u0441\u0442\u0430\u043C\u0438 \u0432\u0442\u043E\u0440\u043E\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430. \u0412 \u043A\u0430\u0436\u0434\u043E\u043C \u0440\u044F\u0434\u0443 \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430 4 \u043C\u0435\u0441\u0442\u0430. \u0412 \u043A\u0430\u0436\u0434\u043E\u043C \u0440\u044F\u0434\u0443 \u0432\u0442\u043E\u0440\u043E\u0433\u043E \u043A\u043B\u0430\u0441\u0441\u0430 5 \u043C\u0435\u0441\u0442.';
       break;
   }
-  output += '</p><p>Постройте формулу в области ниже, которая поможет рассчитать общее количество мест в самолёте (как на рисунке выше).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u041F\u043E\u0441\u0442\u0440\u043E\u0439\u0442\u0435 \u0444\u043E\u0440\u043C\u0443\u043B\u0443 \u0432 \u043E\u0431\u043B\u0430\u0441\u0442\u0438 \u043D\u0438\u0436\u0435, \u043A\u043E\u0442\u043E\u0440\u0430\u044F \u043F\u043E\u043C\u043E\u0436\u0435\u0442 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u0430\u0442\u044C \u043E\u0431\u0449\u0435\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442 \u0432 \u0441\u0430\u043C\u043E\u043B\u0451\u0442\u0435 (\u043A\u0430\u043A \u043D\u0430 \u0440\u0438\u0441\u0443\u043D\u043A\u0435 \u0432\u044B\u0448\u0435).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/sc.js b/demos/plane/generated/sc.js
index 453c5e796..b8511cc0e 100644
--- a/demos/plane/generated/sc.js
+++ b/demos/plane/generated/sc.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
   return '<div style="display: none"><span id="Plane_rows">Fileras: %1</span><span id="Plane_getRows">fileras (%1)</span><span id="Plane_rows1">fileras de primu classi: %1</span><span id="Plane_getRows1">fileras de primu classi (%1)</span><span id="Plane_rows2">fileras de segunda classi: %1</span><span id="Plane_getRows2">fileras de segunda classi (%1)</span><span id="Plane_seats">Cadironis: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">cadironis =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Fai su contu de is cadironis de unu aparèchiu</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Fai su contu de is cadironis de unu apar\u00E8chiu</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Unu aparèchiu tenit unas cantu fileras de cadironis po passigeris. Dònnia filera tenit cuatru cadironis.';
+      output += 'Unu apar\u00E8chiu tenit unas cantu fileras de cadironis po passigeris. D\u00F2nnia filera tenit cuatru cadironis.';
       break;
     case 2:
-      output += 'Unu aparèchiu tenit duus cadironis in sa cabina de cumandu (po su pilota e su co-pilota), e unas cantu fileras de cadironis po passigeris. Dònnia filera tenit cuatru cadironis.';
+      output += 'Unu apar\u00E8chiu tenit duus cadironis in sa cabina de cumandu (po su pilota e su co-pilota), e unas cantu fileras de cadironis po passigeris. D\u00F2nnia filera tenit cuatru cadironis.';
       break;
     case 3:
-      output += 'Unu aparèchiu tenit duus cadironis in sa cabina de cumandu (po su pilota e su co-pilota), e unas cantu fileras de cadironis po passigeris de prima classi e de segunda classi. Dònnia filera de prima classi tenit cuatru cadironis. Dònnia filera de segunda classi tenit cincu cadironis.';
+      output += 'Unu apar\u00E8chiu tenit duus cadironis in sa cabina de cumandu (po su pilota e su co-pilota), e unas cantu fileras de cadironis po passigeris de prima classi e de segunda classi. D\u00F2nnia filera de prima classi tenit cuatru cadironis. D\u00F2nnia filera de segunda classi tenit cincu cadironis.';
       break;
   }
   output += '</p><p>Cuncorda una formula (innoi asuta) chi cumpudit su numeru totali de postus a setzi in s\'aparechiu, a segunda de comenti mudant is fileras de postus (innoi in susu)</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/sv.js b/demos/plane/generated/sv.js
index acba58c02..70b7c063b 100644
--- a/demos/plane/generated/sv.js
+++ b/demos/plane/generated/sv.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Rader: %1</span><span id="Plane_getRows">rader (%1)</span><span id="Plane_rows1">Rader i första klass: %1</span><span id="Plane_getRows1">Rader i första klass (%1)</span><span id="Plane_rows2">Rader i andra klass: %1</span><span id="Plane_getRows2">Rader i andra klass (%1)</span><span id="Plane_seats">Säten: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">säten =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">Rader: %1</span><span id="Plane_getRows">rader (%1)</span><span id="Plane_rows1">Rader i f\u00F6rsta klass: %1</span><span id="Plane_getRows1">Rader i f\u00F6rsta klass (%1)</span><span id="Plane_rows2">Rader i andra klass: %1</span><span id="Plane_getRows2">Rader i andra klass (%1)</span><span id="Plane_seats">S\u00E4ten: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">s\u00E4ten =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Plansäteskalkylator</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Plans\u00E4teskalkylator</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Ett flygplan har ett antal rader med passagerarsäten. Varje rad innehåller fyra säten.';
+      output += 'Ett flygplan har ett antal rader med passagerars\u00E4ten. Varje rad inneh\u00E5ller fyra s\u00E4ten.';
       break;
     case 2:
-      output += 'Ett flygplan har två säten i cockpiten (ett för piloten och ett för andrepiloten) och ett antal rader med passagerarsäten. Varje rad innehåller fyra säten.';
+      output += 'Ett flygplan har tv\u00E5 s\u00E4ten i cockpiten (ett f\u00F6r piloten och ett f\u00F6r andrepiloten) och ett antal rader med passagerars\u00E4ten. Varje rad inneh\u00E5ller fyra s\u00E4ten.';
       break;
     case 3:
-      output += 'Ett flygplan har två säten i cockpiten (ett för piloten och ett för andrepiloten) och ett antal rader med passagerarsäten i första och andra klass. Varje rad i första klass innehåller fyra säten. Varje rad i andra klass innehåller fem säten.';
+      output += 'Ett flygplan har tv\u00E5 s\u00E4ten i cockpiten (ett f\u00F6r piloten och ett f\u00F6r andrepiloten) och ett antal rader med passagerars\u00E4ten i f\u00F6rsta och andra klass. Varje rad i f\u00F6rsta klass inneh\u00E5ller fyra s\u00E4ten. Varje rad i andra klass inneh\u00E5ller fem s\u00E4ten.';
       break;
   }
-  output += '</p><p>Bygg en formel (nedan) som beräknar det totala antalet säten på flygplanet när raderna ändras (ovan).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>Bygg en formel (nedan) som ber\u00E4knar det totala antalet s\u00E4ten p\u00E5 flygplanet n\u00E4r raderna \u00E4ndras (ovan).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/th.js b/demos/plane/generated/th.js
index bfa8621ab..bf6678372 100644
--- a/demos/plane/generated/th.js
+++ b/demos/plane/generated/th.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">%1 แถว</span><span id="Plane_getRows">จำนวนแถว (%1)</span><span id="Plane_rows1">ชั้นเฟิร์สคลาส %1 แถว</span><span id="Plane_getRows1">จำนวนแถวชั้นเฟิร์สคลาส (%1)</span><span id="Plane_rows2">ชั้นธุรกิจ %1 แถว</span><span id="Plane_getRows2">จำนวนแถวชั้นธุรกิจ (%1)</span><span id="Plane_seats">คำนวณได้ทั้งหมด %1 ที่นั่ง</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">จำนวนที่นั่ง =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">%1 \u0E41\u0E16\u0E27</span><span id="Plane_getRows">\u0E08\u0E33\u0E19\u0E27\u0E19\u0E41\u0E16\u0E27 (%1)</span><span id="Plane_rows1">\u0E0A\u0E31\u0E49\u0E19\u0E40\u0E1F\u0E34\u0E23\u0E4C\u0E2A\u0E04\u0E25\u0E32\u0E2A %1 \u0E41\u0E16\u0E27</span><span id="Plane_getRows1">\u0E08\u0E33\u0E19\u0E27\u0E19\u0E41\u0E16\u0E27\u0E0A\u0E31\u0E49\u0E19\u0E40\u0E1F\u0E34\u0E23\u0E4C\u0E2A\u0E04\u0E25\u0E32\u0E2A (%1)</span><span id="Plane_rows2">\u0E0A\u0E31\u0E49\u0E19\u0E18\u0E38\u0E23\u0E01\u0E34\u0E08 %1 \u0E41\u0E16\u0E27</span><span id="Plane_getRows2">\u0E08\u0E33\u0E19\u0E27\u0E19\u0E41\u0E16\u0E27\u0E0A\u0E31\u0E49\u0E19\u0E18\u0E38\u0E23\u0E01\u0E34\u0E08 (%1)</span><span id="Plane_seats">\u0E04\u0E33\u0E19\u0E27\u0E13\u0E44\u0E14\u0E49\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14 %1 \u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u0E08\u0E33\u0E19\u0E27\u0E19\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07 =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">ระบบคำนวณที่นั่งบนเครื่องบิน</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u0E23\u0E30\u0E1A\u0E1A\u0E04\u0E33\u0E19\u0E27\u0E13\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E1A\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1A\u0E34\u0E19</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'ภายในเครื่องบินประกอบไปด้วยแถวของที่นั่งผู้โดยสาร ในแต่ละแถวจะมี 4 ที่นั่ง';
+      output += '\u0E20\u0E32\u0E22\u0E43\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1A\u0E34\u0E19\u0E1B\u0E23\u0E30\u0E01\u0E2D\u0E1A\u0E44\u0E1B\u0E14\u0E49\u0E27\u0E22\u0E41\u0E16\u0E27\u0E02\u0E2D\u0E07\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E1C\u0E39\u0E49\u0E42\u0E14\u0E22\u0E2A\u0E32\u0E23 \u0E43\u0E19\u0E41\u0E15\u0E48\u0E25\u0E30\u0E41\u0E16\u0E27\u0E08\u0E30\u0E21\u0E35 4 \u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07';
       break;
     case 2:
-      output += 'ภายในเครื่องบินจะมีที่นั่งนักบินอยู่ 2 ที่ (สำหรับนักบิน และผู้ช่วยนักบิน) และมีแถวที่นั่งผู้โดยสารอยู่จำนวนหนึ่ง ในแต่ละแถวจะมี 4 ที่นั่ง';
+      output += '\u0E20\u0E32\u0E22\u0E43\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1A\u0E34\u0E19\u0E08\u0E30\u0E21\u0E35\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19\u0E2D\u0E22\u0E39\u0E48 2 \u0E17\u0E35\u0E48 (\u0E2A\u0E33\u0E2B\u0E23\u0E31\u0E1A\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19 \u0E41\u0E25\u0E30\u0E1C\u0E39\u0E49\u0E0A\u0E48\u0E27\u0E22\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19) \u0E41\u0E25\u0E30\u0E21\u0E35\u0E41\u0E16\u0E27\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E1C\u0E39\u0E49\u0E42\u0E14\u0E22\u0E2A\u0E32\u0E23\u0E2D\u0E22\u0E39\u0E48\u0E08\u0E33\u0E19\u0E27\u0E19\u0E2B\u0E19\u0E36\u0E48\u0E07 \u0E43\u0E19\u0E41\u0E15\u0E48\u0E25\u0E30\u0E41\u0E16\u0E27\u0E08\u0E30\u0E21\u0E35 4 \u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07';
       break;
     case 3:
-      output += 'ภายในเครื่องบินจะมีที่นั่งนักบินอยู่ 2 ที่ (สำหรับนักบิน และผู้ช่วยนักบิน) และจะมีแถวที่นั่งสำหรับผู้โดยสาร "ชั้นเฟิร์สคลาส" และ "ชั้นธุรกิจ" อยู่จำนวนหนึ่ง โดยในชั้นเฟิร์สคลาสจะมีแถวละ 4 ที่นั่ง ส่วนในชั้นธุรกิจจะมีแถวละ 5 ที่นั่ง';
+      output += '\u0E20\u0E32\u0E22\u0E43\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1A\u0E34\u0E19\u0E08\u0E30\u0E21\u0E35\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19\u0E2D\u0E22\u0E39\u0E48 2 \u0E17\u0E35\u0E48 (\u0E2A\u0E33\u0E2B\u0E23\u0E31\u0E1A\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19 \u0E41\u0E25\u0E30\u0E1C\u0E39\u0E49\u0E0A\u0E48\u0E27\u0E22\u0E19\u0E31\u0E01\u0E1A\u0E34\u0E19) \u0E41\u0E25\u0E30\u0E08\u0E30\u0E21\u0E35\u0E41\u0E16\u0E27\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E2A\u0E33\u0E2B\u0E23\u0E31\u0E1A\u0E1C\u0E39\u0E49\u0E42\u0E14\u0E22\u0E2A\u0E32\u0E23 "\u0E0A\u0E31\u0E49\u0E19\u0E40\u0E1F\u0E34\u0E23\u0E4C\u0E2A\u0E04\u0E25\u0E32\u0E2A" \u0E41\u0E25\u0E30 "\u0E0A\u0E31\u0E49\u0E19\u0E18\u0E38\u0E23\u0E01\u0E34\u0E08" \u0E2D\u0E22\u0E39\u0E48\u0E08\u0E33\u0E19\u0E27\u0E19\u0E2B\u0E19\u0E36\u0E48\u0E07 \u0E42\u0E14\u0E22\u0E43\u0E19\u0E0A\u0E31\u0E49\u0E19\u0E40\u0E1F\u0E34\u0E23\u0E4C\u0E2A\u0E04\u0E25\u0E32\u0E2A\u0E08\u0E30\u0E21\u0E35\u0E41\u0E16\u0E27\u0E25\u0E30 4 \u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07 \u0E2A\u0E48\u0E27\u0E19\u0E43\u0E19\u0E0A\u0E31\u0E49\u0E19\u0E18\u0E38\u0E23\u0E01\u0E34\u0E08\u0E08\u0E30\u0E21\u0E35\u0E41\u0E16\u0E27\u0E25\u0E30 5 \u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07';
       break;
   }
-  output += '</p><p>สร้างสูตรคำนวณ (ด้านล่าง) เพื่อคำนวณหาจำนวนที่นั่งทั้งหมดบนเครื่องบิน ตามจำนวนแถวที่เปลี่ยนไป (ด้านบน)</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E2A\u0E39\u0E15\u0E23\u0E04\u0E33\u0E19\u0E27\u0E13 (\u0E14\u0E49\u0E32\u0E19\u0E25\u0E48\u0E32\u0E07) \u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E04\u0E33\u0E19\u0E27\u0E13\u0E2B\u0E32\u0E08\u0E33\u0E19\u0E27\u0E19\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E07\u0E17\u0E31\u0E49\u0E07\u0E2B\u0E21\u0E14\u0E1A\u0E19\u0E40\u0E04\u0E23\u0E37\u0E48\u0E2D\u0E07\u0E1A\u0E34\u0E19 \u0E15\u0E32\u0E21\u0E08\u0E33\u0E19\u0E27\u0E19\u0E41\u0E16\u0E27\u0E17\u0E35\u0E48\u0E40\u0E1B\u0E25\u0E35\u0E48\u0E22\u0E19\u0E44\u0E1B (\u0E14\u0E49\u0E32\u0E19\u0E1A\u0E19)</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/tr.js b/demos/plane/generated/tr.js
index e1bb1348a..56d41cab3 100644
--- a/demos/plane/generated/tr.js
+++ b/demos/plane/generated/tr.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Sıralar: %1</span><span id="Plane_getRows">sıralar (%1)</span><span id="Plane_rows1">Birinci sınıf sıralar: (%1)</span><span id="Plane_getRows1">Birinci sınıf sıralar (%1)</span><span id="Plane_rows2">İkinci sınıf sıralar: %1</span><span id="Plane_getRows2">İkinci sınıf sıralar (%1)</span><span id="Plane_seats">Koltuklar: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">koltuklar =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">S\u0131ralar: %1</span><span id="Plane_getRows">s\u0131ralar (%1)</span><span id="Plane_rows1">Birinci s\u0131n\u0131f s\u0131ralar: (%1)</span><span id="Plane_getRows1">Birinci s\u0131n\u0131f s\u0131ralar (%1)</span><span id="Plane_rows2">\u0130kinci s\u0131n\u0131f s\u0131ralar: %1</span><span id="Plane_getRows2">\u0130kinci s\u0131n\u0131f s\u0131ralar (%1)</span><span id="Plane_seats">Koltuklar: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">koltuklar =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Uçak Koltuğu Hesaplayıcı</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">U\u00E7ak Koltu\u011Fu Hesaplay\u0131c\u0131</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Bir uçağın belirli sayıda koltuk sırası vardır. Her sıra dört koltuk içerir.';
+      output += 'Bir u\u00E7a\u011F\u0131n belirli say\u0131da koltuk s\u0131ras\u0131 vard\u0131r. Her s\u0131ra d\u00F6rt koltuk i\u00E7erir.';
       break;
     case 2:
-      output += 'Bir uçağın uçuş güvertesinde iki koltuğu (pilot ve yardımcı pilot için), ve belirli sayıda koltuk sırası vardır. Her sıra dört koltuk içerir.';
+      output += 'Bir u\u00E7a\u011F\u0131n u\u00E7u\u015F g\u00FCvertesinde iki koltu\u011Fu (pilot ve yard\u0131mc\u0131 pilot i\u00E7in), ve belirli say\u0131da koltuk s\u0131ras\u0131 vard\u0131r. Her s\u0131ra d\u00F6rt koltuk i\u00E7erir.';
       break;
     case 3:
-      output += 'Bir uçağın uçuş güvertesinde iki koltuğu (pilot ve yardımcı pilot için), ve belirli sayıda birinci sınıf ve ikinci sınıf yolcu koltuğu sırası vardır. Her birinci sınıf sıra dört koltuk içerir. Her ikinci sınıf sıra beş koltuk içerir.';
+      output += 'Bir u\u00E7a\u011F\u0131n u\u00E7u\u015F g\u00FCvertesinde iki koltu\u011Fu (pilot ve yard\u0131mc\u0131 pilot i\u00E7in), ve belirli say\u0131da birinci s\u0131n\u0131f ve ikinci s\u0131n\u0131f yolcu koltu\u011Fu s\u0131ras\u0131 vard\u0131r. Her birinci s\u0131n\u0131f s\u0131ra d\u00F6rt koltuk i\u00E7erir. Her ikinci s\u0131n\u0131f s\u0131ra be\u015F koltuk i\u00E7erir.';
       break;
   }
-  output += '</p><p>Sıralar(üstte) değiştikçe uçaktaki toplam koltuk sayısını hesaplayan bir formül(altta) oluşturun.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>S\u0131ralar(\u00FCstte) de\u011Fi\u015Ftik\u00E7e u\u00E7aktaki toplam koltuk say\u0131s\u0131n\u0131 hesaplayan bir form\u00FCl(altta) olu\u015Fturun.</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/uk.js b/demos/plane/generated/uk.js
index 047adfcd8..a73409dc8 100644
--- a/demos/plane/generated/uk.js
+++ b/demos/plane/generated/uk.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Рядки: %1</span><span id="Plane_getRows">рядки (%1)</span><span id="Plane_rows1">рядів 1-го класу: %1</span><span id="Plane_getRows1">рядів 1-го класу (%1)</span><span id="Plane_rows2">рядів 2-го класу: %1</span><span id="Plane_getRows2">рядів 2-го класу (%1)</span><span id="Plane_seats">Місць: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">місць=</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u0420\u044F\u0434\u043A\u0438: %1</span><span id="Plane_getRows">\u0440\u044F\u0434\u043A\u0438 (%1)</span><span id="Plane_rows1">\u0440\u044F\u0434\u0456\u0432 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0443: %1</span><span id="Plane_getRows1">\u0440\u044F\u0434\u0456\u0432 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 (%1)</span><span id="Plane_rows2">\u0440\u044F\u0434\u0456\u0432 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0443: %1</span><span id="Plane_getRows2">\u0440\u044F\u0434\u0456\u0432 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 (%1)</span><span id="Plane_seats">\u041C\u0456\u0441\u0446\u044C: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">\u043C\u0456\u0441\u0446\u044C=</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Калькулятор місць у літаку</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u041A\u0430\u043B\u044C\u043A\u0443\u043B\u044F\u0442\u043E\u0440 \u043C\u0456\u0441\u0446\u044C \u0443 \u043B\u0456\u0442\u0430\u043A\u0443</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Літак має кілька рядів пасажирських сидінь. Кожен ряд містить чотири місця.';
+      output += '\u041B\u0456\u0442\u0430\u043A \u043C\u0430\u0454 \u043A\u0456\u043B\u044C\u043A\u0430 \u0440\u044F\u0434\u0456\u0432 \u043F\u0430\u0441\u0430\u0436\u0438\u0440\u0441\u044C\u043A\u0438\u0445 \u0441\u0438\u0434\u0456\u043D\u044C. \u041A\u043E\u0436\u0435\u043D \u0440\u044F\u0434 \u043C\u0456\u0441\u0442\u0438\u0442\u044C \u0447\u043E\u0442\u0438\u0440\u0438 \u043C\u0456\u0441\u0446\u044F.';
       break;
     case 2:
-      output += 'Літак має два місця в кабіні екіпажу (пілот і другий пілот), і кілька рядів пасажирських сидінь. Кожен рядок містить чотири місця.';
+      output += '\u041B\u0456\u0442\u0430\u043A \u043C\u0430\u0454 \u0434\u0432\u0430 \u043C\u0456\u0441\u0446\u044F \u0432 \u043A\u0430\u0431\u0456\u043D\u0456 \u0435\u043A\u0456\u043F\u0430\u0436\u0443 (\u043F\u0456\u043B\u043E\u0442 \u0456 \u0434\u0440\u0443\u0433\u0438\u0439 \u043F\u0456\u043B\u043E\u0442), \u0456 \u043A\u0456\u043B\u044C\u043A\u0430 \u0440\u044F\u0434\u0456\u0432 \u043F\u0430\u0441\u0430\u0436\u0438\u0440\u0441\u044C\u043A\u0438\u0445 \u0441\u0438\u0434\u0456\u043D\u044C. \u041A\u043E\u0436\u0435\u043D \u0440\u044F\u0434\u043E\u043A \u043C\u0456\u0441\u0442\u0438\u0442\u044C \u0447\u043E\u0442\u0438\u0440\u0438 \u043C\u0456\u0441\u0446\u044F.';
       break;
     case 3:
-      output += 'Літак має два місця в кабіні екіпажу (пілот і другий пілот), і кілька рядів 1-го класу 2-го класу пасажирських місць. Кожний ряд 1-го класу містить чотири місця. Кожен ряд 2-го класу містить п\'ять місць.';
+      output += '\u041B\u0456\u0442\u0430\u043A \u043C\u0430\u0454 \u0434\u0432\u0430 \u043C\u0456\u0441\u0446\u044F \u0432 \u043A\u0430\u0431\u0456\u043D\u0456 \u0435\u043A\u0456\u043F\u0430\u0436\u0443 (\u043F\u0456\u043B\u043E\u0442 \u0456 \u0434\u0440\u0443\u0433\u0438\u0439 \u043F\u0456\u043B\u043E\u0442), \u0456 \u043A\u0456\u043B\u044C\u043A\u0430 \u0440\u044F\u0434\u0456\u0432 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 \u043F\u0430\u0441\u0430\u0436\u0438\u0440\u0441\u044C\u043A\u0438\u0445 \u043C\u0456\u0441\u0446\u044C. \u041A\u043E\u0436\u043D\u0438\u0439 \u0440\u044F\u0434 1-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 \u043C\u0456\u0441\u0442\u0438\u0442\u044C \u0447\u043E\u0442\u0438\u0440\u0438 \u043C\u0456\u0441\u0446\u044F. \u041A\u043E\u0436\u0435\u043D \u0440\u044F\u0434 2-\u0433\u043E \u043A\u043B\u0430\u0441\u0443 \u043C\u0456\u0441\u0442\u0438\u0442\u044C \u043F\'\u044F\u0442\u044C \u043C\u0456\u0441\u0446\u044C.';
       break;
   }
-  output += '</p><p>Побудувати формулу (нижче), яка обчислює кількість місць на літаку при зміні рядків (див. вище).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u041F\u043E\u0431\u0443\u0434\u0443\u0432\u0430\u0442\u0438 \u0444\u043E\u0440\u043C\u0443\u043B\u0443 (\u043D\u0438\u0436\u0447\u0435), \u044F\u043A\u0430 \u043E\u0431\u0447\u0438\u0441\u043B\u044E\u0454 \u043A\u0456\u043B\u044C\u043A\u0456\u0441\u0442\u044C \u043C\u0456\u0441\u0446\u044C \u043D\u0430 \u043B\u0456\u0442\u0430\u043A\u0443 \u043F\u0440\u0438 \u0437\u043C\u0456\u043D\u0456 \u0440\u044F\u0434\u043A\u0456\u0432 (\u0434\u0438\u0432. \u0432\u0438\u0449\u0435).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/vi.js b/demos/plane/generated/vi.js
index 61dc24ab6..54723b7f3 100644
--- a/demos/plane/generated/vi.js
+++ b/demos/plane/generated/vi.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">Số hàng ghế: %1</span><span id="Plane_getRows">đếm số hàng ghế (%1)</span><span id="Plane_rows1">Hàng hạng nhất: %1</span><span id="Plane_getRows1">số hàng hạng nhất (%1)</span><span id="Plane_rows2">Hàng hạng hai: %1</span><span id="Plane_getRows2">số hàng hạng hai (%1)</span><span id="Plane_seats">Số chỗ ngồi: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">Tính số chỗ ngồi =</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">S\u1ED1 h\u00E0ng gh\u1EBF: %1</span><span id="Plane_getRows">\u0111\u1EBFm s\u1ED1 h\u00E0ng gh\u1EBF (%1)</span><span id="Plane_rows1">H\u00E0ng h\u1EA1ng nh\u1EA5t: %1</span><span id="Plane_getRows1">s\u1ED1 h\u00E0ng h\u1EA1ng nh\u1EA5t (%1)</span><span id="Plane_rows2">H\u00E0ng h\u1EA1ng hai: %1</span><span id="Plane_getRows2">s\u1ED1 h\u00E0ng h\u1EA1ng hai (%1)</span><span id="Plane_seats">S\u1ED1 ch\u1ED7 ng\u1ED3i: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">T\u00EDnh s\u1ED1 ch\u1ED7 ng\u1ED3i =</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">Máy bay ghế máy tính</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">M\u00E1y bay gh\u1EBF m\u00E1y t\u00EDnh</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += 'Máy bay có một số hàng ghế hành khách.  Mỗi hàng có bốn chỗ ngồi.';
+      output += 'M\u00E1y bay c\u00F3 m\u1ED9t s\u1ED1 h\u00E0ng gh\u1EBF h\u00E0nh kh\u00E1ch.  M\u1ED7i h\u00E0ng c\u00F3 b\u1ED1n ch\u1ED7 ng\u1ED3i.';
       break;
     case 2:
-      output += 'Một máy bay có hai ghế trong buồng lái (dành cho phi công trưởng và phi công phụ), và một loạt hàng ghế cho hành khách. Mỗi hàng có bốn ghế (bốn chỗ ngồi).';
+      output += 'M\u1ED9t m\u00E1y bay c\u00F3 hai gh\u1EBF trong bu\u1ED3ng l\u00E1i (d\u00E0nh cho phi c\u00F4ng tr\u01B0\u1EDFng v\u00E0 phi c\u00F4ng ph\u1EE5), v\u00E0 m\u1ED9t lo\u1EA1t h\u00E0ng gh\u1EBF cho h\u00E0nh kh\u00E1ch. M\u1ED7i h\u00E0ng c\u00F3 b\u1ED1n gh\u1EBF (b\u1ED1n ch\u1ED7 ng\u1ED3i).';
       break;
     case 3:
-      output += 'Một chiếc máy bay này có hai chỗ ngồi ở sàn (cho phi công trưởng và phi công phó), và một số hàng ghế hạng 1 và hạng 2.  Mỗi hàng hạng 1 có bốn chỗ ngồi. Mỗi hàng hạng 2 có năm chỗ ngồi.';
+      output += 'M\u1ED9t chi\u1EBFc m\u00E1y bay n\u00E0y c\u00F3 hai ch\u1ED7 ng\u1ED3i \u1EDF s\u00E0n (cho phi c\u00F4ng tr\u01B0\u1EDFng v\u00E0 phi c\u00F4ng ph\u00F3), v\u00E0 m\u1ED9t s\u1ED1 h\u00E0ng gh\u1EBF h\u1EA1ng 1 v\u00E0 h\u1EA1ng 2.  M\u1ED7i h\u00E0ng h\u1EA1ng 1 c\u00F3 b\u1ED1n ch\u1ED7 ng\u1ED3i. M\u1ED7i h\u00E0ng h\u1EA1ng 2 c\u00F3 n\u0103m ch\u1ED7 ng\u1ED3i.';
       break;
   }
-  output += '</p><p>Dưới đây hãy tạo công thức tính số chỗ ngồi trên máy bay để nó thay đổi tùy theo số lượng hàng ghế (hình trên).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>D\u01B0\u1EDBi \u0111\u00E2y h\u00E3y t\u1EA1o c\u00F4ng th\u1EE9c t\u00EDnh s\u1ED1 ch\u1ED7 ng\u1ED3i tr\u00EAn m\u00E1y bay \u0111\u1EC3 n\u00F3 thay \u0111\u1ED5i t\u00F9y theo s\u1ED1 l\u01B0\u1EE3ng h\u00E0ng gh\u1EBF (h\u00ECnh tr\u00EAn).</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/zh-hans.js b/demos/plane/generated/zh-hans.js
index d8ea3d3b9..3331b8e99 100644
--- a/demos/plane/generated/zh-hans.js
+++ b/demos/plane/generated/zh-hans.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">行：%1</span><span id="Plane_getRows">行 (%1)</span><span id="Plane_rows1">头等行：%1</span><span id="Plane_getRows1">头等行（%1）</span><span id="Plane_rows2">经济等行：%1</span><span id="Plane_getRows2">经济等行（%1）</span><span id="Plane_seats">座位：%1</span><span id="Plane_placeholder">？</span><span id="Plane_setSeats">座位＝</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u884C\uFF1A%1</span><span id="Plane_getRows">\u884C (%1)</span><span id="Plane_rows1">\u5934\u7B49\u884C\uFF1A%1</span><span id="Plane_getRows1">\u5934\u7B49\u884C\uFF08%1\uFF09</span><span id="Plane_rows2">\u7ECF\u6D4E\u7B49\u884C\uFF1A%1</span><span id="Plane_getRows2">\u7ECF\u6D4E\u7B49\u884C\uFF08%1\uFF09</span><span id="Plane_seats">\u5EA7\u4F4D\uFF1A%1</span><span id="Plane_placeholder">\uFF1F</span><span id="Plane_setSeats">\u5EA7\u4F4D\uFF1D</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">飞机座位计算器</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u98DE\u673A\u5EA7\u4F4D\u8BA1\u7B97\u5668</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += '一架飞机有一定量行数的乘客座位，每行共四座。';
+      output += '\u4E00\u67B6\u98DE\u673A\u6709\u4E00\u5B9A\u91CF\u884C\u6570\u7684\u4E58\u5BA2\u5EA7\u4F4D\uFF0C\u6BCF\u884C\u5171\u56DB\u5EA7\u3002';
       break;
     case 2:
-      output += '一架飞机除了有两个座位供正副驾驶员，还有一定量行数的乘客座位。每行共四座。';
+      output += '\u4E00\u67B6\u98DE\u673A\u9664\u4E86\u6709\u4E24\u4E2A\u5EA7\u4F4D\u4F9B\u6B63\u526F\u9A7E\u9A76\u5458\uFF0C\u8FD8\u6709\u4E00\u5B9A\u91CF\u884C\u6570\u7684\u4E58\u5BA2\u5EA7\u4F4D\u3002\u6BCF\u884C\u5171\u56DB\u5EA7\u3002';
       break;
     case 3:
-      output += '一架飞机除了有两个座位供正副驾驶员，还有一定量行数的头等及经济乘客座位。头等每行共四座，经济每行共五座。';
+      output += '\u4E00\u67B6\u98DE\u673A\u9664\u4E86\u6709\u4E24\u4E2A\u5EA7\u4F4D\u4F9B\u6B63\u526F\u9A7E\u9A76\u5458\uFF0C\u8FD8\u6709\u4E00\u5B9A\u91CF\u884C\u6570\u7684\u5934\u7B49\u53CA\u7ECF\u6D4E\u4E58\u5BA2\u5EA7\u4F4D\u3002\u5934\u7B49\u6BCF\u884C\u5171\u56DB\u5EA7\uFF0C\u7ECF\u6D4E\u6BCF\u884C\u5171\u4E94\u5EA7\u3002';
       break;
   }
-  output += '</p><p>于下方写出一条公式以计算飞机上的座位总数。</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u4E8E\u4E0B\u65B9\u5199\u51FA\u4E00\u6761\u516C\u5F0F\u4EE5\u8BA1\u7B97\u98DE\u673A\u4E0A\u7684\u5EA7\u4F4D\u603B\u6570\u3002</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/generated/zh-hant.js b/demos/plane/generated/zh-hant.js
index a85010ef7..8eeb91d86 100644
--- a/demos/plane/generated/zh-hant.js
+++ b/demos/plane/generated/zh-hant.js
@@ -1,37 +1,50 @@
 // This file was automatically generated from template.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace planepage.
+ */
+
 if (typeof planepage == 'undefined') { var planepage = {}; }
 
 
 planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
-  return '<div style="display: none"><span id="Plane_rows">排：%1</span><span id="Plane_getRows">排（%1）</span><span id="Plane_rows1">頭等艙：%1 排</span><span id="Plane_getRows1">頭等艙（%1）</span><span id="Plane_rows2">經濟艙：%1 排</span><span id="Plane_getRows2">經濟艙（%1）</span><span id="Plane_seats">座位：%1</span><span id="Plane_placeholder">？</span><span id="Plane_setSeats">座位＝</span></div>';
+  return '<div style="display: none"><span id="Plane_rows">\u6392\uFF1A%1</span><span id="Plane_getRows">\u6392\uFF08%1\uFF09</span><span id="Plane_rows1">\u982D\u7B49\u8259\uFF1A%1 \u6392</span><span id="Plane_getRows1">\u982D\u7B49\u8259\uFF08%1\uFF09</span><span id="Plane_rows2">\u7D93\u6FDF\u8259\uFF1A%1 \u6392</span><span id="Plane_getRows2">\u7D93\u6FDF\u8259\uFF08%1\uFF09</span><span id="Plane_seats">\u5EA7\u4F4D\uFF1A%1</span><span id="Plane_placeholder">\uFF1F</span><span id="Plane_setSeats">\u5EA7\u4F4D\uFF1D</span></div>';
 };
+if (goog.DEBUG) {
+  planepage.messages.soyTemplateName = 'planepage.messages';
+}
 
 
 planepage.start = function(opt_data, opt_ignored, opt_ijData) {
-  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">飛機座位計算器</span> &nbsp; ';
-  var iLimit37 = opt_ijData.maxLevel + 1;
-  for (var i37 = 1; i37 < iLimit37; i37++) {
-    output += ' ' + ((i37 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i37) + '</span>' : (i37 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i37) + '">' + soy.$$escapeHtml(i37) + '</a>');
+  var output = planepage.messages(null, null, opt_ijData) + '<table width="100%"><tr><td><h1><a href="https://developers.google.com/blockly/">Blockly</a>&rlm; &gt; <a href="../index.html">Demos</a>&rlm; &gt; <span id="title">\u98DB\u6A5F\u5EA7\u4F4D\u8A08\u7B97\u5668</span> &nbsp; ';
+  var iLimit47 = opt_ijData.maxLevel + 1;
+  for (var i47 = 1; i47 < iLimit47; i47++) {
+    output += ' ' + ((i47 == opt_ijData.level) ? '<span class="tab" id="selected">' + soy.$$escapeHtml(i47) + '</span>' : (i47 < opt_ijData.level) ? '<a class="tab previous" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>' : '<a class="tab" href="?lang=' + soy.$$escapeHtml(opt_ijData.lang) + '&level=' + soy.$$escapeHtml(i47) + '">' + soy.$$escapeHtml(i47) + '</a>');
   }
   output += '</h1></td><td class="farSide"><span ' + ((opt_ijData.lang == 'en') ? 'id="languageBorder"' : '') + ' style="padding: 10px"><select id="languageMenu"></select></span></td></tr></table><script src="slider.js"><\/script><svg id="plane" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="600" height="320" viewBox="0 110 600 320"><defs><g id="row1st"><rect class="seat1st" width="10" height="10" x="75" y="243" /><rect class="seat1st" width="10" height="10" x="75" y="254" /><rect class="seat1st" width="10" height="10" x="75" y="272" /><rect class="seat1st" width="10" height="10" x="75" y="283" /></g><g id="row2nd"><rect class="seat2nd" width="10" height="8" x="75" y="243" /><rect class="seat2nd" width="10" height="8" x="75" y="251" /><rect class="seat2nd" width="10" height="8" x="75" y="269" /><rect class="seat2nd" width="10" height="8" x="75" y="277" /><rect class="seat2nd" width="10" height="8" x="75" y="285" /></g><linearGradient id="grad1" x1="0%" y1="100%" x2="0%" y2="0%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient><linearGradient id="grad2" x1="0%" y1="0%" x2="0%" y2="100%"><stop offset="0%" style="stop-color:#fff;stop-opacity:0" /><stop offset="100%" style="stop-color:#fff;stop-opacity:1" /></linearGradient></defs><path d="m 214,270 l 159,-254 31,-16 -74,189 0,162 74,189 -31,16 z" id="wing" /><path d="m 577,270 22,-93 -27,6 -44,88 44,88 27,6 z" id="tail" /><path d="m 577,270 l -94,24 h -407 c -38,0 -75,-13 -75,-26 c 0,-13 38,-26 75,-26 h 407 z" id="fuselage" /><rect width="610" height="100" x="-5" y="110" fill="url(#grad1)" /><rect width="610" height="100" x="-5" y="330" fill="url(#grad2)" /><text id="row1stText" x="55" y="380"></text><text id="row2ndText" x="55" y="420"></text><text x="55" y="210"><tspan id="seatText"></tspan><tspan id="seatYes" style="fill: #0c0;" dy="10">&#x2713;</tspan><tspan id="seatNo" style="fill: #f00;" dy="10">&#x2717;</tspan></text>' + ((opt_ijData.level > 1) ? '<rect id="crew_right" class="crew" width="10" height="10" x="35" y="254" /><rect id="crew_left" class="crew" width="10" height="10" x="35" y="272" />' : '') + '</svg><p>';
   switch (opt_ijData.level) {
     case 1:
-      output += '一架飛機有一定量行數的乘客座位，每排都包含四個席位。';
+      output += '\u4E00\u67B6\u98DB\u6A5F\u6709\u4E00\u5B9A\u91CF\u884C\u6578\u7684\u4E58\u5BA2\u5EA7\u4F4D\uFF0C\u6BCF\u6392\u90FD\u5305\u542B\u56DB\u500B\u5E2D\u4F4D\u3002';
       break;
     case 2:
-      output += '一架飛機除了有兩個座位供正副機師，還有一定量行數的乘客座位。每排都包含四個席位。';
+      output += '\u4E00\u67B6\u98DB\u6A5F\u9664\u4E86\u6709\u5169\u500B\u5EA7\u4F4D\u4F9B\u6B63\u526F\u6A5F\u5E2B\uFF0C\u9084\u6709\u4E00\u5B9A\u91CF\u884C\u6578\u7684\u4E58\u5BA2\u5EA7\u4F4D\u3002\u6BCF\u6392\u90FD\u5305\u542B\u56DB\u500B\u5E2D\u4F4D\u3002';
       break;
     case 3:
-      output += '一架飛機除了有兩個座位供正副機師，還有一定量行數的頭等及經濟乘客座位。頭等艙每排都包含四個席位，經濟艙每排都包含五個席位。。';
+      output += '\u4E00\u67B6\u98DB\u6A5F\u9664\u4E86\u6709\u5169\u500B\u5EA7\u4F4D\u4F9B\u6B63\u526F\u6A5F\u5E2B\uFF0C\u9084\u6709\u4E00\u5B9A\u91CF\u884C\u6578\u7684\u982D\u7B49\u53CA\u7D93\u6FDF\u4E58\u5BA2\u5EA7\u4F4D\u3002\u982D\u7B49\u8259\u6BCF\u6392\u90FD\u5305\u542B\u56DB\u500B\u5E2D\u4F4D\uFF0C\u7D93\u6FDF\u8259\u6BCF\u6392\u90FD\u5305\u542B\u4E94\u500B\u5E2D\u4F4D\u3002\u3002';
       break;
   }
-  output += '</p><p>於下方寫出一條公式以計算飛機上的座位總數。</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
+  output += '</p><p>\u65BC\u4E0B\u65B9\u5BEB\u51FA\u4E00\u689D\u516C\u5F0F\u4EE5\u8A08\u7B97\u98DB\u6A5F\u4E0A\u7684\u5EA7\u4F4D\u7E3D\u6578\u3002</p><script src="../../blockly_compressed.js"><\/script><script src="../../blocks_compressed.js"><\/script><script src="../../javascript_compressed.js"><\/script><script src="../../msg/js/' + soy.$$escapeHtml(opt_ijData.lang) + '.js"><\/script><script src="blocks.js"><\/script>' + planepage.toolbox(null, null, opt_ijData) + '<div id="blockly"></div>';
   return output;
 };
+if (goog.DEBUG) {
+  planepage.start.soyTemplateName = 'planepage.start';
+}
 
 
 planepage.toolbox = function(opt_data, opt_ignored, opt_ijData) {
   return '<xml id="toolbox" style="display: none"><block type="math_number"></block><block type="math_arithmetic"><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block><block type="math_arithmetic"><field name="OP">MULTIPLY</field><value name="A"><shadow type="math_number"><field name="NUM">1</field></shadow></value><value name="B"><shadow type="math_number"><field name="NUM">1</field></shadow></value></block>' + ((opt_ijData.level <= 2) ? '<block type="plane_get_rows"></block>' : '<block type="plane_get_rows1st"></block><block type="plane_get_rows2nd"></block>') + '</xml>';
 };
+if (goog.DEBUG) {
+  planepage.toolbox.soyTemplateName = 'planepage.toolbox';
+}
diff --git a/demos/plane/soy/SoyMsgExtractor.jar b/demos/plane/soy/SoyMsgExtractor.jar
index d7d261984..d5c112f5e 100644
Binary files a/demos/plane/soy/SoyMsgExtractor.jar and b/demos/plane/soy/SoyMsgExtractor.jar differ
diff --git a/demos/plane/soy/SoyToJsSrcCompiler.jar b/demos/plane/soy/SoyToJsSrcCompiler.jar
index 540a0702a..bb3b7a979 100644
Binary files a/demos/plane/soy/SoyToJsSrcCompiler.jar and b/demos/plane/soy/SoyToJsSrcCompiler.jar differ
diff --git a/demos/plane/soy/soyutils.js b/demos/plane/soy/soyutils.js
index bde8e4133..5b480c192 100644
--- a/demos/plane/soy/soyutils.js
+++ b/demos/plane/soy/soyutils.js
@@ -48,11 +48,23 @@ goog.DEBUG = false;
 
 goog.inherits = function(childCtor, parentCtor) {
   /** @constructor */
-  function tempCtor() {}
+  function tempCtor() {};
   tempCtor.prototype = parentCtor.prototype;
   childCtor.superClass_ = parentCtor.prototype;
   childCtor.prototype = new tempCtor();
   childCtor.prototype.constructor = childCtor;
+
+  /**
+   * Calls superclass constructor/method.
+   * @param {!Object} me Should always be "this".
+   * @param {string} methodName
+   * @param {...*} var_args
+   * @return {?} The return value of the superclass method/constructor.
+   */
+  childCtor.base = function(me, methodName, var_args) {
+    var args = Array.prototype.slice.call(arguments, 2);
+    return parentCtor.prototype[methodName].apply(me, args);
+  };
 };
 
 
@@ -228,46 +240,61 @@ if (!goog.format) {
     },
     /**
      * String inserted as a word break by insertWordBreaks(). Safari requires
-     * <wbr></wbr>, Opera needs the 'shy' entity, though this will give a
-     * visible hyphen at breaks. Other browsers just use <wbr>.
+     * <wbr></wbr>, Opera needs the &shy; entity, though this will give a
+     * visible hyphen at breaks. IE8+ use a zero width space. Other browsers
+     * just use <wbr>.
      * @type {string}
      * @private
      */
-    WORD_BREAK: goog.userAgent.WEBKIT
-        ? '<wbr></wbr>' : goog.userAgent.OPERA ? '&shy;' : '<wbr>'
+    WORD_BREAK:
+        goog.userAgent.WEBKIT ? '<wbr></wbr>' :
+        goog.userAgent.OPERA ? '&shy;' :
+        goog.userAgent.IE ? '&#8203;' :
+        '<wbr>'
   };
 }
 
 
 if (!goog.i18n) {
   goog.i18n = {
-    bidi: {
-      /**
-       * Check the directionality of a piece of text, return true if the piece
-       * of text should be laid out in RTL direction.
-       * @param {string} text The piece of text that need to be detected.
-       * @param {boolean=} opt_isHtml Whether {@code text} is HTML/HTML-escaped.
-       *     Default: false.
-       * @return {boolean}
-       * @private
-       */
-      detectRtlDirectionality: function(text, opt_isHtml) {
-        text = soyshim.$$bidiStripHtmlIfNecessary_(text, opt_isHtml);
-        return soyshim.$$bidiRtlWordRatio_(text)
-            > soyshim.$$bidiRtlDetectionThreshold_;
-      }
-    }
+    bidi: {}
   };
 }
 
+
+/**
+ * Constant that defines whether or not the current locale is an RTL locale.
+ *
+ * @type {boolean}
+ */
+goog.i18n.bidi.IS_RTL = false;
+
+
 /**
  * Directionality enum.
  * @enum {number}
  */
 goog.i18n.bidi.Dir = {
+  /**
+   * Left-to-right.
+   */
+  LTR: 1,
+
+  /**
+   * Right-to-left.
+   */
   RTL: -1,
-  UNKNOWN: 0,
-  LTR: 1
+
+  /**
+   * Neither left-to-right nor right-to-left.
+   */
+  NEUTRAL: 0,
+
+  /**
+   * A historical misnomer for NEUTRAL.
+   * @deprecated For "neutral", use NEUTRAL; for "unknown", use null.
+   */
+  UNKNOWN: 0
 };
 
 
@@ -276,53 +303,114 @@ goog.i18n.bidi.Dir = {
  * constant. Useful for interaction with different standards of directionality
  * representation.
  *
- * @param {goog.i18n.bidi.Dir|number|boolean} givenDir Directionality given in
- *     one of the following formats:
+ * @param {goog.i18n.bidi.Dir|number|boolean|null} givenDir Directionality given
+ *     in one of the following formats:
  *     1. A goog.i18n.bidi.Dir constant.
- *     2. A number (positive = LRT, negative = RTL, 0 = unknown).
+ *     2. A number (positive = LTR, negative = RTL, 0 = neutral).
  *     3. A boolean (true = RTL, false = LTR).
- * @return {goog.i18n.bidi.Dir} A goog.i18n.bidi.Dir constant matching the given
- *     directionality.
+ *     4. A null for unknown directionality.
+ * @param {boolean=} opt_noNeutral Whether a givenDir of zero or
+ *     goog.i18n.bidi.Dir.NEUTRAL should be treated as null, i.e. unknown, in
+ *     order to preserve legacy behavior.
+ * @return {?goog.i18n.bidi.Dir} A goog.i18n.bidi.Dir constant matching the
+ *     given directionality. If given null, returns null (i.e. unknown).
  */
-goog.i18n.bidi.toDir = function(givenDir) {
+goog.i18n.bidi.toDir = function(givenDir, opt_noNeutral) {
   if (typeof givenDir == 'number') {
+    // This includes the non-null goog.i18n.bidi.Dir case.
     return givenDir > 0 ? goog.i18n.bidi.Dir.LTR :
-        givenDir < 0 ? goog.i18n.bidi.Dir.RTL : goog.i18n.bidi.Dir.UNKNOWN;
+        givenDir < 0 ? goog.i18n.bidi.Dir.RTL :
+        opt_noNeutral ? null : goog.i18n.bidi.Dir.NEUTRAL;
+  } else if (givenDir == null) {
+    return null;
   } else {
+    // Must be typeof givenDir == 'boolean'.
     return givenDir ? goog.i18n.bidi.Dir.RTL : goog.i18n.bidi.Dir.LTR;
   }
 };
 
 
+/**
+ * Estimates the directionality of a string based on relative word counts.
+ * If the number of RTL words is above a certain percentage of the total number
+ * of strongly directional words, returns RTL.
+ * Otherwise, if any words are strongly or weakly LTR, returns LTR.
+ * Otherwise, returns NEUTRAL.
+ * Numbers are counted as weakly LTR.
+ * @param {string} str The string to be checked.
+ * @param {boolean=} opt_isHtml Whether str is HTML / HTML-escaped.
+ *     Default: false.
+ * @return {goog.i18n.bidi.Dir} Estimated overall directionality of {@code str}.
+ */
+goog.i18n.bidi.estimateDirection = function(str, opt_isHtml) {
+  var rtlCount = 0;
+  var totalCount = 0;
+  var hasWeaklyLtr = false;
+  var tokens = soyshim.$$bidiStripHtmlIfNecessary_(str, opt_isHtml).
+      split(soyshim.$$bidiWordSeparatorRe_);
+  for (var i = 0; i < tokens.length; i++) {
+    var token = tokens[i];
+    if (soyshim.$$bidiRtlDirCheckRe_.test(token)) {
+      rtlCount++;
+      totalCount++;
+    } else if (soyshim.$$bidiIsRequiredLtrRe_.test(token)) {
+      hasWeaklyLtr = true;
+    } else if (soyshim.$$bidiLtrCharRe_.test(token)) {
+      totalCount++;
+    } else if (soyshim.$$bidiHasNumeralsRe_.test(token)) {
+      hasWeaklyLtr = true;
+    }
+  }
+
+  return totalCount == 0 ?
+      (hasWeaklyLtr ? goog.i18n.bidi.Dir.LTR : goog.i18n.bidi.Dir.NEUTRAL) :
+      (rtlCount / totalCount > soyshim.$$bidiRtlDetectionThreshold_ ?
+          goog.i18n.bidi.Dir.RTL : goog.i18n.bidi.Dir.LTR);
+};
+
+
 /**
  * Utility class for formatting text for display in a potentially
  * opposite-directionality context without garbling. Provides the following
  * functionality:
  *
- * @param {goog.i18n.bidi.Dir|number|boolean} dir The context
- *     directionality as a number
- *     (positive = LRT, negative = RTL, 0 = unknown).
+ * @param {goog.i18n.bidi.Dir|number|boolean|null} dir The context
+ *     directionality, in one of the following formats:
+ *     1. A goog.i18n.bidi.Dir constant. NEUTRAL is treated the same as null,
+ *        i.e. unknown, for backward compatibility with legacy calls.
+ *     2. A number (positive = LTR, negative = RTL, 0 = unknown).
+ *     3. A boolean (true = RTL, false = LTR).
+ *     4. A null for unknown directionality.
  * @constructor
  */
 goog.i18n.BidiFormatter = function(dir) {
-  this.dir_ = goog.i18n.bidi.toDir(dir);
+  /**
+   * The overall directionality of the context in which the formatter is being
+   * used.
+   * @type {?goog.i18n.bidi.Dir}
+   * @private
+   */
+  this.dir_ = goog.i18n.bidi.toDir(dir, true /* opt_noNeutral */);
 };
 
+/**
+ * @return {?goog.i18n.bidi.Dir} The context directionality.
+ */
+goog.i18n.BidiFormatter.prototype.getContextDir = function() {
+  return this.dir_;
+};
 
 /**
- * Returns 'dir="ltr"' or 'dir="rtl"', depending on {@code text}'s estimated
- * directionality, if it is not the same as the context directionality.
- * Otherwise, returns the empty string.
+ * Returns 'dir="ltr"' or 'dir="rtl"', depending on the given directionality, if
+ * it is not the same as the context directionality. Otherwise, returns the
+ * empty string.
  *
- * @param {string} text Text whose directionality is to be estimated.
- * @param {boolean=} opt_isHtml Whether {@code text} is HTML / HTML-escaped.
- *     Default: false.
+ * @param {goog.i18n.bidi.Dir} dir A directionality.
  * @return {string} 'dir="rtl"' for RTL text in non-RTL context; 'dir="ltr"' for
  *     LTR text in non-LTR context; else, the empty string.
  */
-goog.i18n.BidiFormatter.prototype.dirAttr = function (text, opt_isHtml) {
-  var dir = soy.$$bidiTextDir(text, opt_isHtml);
-  return dir && dir != this.dir_ ? dir < 0 ? 'dir="rtl"' : 'dir="ltr"' : '';
+goog.i18n.BidiFormatter.prototype.knownDirAttr = function(dir) {
+  return !dir || dir == this.dir_ ? '' : dir < 0 ? 'dir="rtl"' : 'dir="ltr"';
 };
 
 /**
@@ -337,7 +425,7 @@ goog.i18n.BidiFormatter.prototype.endEdge = function () {
 /**
  * Returns the Unicode BiDi mark matching the context directionality (LRM for
  * LTR context directionality, RLM for RTL context directionality), or the
- * empty string for neutral / unknown context directionality.
+ * empty string for unknown context directionality.
  *
  * @return {string} LRM for LTR context directionality and RLM for RTL context
  *     directionality.
@@ -350,35 +438,51 @@ goog.i18n.BidiFormatter.prototype.mark = function () {
 };
 
 /**
- * Returns a Unicode BiDi mark matching the context directionality (LRM or RLM)
+ * Returns a Unicode bidi mark matching the context directionality (LRM or RLM)
  * if the directionality or the exit directionality of {@code text} are opposite
  * to the context directionality. Otherwise returns the empty string.
- *
- * @param {string} text The input text.
- * @param {boolean=} opt_isHtml Whether {@code text} is HTML / HTML-escaped.
+ * If opt_isHtml, makes sure to ignore the LTR nature of the mark-up and escapes
+ * in text, making the logic suitable for HTML and HTML-escaped text.
+ * @param {?goog.i18n.bidi.Dir} textDir {@code text}'s overall directionality,
+ *     or null if unknown and needs to be estimated.
+ * @param {string} text The text whose directionality is to be estimated.
+ * @param {boolean=} opt_isHtml Whether text is HTML/HTML-escaped.
  *     Default: false.
- * @return {string} A Unicode bidi mark matching the global directionality or
- *     the empty string.
+ * @return {string} A Unicode bidi mark matching the context directionality, or
+ *     the empty string when either the context directionality is unknown or
+ *     neither the text's overall nor its exit directionality is opposite to it.
  */
-goog.i18n.BidiFormatter.prototype.markAfter = function (text, opt_isHtml) {
-  var dir = soy.$$bidiTextDir(text, opt_isHtml);
-  return soyshim.$$bidiMarkAfterKnownDir_(this.dir_, dir, text, opt_isHtml);
+goog.i18n.BidiFormatter.prototype.markAfterKnownDir = function (
+    textDir, text, opt_isHtml) {
+  if (textDir == null) {
+    textDir = goog.i18n.bidi.estimateDirection(text, opt_isHtml);
+  }
+  return (
+      this.dir_ > 0 && (textDir < 0 ||
+          soyshim.$$bidiIsRtlExitText_(text, opt_isHtml)) ? '\u200E' : // LRM
+      this.dir_ < 0 && (textDir > 0 ||
+          soyshim.$$bidiIsLtrExitText_(text, opt_isHtml)) ? '\u200F' : // RLM
+      '');
 };
 
 /**
- * Formats a string of unknown directionality for use in HTML output of the
- * context directionality, so an opposite-directionality string is neither
- * garbled nor garbles what follows it.
+ * Formats an HTML string for use in HTML output of the context directionality,
+ * so an opposite-directionality string is neither garbled nor garbles what
+ * follows it.
  *
- * @param {string} str The input text.
+ * @param {?goog.i18n.bidi.Dir} textDir {@code str}'s overall directionality, or
+ *     null if unknown and needs to be estimated.
+ * @param {string} str The input text (HTML or HTML-escaped).
  * @param {boolean=} placeholder This argument exists for consistency with the
  *     Closure Library. Specifying it has no effect.
- * @return {string} Input text after applying the above processing.
+ * @return {string} The input text after applying the above processing.
  */
-goog.i18n.BidiFormatter.prototype.spanWrap = function(str, placeholder) {
-  str = String(str);
-  var textDir = soy.$$bidiTextDir(str, true);
-  var reset = soyshim.$$bidiMarkAfterKnownDir_(this.dir_, textDir, str, true);
+goog.i18n.BidiFormatter.prototype.spanWrapWithKnownDir = function(
+    textDir, str, placeholder) {
+  if (textDir == null) {
+    textDir = goog.i18n.bidi.estimateDirection(str, true);
+  }
+  var reset = this.markAfterKnownDir(textDir, str, true);
   if (textDir > 0 && this.dir_ <= 0) {
     str = '<span dir="ltr">' + str + '</span>';
   } else if (textDir < 0 && this.dir_ >= 0) {
@@ -397,22 +501,26 @@ goog.i18n.BidiFormatter.prototype.startEdge = function () {
 };
 
 /**
- * Formats a string of unknown directionality for use in plain-text output of
- * the context directionality, so an opposite-directionality string is neither
- * garbled nor garbles what follows it.
- * As opposed to {@link #spanWrap}, this makes use of unicode BiDi formatting
- * characters. In HTML, its *only* valid use is inside of elements that do not
- * allow mark-up, e.g. an 'option' tag.
+ * Formats an HTML-escaped string for use in HTML output of the context
+ * directionality, so an opposite-directionality string is neither garbled nor
+ * garbles what follows it.
+ * As opposed to {@link #spanWrapWithKnownDir}, this makes use of unicode bidi
+ * formatting characters. In HTML, it should only be used inside attribute
+ * values and elements that do not allow markup, e.g. an 'option' tag.
  *
- * @param {string} str The input text.
- * @param {boolean=} placeholder This argument exists for consistency with the
- *     Closure Library. Specifying it has no effect.
- * @return {string} Input text after applying the above processing.
+ * @param {?goog.i18n.bidi.Dir} textDir {@code str}'s overall directionality, or
+ *     null if unknown and needs to be estimated.
+ * @param {string} str The input text (HTML-escaped).
+ * @param {boolean=} opt_isHtml Whether {@code str} is HTML / HTML-escaped.
+ *     Default: false.
+ * @return {string} The input text after applying the above processing.
  */
-goog.i18n.BidiFormatter.prototype.unicodeWrap = function(str, placeholder) {
-  str = String(str);
-  var textDir = soy.$$bidiTextDir(str, true);
-  var reset = soyshim.$$bidiMarkAfterKnownDir_(this.dir_, textDir, str, true);
+goog.i18n.BidiFormatter.prototype.unicodeWrapWithKnownDir = function(
+    textDir, str, opt_isHtml) {
+  if (textDir == null) {
+    textDir = goog.i18n.bidi.estimateDirection(str, opt_isHtml);
+  }
+  var reset = this.markAfterKnownDir(textDir, str, opt_isHtml);
   if (textDir > 0 && this.dir_ <= 0) {
     str = '\u202A' + str + '\u202C';
   } else if (textDir < 0 && this.dir_ >= 0) {
@@ -637,16 +745,16 @@ goog.soy.data.SanitizedContentKind = {
    * or DOCTYPE; and that does not contain any executable code
    * (JS, {@code <object>}s, etc.) from a different trust domain.
    */
-  HTML: {},
+  HTML: goog.DEBUG ? {sanitizedContentKindHtml: true} : {},
 
   /**
    * Executable Javascript code or expression, safe for insertion in a
    * script-tag or event handler context, known to be free of any
    * attacker-controlled scripts. This can either be side-effect-free
-   * Javascript (such as JSON) or Javascript that entirely under Google's
+   * Javascript (such as JSON) or Javascript that's entirely under Google's
    * control.
    */
-  JS: goog.DEBUG ? {sanitizedContentJsStrChars: true} : {},
+  JS: goog.DEBUG ? {sanitizedContentJsChars: true} : {},
 
   /**
    * A sequence of code units that can appear between quotes (either kind) in a
@@ -660,10 +768,10 @@ goog.soy.data.SanitizedContentKind = {
    * The content must also not end inside an escape sequence ; no partial octal
    * escape sequences or odd number of '{@code \}'s at the end.
    */
-  JS_STR_CHARS: {},
+  JS_STR_CHARS: goog.DEBUG ? {sanitizedContentJsStrChars: true} : {},
 
   /** A properly encoded portion of a URI. */
-  URI: {},
+  URI: goog.DEBUG ? {sanitizedContentUri: true} : {},
 
   /**
    * Repeated attribute names and values. For example,
@@ -678,7 +786,7 @@ goog.soy.data.SanitizedContentKind = {
    * A CSS3 declaration, property, value or group of semicolon separated
    * declarations.
    */
-  CSS: {},
+  CSS: goog.DEBUG ? {sanitizedContentCss: true} : {},
 
   /**
    * Unsanitized plain-text content.
@@ -688,13 +796,13 @@ goog.soy.data.SanitizedContentKind = {
    * string is safe to use as text, being of ContentKind.TEXT makes no
    * guarantees about its safety in any other context such as HTML.
    */
-  TEXT: {}
+  TEXT: goog.DEBUG ? {sanitizedContentKindText: true} : {}
 };
 
 
 
 /**
- * A string-like object that carries a content-type.
+ * A string-like object that carries a content-type and a content direction.
  *
  * IMPORTANT! Do not create these directly, nor instantiate the subclasses.
  * Instead, use a trusted, centrally reviewed library as endorsed by your team
@@ -716,6 +824,14 @@ goog.soy.data.SanitizedContent = function() {
 goog.soy.data.SanitizedContent.prototype.contentKind;
 
 
+/**
+ * The content's direction; null if unknown and thus to be estimated when
+ * necessary.
+ * @type {?goog.i18n.bidi.Dir}
+ */
+goog.soy.data.SanitizedContent.prototype.contentDir = null;
+
+
 /**
  * The already-safe content.
  * @type {string}
@@ -781,38 +897,11 @@ soyshim.$$renderWithWrapper_ = function(
 };
 
 
-/**
- * Returns a Unicode BiDi mark matching bidiGlobalDir (LRM or RLM) if the
- * directionality or the exit directionality of text are opposite to
- * bidiGlobalDir. Otherwise returns the empty string.
- * If opt_isHtml, makes sure to ignore the LTR nature of the mark-up and escapes
- * in text, making the logic suitable for HTML and HTML-escaped text.
- * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
- *     if rtl, 0 if unknown.
- * @param {number} dir text's directionality: 1 if ltr, -1 if rtl, 0 if unknown.
- * @param {string} text The text whose directionality is to be estimated.
- * @param {boolean=} opt_isHtml Whether text is HTML/HTML-escaped.
- *     Default: false.
- * @return {string} A Unicode bidi mark matching bidiGlobalDir, or
- *     the empty string when text's overall and exit directionalities both match
- *     bidiGlobalDir, or bidiGlobalDir is 0 (unknown).
- * @private
- */
-soyshim.$$bidiMarkAfterKnownDir_ = function(
-    bidiGlobalDir, dir, text, opt_isHtml) {
-  return (
-      bidiGlobalDir > 0 && (dir < 0 ||
-          soyshim.$$bidiIsRtlExitText_(text, opt_isHtml)) ? '\u200E' : // LRM
-      bidiGlobalDir < 0 && (dir > 0 ||
-          soyshim.$$bidiIsLtrExitText_(text, opt_isHtml)) ? '\u200F' : // RLM
-      '');
-};
-
-
 /**
  * Strips str of any HTML mark-up and escapes. Imprecise in several ways, but
  * precision is not very important, since the result is only meant to be used
  * for directionality detection.
+ * Based on goog.i18n.bidi.stripHtmlIfNeeded_().
  * @param {string} str The string to be stripped.
  * @param {boolean=} opt_isHtml Whether str is HTML / HTML-escaped.
  *     Default: false.
@@ -820,7 +909,7 @@ soyshim.$$bidiMarkAfterKnownDir_ = function(
  * @private
  */
 soyshim.$$bidiStripHtmlIfNecessary_ = function(str, opt_isHtml) {
-  return opt_isHtml ? str.replace(soyshim.$$BIDI_HTML_SKIP_RE_, ' ') : str;
+  return opt_isHtml ? str.replace(soyshim.$$BIDI_HTML_SKIP_RE_, '') : str;
 };
 
 
@@ -828,6 +917,7 @@ soyshim.$$bidiStripHtmlIfNecessary_ = function(str, opt_isHtml) {
  * Simplified regular expression for am HTML tag (opening or closing) or an HTML
  * escape - the things we want to skip over in order to ignore their ltr
  * characters.
+ * Copied from goog.i18n.bidi.htmlSkipReg_.
  * @type {RegExp}
  * @private
  */
@@ -838,38 +928,30 @@ soyshim.$$BIDI_HTML_SKIP_RE_ = /<[^>]*>|&[^;]+;/g;
  * A practical pattern to identify strong LTR character. This pattern is not
  * theoretically correct according to unicode standard. It is simplified for
  * performance and small code size.
+ * Copied from goog.i18n.bidi.ltrChars_.
  * @type {string}
  * @private
  */
 soyshim.$$bidiLtrChars_ =
     'A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF' +
-    '\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF';
-
-
-/**
- * A practical pattern to identify strong neutral and weak character. This
- * pattern is not theoretically correct according to unicode standard. It is
- * simplified for performance and small code size.
- * @type {string}
- * @private
- */
-soyshim.$$bidiNeutralChars_ =
-    '\u0000-\u0020!-@[-`{-\u00BF\u00D7\u00F7\u02B9-\u02FF\u2000-\u2BFF';
+    '\u200E\u2C00-\uFB1C\uFE00-\uFE6F\uFEFD-\uFFFF';
 
 
 /**
  * A practical pattern to identify strong RTL character. This pattern is not
  * theoretically correct according to unicode standard. It is simplified for
  * performance and small code size.
+ * Copied from goog.i18n.bidi.rtlChars_.
  * @type {string}
  * @private
  */
-soyshim.$$bidiRtlChars_ = '\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC';
+soyshim.$$bidiRtlChars_ = '\u0591-\u07FF\u200F\uFB1D-\uFDFF\uFE70-\uFEFC';
 
 
 /**
  * Regular expressions to check if a piece of text is of RTL directionality
  * on first character with strong directionality.
+ * Based on goog.i18n.bidi.rtlDirCheckRe_.
  * @type {RegExp}
  * @private
  */
@@ -878,73 +960,59 @@ soyshim.$$bidiRtlDirCheckRe_ = new RegExp(
 
 
 /**
- * Regular expressions to check if a piece of text is of neutral directionality.
- * Url are considered as neutral.
+ * Regular expression to check for LTR characters.
+ * Based on goog.i18n.bidi.ltrCharReg_.
  * @type {RegExp}
  * @private
  */
-soyshim.$$bidiNeutralDirCheckRe_ = new RegExp(
-    '^[' + soyshim.$$bidiNeutralChars_ + ']*$|^http://');
+soyshim.$$bidiLtrCharRe_ = new RegExp('[' + soyshim.$$bidiLtrChars_ + ']');
 
 
 /**
- * Check the directionality of the a piece of text based on the first character
- * with strong directionality.
- * @param {string} str string being checked.
- * @return {boolean} return true if rtl directionality is being detected.
+ * Regular expression to check if a string looks like something that must
+ * always be LTR even in RTL text, e.g. a URL. When estimating the
+ * directionality of text containing these, we treat these as weakly LTR,
+ * like numbers.
+ * Copied from goog.i18n.bidi.isRequiredLtrRe_.
+ * @type {RegExp}
  * @private
  */
-soyshim.$$bidiIsRtlText_ = function(str) {
-  return soyshim.$$bidiRtlDirCheckRe_.test(str);
-};
+soyshim.$$bidiIsRequiredLtrRe_ = /^http:\/\/.*/;
 
 
 /**
- * Check the directionality of the a piece of text based on the first character
- * with strong directionality.
- * @param {string} str string being checked.
- * @return {boolean} true if all characters have neutral directionality.
+ * Regular expression to check if a string contains any numerals. Used to
+ * differentiate between completely neutral strings and those containing
+ * numbers, which are weakly LTR.
+ * Copied from goog.i18n.bidi.hasNumeralsRe_.
+ * @type {RegExp}
  * @private
  */
-soyshim.$$bidiIsNeutralText_ = function(str) {
-  return soyshim.$$bidiNeutralDirCheckRe_.test(str);
-};
+soyshim.$$bidiHasNumeralsRe_ = /\d/;
+
+
+/**
+ * Regular expression to split a string into "words" for directionality
+ * estimation based on relative word counts.
+ * Copied from goog.i18n.bidi.wordSeparatorRe_.
+ * @type {RegExp}
+ * @private
+ */
+soyshim.$$bidiWordSeparatorRe_ = /\s+/;
 
 
 /**
  * This constant controls threshold of rtl directionality.
+ * Copied from goog.i18n.bidi.rtlDetectionThreshold_.
  * @type {number}
  * @private
  */
 soyshim.$$bidiRtlDetectionThreshold_ = 0.40;
 
-
-/**
- * Returns the RTL ratio based on word count.
- * @param {string} str the string that need to be checked.
- * @return {number} the ratio of RTL words among all words with directionality.
- * @private
- */
-soyshim.$$bidiRtlWordRatio_ = function(str) {
-  var rtlCount = 0;
-  var totalCount = 0;
-  var tokens = str.split(' ');
-  for (var i = 0; i < tokens.length; i++) {
-    if (soyshim.$$bidiIsRtlText_(tokens[i])) {
-      rtlCount++;
-      totalCount++;
-    } else if (!soyshim.$$bidiIsNeutralText_(tokens[i])) {
-      totalCount++;
-    }
-  }
-
-  return totalCount == 0 ? 0 : rtlCount / totalCount;
-};
-
-
 /**
  * Regular expressions to check if the last strongly-directional character in a
  * piece of text is LTR.
+ * Based on goog.i18n.bidi.ltrExitDirCheckRe_.
  * @type {RegExp}
  * @private
  */
@@ -955,6 +1023,7 @@ soyshim.$$bidiLtrExitDirCheckRe_ = new RegExp(
 /**
  * Regular expressions to check if the last strongly-directional character in a
  * piece of text is RTL.
+ * Based on goog.i18n.bidi.rtlExitDirCheckRe_.
  * @type {RegExp}
  * @private
  */
@@ -965,6 +1034,7 @@ soyshim.$$bidiRtlExitDirCheckRe_ = new RegExp(
 /**
  * Check if the exit directionality a piece of text is LTR, i.e. if the last
  * strongly-directional character in the string is LTR.
+ * Based on goog.i18n.bidi.endsWithLtr().
  * @param {string} str string being checked.
  * @param {boolean=} opt_isHtml Whether str is HTML / HTML-escaped.
  *     Default: false.
@@ -980,6 +1050,7 @@ soyshim.$$bidiIsLtrExitText_ = function(str, opt_isHtml) {
 /**
  * Check if the exit directionality a piece of text is RTL, i.e. if the last
  * strongly-directional character in the string is RTL.
+ * Based on goog.i18n.bidi.endsWithRtl().
  * @param {string} str string being checked.
  * @param {boolean=} opt_isHtml Whether str is HTML / HTML-escaped.
  *     Default: false.
@@ -1027,6 +1098,50 @@ soy.StringBuilder = goog.string.StringBuffer;
 soydata.SanitizedContentKind = goog.soy.data.SanitizedContentKind;
 
 
+/**
+ * Checks whether a given value is of a given content kind.
+ *
+ * @param {*} value The value to be examined.
+ * @param {soydata.SanitizedContentKind} contentKind The desired content
+ *     kind.
+ * @return {boolean} Whether the given value is of the given kind.
+ * @private
+ */
+soydata.isContentKind = function(value, contentKind) {
+  // TODO(user): This function should really include the assert on
+  // value.constructor that is currently sprinkled at most of the call sites.
+  // Unfortunately, that would require a (debug-mode-only) switch statement.
+  // TODO(user): Perhaps we should get rid of the contentKind property
+  // altogether and only at the constructor.
+  return value != null && value.contentKind === contentKind;
+};
+
+
+/**
+ * Returns a given value's contentDir property, constrained to a
+ * goog.i18n.bidi.Dir value or null. Returns null if the value is null,
+ * undefined, a primitive or does not have a contentDir property, or the
+ * property's value is not 1 (for LTR), -1 (for RTL), or 0 (for neutral).
+ *
+ * @param {*} value The value whose contentDir property, if any, is to
+ *     be returned.
+ * @return {?goog.i18n.bidi.Dir} The contentDir property.
+ */
+soydata.getContentDir = function(value) {
+  if (value != null) {
+    switch (value.contentDir) {
+      case goog.i18n.bidi.Dir.LTR:
+        return goog.i18n.bidi.Dir.LTR;
+      case goog.i18n.bidi.Dir.RTL:
+        return goog.i18n.bidi.Dir.RTL;
+      case goog.i18n.bidi.Dir.NEUTRAL:
+        return goog.i18n.bidi.Dir.NEUTRAL;
+    }
+  }
+  return null;
+};
+
+
 /**
  * Content of type {@link soydata.SanitizedContentKind.HTML}.
  *
@@ -1034,7 +1149,8 @@ soydata.SanitizedContentKind = goog.soy.data.SanitizedContentKind;
  * context in your app.  If you would be surprised to find that an HTML
  * sanitizer produced {@code s} (e.g.  it runs code or fetches bad URLs) and
  * you wouldn't write a template that produces {@code s} on security or privacy
- * grounds, then don't pass {@code s} here.
+ * grounds, then don't pass {@code s} here. The default content direction is
+ * unknown, i.e. to be estimated when necessary.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1047,12 +1163,34 @@ goog.inherits(soydata.SanitizedHtml, goog.soy.data.SanitizedContent);
 /** @override */
 soydata.SanitizedHtml.prototype.contentKind = soydata.SanitizedContentKind.HTML;
 
+/**
+ * Returns a SanitizedHtml object for a particular value. The content direction
+ * is preserved.
+ *
+ * This HTML-escapes the value unless it is already SanitizedHtml.
+ *
+ * @param {*} value The value to convert. If it is already a SanitizedHtml
+ *     object, it is left alone.
+ * @return {!soydata.SanitizedHtml} A SanitizedHtml object derived from the
+ *     stringified value. It is escaped unless the input is SanitizedHtml.
+ */
+soydata.SanitizedHtml.from = function(value) {
+  // The check is soydata.isContentKind() inlined for performance.
+  if (value != null &&
+      value.contentKind === soydata.SanitizedContentKind.HTML) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtml);
+    return /** @type {!soydata.SanitizedHtml} */ (value);
+  }
+  return soydata.VERY_UNSAFE.ordainSanitizedHtml(
+      soy.esc.$$escapeHtmlHelper(String(value)), soydata.getContentDir(value));
+};
+
 
 /**
  * Content of type {@link soydata.SanitizedContentKind.JS}.
  *
  * The content is Javascript source that when evaluated does not execute any
- * attacker-controlled scripts.
+ * attacker-controlled scripts. The content direction is LTR.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1066,12 +1204,16 @@ goog.inherits(soydata.SanitizedJs, goog.soy.data.SanitizedContent);
 soydata.SanitizedJs.prototype.contentKind =
     soydata.SanitizedContentKind.JS;
 
+/** @override */
+soydata.SanitizedJs.prototype.contentDir = goog.i18n.bidi.Dir.LTR;
+
 
 /**
  * Content of type {@link soydata.SanitizedContentKind.JS_STR_CHARS}.
  *
  * The content can be safely inserted as part of a single- or double-quoted
- * string without terminating the string.
+ * string without terminating the string. The default content direction is
+ * unknown, i.e. to be estimated when necessary.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1085,12 +1227,11 @@ goog.inherits(soydata.SanitizedJsStrChars, goog.soy.data.SanitizedContent);
 soydata.SanitizedJsStrChars.prototype.contentKind =
     soydata.SanitizedContentKind.JS_STR_CHARS;
 
-
 /**
  * Content of type {@link soydata.SanitizedContentKind.URI}.
  *
  * The content is a URI chunk that the caller knows is safe to emit in a
- * template.
+ * template. The content direction is LTR.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1103,12 +1244,15 @@ goog.inherits(soydata.SanitizedUri, goog.soy.data.SanitizedContent);
 /** @override */
 soydata.SanitizedUri.prototype.contentKind = soydata.SanitizedContentKind.URI;
 
+/** @override */
+soydata.SanitizedUri.prototype.contentDir = goog.i18n.bidi.Dir.LTR;
+
 
 /**
  * Content of type {@link soydata.SanitizedContentKind.ATTRIBUTES}.
  *
  * The content should be safely embeddable within an open tag, such as a
- * key="value" pair.
+ * key="value" pair. The content direction is LTR.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1122,11 +1266,15 @@ goog.inherits(soydata.SanitizedHtmlAttribute, goog.soy.data.SanitizedContent);
 soydata.SanitizedHtmlAttribute.prototype.contentKind =
     soydata.SanitizedContentKind.ATTRIBUTES;
 
+/** @override */
+soydata.SanitizedHtmlAttribute.prototype.contentDir = goog.i18n.bidi.Dir.LTR;
+
 
 /**
  * Content of type {@link soydata.SanitizedContentKind.CSS}.
  *
  * The content is non-attacker-exploitable CSS, such as {@code color:#c3d9ff}.
+ * The content direction is LTR.
  *
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
@@ -1140,6 +1288,9 @@ goog.inherits(soydata.SanitizedCss, goog.soy.data.SanitizedContent);
 soydata.SanitizedCss.prototype.contentKind =
     soydata.SanitizedContentKind.CSS;
 
+/** @override */
+soydata.SanitizedCss.prototype.contentDir = goog.i18n.bidi.Dir.LTR;
+
 
 /**
  * Unsanitized plain text string.
@@ -1149,12 +1300,15 @@ soydata.SanitizedCss.prototype.contentKind =
  * sometimes used to mark that should never be used unescaped.
  *
  * @param {*} content Plain text with no guarantees.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
  * @constructor
  * @extends {goog.soy.data.SanitizedContent}
  */
-soydata.UnsanitizedText = function(content) {
+soydata.UnsanitizedText = function(content, opt_contentDir) {
   /** @override */
   this.content = String(content);
+  this.contentDir = opt_contentDir != null ? opt_contentDir : null;
 };
 goog.inherits(soydata.UnsanitizedText, goog.soy.data.SanitizedContent);
 
@@ -1163,6 +1317,16 @@ soydata.UnsanitizedText.prototype.contentKind =
     soydata.SanitizedContentKind.TEXT;
 
 
+/**
+ * Empty string, used as a type in Soy templates.
+ * @enum {string}
+ * @private
+ */
+soydata.$$EMPTY_STRING_ = {
+  VALUE: ''
+};
+
+
 /**
  * Creates a factory for SanitizedContent types.
  *
@@ -1172,21 +1336,73 @@ soydata.UnsanitizedText.prototype.contentKind =
  * helps callers and their reviewers easily tell that creating SanitizedContent
  * is not always safe and calls for careful review.
  *
- * @param {function(new: T, string)} ctor A constructor.
- * @return {!function(*): T} A factory that takes content and returns a
- *     new instance.
+ * @param {function(new: T)} ctor A constructor.
+ * @return {!function(*, ?goog.i18n.bidi.Dir=): T} A factory that takes
+ *     content and an optional content direction and returns a new instance. If
+ *     the content direction is undefined, ctor.prototype.contentDir is used.
  * @template T
  * @private
  */
 soydata.$$makeSanitizedContentFactory_ = function(ctor) {
-  /** @constructor */
+  /** @type {function(new: goog.soy.data.SanitizedContent)} */
   function InstantiableCtor() {}
   InstantiableCtor.prototype = ctor.prototype;
-  return function(content) {
+  /**
+   * Creates a ctor-type SanitizedContent instance.
+   *
+   * @param {*} content The content to put in the instance.
+   * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction. If
+   *     undefined, ctor.prototype.contentDir is used.
+   * @return {goog.soy.data.SanitizedContent} The new instance. It is actually
+   *     of type T above (ctor's type, a descendant of SanitizedContent), but
+   *     there is no way to express that here.
+   */
+  function sanitizedContentFactory(content, opt_contentDir) {
+    var result = new InstantiableCtor();
+    result.content = String(content);
+    if (opt_contentDir !== undefined) {
+      result.contentDir = opt_contentDir;
+    }
+    return result;
+  }
+  return sanitizedContentFactory;
+};
+
+
+/**
+ * Creates a factory for SanitizedContent types that should always have their
+ * default directionality.
+ *
+ * This is a hack so that the soydata.VERY_UNSAFE.ordainSanitized* can
+ * instantiate Sanitized* classes, without making the Sanitized* constructors
+ * publicly usable. Requiring all construction to use the VERY_UNSAFE names
+ * helps callers and their reviewers easily tell that creating SanitizedContent
+ * is not always safe and calls for careful review.
+ *
+ * @param {function(new: T, string)} ctor A constructor.
+ * @return {!function(*): T} A factory that takes content and returns a new
+ *     instance (with default directionality, i.e. ctor.prototype.contentDir).
+ * @template T
+ * @private
+ */
+soydata.$$makeSanitizedContentFactoryWithDefaultDirOnly_ = function(ctor) {
+  /** @type {function(new: goog.soy.data.SanitizedContent)} */
+  function InstantiableCtor() {}
+  InstantiableCtor.prototype = ctor.prototype;
+  /**
+   * Creates a ctor-type SanitizedContent instance.
+   *
+   * @param {*} content The content to put in the instance.
+   * @return {goog.soy.data.SanitizedContent} The new instance. It is actually
+   *     of type T above (ctor's type, a descendant of SanitizedContent), but
+   *     there is no way to express that here.
+   */
+  function sanitizedContentFactory(content) {
     var result = new InstantiableCtor();
     result.content = String(content);
     return result;
-  };
+  }
+  return sanitizedContentFactory;
 };
 
 
@@ -1205,11 +1421,13 @@ soydata.$$makeSanitizedContentFactory_ = function(ctor) {
  * data that has historically been a source of vulernabilities.
  *
  * @param {*} content Text to protect.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
  * @return {!soydata.UnsanitizedText} A wrapper that is rejected by the
  *     Soy noAutoescape print directive.
  */
-soydata.markUnsanitizedText = function(content) {
-  return new soydata.UnsanitizedText(content);
+soydata.markUnsanitizedText = function(content, opt_contentDir) {
+  return new soydata.UnsanitizedText(content, opt_contentDir);
 };
 
 
@@ -1221,6 +1439,8 @@ soydata.markUnsanitizedText = function(content) {
  *     HTML sanitizer produced {@code s} (e.g. it runs code or fetches bad URLs)
  *     and you wouldn't write a template that produces {@code s} on security or
  *     privacy grounds, then don't pass {@code s} here.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
  * @return {!soydata.SanitizedHtml} Sanitized content wrapper that
  *     indicates to Soy not to escape when printed as HTML.
  */
@@ -1238,7 +1458,8 @@ soydata.VERY_UNSAFE.ordainSanitizedHtml =
  *     Soy not to escape when printed as Javascript source.
  */
 soydata.VERY_UNSAFE.ordainSanitizedJs =
-    soydata.$$makeSanitizedContentFactory_(soydata.SanitizedJs);
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnly_(
+        soydata.SanitizedJs);
 
 
 // TODO: This function is probably necessary, either externally or internally
@@ -1251,6 +1472,8 @@ soydata.VERY_UNSAFE.ordainSanitizedJs =
  *
  * @param {*} content Content that can be safely inserted as part of a
  *     single- or double-quoted string without terminating the string.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
  * @return {!soydata.SanitizedJsStrChars} Sanitized content wrapper that
  *     indicates to Soy not to escape when printed in a JS string.
  */
@@ -1273,7 +1496,8 @@ soydata.VERY_UNSAFE.ordainSanitizedJsStrChars =
  *     Soy not to escape or filter when printed in URI context.
  */
 soydata.VERY_UNSAFE.ordainSanitizedUri =
-    soydata.$$makeSanitizedContentFactory_(soydata.SanitizedUri);
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnly_(
+        soydata.SanitizedUri);
 
 
 /**
@@ -1286,7 +1510,8 @@ soydata.VERY_UNSAFE.ordainSanitizedUri =
  *     indicates to Soy not to escape when printed as an HTML attribute.
  */
 soydata.VERY_UNSAFE.ordainSanitizedHtmlAttribute =
-    soydata.$$makeSanitizedContentFactory_(soydata.SanitizedHtmlAttribute);
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnly_(
+        soydata.SanitizedHtmlAttribute);
 
 
 /**
@@ -1298,7 +1523,8 @@ soydata.VERY_UNSAFE.ordainSanitizedHtmlAttribute =
  *     Soy there is no need to escape or filter when printed in CSS context.
  */
 soydata.VERY_UNSAFE.ordainSanitizedCss =
-    soydata.$$makeSanitizedContentFactory_(soydata.SanitizedCss);
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnly_(
+        soydata.SanitizedCss);
 
 
 // -----------------------------------------------------------------------------
@@ -1374,6 +1600,14 @@ soy.renderAsElement = function(
 // Below are private utilities to be used by Soy-generated code only.
 
 
+/**
+ * Whether the locale is right-to-left.
+ *
+ * @type {boolean}
+ */
+soy.$$IS_LOCALE_RTL = goog.i18n.bidi.IS_RTL;
+
+
 /**
  * Builds an augmented map. The returned map will contain mappings from both
  * the base map and the additional map. If the same key appears in both, then
@@ -1408,6 +1642,7 @@ soy.$$augmentMap = function(baseMap, additionalMap) {
  * @return {string} The given key.
  */
 soy.$$checkMapKey = function(key) {
+  // TODO: Support map literal with nonstring key.
   if ((typeof key) != 'string') {
     throw Error(
         'Map literal\'s key expression must evaluate to string' +
@@ -1511,8 +1746,8 @@ soy.$$registerDelegateFn = function(
  * (i.e. rendered output would be empty string).
  *
  * @param {string} delTemplateId The delegate template id.
- * @param {string} delTemplateVariant The delegate template variant (can be
- *     empty string).
+ * @param {string|number} delTemplateVariant The delegate template variant (can
+ *     be an empty string, or a number when a global is used).
  * @param {boolean} allowsEmptyDefault Whether to default to the empty template
  *     function if there's no active implementation.
  * @return {Function} The retrieved implementation function.
@@ -1554,49 +1789,220 @@ soy.$$EMPTY_TEMPLATE_FN_ = function(opt_data, opt_sb, opt_ijData) {
 };
 
 
+// -----------------------------------------------------------------------------
+// Internal sanitized content wrappers.
+
+
+/**
+ * Creates a SanitizedContent factory for SanitizedContent types for internal
+ * Soy let and param blocks.
+ *
+ * This is a hack within Soy so that SanitizedContent objects created via let
+ * and param blocks will truth-test as false if they are empty string.
+ * Tricking the Javascript runtime to treat empty SanitizedContent as falsey is
+ * not possible, and changing the Soy compiler to wrap every boolean statement
+ * for just this purpose is impractical.  Instead, we just avoid wrapping empty
+ * string as SanitizedContent, since it's a no-op for empty strings anyways.
+ *
+ * @param {function(new: T)} ctor A constructor.
+ * @return {!function(*, ?goog.i18n.bidi.Dir=): (T|soydata.$$EMPTY_STRING_)}
+ *     A factory that takes content and an optional content direction and
+ *     returns a new instance, or an empty string. If the content direction is
+ *     undefined, ctor.prototype.contentDir is used.
+ * @template T
+ * @private
+ */
+soydata.$$makeSanitizedContentFactoryForInternalBlocks_ = function(ctor) {
+  /** @type {function(new: goog.soy.data.SanitizedContent)} */
+  function InstantiableCtor() {}
+  InstantiableCtor.prototype = ctor.prototype;
+  /**
+   * Creates a ctor-type SanitizedContent instance.
+   *
+   * @param {*} content The content to put in the instance.
+   * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction. If
+   *     undefined, ctor.prototype.contentDir is used.
+   * @return {goog.soy.data.SanitizedContent|soydata.$$EMPTY_STRING_} The new
+   *     instance, or an empty string. A new instance is actually of type T
+   *     above (ctor's type, a descendant of SanitizedContent), but there's no
+   *     way to express that here.
+   */
+  function sanitizedContentFactory(content, opt_contentDir) {
+    var contentString = String(content);
+    if (!contentString) {
+      return soydata.$$EMPTY_STRING_.VALUE;
+    }
+    var result = new InstantiableCtor();
+    result.content = String(content);
+    if (opt_contentDir !== undefined) {
+      result.contentDir = opt_contentDir;
+    }
+    return result;
+  }
+  return sanitizedContentFactory;
+};
+
+
+/**
+ * Creates a SanitizedContent factory for SanitizedContent types that should
+ * always have their default directionality for internal Soy let and param
+ * blocks.
+ *
+ * This is a hack within Soy so that SanitizedContent objects created via let
+ * and param blocks will truth-test as false if they are empty string.
+ * Tricking the Javascript runtime to treat empty SanitizedContent as falsey is
+ * not possible, and changing the Soy compiler to wrap every boolean statement
+ * for just this purpose is impractical.  Instead, we just avoid wrapping empty
+ * string as SanitizedContent, since it's a no-op for empty strings anyways.
+ *
+ * @param {function(new: T)} ctor A constructor.
+ * @return {!function(*): (T|soydata.$$EMPTY_STRING_)} A
+ *     factory that takes content and returns a
+ *     new instance (with default directionality, i.e.
+ *     ctor.prototype.contentDir), or an empty string.
+ * @template T
+ * @private
+ */
+soydata.$$makeSanitizedContentFactoryWithDefaultDirOnlyForInternalBlocks_ =
+    function(ctor) {
+  /** @type {function(new: goog.soy.data.SanitizedContent)} */
+  function InstantiableCtor() {}
+  InstantiableCtor.prototype = ctor.prototype;
+  /**
+   * Creates a ctor-type SanitizedContent instance.
+   *
+   * @param {*} content The content to put in the instance.
+   * @return {goog.soy.data.SanitizedContent|soydata.$$EMPTY_STRING_} The new
+   *     instance, or an empty string. A new instance is actually of type T
+   *     above (ctor's type, a descendant of SanitizedContent), but there's no
+   *     way to express that here.
+   */
+  function sanitizedContentFactory(content) {
+    var contentString = String(content);
+    if (!contentString) {
+      return soydata.$$EMPTY_STRING_.VALUE;
+    }
+    var result = new InstantiableCtor();
+    result.content = String(content);
+    return result;
+  }
+  return sanitizedContentFactory;
+};
+
+
+/**
+ * Creates kind="text" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
+ * @return {!soydata.UnsanitizedText|soydata.$$EMPTY_STRING_} Wrapped result.
+ */
+soydata.$$markUnsanitizedTextForInternalBlocks = function(
+    content, opt_contentDir) {
+  var contentString = String(content);
+  if (!contentString) {
+    return soydata.$$EMPTY_STRING_.VALUE;
+  }
+  return new soydata.UnsanitizedText(contentString, opt_contentDir);
+};
+
+
+/**
+ * Creates kind="html" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @param {?goog.i18n.bidi.Dir=} opt_contentDir The content direction; null if
+ *     unknown and thus to be estimated when necessary. Default: null.
+ * @return {soydata.SanitizedHtml|soydata.$$EMPTY_STRING_} Wrapped result.
+ */
+soydata.VERY_UNSAFE.$$ordainSanitizedHtmlForInternalBlocks =
+    soydata.$$makeSanitizedContentFactoryForInternalBlocks_(
+        soydata.SanitizedHtml);
+
+
+/**
+ * Creates kind="js" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @return {soydata.SanitizedJs|soydata.$$EMPTY_STRING_} Wrapped result.
+ */
+soydata.VERY_UNSAFE.$$ordainSanitizedJsForInternalBlocks =
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnlyForInternalBlocks_(
+        soydata.SanitizedJs);
+
+
+/**
+ * Creates kind="uri" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @return {soydata.SanitizedUri|soydata.$$EMPTY_STRING_} Wrapped result.
+ */
+soydata.VERY_UNSAFE.$$ordainSanitizedUriForInternalBlocks =
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnlyForInternalBlocks_(
+        soydata.SanitizedUri);
+
+
+/**
+ * Creates kind="attributes" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @return {soydata.SanitizedHtmlAttribute|soydata.$$EMPTY_STRING_} Wrapped
+ *     result.
+ */
+soydata.VERY_UNSAFE.$$ordainSanitizedAttributesForInternalBlocks =
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnlyForInternalBlocks_(
+        soydata.SanitizedHtmlAttribute);
+
+
+/**
+ * Creates kind="css" block contents (internal use only).
+ *
+ * @param {*} content Text.
+ * @return {soydata.SanitizedCss|soydata.$$EMPTY_STRING_} Wrapped result.
+ */
+soydata.VERY_UNSAFE.$$ordainSanitizedCssForInternalBlocks =
+    soydata.$$makeSanitizedContentFactoryWithDefaultDirOnlyForInternalBlocks_(
+        soydata.SanitizedCss);
+
+
 // -----------------------------------------------------------------------------
 // Escape/filter/normalize.
 
 
 /**
- * Escapes HTML special characters in a string. Escapes double quote '"' in
- * addition to '&', '<', and '>' so that a string can be included in an HTML
- * tag attribute value within double quotes.
- * Will emit known safe HTML as-is.
+ * Returns a SanitizedHtml object for a particular value. The content direction
+ * is preserved.
  *
- * @param {*} value The string-like value to be escaped. May not be a string,
- *     but the value will be coerced to a string.
- * @return {string} An escaped version of value.
+ * This HTML-escapes the value unless it is already SanitizedHtml. Escapes
+ * double quote '"' in addition to '&', '<', and '>' so that a string can be
+ * included in an HTML tag attribute value within double quotes.
+ *
+ * @param {*} value The value to convert. If it is already a SanitizedHtml
+ *     object, it is left alone.
+ * @return {!soydata.SanitizedHtml} An escaped version of value.
  */
 soy.$$escapeHtml = function(value) {
-  // TODO: Perhaps we should just ignore the contentKind property and instead
-  // look only at the constructor.
-  if (value && value.contentKind &&
-      value.contentKind === goog.soy.data.SanitizedContentKind.HTML) {
-    goog.asserts.assert(
-        value.constructor === soydata.SanitizedHtml);
-    return value.content;
-  }
-  return soy.esc.$$escapeHtmlHelper(value);
+  return soydata.SanitizedHtml.from(value);
 };
 
 
 /**
  * Strips unsafe tags to convert a string of untrusted HTML into HTML that
- * is safe to embed.
+ * is safe to embed. The content direction is preserved.
  *
  * @param {*} value The string-like value to be escaped. May not be a string,
  *     but the value will be coerced to a string.
- * @return {string} A sanitized and normalized version of value.
+ * @return {!soydata.SanitizedHtml} A sanitized and normalized version of value.
  */
 soy.$$cleanHtml = function(value) {
-  if (value && value.contentKind &&
-      value.contentKind === goog.soy.data.SanitizedContentKind.HTML) {
-    goog.asserts.assert(
-        value.constructor === soydata.SanitizedHtml);
-    return value.content;
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtml);
+    return /** @type {!soydata.SanitizedHtml} */ (value);
   }
-  return soy.$$stripHtmlTags(value, soy.esc.$$SAFE_TAG_WHITELIST_);
+  return soydata.VERY_UNSAFE.ordainSanitizedHtml(
+      soy.$$stripHtmlTags(value, soy.esc.$$SAFE_TAG_WHITELIST_),
+      soydata.getContentDir(value));
 };
 
 
@@ -1619,10 +2025,8 @@ soy.$$cleanHtml = function(value) {
  * @return {string} An escaped version of value.
  */
 soy.$$escapeHtmlRcdata = function(value) {
-  if (value && value.contentKind &&
-      value.contentKind === goog.soy.data.SanitizedContentKind.HTML) {
-    goog.asserts.assert(
-        value.constructor === soydata.SanitizedHtml);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtml);
     return soy.esc.$$normalizeHtmlHelper(value.content);
   }
   return soy.esc.$$escapeHtmlHelper(value);
@@ -1751,16 +2155,13 @@ soy.$$balanceTags_ = function(tags) {
  * @return {string} An escaped version of value.
  */
 soy.$$escapeHtmlAttribute = function(value) {
-  if (value && value.contentKind) {
-    // NOTE: We don't accept ATTRIBUTES here because ATTRIBUTES is
-    // actually not the attribute value context, but instead k/v pairs.
-    if (value.contentKind === goog.soy.data.SanitizedContentKind.HTML) {
-      // NOTE: After removing tags, we also escape quotes ("normalize") so that
-      // the HTML can be embedded in attribute context.
-      goog.asserts.assert(
-          value.constructor === soydata.SanitizedHtml);
-      return soy.esc.$$normalizeHtmlHelper(soy.$$stripHtmlTags(value.content));
-    }
+  // NOTE: We don't accept ATTRIBUTES here because ATTRIBUTES is actually not
+  // the attribute value context, but instead k/v pairs.
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    // NOTE: After removing tags, we also escape quotes ("normalize") so that
+    // the HTML can be embedded in attribute context.
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtml);
+    return soy.esc.$$normalizeHtmlHelper(soy.$$stripHtmlTags(value.content));
   }
   return soy.esc.$$escapeHtmlHelper(value);
 };
@@ -1775,13 +2176,10 @@ soy.$$escapeHtmlAttribute = function(value) {
  * @return {string} An escaped version of value.
  */
 soy.$$escapeHtmlAttributeNospace = function(value) {
-  if (value && value.contentKind) {
-    if (value.contentKind === goog.soy.data.SanitizedContentKind.HTML) {
-      goog.asserts.assert(value.constructor ===
-          soydata.SanitizedHtml);
-      return soy.esc.$$normalizeHtmlNospaceHelper(
-          soy.$$stripHtmlTags(value.content));
-    }
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtml);
+    return soy.esc.$$normalizeHtmlNospaceHelper(
+        soy.$$stripHtmlTags(value.content));
   }
   return soy.esc.$$escapeHtmlNospaceHelper(value);
 };
@@ -1800,10 +2198,8 @@ soy.$$escapeHtmlAttributeNospace = function(value) {
 soy.$$filterHtmlAttributes = function(value) {
   // NOTE: Explicitly no support for SanitizedContentKind.HTML, since that is
   // meaningless in this context, which is generally *between* html attributes.
-  if (value &&
-      value.contentKind === goog.soy.data.SanitizedContentKind.ATTRIBUTES) {
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedHtmlAttribute);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.ATTRIBUTES)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedHtmlAttribute);
     // Add a space at the end to ensure this won't get merged into following
     // attributes, unless the interpretation is unambiguous (ending with quotes
     // or a space).
@@ -1859,12 +2255,10 @@ soy.$$escapeJs = function(value) {
  * @return {string} An escaped version of value.
  */
 soy.$$escapeJsString = function(value) {
-  if (value &&
-      value.contentKind === goog.soy.data.SanitizedContentKind.JS_STR_CHARS) {
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.JS_STR_CHARS)) {
     // TODO: It might still be worthwhile to normalize it to remove
     // unescaped quotes, null, etc: replace(/(?:^|[^\])['"]/g, '\\$
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedJsStrChars);
+    goog.asserts.assert(value.constructor === soydata.SanitizedJsStrChars);
     return value.content;
   }
   return soy.esc.$$escapeJsStringHelper(value);
@@ -1889,9 +2283,8 @@ soy.$$escapeJsValue = function(value) {
     // distinct undefined value.
     return ' null ';
   }
-  if (value.contentKind == goog.soy.data.SanitizedContentKind.JS) {
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedJs);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.JS)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedJs);
     return value.content;
   }
   switch (typeof value) {
@@ -1946,9 +2339,8 @@ soy.$$pctEncode_ = function(ch) {
  * @return {string} An escaped version of value.
  */
 soy.$$escapeUri = function(value) {
-  if (value && value.contentKind === goog.soy.data.SanitizedContentKind.URI) {
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedUri);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.URI)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedUri);
     return soy.$$normalizeUri(value);
   }
   // Apostophes and parentheses are not matched by encodeURIComponent.
@@ -1985,15 +2377,28 @@ soy.$$normalizeUri = function(value) {
  * @return {string} An escaped version of value.
  */
 soy.$$filterNormalizeUri = function(value) {
-  if (value && value.contentKind == goog.soy.data.SanitizedContentKind.URI) {
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedUri);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.URI)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedUri);
     return soy.$$normalizeUri(value);
   }
   return soy.esc.$$filterNormalizeUriHelper(value);
 };
 
 
+/**
+ * Allows only data-protocol image URI's.
+ *
+ * @param {*} value The value to process. May not be a string, but the value
+ *     will be coerced to a string.
+ * @return {!soydata.SanitizedUri} An escaped version of value.
+ */
+soy.$$filterImageDataUri = function(value) {
+  // NOTE: Even if it's a SanitizedUri, we will still filter it.
+  return soydata.VERY_UNSAFE.ordainSanitizedUri(
+      soy.esc.$$filterImageDataUriHelper(value));
+};
+
+
 /**
  * Escapes a string so it can safely be included inside a quoted CSS string.
  *
@@ -2014,9 +2419,8 @@ soy.$$escapeCssString = function(value) {
  * @return {string} A safe CSS identifier part, keyword, or quanitity.
  */
 soy.$$filterCssValue = function(value) {
-  if (value && value.contentKind === goog.soy.data.SanitizedContentKind.CSS) {
-    goog.asserts.assert(value.constructor ===
-        soydata.SanitizedCss);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.CSS)) {
+    goog.asserts.assert(value.constructor === soydata.SanitizedCss);
     return value.content;
   }
   // Uses == to intentionally match null and undefined for Java compatibility.
@@ -2034,10 +2438,10 @@ soy.$$filterCssValue = function(value) {
  * meant to be used unescaped.
  *
  * @param {*} value The value to filter.
- * @return {string} The value, that we dearly hope will not cause an attack.
+ * @return {*} The value, that we dearly hope will not cause an attack.
  */
 soy.$$filterNoAutoescape = function(value) {
-  if (value && value.contentKind === goog.soy.data.SanitizedContentKind.TEXT) {
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.TEXT)) {
     // Fail in development mode.
     goog.asserts.fail(
         'Tainted SanitizedContentKind.TEXT for |noAutoescape: `%s`',
@@ -2045,7 +2449,8 @@ soy.$$filterNoAutoescape = function(value) {
     // Return innocuous data in production.
     return 'zSoyz';
   }
-  return String(value);
+
+  return value;
 };
 
 
@@ -2055,11 +2460,18 @@ soy.$$filterNoAutoescape = function(value) {
 
 /**
  * Converts \r\n, \r, and \n to <br>s
- * @param {*} str The string in which to convert newlines.
- * @return {string} A copy of {@code str} with converted newlines.
+ * @param {*} value The string in which to convert newlines.
+ * @return {string|!soydata.SanitizedHtml} A copy of {@code value} with
+ *     converted newlines. If {@code value} is SanitizedHtml, the return value
+ *     is also SanitizedHtml, of the same known directionality.
  */
-soy.$$changeNewlineToBr = function(str) {
-  return goog.string.newLineToBr(String(str), false);
+soy.$$changeNewlineToBr = function(value) {
+  var result = goog.string.newLineToBr(String(value), false);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    return soydata.VERY_UNSAFE.ordainSanitizedHtml(
+        result, soydata.getContentDir(value));
+  }
+  return result;
 };
 
 
@@ -2069,14 +2481,22 @@ soy.$$changeNewlineToBr = function(str) {
  * HTML tags or entities. Entites count towards the character count; HTML tags
  * do not.
  *
- * @param {*} str The HTML string to insert word breaks into. Can be other
+ * @param {*} value The HTML string to insert word breaks into. Can be other
  *     types, but the value will be coerced to a string.
  * @param {number} maxCharsBetweenWordBreaks Maximum number of non-space
  *     characters to allow before adding a word break.
- * @return {string} The string including word breaks.
+ * @return {string|!soydata.SanitizedHtml} The string including word
+ *     breaks. If {@code value} is SanitizedHtml, the return value
+ *     is also SanitizedHtml, of the same known directionality.
  */
-soy.$$insertWordBreaks = function(str, maxCharsBetweenWordBreaks) {
-  return goog.format.insertWordBreaks(String(str), maxCharsBetweenWordBreaks);
+soy.$$insertWordBreaks = function(value, maxCharsBetweenWordBreaks) {
+  var result = goog.format.insertWordBreaks(
+      String(value), maxCharsBetweenWordBreaks);
+  if (soydata.isContentKind(value, soydata.SanitizedContentKind.HTML)) {
+    return soydata.VERY_UNSAFE.ordainSanitizedHtml(
+        result, soydata.getContentDir(value));
+  }
+  return result;
 };
 
 
@@ -2178,16 +2598,22 @@ soy.$$getBidiFormatterInstance_ = function(bidiGlobalDir) {
  * Estimate the overall directionality of text. If opt_isHtml, makes sure to
  * ignore the LTR nature of the mark-up and escapes in text, making the logic
  * suitable for HTML and HTML-escaped text.
- * @param {string} text The text whose directionality is to be estimated.
+ * If text has a goog.i18n.bidi.Dir-valued contentDir, this is used instead of
+ * estimating the directionality.
+ *
+ * @param {*} text The content whose directionality is to be estimated.
  * @param {boolean=} opt_isHtml Whether text is HTML/HTML-escaped.
  *     Default: false.
  * @return {number} 1 if text is LTR, -1 if it is RTL, and 0 if it is neutral.
  */
 soy.$$bidiTextDir = function(text, opt_isHtml) {
-  if (!text) {
-    return 0;
+  var contentDir = soydata.getContentDir(text);
+  if (contentDir != null) {
+    return contentDir;
   }
-  return goog.i18n.bidi.detectRtlDirectionality(text, opt_isHtml) ? -1 : 1;
+  var isHtml = opt_isHtml ||
+      soydata.isContentKind(text, soydata.SanitizedContentKind.HTML);
+  return goog.i18n.bidi.estimateDirection(text + '', isHtml);
 };
 
 
@@ -2197,9 +2623,12 @@ soy.$$bidiTextDir = function(text, opt_isHtml) {
  * Otherwise, returns the empty string.
  * If opt_isHtml, makes sure to ignore the LTR nature of the mark-up and escapes
  * in text, making the logic suitable for HTML and HTML-escaped text.
+ * If text has a goog.i18n.bidi.Dir-valued contentDir, this is used instead of
+ * estimating the directionality.
+ *
  * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
  *     if rtl, 0 if unknown.
- * @param {string} text The text whose directionality is to be estimated.
+ * @param {*} text The content whose directionality is to be estimated.
  * @param {boolean=} opt_isHtml Whether text is HTML/HTML-escaped.
  *     Default: false.
  * @return {soydata.SanitizedHtmlAttribute} 'dir="rtl"' for RTL text in non-RTL
@@ -2207,8 +2636,15 @@ soy.$$bidiTextDir = function(text, opt_isHtml) {
  *     else, the empty string.
  */
 soy.$$bidiDirAttr = function(bidiGlobalDir, text, opt_isHtml) {
+  var formatter = soy.$$getBidiFormatterInstance_(bidiGlobalDir);
+  var contentDir = soydata.getContentDir(text);
+  if (contentDir == null) {
+    var isHtml = opt_isHtml ||
+        soydata.isContentKind(text, soydata.SanitizedContentKind.HTML);
+    contentDir = goog.i18n.bidi.estimateDirection(text + '', isHtml);
+  }
   return soydata.VERY_UNSAFE.ordainSanitizedHtmlAttribute(
-      soy.$$getBidiFormatterInstance_(bidiGlobalDir).dirAttr(text, opt_isHtml));
+      formatter.knownDirAttr(contentDir));
 };
 
 
@@ -2218,9 +2654,12 @@ soy.$$bidiDirAttr = function(bidiGlobalDir, text, opt_isHtml) {
  * bidiGlobalDir. Otherwise returns the empty string.
  * If opt_isHtml, makes sure to ignore the LTR nature of the mark-up and escapes
  * in text, making the logic suitable for HTML and HTML-escaped text.
+ * If text has a goog.i18n.bidi.Dir-valued contentDir, this is used instead of
+ * estimating the directionality.
+ *
  * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
  *     if rtl, 0 if unknown.
- * @param {string} text The text whose directionality is to be estimated.
+ * @param {*} text The content whose directionality is to be estimated.
  * @param {boolean=} opt_isHtml Whether text is HTML/HTML-escaped.
  *     Default: false.
  * @return {string} A Unicode bidi mark matching bidiGlobalDir, or the empty
@@ -2229,44 +2668,112 @@ soy.$$bidiDirAttr = function(bidiGlobalDir, text, opt_isHtml) {
  */
 soy.$$bidiMarkAfter = function(bidiGlobalDir, text, opt_isHtml) {
   var formatter = soy.$$getBidiFormatterInstance_(bidiGlobalDir);
-  return formatter.markAfter(text, opt_isHtml);
+  var isHtml = opt_isHtml ||
+      soydata.isContentKind(text, soydata.SanitizedContentKind.HTML);
+  return formatter.markAfterKnownDir(soydata.getContentDir(text), text + '',
+      isHtml);
 };
 
 
 /**
- * Returns str wrapped in a <span dir="ltr|rtl"> according to its directionality
- * - but only if that is neither neutral nor the same as the global context.
- * Otherwise, returns str unchanged.
- * Always treats str as HTML/HTML-escaped, i.e. ignores mark-up and escapes when
- * estimating str's directionality.
+ * Returns text wrapped in a <span dir="ltr|rtl"> according to its
+ * directionality - but only if that is neither neutral nor the same as the
+ * global context. Otherwise, returns text unchanged.
+ * Always treats text as HTML/HTML-escaped, i.e. ignores mark-up and escapes
+ * when estimating text's directionality.
+ * If text has a goog.i18n.bidi.Dir-valued contentDir, this is used instead of
+ * estimating the directionality.
+ *
  * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
  *     if rtl, 0 if unknown.
- * @param {*} str The string to be wrapped. Can be other types, but the value
+ * @param {*} text The string to be wrapped. Can be other types, but the value
  *     will be coerced to a string.
- * @return {string} The wrapped string.
+ * @return {!goog.soy.data.SanitizedContent|string} The wrapped text.
  */
-soy.$$bidiSpanWrap = function(bidiGlobalDir, str) {
+soy.$$bidiSpanWrap = function(bidiGlobalDir, text) {
   var formatter = soy.$$getBidiFormatterInstance_(bidiGlobalDir);
-  return formatter.spanWrap(str + '', true);
+
+  // We always treat the value as HTML, because span-wrapping is only useful
+  // when its output will be treated as HTML (without escaping), and because
+  // |bidiSpanWrap is not itself specified to do HTML escaping in Soy. (Both
+  // explicit and automatic HTML escaping, if any, is done before calling
+  // |bidiSpanWrap because the BidiSpanWrapDirective Java class implements
+  // SanitizedContentOperator, but this does not mean that the input has to be
+  // HTML SanitizedContent. In legacy usage, a string that is not
+  // SanitizedContent is often printed in an autoescape="false" template or by
+  // a print with a |noAutoescape, in which case our input is just SoyData.) If
+  // the output will be treated as HTML, the input had better be safe
+  // HTML/HTML-escaped (even if it isn't HTML SanitizedData), or we have an XSS
+  // opportunity and a much bigger problem than bidi garbling.
+  var wrappedText = formatter.spanWrapWithKnownDir(
+      soydata.getContentDir(text), text + '', true /* opt_isHtml */);
+
+  // Like other directives whose Java class implements SanitizedContentOperator,
+  // |bidiSpanWrap is called after the escaping (if any) has already been done,
+  // and thus there is no need for it to produce actual SanitizedContent.
+  return wrappedText;
 };
 
 
 /**
- * Returns str wrapped in Unicode BiDi formatting characters according to its
+ * Returns text wrapped in Unicode BiDi formatting characters according to its
  * directionality, i.e. either LRE or RLE at the beginning and PDF at the end -
- * but only if str's directionality is neither neutral nor the same as the
- * global context. Otherwise, returns str unchanged.
- * Always treats str as HTML/HTML-escaped, i.e. ignores mark-up and escapes when
- * estimating str's directionality.
+ * but only if text's directionality is neither neutral nor the same as the
+ * global context. Otherwise, returns text unchanged.
+ * Only treats soydata.SanitizedHtml as HTML/HTML-escaped, i.e. ignores mark-up
+ * and escapes when estimating text's directionality.
+ * If text has a goog.i18n.bidi.Dir-valued contentDir, this is used instead of
+ * estimating the directionality.
+ *
  * @param {number} bidiGlobalDir The global directionality context: 1 if ltr, -1
  *     if rtl, 0 if unknown.
- * @param {*} str The string to be wrapped. Can be other types, but the value
+ * @param {*} text The string to be wrapped. Can be other types, but the value
  *     will be coerced to a string.
- * @return {string} The wrapped string.
+ * @return {!goog.soy.data.SanitizedContent|string} The wrapped string.
  */
-soy.$$bidiUnicodeWrap = function(bidiGlobalDir, str) {
+soy.$$bidiUnicodeWrap = function(bidiGlobalDir, text) {
   var formatter = soy.$$getBidiFormatterInstance_(bidiGlobalDir);
-  return formatter.unicodeWrap(str + '', true);
+
+  // We treat the value as HTML if and only if it says it's HTML, even though in
+  // legacy usage, we sometimes have an HTML string (not SanitizedContent) that
+  // is passed to an autoescape="false" template or a {print $foo|noAutoescape},
+  // with the output going into an HTML context without escaping. We simply have
+  // no way of knowing if this is what is happening when we get
+  // non-SanitizedContent input, and most of the time it isn't.
+  var isHtml = soydata.isContentKind(text, soydata.SanitizedContentKind.HTML);
+  var wrappedText = formatter.unicodeWrapWithKnownDir(
+      soydata.getContentDir(text), text + '', isHtml);
+
+  // Bidi-wrapping a value converts it to the context directionality. Since it
+  // does not cost us anything, we will indicate this known direction in the
+  // output SanitizedContent, even though the intended consumer of that
+  // information - a bidi wrapping directive - has already been run.
+  var wrappedTextDir = formatter.getContextDir();
+
+  // Unicode-wrapping UnsanitizedText gives UnsanitizedText.
+  // Unicode-wrapping safe HTML or JS string data gives valid, safe HTML or JS
+  // string data.
+  // ATTENTION: Do these need to be ...ForInternalBlocks()?
+  if (soydata.isContentKind(text, soydata.SanitizedContentKind.TEXT)) {
+    return new soydata.UnsanitizedText(wrappedText, wrappedTextDir);
+  }
+  if (isHtml) {
+    return soydata.VERY_UNSAFE.ordainSanitizedHtml(wrappedText, wrappedTextDir);
+  }
+  if (soydata.isContentKind(text, soydata.SanitizedContentKind.JS_STR_CHARS)) {
+    return soydata.VERY_UNSAFE.ordainSanitizedJsStrChars(
+        wrappedText, wrappedTextDir);
+  }
+
+  // Unicode-wrapping does not conform to the syntax of the other types of
+  // content. For lack of anything better to do, we we do not declare a content
+  // kind at all by falling through to the non-SanitizedContent case below.
+  // TODO(user): Consider throwing a runtime error on receipt of
+  // SanitizedContent other than TEXT, HTML, or JS_STR_CHARS.
+
+  // The input was not SanitizedContent, so our output isn't SanitizedContent
+  // either.
+  return wrappedText;
 };
 
 
@@ -2276,6 +2783,10 @@ soy.$$bidiUnicodeWrap = function(bidiGlobalDir, str) {
 
 
 
+
+
+
+
 // START GENERATED CODE FOR ESCAPERS.
 
 /**
@@ -2286,7 +2797,7 @@ soy.esc.$$escapeUriHelper = function(v) {
 };
 
 /**
- * Maps charcters to the escaped versions for the named escape directives.
+ * Maps characters to the escaped versions for the named escape directives.
  * @type {Object.<string, string>}
  * @private
  */
@@ -2314,7 +2825,7 @@ soy.esc.$$ESCAPE_MAP_FOR_ESCAPE_HTML__AND__NORMALIZE_HTML__AND__ESCAPE_HTML_NOSP
 };
 
 /**
- * A function that can be used with String.replace..
+ * A function that can be used with String.replace.
  * @param {string} ch A single character matched by a compatible matcher.
  * @return {string} A token in the output language.
  * @private
@@ -2324,7 +2835,7 @@ soy.esc.$$REPLACER_FOR_ESCAPE_HTML__AND__NORMALIZE_HTML__AND__ESCAPE_HTML_NOSPAC
 };
 
 /**
- * Maps charcters to the escaped versions for the named escape directives.
+ * Maps characters to the escaped versions for the named escape directives.
  * @type {Object.<string, string>}
  * @private
  */
@@ -2366,7 +2877,7 @@ soy.esc.$$ESCAPE_MAP_FOR_ESCAPE_JS_STRING__AND__ESCAPE_JS_REGEX_ = {
 };
 
 /**
- * A function that can be used with String.replace..
+ * A function that can be used with String.replace.
  * @param {string} ch A single character matched by a compatible matcher.
  * @return {string} A token in the output language.
  * @private
@@ -2376,7 +2887,7 @@ soy.esc.$$REPLACER_FOR_ESCAPE_JS_STRING__AND__ESCAPE_JS_REGEX_ = function(ch) {
 };
 
 /**
- * Maps charcters to the escaped versions for the named escape directives.
+ * Maps characters to the escaped versions for the named escape directives.
  * @type {Object.<string, string>}
  * @private
  */
@@ -2411,7 +2922,7 @@ soy.esc.$$ESCAPE_MAP_FOR_ESCAPE_CSS_STRING_ = {
 };
 
 /**
- * A function that can be used with String.replace..
+ * A function that can be used with String.replace.
  * @param {string} ch A single character matched by a compatible matcher.
  * @return {string} A token in the output language.
  * @private
@@ -2421,7 +2932,7 @@ soy.esc.$$REPLACER_FOR_ESCAPE_CSS_STRING_ = function(ch) {
 };
 
 /**
- * Maps charcters to the escaped versions for the named escape directives.
+ * Maps characters to the escaped versions for the named escape directives.
  * @type {Object.<string, string>}
  * @private
  */
@@ -2494,7 +3005,7 @@ soy.esc.$$ESCAPE_MAP_FOR_NORMALIZE_URI__AND__FILTER_NORMALIZE_URI_ = {
 };
 
 /**
- * A function that can be used with String.replace..
+ * A function that can be used with String.replace.
  * @param {string} ch A single character matched by a compatible matcher.
  * @return {string} A token in the output language.
  * @private
@@ -2573,6 +3084,13 @@ soy.esc.$$FILTER_FOR_FILTER_CSS_VALUE_ = /^(?!-*(?:expression|(?:moz-)?binding))
  */
 soy.esc.$$FILTER_FOR_FILTER_NORMALIZE_URI_ = /^(?:(?:https?|mailto):|[^&:\/?#]*(?:[\/?#]|$))/i;
 
+/**
+ * A pattern that vets values produced by the named directives.
+ * @type RegExp
+ * @private
+ */
+soy.esc.$$FILTER_FOR_FILTER_IMAGE_DATA_URI_ = /^data:image\/(?:bmp|gif|jpe?g|png|tiff|webp);base64,[a-z0-9+\/]+=*$/i;
+
 /**
  * A pattern that vets values produced by the named directives.
  * @type RegExp
@@ -2711,6 +3229,19 @@ soy.esc.$$filterNormalizeUriHelper = function(value) {
       soy.esc.$$REPLACER_FOR_NORMALIZE_URI__AND__FILTER_NORMALIZE_URI_);
 };
 
+/**
+ * A helper for the Soy directive |filterImageDataUri
+ * @param {*} value Can be of any type but will be coerced to a string.
+ * @return {string} The escaped text.
+ */
+soy.esc.$$filterImageDataUriHelper = function(value) {
+  var str = String(value);
+  if (!soy.esc.$$FILTER_FOR_FILTER_IMAGE_DATA_URI_.test(str)) {
+    return 'data:image/gif;base64,zSoyz';
+  }
+  return str;
+};
+
 /**
  * A helper for the Soy directive |filterHtmlAttributes
  * @param {*} value Can be of any type but will be coerced to a string.