Fix translations.

diff --git a/karesansui/locale/en/LC_MESSAGES/messages.po b/karesansui/locale/en/LC_MESSAGES/messages.po
index 78fe27a..8d3a66e 100644 (file)
--- a/karesansui/locale/en/LC_MESSAGES/messages.po
+++ b/karesansui/locale/en/LC_MESSAGES/messages.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2009-01-06 15:17+0900\n"
-"PO-Revision-Date: 2010-06-07 18:37+0900\n"
+"PO-Revision-Date: 2010-06-08 12:16+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
+"Generated-By: Babel 0.9.5\n"
 
 #: /git/karesansui/bin/add_disk.py:77 /git/karesansui/bin/add_nic.py:73
 #: /git/karesansui/bin/append_disk.py:69

diff --git a/karesansui/locale/ja/LC_MESSAGES/messages.po b/karesansui/locale/ja/LC_MESSAGES/messages.po
index 9e1211a..ee6bc9a 100644 (file)
--- a/karesansui/locale/ja/LC_MESSAGES/messages.po
+++ b/karesansui/locale/ja/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2010-05-14 18:28+0900\n"
-"PO-Revision-Date: 2010-06-07 18:37+0900\n"
+"PO-Revision-Date: 2010-06-08 12:16+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
+"Generated-By: Babel 0.9.5\n"
 
 #: /git/karesansui/bin/add_disk.py:77 /git/karesansui/bin/add_nic.py:73
 #: /git/karesansui/bin/append_disk.py:69
@@ -5459,7 +5459,7 @@ msgstr "転送デバイス"
 
 #: /git/karesansui/karesansui/templates/default/hostby1networkby1/hostby1networkby1.part:83
 msgid "DHCP Start/End Address"
-msgstr "DHCP開始IPアドレス"
+msgstr "DHCP開始/終了IPアドレス"
 
 #: /git/karesansui/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part:89
 msgid "Edit Settings"

diff --git a/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part b/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part
index 6af58e4..547d7e5 100644 (file)
--- a/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part
+++ b/karesansui/templates/default/hostby1networksettings/hostby1networksettings.part
@@ -133,14 +133,14 @@ function unbind_event() {
                 <tr>
                     <td id="general_" style="font-size:10px;">
                                            <img src="${ctx.homepath}/static/images/device-console.png">
-                        <span class="status">-&nbsp;General&nbsp;-</span>
+                        <span class="status">${_('General Settings')}</span>
                     </td>
                 </tr>
-% for dev,current_info in current.iteritems():
+% for dev in sorted(current.keys()):
                 <tr>
                     <td id="nic_${dev}" style="font-size:10px;" width="100">
                         <img src="${ctx.homepath}/static/images/device-network.png">
-                        <span class="status">-&nbsp;Device&nbsp;${dev}&nbsp;-</span>
+                        <span class="status">${_('Device')} ${dev}</span>
                     </td>
                 </tr>
 % endfor