From b04eb2cff8447e886540a1b61289bd4c85507378 Mon Sep 17 00:00:00 2001
From: Thorsten Sick <thorsten.sick@avira.com>
Date: Mon, 8 Jun 2015 13:11:00 +0200
Subject: [PATCH 1/2] I18N support for popup.html. German and English.

---
 chromium/_locales/de/messages.json | 35 +++++++++++++++++++++++++++++-
 chromium/_locales/en/messages.json | 33 ++++++++++++++++++++++++++++
 chromium/popup.html                | 22 +++++++++----------
 3 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/chromium/_locales/de/messages.json b/chromium/_locales/de/messages.json
index 40b7e7aa817f..ddb6ffc93f26 100644
--- a/chromium/_locales/de/messages.json
+++ b/chromium/_locales/de/messages.json
@@ -1,6 +1,6 @@
 {
     "menu_blockHttpRequests": {
-        "message": "Block all HTTP requests"
+        "message": "Alle HTTP requests blockieren"
     },
     "about_title": {
         "message": "Über HTTPS Everywhere"
@@ -121,6 +121,39 @@
     },
     "chrome_what_is_this_title": {
         "message": "HTTPS-Everywhere-Webseite"
+    },
+    "menu_add_rule": {
+        "message": "Regel für diese Seite hinzufügen"
+    },
+    "about_add_new_rule": {
+        "message": "Eine Regel für diese Seite hinzufügen"
+    },
+    "menu_always_https_for_host": {
+        "message": "Für diese Seite HTTPS erzwingen"
+    },
+    "menu_host": {
+        "message": "Host:"
+    },
+    "menu_show_advanced": {
+        "message": "Erweiterte Optionen anzeigen"
+    },
+    "menu_hide_advanced": {
+        "message": "Erweiterte Optionen verstecken"
+    },
+    "menu_rule_name": {
+        "message": "Regel Name"
+    },
+    "menu_regex": {
+        "message": "Auslösende regex"
+    },
+    "menu_redirect_to": {
+        "message": "Umleiten zu"
+    },
+    "menu_add_new_rule": {
+        "message": "Neue Regel hinzufügen"
+    },
+    "status_cancel_button": {
+        "message": "Abbrechen"
     }
 }
 
diff --git a/chromium/_locales/en/messages.json b/chromium/_locales/en/messages.json
index 8d01a04faeef..7cf06ab79379 100644
--- a/chromium/_locales/en/messages.json
+++ b/chromium/_locales/en/messages.json
@@ -121,6 +121,39 @@
     },
     "chrome_what_is_this_title": {
         "message": "HTTPS Everywhere website"
+    },
+    "menu_add_rule": {
+        "message": "Add a rule for this site"
+    },
+    "about_add_new_rule": {
+        "message": "Add a new rule for this site"
+    },
+    "menu_always_https_for_host": {
+        "message": "Always use https for this host."
+    },
+    "menu_host": {
+        "message": "Host:"
+    },
+    "menu_show_advanced": {
+        "message": "Show advanced"
+    },
+    "menu_hide_advanced": {
+        "message": "Hide advanced"
+    },
+    "menu_rule_name": {
+        "message": "Rule name"
+    },
+    "menu_regex": {
+        "message": "Matching regex"
+    },
+    "menu_redirect_to": {
+        "message": "Redirect to"
+    },
+    "menu_add_new_rule": {
+        "message": "Add new rule"
+    },
+    "status_cancel_button": {
+        "message": "Cancel"
     }
 }
 
diff --git a/chromium/popup.html b/chromium/popup.html
index 2182562d4804..43b04505dab9 100755
--- a/chromium/popup.html
+++ b/chromium/popup.html
@@ -19,25 +19,25 @@ <h1 i18n="about_ext_name"></h1>
     >Block all HTTP requests</label>
 </section>
 <section>
-  <a href="#" id="add-rule-link">Add a rule for this site</a>
+  <a href="#" id="add-rule-link" i18n="menu_add_rule">Add a rule for this site</a>
   <div id="add-new-rule-div" style="display:none">
-    <h3> Add a new rule for this site</h3>
-    <p>Always use https for this host.
-    <label for="new-rule-host">Host:</label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
+    <h3 i18n="about_add_new_rule"> Add a new rule for this site</h3>
+    <p i18n="menu_always_https_for_host">Always use https for this host.
+    <label for="new-rule-host" i18n="menu_host">Host:</label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
 
     <div id="new-rule-regular-text">
-      <p><a href="#" id="new-rule-show-advanced-link">Show advanced</a>
+      <p><a href="#" id="new-rule-show-advanced-link" i18n="menu_show_advanced">Show advanced</a>
     </div>
     <div id="new-rule-advanced" style="display:none;">
-      <p><a href="#" id="new-rule-hide-advanced-link">Hide advanced</a>
+      <p><a href="#" id="new-rule-hide-advanced-link" i18n="menu_hide_advanced">Hide advanced</a>
       <p>
-      <label for="new-rule-name">Rule name</label><br><input size="50" id="new-rule-name" type="text"><br>
-      <label for="new-rule-regex">Matching regex</label> <br><input size="50" id="new-rule-regex" type="text"><br>
-      <label for="new-rule-redirect">Redirect to</label> <br><input size="50" id="new-rule-redirect" type="text"><br>
+      <label for="new-rule-name" i18n="menu_rule_name">Rule name</label><br><input size="50" id="new-rule-name" type="text"><br>
+      <label for="new-rule-regex" i18n="menu_regex">Matching regex</label> <br><input size="50" id="new-rule-regex" type="text"><br>
+      <label for="new-rule-redirect" i18n="menu_redirect_to">Redirect to</label> <br><input size="50" id="new-rule-redirect" type="text"><br>
     </div>
 
-    <button id="add-new-rule-button">Add new Rule</button><br>
-    <button id="cancel-new-rule">Cancel</button>
+    <button id="add-new-rule-button" i18n="menu_add_new_rule">Add new Rule</button><br>
+    <button id="cancel-new-rule" i18n="status_cancel_button">Cancel</button>
   </div>
 </section>
 <section id="StableRules" class="rules">

From a1569f4218d4238837ca6c0e91b697fda9cabc5e Mon Sep 17 00:00:00 2001
From: Thorsten Sick <thorsten.sick@avira.com>
Date: Mon, 15 Jun 2015 08:01:20 +0200
Subject: [PATCH 2/2] removed English text content from html. I18n is replacing
 it

---
 chromium/popup.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/chromium/popup.html b/chromium/popup.html
index 43b04505dab9..d1b8f5af51a3 100755
--- a/chromium/popup.html
+++ b/chromium/popup.html
@@ -16,28 +16,28 @@ <h1 i18n="about_ext_name"></h1>
 <section id="HttpNowhere" class="options">
   <input id="http-nowhere-checkbox" type="checkbox" value="httpNowhere"/>
   <label i18n="menu_blockHttpRequests" for="http-nowhere-checkbox"
-    >Block all HTTP requests</label>
+    ></label>
 </section>
 <section>
-  <a href="#" id="add-rule-link" i18n="menu_add_rule">Add a rule for this site</a>
+  <a href="#" id="add-rule-link" i18n="menu_add_rule"></a>
   <div id="add-new-rule-div" style="display:none">
-    <h3 i18n="about_add_new_rule"> Add a new rule for this site</h3>
-    <p i18n="menu_always_https_for_host">Always use https for this host.
-    <label for="new-rule-host" i18n="menu_host">Host:</label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
+    <h3 i18n="about_add_new_rule"> </h3>
+    <p i18n="menu_always_https_for_host">
+    <label for="new-rule-host" i18n="menu_host"></label> <br><input size="50" id="new-rule-host" type="text" disabled><br>
 
     <div id="new-rule-regular-text">
-      <p><a href="#" id="new-rule-show-advanced-link" i18n="menu_show_advanced">Show advanced</a>
+      <p><a href="#" id="new-rule-show-advanced-link" i18n="menu_show_advanced"></a>
     </div>
     <div id="new-rule-advanced" style="display:none;">
-      <p><a href="#" id="new-rule-hide-advanced-link" i18n="menu_hide_advanced">Hide advanced</a>
+      <p><a href="#" id="new-rule-hide-advanced-link" i18n="menu_hide_advanced"></a>
       <p>
-      <label for="new-rule-name" i18n="menu_rule_name">Rule name</label><br><input size="50" id="new-rule-name" type="text"><br>
-      <label for="new-rule-regex" i18n="menu_regex">Matching regex</label> <br><input size="50" id="new-rule-regex" type="text"><br>
-      <label for="new-rule-redirect" i18n="menu_redirect_to">Redirect to</label> <br><input size="50" id="new-rule-redirect" type="text"><br>
+      <label for="new-rule-name" i18n="menu_rule_name"></label><br><input size="50" id="new-rule-name" type="text"><br>
+      <label for="new-rule-regex" i18n="menu_regex"></label> <br><input size="50" id="new-rule-regex" type="text"><br>
+      <label for="new-rule-redirect" i18n="menu_redirect_to"></label> <br><input size="50" id="new-rule-redirect" type="text"><br>
     </div>
 
-    <button id="add-new-rule-button" i18n="menu_add_new_rule">Add new Rule</button><br>
-    <button id="cancel-new-rule" i18n="status_cancel_button">Cancel</button>
+    <button id="add-new-rule-button" i18n="menu_add_new_rule"></button><br>
+    <button id="cancel-new-rule" i18n="status_cancel_button"></button>
   </div>
 </section>
 <section id="StableRules" class="rules">
@@ -49,7 +49,7 @@ <h3 i18n="chrome_experimental_rules"></h3>
   <p class="description" i18n="chrome_experimental_rules_description"></p>
 </section>
 <footer>
-  <a id="whatIsThis" href="https://www.eff.org/https-everywhere" target="_blank" tabindex="-1" i18n="chrome_what_is_this">blah</a>
+  <a id="whatIsThis" href="https://www.eff.org/https-everywhere" target="_blank" tabindex="-1" i18n="chrome_what_is_this"></a>
   <p><small>(Version: <span id="current-version"></span>)</small></p>
   <!-- <a href="" title="HTTPS Everywhere Options">Options</a> -->
 </footer>