diff --git a/demos/code/code.js b/demos/code/code.js
index 2dfebbbfb..65a2621ff 100644
--- a/demos/code/code.js
+++ b/demos/code/code.js
@@ -42,6 +42,7 @@ Code.LANGUAGE_NAME = {
   'el': 'Ελληνικά',
   'en': 'English',
   'es': 'Español',
+  'et': 'Eesti',
   'fa': 'فارسی',
   'fr': 'Français',
   'he': 'עברית',
diff --git a/demos/code/msg/et.js b/demos/code/msg/et.js
new file mode 100644
index 000000000..320c39174
--- /dev/null
+++ b/demos/code/msg/et.js
@@ -0,0 +1,24 @@
+var MSG = {
+  title: "Kood",
+  blocks: "Plokid",
+  linkTooltip: "Salvesta ja tekita link plokkidele.",
+  runTooltip: "Käivita töölaual olevate plokkidega defineeritud programm.",
+  badCode: "Viga programmis:\n%1",
+  timeout: "Käivitatavate iteratsioonide maksimaalne arv on ületatud.",
+  trashTooltip: "Eemalda kõik plokid.",
+  catLogic: "Loogika",
+  catLoops: "Kordus",
+  catMath: "Matemaatika",
+  catText: "Tekst",
+  catLists: "Loendid",
+  catColour: "Värv",
+  catVariables: "Muutujad",
+  catFunctions: "Funktsioonid",
+  listVariable: "loend",
+  textVariable: "tekst",
+  httpRequestError: "Probleem päringuga.",
+  linkAlert: "Oma plokke saad jagada selle lingiga:\n\n%1",
+  hashError: "Vabandust, kuid '%1' ei vasta ühelegi salvestatud programmile.",
+  xmlError: "Su salvestatud faili ei õnnestunud laadida. Võibolla on see loodud mõne teise Blockly versiooniga?",
+  badXml: "Viga XML-i parsimisel:\n%1\n\nTehtud muudatustest loobumiseks vajuta 'OK', XML-i muudatuste tegemise jätkamiseks 'Katkesta'."
+};
diff --git a/demos/plane/generated/et.js b/demos/plane/generated/et.js
new file mode 100644
index 000000000..069c7cb28
--- /dev/null
+++ b/demos/plane/generated/et.js
@@ -0,0 +1,37 @@
+// This file was automatically generated from template.soy.
+// Please don't edit this file by hand.
+
+if (typeof planepage == 'undefined') { var planepage = {}; }
+
+
+planepage.messages = function(opt_data, opt_ignored, opt_ijData) {
+  return '<div style="display: none"><span id="Plane_rows">Ridu: %1</span><span id="Plane_getRows">rows (%1)</span><span id="Plane_rows1">1. klassi ridu: %1</span><span id="Plane_getRows1">1. klassi ridu (%1)</span><span id="Plane_rows2">2. klassi ridu: %1</span><span id="Plane_getRows2">2. klassi ridu (%1)</span><span id="Plane_seats">Istmeid: %1</span><span id="Plane_placeholder">?</span><span id="Plane_setSeats">istmete arv =</span></div>';
+};
+
+
+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">Lennukiistmete kalkulaator</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>');
+  }
+  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 += 'Lennukis on reisijate istmed mitmes reas. Igas reas on neli istet.';
+      break;
+    case 2:
+      output += 'Lennuki kokpitis on kaks istet (üks kummalegi piloodile) ja mingi arv istemridu reisijatele. Igas reas on neli istet.';
+      break;
+    case 3:
+      output += 'Lennuki kokpitis on kaks istet (üks kummalegi piloodile), mingi arv ridu 1. klassi reisijatele ja mingi arv ridu 2. klassi reisijatele. Igas 1. klassi reas on neli istet, igas 2. klassi reas viis istet.';
+      break;
+  }
+  output += '</p><p>Ehita plokkidest valem, mis arvutab istmete arvu lennukis õigesti sõltumata ridade arvust (seda saad muuta lennuki juures oleva liuguriga).</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;
+};
+
+
+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>';
+};
diff --git a/demos/plane/xlf/translated_msgs_et.xlf b/demos/plane/xlf/translated_msgs_et.xlf
new file mode 100644
index 000000000..d88be0a9f
--- /dev/null
+++ b/demos/plane/xlf/translated_msgs_et.xlf
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file original="SoyMsgBundle" datatype="x-soy-msg-bundle" source-language="en" target-language="en">
+    <body>
+      <trans-unit id="286555642257111053" datatype="html">
+        <source>Rows: %1</source>
+        <target>Ridu: %1</target>
+      </trans-unit>
+      <trans-unit id="990695256953568910" datatype="html">
+        <source>seats =</source>
+        <target>istmete arv =</target>
+      </trans-unit>
+      <trans-unit id="1327005465775917626" datatype="html">
+        <source>An airplane has two seats in the flight deck (for the pilot and co-pilot), and a number of rows of 1st class and 2nd class passenger seats.  Each 1st class row contains four seats. Each 2nd class row contains five seats.</source>
+        <target>Lennuki kokpitis on kaks istet (üks kummalegi piloodile), mingi arv ridu 1. klassi reisijatele ja mingi arv ridu 2. klassi reisijatele. Igas 1. klassi reas on neli istet, igas 2. klassi reas viis istet.</target>
+      </trans-unit>
+      <trans-unit id="1649099567159388799" datatype="html">
+        <source>?</source>
+        <target>?</target>
+      </trans-unit>
+      <trans-unit id="3872872459414039837" datatype="html">
+        <source>Build a formula (below) that calculates the total number of seats on the airplane as the rows are changed (above).</source>
+        <target>Ehita plokkidest valem, mis arvutab istmete arvu lennukis õigesti sõltumata ridade arvust (seda saad muuta lennuki juures oleva liuguriga).</target>
+      </trans-unit>
+      <trans-unit id="4755413400587385256" datatype="html">
+        <source>An airplane has two seats in the flight deck (for the pilot and co-pilot), and a number of rows of passenger seats.  Each row contains four seats.</source>
+        <target>Lennuki kokpitis on kaks istet (üks kummalegi piloodile) ja mingi arv istemridu reisijatele. Igas reas on neli istet.</target>
+      </trans-unit>
+      <trans-unit id="5622822520334788359" datatype="html">
+        <source>1st class rows (%1)</source>
+        <target>1. klassi ridu (%1)</target>
+      </trans-unit>
+      <trans-unit id="6523489254328705062" datatype="html">
+        <source>2nd class rows: %1</source>
+        <target>2. klassi ridu: %1</target>
+      </trans-unit>
+      <trans-unit id="6636919311618748816" datatype="html">
+        <source>Seats: %1</source>
+        <target>Istmeid: %1</target>
+      </trans-unit>
+      <trans-unit id="6646116297668869388" datatype="html">
+        <source>Plane Seat Calculator</source>
+        <target>Lennukiistmete kalkulaator</target>
+      </trans-unit>
+      <trans-unit id="7030918043298347994" datatype="html">
+        <source>rows (%1)</source>
+        <target>rows (%1)</target>
+      </trans-unit>
+      <trans-unit id="7091637686507441682" datatype="html">
+        <source>1st class rows: %1</source>
+        <target>1. klassi ridu: %1</target>
+      </trans-unit>
+      <trans-unit id="7784699858027886282" datatype="html">
+        <source>An airplane has a number of rows of passenger seats.  Each row contains four seats.</source>
+        <target>Lennukis on reisijate istmed mitmes reas. Igas reas on neli istet.</target>
+      </trans-unit>
+      <trans-unit id="8347578891541780742" datatype="html">
+        <source>2nd class rows (%1)</source>
+        <target>2. klassi ridu (%1)</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>