fix 802.1X translation

3 files changed, 14 insertions, 80 deletions

diff --git a/de.po b/de.po
index 75bc247..1dd6772 100644
--- a/de.po
+++ b/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-09-27 10:20+0200\n"
+"POT-Creation-Date: 2011-09-27 17:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,42 +47,9 @@ msgstr "login"
 msgid "wpa_supplicant WPA-EAP template"
 msgstr "wpa_supplicant WPA-EAP Vorlage"
 
-#: templates/8021x.html:15
-#, python-format
-msgid ""
-"network={\n"
-"\tscan_ssid=1\n"
-"\tssid=\"crew.sublab.org\"\n"
-"\n"
-"\tkey_mgmt=WPA-EAP\n"
-"\teap=TTLS\n"
-"\tphase2=\"auth=PAP\"\n"
-"\n"
-"\tidentity=\"%(8021x)s\"\n"
-"\tpassword=\"[1:insert password here]\"\n"
-"\n"
-"\tanonymous_identity=\"bernd\"\n"
-"\tca_cert=\"[2:/etc/ssl/certs/cacert.org.pem]\"\n"
-"\taltsubject_match=\"DNS:taifun.local.sublab.org\"\n"
-"\tpriority=500\n"
-"}"
-msgstr ""
-"network={\n"
-"\tscan_ssid=1\n"
-"\tssid=\"crew.sublab.org\"\n"
-"\n"
-"\tkey_mgmt=WPA-EAP\n"
-"\teap=TTLS\n"
-"\tphase2=\"auth=PAP\"\n"
-"\n"
-"\tidentity=\"%(8021x)s\"\n"
-"\tpassword=\"[1:Passwort hier einsetzen]\"\n"
-"\n"
-"\tanonymous_identity=\"bernd\"\n"
-"\tca_cert=\"[2:/etc/ssl/certs/cacert.org.pem]\"\n"
-"\taltsubject_match=\"DNS:taifun.local.sublab.org\"\n"
-"\tpriority=500\n"
-"}"
+#: templates/8021x.html:24
+msgid "insert password here"
+msgstr "Passwort hier einsetzen"
 
 #: templates/create.html:9 templates/create.html:19
 msgid "create"
@@ -126,11 +93,11 @@ msgstr ""
 "    Bitte schicken sie einen Fehlerbericht an [4:equinox ! diac24 ! net].]\n"
 "   [5:%(exception)s]"
 
-#: templates/layout.xi:11 templates/layout.xi:28 templates/layout.xi:37
+#: templates/layout.xi:11 templates/layout.xi:29 templates/layout.xi:38
 msgid "subdap"
 msgstr "subdap"
 
-#: templates/layout.xi:19
+#: templates/layout.xi:20
 msgid "info"
 msgstr "info"
 
diff --git a/ja.po b/ja.po
index 5ec472f..6d3e1c5 100644
--- a/ja.po
+++ b/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-09-27 10:20+0200\n"
+"POT-Creation-Date: 2011-09-27 17:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,42 +47,9 @@ msgstr "ログイン"
 msgid "wpa_supplicant WPA-EAP template"
 msgstr "wpa_supplicant WPA-EAP 勧告"
 
-#: templates/8021x.html:15
-#, python-format
-msgid ""
-"network={\n"
-"\tscan_ssid=1\n"
-"\tssid=\"crew.sublab.org\"\n"
-"\n"
-"\tkey_mgmt=WPA-EAP\n"
-"\teap=TTLS\n"
-"\tphase2=\"auth=PAP\"\n"
-"\n"
-"\tidentity=\"%(8021x)s\"\n"
-"\tpassword=\"[1:insert password here]\"\n"
-"\n"
-"\tanonymous_identity=\"bernd\"\n"
-"\tca_cert=\"[2:/etc/ssl/certs/cacert.org.pem]\"\n"
-"\taltsubject_match=\"DNS:taifun.local.sublab.org\"\n"
-"\tpriority=500\n"
-"}"
-msgstr ""
-"network={\n"
-"\tscan_ssid=1\n"
-"\tssid=\"crew.sublab.org\"\n"
-"\n"
-"\tkey_mgmt=WPA-EAP\n"
-"\teap=TTLS\n"
-"\tphase2=\"auth=PAP\"\n"
-"\n"
-"\tidentity=\"%(8021x)s\"\n"
-"\tpassword=\"[1:パスワード]\"\n"
-"\n"
-"\tanonymous_identity=\"bernd\"\n"
-"\tca_cert=\"[2:/etc/ssl/certs/cacert.org.pem]\"\n"
-"\taltsubject_match=\"DNS:taifun.local.sublab.org\"\n"
-"\tpriority=500\n"
-"}"
+#: templates/8021x.html:24
+msgid "insert password here"
+msgstr "パスワード"
 
 #: templates/create.html:9 templates/create.html:19
 msgid "create"
@@ -119,11 +86,11 @@ msgid ""
 "   [5:%(exception)s]"
 msgstr ""
 
-#: templates/layout.xi:11 templates/layout.xi:28 templates/layout.xi:37
+#: templates/layout.xi:11 templates/layout.xi:29 templates/layout.xi:38
 msgid "subdap"
 msgstr "subdap"
 
-#: templates/layout.xi:19
+#: templates/layout.xi:20
 msgid "info"
 msgstr "info"
 
diff --git a/templates/8021x.html b/templates/8021x.html
index a5361e2..83a5de4 100644
--- a/templates/8021x.html
+++ b/templates/8021x.html
@@ -12,7 +12,7 @@
  <sub:bodylarge>
   <div class="cont">
    <h1>wpa_supplicant WPA-EAP template</h1>
-   <pre i18n:msg="8021x">network={
+   <pre xml:lang="C">network={
 	scan_ssid=1
 	ssid="crew.sublab.org"
 
@@ -21,7 +21,7 @@
 	phase2="auth=PAP"
 
 	identity="${username}"
-	password="<i style="color:red;background-color:white">insert password here</i>"
+	password="<b style="color:red;background-color:white">${_("insert password here")}</b>"
 
 	anonymous_identity="bernd"
 	ca_cert="<a href="${url('static/cacert.org.pem')}">/etc/ssl/certs/cacert.org.pem</a>"