diff --git a/proxy/static/_locales/en_US/messages.json b/proxy/static/_locales/en_US/messages.json
index e83a0fd..0d638c7 100644
--- a/proxy/static/_locales/en_US/messages.json
+++ b/proxy/static/_locales/en_US/messages.json
@@ -28,5 +28,53 @@
   },
   "badgeCookiesOff": {
     "message": "Cookies are not enabled."
+  },
+  "websiteIntro": {
+    "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>."
+  },
+  "docWiki": {
+    "message": "documentation wiki"
+  },
+  "browser": {
+    "message": "Browser"
+  },
+  "censoredUsers": {
+    "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>."
+  },
+  "extension": {
+    "message": "Extension"
+  },
+  "installExtension": {
+    "message": "If your internet access is <strong>not</strong> censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours."
+  },
+  "installFirefox": {
+    "message": "Install in Firefox"
+  },
+  "installChrome": {
+    "message": "Install in Chrome"
+  },
+  "reportingBugs": {
+    "message": "Reporting Bugs"
+  },
+  "fileBug": {
+    "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug.  To do so, you will have to,"
+  },
+  "sharedAccount": {
+    "message": "Either <a href=\"https://trac.torproject.org/projects/tor/register\">create an account</a> or <a href=\"https://trac.torproject.org/projects/tor/login\">log in</a> using the shared <b>cypherpunks</b> account with password <b>writecode</b>."
+  },
+  "bugTracker": {
+    "message": "<a href=\"https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\">File a ticket</a> using our bug tracker."
+  },
+  "descriptive": {
+    "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug. Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> to let us know how which part of the Snowflake system is experiencing problems."
+  },
+  "embed": {
+    "message": "Embed"
+  },
+  "possible": {
+    "message": "It is now possible to embed the Snowflake badge on any website:"
+  },
+  "looksLike": {
+    "message": "Which looks like this:"
   }
 }
diff --git a/proxy/static/index.html b/proxy/static/index.html
index b9ed2cd..fe751d0 100644
--- a/proxy/static/index.html
+++ b/proxy/static/index.html
@@ -18,27 +18,27 @@
 
       <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png" alt="Diagram" /></p>
 
-      <p>Snowflake is a system to defeat internet censorship. People who are
+      <p data-mdgid="__MSG_websiteIntro__">Snowflake is a system to defeat internet censorship. People who are
       censored can use Snowflake to access the internet. Their connection goes
       through Snowflake proxies, which are run by volunteers. For more detailed
       information about how Snowflake works see our
-      <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">documentation wiki</a>.</p>
+      <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/" data-msgid="__MSG_docWiki__">documentation wiki</a>.</p>
 
       <div class="sidebyside">
 
         <section id="browser" class="browser">
-          <h2>Browser</h2>
+          <h2 data-msgid="__MSG_browser__">Browser</h2>
 
-          <p>If your internet access is censored, you should download
+          <p data-msgid="__MSG_censoredUsers__">If your internet access is censored, you should download 
           <a href="https://www.torproject.org/download/">Tor Browser</a>.</p>
 
           <p class="screenshot"><img src="screenshot.png" alt="Tor Browser screenshot" /></p>
         </section>
 
         <section id="extension" class="extension">
-          <h2>Extension</h2>
+          <h2 data-msgid="__MSG_extension__">Extension</h2>
 
-          <p>If your internet access is <strong>not</strong> censored, you should
+          <p data-msgid="__MSG_installExtension__">If your internet access is <strong>not</strong> censored, you should
           consider installing the Snowflake extension to help users in censored
           networks. There is no need to worry about which websites people are
           accessing through your proxy. Their visible browsing IP address will
@@ -47,11 +47,11 @@
           <p class="addon">
             <a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/">
               <img src="firefox150.jpg" alt="Install in Firefox" height="100" /><br />
-              <span>Install in Firefox</span>
+              <span data-msgid="MSG_installFirefox__">Install in Firefox</span>
             </a>
             <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie">
               <img src="chrome150.jpg" alt="Install in Chrome" height="100" /><br />
-              <span>Install in Chrome</span>
+              <span data-msgid="__MSG_installChrome__">Install in Chrome</span>
             </a>
           </p>
         </section>
@@ -59,35 +59,38 @@
       </div>
 
       <section id="bugs">
-        <h2>REPORTING BUGS</h2>
+        <h2 data-msgid="__MSG_reportingBugs__">Reporting Bugs</h2>
 
-        <p>If you encounter problems with Snowflake as a client or a proxy,
+        <p data-msgid="__MSG_fileBug__">If you encounter problems with Snowflake as a client or a proxy,
         please consider filing a bug.  To do so, you will have to,</p>
 
         <ol>
-          <li>
+          <li data-msgid="__MSG_sharedAccount__">
           Either <a href="https://trac.torproject.org/projects/tor/register">create an
           account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a>
           using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li>
-          <li><a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake">File a ticket</a>
+          <li data-msgid="__MSG_bugTracker__">
+	  <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake">File a ticket</a>
           using our bug tracker.</li>
         </ol>
 
-        <p>Please try to be as descriptive as possible with your ticket and if
+        <p data-msgid="__MSG_descriptive__">
+        Please try to be as descriptive as possible with your ticket and if
         possible include log messages that will help us reproduce the bug.
         Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em>
         to let us know how which part of the Snowflake system is experiencing
-        problems.</p>
+        problems.
+        </p>
       </section>
 
       <section id="embed">
-        <h2>EMBED</h2>
+        <h2 data-msgid="__MSG_embed__">Embed</h2>
 
-        <p>It is now possible to embed the Snowflake badge on any website:</p>
+        <p data-msgid="__MSG_possible__">It is now possible to embed the Snowflake badge on any website:</p>
 
         <textarea readonly>&lt;iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"&gt;&lt;/iframe&gt;</textarea>
 
-        <p>Which looks like this:</p>
+        <p data-msgid="__MSG_looksLike__">Which looks like this:</p>
 
         <iframe src="embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
       </section>