summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua2
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua2
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua9
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua8
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm6
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm4
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/advanced_wirelessconfig.htm10
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm12
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm4
-rw-r--r--applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm18
-rw-r--r--applications/luci-app-mwan3/po/ja/mwan3.po67
-rw-r--r--applications/luci-app-mwan3/po/templates/mwan3.pot61
-rw-r--r--applications/luci-app-mwan3/po/zh-cn/mwan3.po152
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua26
-rw-r--r--applications/luci-app-travelmate/po/ja/travelmate.po269
-rw-r--r--applications/luci-app-travelmate/po/pt-br/travelmate.po115
-rw-r--r--applications/luci-app-travelmate/po/templates/travelmate.pot115
17 files changed, 582 insertions, 298 deletions
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
index 604a4fa842..aeabc63616 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -111,7 +111,7 @@ mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"),
"Interfaces may not share the same name as configured members, policies or rules"))
mwan_interface.addremove = true
mwan_interface.dynamic = false
- mwan_interface.sectionhead = "Interface"
+ mwan_interface.sectionhead = translate("Interface")
mwan_interface.sortable = false
mwan_interface.template = "cbi/tblsection"
mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s")
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
index 3bccbd942f..efbe8f7902 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
@@ -13,7 +13,7 @@ mwan_member = m5:section(TypedSection, "member", translate("Members"),
"Members may not share the same name as configured interfaces, policies or rules"))
mwan_member.addremove = true
mwan_member.dynamic = false
- mwan_member.sectionhead = "Member"
+ mwan_member.sectionhead = translate("Member")
mwan_member.sortable = true
mwan_member.template = "cbi/tblsection"
mwan_member.extedit = ds.build_url("admin", "network", "mwan", "configuration", "member", "%s")
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
index 08c3f69de6..6640564d50 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -42,7 +42,7 @@ mwan_policy = m5:section(TypedSection, "policy", translate("Policies"),
"Policies may not share the same name as configured interfaces, members or rules"))
mwan_policy.addremove = true
mwan_policy.dynamic = false
- mwan_policy.sectionhead = "Policy"
+ mwan_policy.sectionhead = translate("Policy")
mwan_policy.sortable = true
mwan_policy.template = "cbi/tblsection"
mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "configuration", "policy", "%s")
@@ -65,7 +65,6 @@ use_member = mwan_policy:option(DummyValue, "use_member", translate("Members ass
else
return "—"
end
-
end
last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort"))
@@ -73,11 +72,11 @@ last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last reso
function last_resort.cfgvalue(self, s)
local action = self.map:get(s, "last_resort")
if action == "blackhole" then
- return "blackhole (drop)"
+ return translate("blackhole (drop)")
elseif action == "default" then
- return "default (use main routing table)"
+ return translate("default (use main routing table)")
else
- return "unreachable (reject)"
+ return translate("unreachable (reject)")
end
end
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
index 412f369eb0..0f4c5950a0 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -47,7 +47,7 @@ mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"),
mwan_rule.addremove = true
mwan_rule.anonymous = false
mwan_rule.dynamic = false
- mwan_rule.sectionhead = "Rule"
+ mwan_rule.sectionhead = translate("Rule")
mwan_rule.sortable = true
mwan_rule.template = "cbi/tblsection"
mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "rule", "%s")
@@ -93,10 +93,10 @@ sticky = mwan_rule:option(DummyValue, "sticky", translate("Sticky"))
function sticky.cfgvalue(self, s)
if self.map:get(s, "sticky") == "1" then
stickied = 1
- return "Yes"
+ return translate("Yes")
else
stickied = nil
- return "No"
+ return translate("No")
end
end
@@ -133,7 +133,7 @@ errors = mwan_rule:option(DummyValue, "errors", translate("Errors"))
if not string.find(error_protocol_list, " " .. s .. " ") then
return ""
else
- return "<span title=\"No protocol specified\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
+ return "<span title=\"" .. translate("No protocol specified") .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
end
end
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
index 6f350ccf4d..e4a14adade 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
@@ -33,14 +33,14 @@
{
output.innerHTML =
'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
- "Waiting for MWAN to " + task + "..."
+ String.format("<%:Waiting for MWAN to %s...%>", task)
;
}
else
{
output.innerHTML =
'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
- "Waiting for diagnostic results..."
+ "<%:Waiting for diagnostic results...%>"
;
}
@@ -56,7 +56,7 @@
}
else
{
- output.innerHTML = '<pre id="diag_output_css"><strong>No diagnostic results returned</strong></pre>';
+ output.innerHTML = '<pre id="diag_output_css"><strong><%:No diagnostic results returned%></strong></pre>';
}
}
);
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
index 21f516b7c2..4174ef4b21 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
@@ -37,7 +37,7 @@
}
else
{
- tshoot.innerHTML = '<strong>Error collecting troubleshooting information</strong>';
+ tshoot.innerHTML = '<strong><%:Error collecting troubleshooting information%></strong>';
}
}
);
@@ -46,7 +46,7 @@
<div id="troubleshoot">
<fieldset class="cbi-section">
<legend><%:Troubleshooting Data%></legend>
- <div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+ <div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
</fieldset>
</div>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_wirelessconfig.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_wirelessconfig.htm
index 5077674185..bb18d53493 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_wirelessconfig.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_wirelessconfig.htm
@@ -8,17 +8,7 @@
</ul>
<style type="text/css">
- .container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
- max-width: none;
- margin: 0px 0px 0px 30px;
- padding-right: 30px;
- width: auto;
- }
- .cbi-section-node {
- margin-top: 20px;
- }
.cbi-section {
- border: 1px dotted #555555;
padding: 20px;
}
</style>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
index 84b1245021..7cef0630ee 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
@@ -13,19 +13,19 @@
switch (mArray.wans[i].status)
{
case 'online':
- stat = 'Online (tracking active)';
+ stat = '<%:Online (tracking active)%>';
cssc = 'wanon';
break;
case 'notMonitored':
- stat = 'Online (tracking off)';
+ stat = '<%:Online (tracking off)%>';
cssc = 'wanon';
break;
case 'offline':
- stat = 'Offline';
+ stat = '<%:Offline%>';
cssc = 'wanoff';
break;
case 'notEnabled':
- stat = 'Disabled';
+ stat = '<%:Disabled%>';
cssc = 'wanoff';
break;
}
@@ -38,7 +38,7 @@
}
else
{
- status.innerHTML = '<strong>No MWAN interfaces found</strong>';
+ status.innerHTML = '<strong><%:No MWAN interfaces found%></strong>';
}
}
);
@@ -46,7 +46,7 @@
<fieldset id="interface_field" class="cbi-section">
<legend><%:MWAN Interface Live Status%></legend>
- <div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+ <div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
</fieldset>
<style type="text/css">
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
index bbb617b289..6a800c3f98 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
@@ -17,7 +17,7 @@
}
else
{
- status.innerHTML = '<strong>No detailed status information available</strong>';
+ status.innerHTML = '<strong><%:No detailed status information available%></strong>';
}
}
);
@@ -26,7 +26,7 @@
<div id="mwan_detail_status">
<fieldset class="cbi-section">
<legend><%:MWAN Detailed Status%></legend>
- <div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+ <div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
</fieldset>
</div>
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
index f4c8b1224b..2929a6df60 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
@@ -21,19 +21,19 @@
switch (mArray.wans[i].status)
{
case 'online':
- status = 'Online (tracking active)';
+ status = '<%:Online (tracking active)%>';
css = 'wanon';
break;
case 'notMonitored':
- status = 'Online (tracking off)';
+ status = '<%:Online (tracking off)%>';
css = 'wanon';
break;
case 'offline':
- status = 'Offline';
+ status = '<%:Offline%>';
css = 'wanoff';
break;
case 'notEnabled':
- status = 'Disabled';
+ status = '<%:Disabled%>';
css = 'wanoff';
break;
}
@@ -46,18 +46,18 @@
}
else
{
- statusDiv.innerHTML = '<strong>No MWAN interfaces found</strong>';
+ statusDiv.innerHTML = '<strong><%:No MWAN interfaces found%></strong>';
}
var logs = document.getElementById('mwan_statuslog_text');
if (mArray.mwanlog)
{
- var mwanLog = 'Last 50 MWAN systemlog entries. Newest entries sorted at the top :';
+ var mwanLog = '<%:Last 50 MWAN systemlog entries. Newest entries sorted at the top :%>';
logs.innerHTML = String.format('<pre>%s<br /><br />%s</pre>', mwanLog, mArray.mwanlog[0]);
}
else
{
- logs.innerHTML = '<strong>No MWAN systemlog history found</strong>';
+ logs.innerHTML = '<strong><%:No MWAN systemlog history found%></strong>';
}
}
);
@@ -66,11 +66,11 @@
<div id="mwan_interface_status">
<fieldset id="interface_field" class="cbi-section">
<legend><%:MWAN Interface Live Status%></legend>
- <div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+ <div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
</fieldset>
<fieldset class="cbi-section">
<legend><%:MWAN Interface Systemlog%></legend>
- <div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+ <div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
</fieldset>
</div>
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index 834a82053c..0d6ea152d0 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -46,6 +46,9 @@ msgstr "IP ルールのチェック"
msgid "Check routing table"
msgstr "ルーティング テーブルのチェック"
+msgid "Collecting data..."
+msgstr ""
+
msgid "Configuration"
msgstr "設定"
@@ -73,6 +76,9 @@ msgstr "診断結果"
msgid "Diagnostics"
msgstr "診断機能"
+msgid "Disabled"
+msgstr ""
+
msgid ""
"Downed interface will be deemed up after this many successful ping tests"
msgstr ""
@@ -82,6 +88,9 @@ msgstr ""
msgid "Enabled"
msgstr "有効"
+msgid "Error collecting troubleshooting information"
+msgstr ""
+
msgid "Errors"
msgstr "エラー"
@@ -135,6 +144,9 @@ msgstr "インターフェース"
msgid "Internet Protocol"
msgstr "インターネット プロトコル"
+msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :"
+msgstr ""
+
msgid "Last resort"
msgstr "最終手段"
@@ -209,6 +221,9 @@ msgstr ""
"単一または複数のポート(例: \"22\" または \"80,443\")、あるいはポートの範囲"
"(例: \"1024:2048\")を、クオーテーション無しで指定することができます。"
+msgid "Member"
+msgstr ""
+
msgid "Member used"
msgstr "使用されるメンバー"
@@ -244,6 +259,30 @@ msgstr "ネットワーク設定"
msgid "No"
msgstr "いいえ"
+msgid "No MWAN interfaces found"
+msgstr ""
+
+msgid "No MWAN systemlog history found"
+msgstr ""
+
+msgid "No detailed status information available"
+msgstr ""
+
+msgid "No diagnostic results returned"
+msgstr ""
+
+msgid "No protocol specified"
+msgstr ""
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online (tracking active)"
+msgstr ""
+
+msgid "Online (tracking off)"
+msgstr ""
+
msgid "Overview"
msgstr "概要"
@@ -292,6 +331,9 @@ msgstr ""
"ん。また、15文字以内でなければなりません。<br />ポリシーでは、設定済みのイン"
"ターフェースやメンバー、ルールと同じ名前を使用することはできません。"
+msgid "Policy"
+msgstr ""
+
msgid "Policy assigned"
msgstr "アサイン済みポリシー"
@@ -310,6 +352,9 @@ msgstr "デフォルトのホットプラグ スクリプトの復元"
msgid "Restore..."
msgstr "復元..."
+msgid "Rule"
+msgstr ""
+
msgid "Rules"
msgstr "ルール"
@@ -362,6 +407,11 @@ msgid "There are currently %d of 250 supported interfaces configured"
msgstr "現在、250個中 %d 個のサポートされたインターフェースが設定済みです。"
msgid ""
+"This displays the metric assigned to this interface in /etc/config/network"
+msgstr ""
+"/etc/config/network で、このインターフェースに割り当てられたメトリックです。"
+
+msgid ""
"This hostname or IP address will be pinged to determine if the link is up or "
"down. Leave blank to assume interface is always online"
msgstr ""
@@ -369,11 +419,6 @@ msgstr ""
"に対して Ping の送信が行われます。常にオンラインとする場合、空欄のままにしま"
"す。"
-msgid ""
-"This displays the metric assigned to this interface in /etc/config/network"
-msgstr ""
-"/etc/config/network で、このインターフェースに割り当てられたメトリックです。"
-
msgid "This section allows you to modify the contents of /etc/config/mwan3"
msgstr ""
"このセクションでは、 /etc/config/mwan3 の内容を変更することができます。"
@@ -406,12 +451,12 @@ msgstr ""
"wan2, その他)<br />$DEVICE - インターフェースにアタッチされたデバイスの名前"
"(eth0.1, eth1, その他)"
-msgid "Tracking hostname or IP address"
-msgstr "追跡ホスト名または IP アドレス"
-
msgid "Tracking IP"
msgstr "追跡 IP"
+msgid "Tracking hostname or IP address"
+msgstr "追跡ホスト名または IP アドレス"
+
msgid "Tracking reliability"
msgstr "追跡の信頼性"
@@ -529,6 +574,12 @@ msgstr ""
"警告: このルールは不適切なプロトコルが指定されているか、または何も指定されて"
"いません!プロトコルを指定し直してください!"
+msgid "Waiting for MWAN to %s..."
+msgstr ""
+
+msgid "Waiting for diagnostic results..."
+msgstr ""
+
msgid "Weight"
msgstr "ウエイト"
diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot
index 3040d2661a..d9bddf5e08 100644
--- a/applications/luci-app-mwan3/po/templates/mwan3.pot
+++ b/applications/luci-app-mwan3/po/templates/mwan3.pot
@@ -33,6 +33,9 @@ msgstr ""
msgid "Check routing table"
msgstr ""
+msgid "Collecting data..."
+msgstr ""
+
msgid "Configuration"
msgstr ""
@@ -60,6 +63,9 @@ msgstr ""
msgid "Diagnostics"
msgstr ""
+msgid "Disabled"
+msgstr ""
+
msgid ""
"Downed interface will be deemed up after this many successful ping tests"
msgstr ""
@@ -67,6 +73,9 @@ msgstr ""
msgid "Enabled"
msgstr ""
+msgid "Error collecting troubleshooting information"
+msgstr ""
+
msgid "Errors"
msgstr ""
@@ -118,6 +127,9 @@ msgstr ""
msgid "Internet Protocol"
msgstr ""
+msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :"
+msgstr ""
+
msgid "Last resort"
msgstr ""
@@ -183,6 +195,9 @@ msgid ""
"as a portrange (eg \"1024:2048\") without quotes"
msgstr ""
+msgid "Member"
+msgstr ""
+
msgid "Member used"
msgstr ""
@@ -212,6 +227,30 @@ msgstr ""
msgid "No"
msgstr ""
+msgid "No MWAN interfaces found"
+msgstr ""
+
+msgid "No MWAN systemlog history found"
+msgstr ""
+
+msgid "No detailed status information available"
+msgstr ""
+
+msgid "No diagnostic results returned"
+msgstr ""
+
+msgid "No protocol specified"
+msgstr ""
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online (tracking active)"
+msgstr ""
+
+msgid "Online (tracking off)"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -252,6 +291,9 @@ msgid ""
"configured interfaces, members or rules"
msgstr ""
+msgid "Policy"
+msgstr ""
+
msgid "Policy assigned"
msgstr ""
@@ -270,6 +312,9 @@ msgstr ""
msgid "Restore..."
msgstr ""
+msgid "Rule"
+msgstr ""
+
msgid "Rules"
msgstr ""
@@ -312,12 +357,12 @@ msgid "There are currently %d of 250 supported interfaces configured"
msgstr ""
msgid ""
-"This hostname or IP address will be pinged to determine if the link is up or "
-"down. Leave blank to assume interface is always online"
+"This displays the metric assigned to this interface in /etc/config/network"
msgstr ""
msgid ""
-"This displays the metric assigned to this interface in /etc/config/network"
+"This hostname or IP address will be pinged to determine if the link is up or "
+"down. Leave blank to assume interface is always online"
msgstr ""
msgid "This section allows you to modify the contents of /etc/config/mwan3"
@@ -340,10 +385,10 @@ msgid ""
"device name attached to the interface (eth0.1, eth1, etc.)"
msgstr ""
-msgid "Tracking hostname or IP address"
+msgid "Tracking IP"
msgstr ""
-msgid "Tracking IP"
+msgid "Tracking hostname or IP address"
msgstr ""
msgid "Tracking reliability"
@@ -432,6 +477,12 @@ msgid ""
"specified! Please configure a specific protocol!"
msgstr ""
+msgid "Waiting for MWAN to %s..."
+msgstr ""
+
+msgid "Waiting for diagnostic results..."
+msgstr ""
+
msgid "Weight"
msgstr ""
diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index d1066c5850..d239312f9b 100644
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -1,17 +1,7 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
"Last-Translator: Hsing-Wang Liao <kuoruan@gmail.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0\n"
-"Last-Translator: \n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_CN\n"
msgid "%d hour"
msgstr "%d 小时"
@@ -32,20 +22,23 @@ msgid ""
"Acceptable values: 1-100. This many Tracking IP addresses must respond for "
"the link to be deemed up"
msgstr ""
-"接受的值: 1-100。这个设置项指定了当多少个IP地址能够连通时接口会被认为在线"
+"取值范围: 1-100。这个设置项指定了当多少个 IP 地址能够连通时接口会被认为在线"
msgid "Acceptable values: 1-1000. Defaults to 1 if not set"
-msgstr "接受的值: 1-100。如果不填写,默认值为 1"
+msgstr "取值范围: 1-100。如果不填写,默认值为 1"
msgid "Advanced"
msgstr "高级"
msgid "Check IP rules"
-msgstr "检查IP规则"
+msgstr "检查 IP 规则"
msgid "Check routing table"
msgstr "检查路由表"
+msgid "Collecting data..."
+msgstr "正在收集数据..."
+
msgid "Configuration"
msgstr "配置"
@@ -73,6 +66,9 @@ msgstr "诊断结果"
msgid "Diagnostics"
msgstr "诊断"
+msgid "Disabled"
+msgstr "禁用"
+
msgid ""
"Downed interface will be deemed up after this many successful ping tests"
msgstr "当 Ping 成功次数达到这个数值后,已经被认为离线的接口将会重新上线"
@@ -80,6 +76,9 @@ msgstr "当 Ping 成功次数达到这个数值后,已经被认为离线的接
msgid "Enabled"
msgstr "启用"
+msgid "Error collecting troubleshooting information"
+msgstr "收集故障排除信息时出错"
+
msgid "Errors"
msgstr "错误"
@@ -131,6 +130,9 @@ msgstr "接口"
msgid "Internet Protocol"
msgstr "互联网协议"
+msgid "Last 50 MWAN systemlog entries. Newest entries sorted at the top :"
+msgstr "最近 50 条 MWAN 系统日志,最新条目排在顶部:"
+
msgid "Last resort"
msgstr "备用成员"
@@ -192,15 +194,19 @@ msgid ""
msgstr ""
"MWAN 支持最多 250 个物理或逻辑接口。<br />MWAN 要求所有接口必须在 /etc/"
"config/network 中设定唯一的网关跃点。<br />名称必须与 /etc/config/network 中"
-"的接口名称匹配。(可查看“高级”选项卡)<br />名称允许包括A-Z、a-z、0-9、_ 但是不"
-"能有空格。<br />接口不应该与成员、策略、规则中的任意一个设置项使用相同的名称"
+"的接口名称匹配。(可查看“高级”选项卡)<br />名称允许包括A-Z、a-z、0-9、_ 但是"
+"不能有空格。<br />接口不应该与成员、策略、规则中的任意一个设置项使用相同的名"
+"称"
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
msgstr ""
-"可以输入一个或多个端口 (例如 \"22\" 或者 \"80,443\") 或者是一个端口范围 (例"
-"如 \"1024:2048\") 不含引号"
+"可以输入一个或多个端口(例如 \"22\" 或者 \"80,443\")或者是一个端口范围(例"
+"如 \"1024:2048\")不含引号"
+
+msgid "Member"
+msgstr "成员"
msgid "Member used"
msgstr "使用的成员"
@@ -213,7 +219,7 @@ msgid ""
">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Members "
"may not share the same name as configured interfaces, policies or rules"
msgstr ""
-"“成员”用来设置每一个 MWAN 接口的跃点数 (即接口优先级) 和所占比重。<br />名称"
+"“成员”用来设置每一个 MWAN 接口的跃点数(即接口优先级)和所占比重。<br />名称"
"允许包括 A-Z、 a-、0-9、_ 但是不能有空格。<br />成员不应该与接口、策略、规则"
"中的任意一个设置项使用相同的名称"
@@ -236,6 +242,30 @@ msgstr "网络配置文件"
msgid "No"
msgstr "否"
+msgid "No MWAN interfaces found"
+msgstr "没有找到 MWAN 接口"
+
+msgid "No MWAN systemlog history found"
+msgstr "没有在系统日志中找到 MWAN 历史信息"
+
+msgid "No detailed status information available"
+msgstr "没有状态详细信息可用"
+
+msgid "No diagnostic results returned"
+msgstr "没有返回诊断结果"
+
+msgid "No protocol specified"
+msgstr "未指定协议"
+
+msgid "Offline"
+msgstr "离线"
+
+msgid "Online (tracking active)"
+msgstr "在线(追踪启用中)"
+
+msgid "Online (tracking off)"
+msgstr "在线(追踪已关闭)"
+
msgid "Overview"
msgstr "概况"
@@ -281,6 +311,9 @@ msgstr ""
"包括A-Z、a-z、0-9、_ 但是不能有空格。名称应该在 15 个字符以内<br />策略不应该"
"与接口、成员、规则中的任意一个设置项使用相同的名称"
+msgid "Policy"
+msgstr "策略"
+
msgid "Policy assigned"
msgstr "分配的策略"
@@ -299,6 +332,9 @@ msgstr "恢复默认的 hotplug 脚本"
msgid "Restore..."
msgstr "恢复..."
+msgid "Rule"
+msgstr "规则"
+
msgid "Rules"
msgstr "规则"
@@ -342,20 +378,20 @@ msgid "Stop MWAN"
msgstr "停止 MWAN"
msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"
-msgstr "支持 CIDR 记法 (例如: \"192.168.100.0/24\") 不含引号"
+msgstr "支持 CIDR 记法(例如: \"192.168.100.0/24\")不含引号"
msgid "There are currently %d of 250 supported interfaces configured"
-msgstr ""
-
-msgid ""
-"This hostname or IP address will be pinged to determine if the link is up or "
-"down. Leave blank to assume interface is always online"
-msgstr ""
+msgstr "当前已配置 %d 个接口,最大支持 250 个"
msgid ""
"This displays the metric assigned to this interface in /etc/config/network"
msgstr "这里显示了这个接口在 /etc/config/network 中配置的跃点数"
+msgid ""
+"This hostname or IP address will be pinged to determine if the link is up or "
+"down. Leave blank to assume interface is always online"
+msgstr "通过 ping 此主机或 IP 地址来确定链路是否在线。留空则认为接口始终在线"
+
msgid "This section allows you to modify the contents of /etc/config/mwan3"
msgstr "这里允许你修改 /etc/config/mwan3 的内容"
@@ -375,21 +411,21 @@ msgid ""
"$INTERFACE is the interface name (wan1, wan2, etc.)<br />$DEVICE is the "
"device name attached to the interface (eth0.1, eth1, etc.)"
msgstr ""
-"这里允许你修改/etc/hotplug.d/iface/16-mwancustom 的内容<br />这可以在接口 "
+"这里允许你修改 /etc/hotplug.d/iface/16-mwancustom 的内容<br />这可以在接口 "
"ifup 或 ifdown Hotplug 事件时运行系统命令或脚本<br /><br />注意:<br />脚本的"
"第一行必须是 &#34;#!/bin/sh&#34; 不含引号<br />以#开头的行是注释,不会执行"
-"<br /><br />可用变量:<br />$ACTION 是 Hotplug 事件 (ifup, ifdown)<br />"
-"$INTERFACE 是接口名称 (wan1、wan2 等)<br />$DEVICE 是连接到接口的设备名称 "
-"(eth0.1、eth1 等)"
-
-msgid "Tracking hostname or IP address"
-msgstr ""
+"<br /><br />可用变量:<br />$ACTION 是 Hotplug 事件(ifup, ifdown)<br />"
+"$INTERFACE 是接口名称(wan1、wan2 等)<br />$DEVICE 是连接到接口的设备名称 "
+"(eth0.1、eth1 等)"
msgid "Tracking IP"
-msgstr "跟踪的 IP"
+msgstr "追踪的 IP"
+
+msgid "Tracking hostname or IP address"
+msgstr "追踪的主机或 IP 地址"
msgid "Tracking reliability"
-msgstr "跟踪可靠性"
+msgstr "追踪可靠性"
msgid "Traffic Rules"
msgstr "流量规则"
@@ -411,70 +447,77 @@ msgid "View the contents of /etc/protocols for protocol descriptions"
msgstr "请查看 /etc/protocols 获取可选协议详情"
msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!"
-msgstr ""
+msgstr "警告: 已配置 %d 个接口,超过最大值 250!"
msgid ""
"WARNING: Some policies have names exceeding the maximum of 15 characters!"
-msgstr ""
+msgstr "警告: 某些策略的名称超过了 15 个字符!"
msgid ""
"WARNING: some interfaces are configured incorrectly or not at all in /etc/"
"config/network!"
-msgstr ""
+msgstr "警告: 某些接口配置不正确或未配置到 /etc/config/network!"
msgid ""
"WARNING: some interfaces have a higher reliability requirement than there "
"are tracking IP addresses!"
-msgstr ""
+msgstr "警告: 某些接口的追踪可靠性要求大于了追踪 IP 地址总数!"
msgid ""
"WARNING: some interfaces have duplicate metrics configured in /etc/config/"
"network!"
-msgstr ""
+msgstr "警告: 某些接口在 /etc/config/network 中配置了相同的跃点数!"
msgid ""
"WARNING: some interfaces have no default route in the main routing table!"
-msgstr ""
+msgstr "警告: 某些接口在主路由表中没有默认路由!"
msgid ""
"WARNING: some interfaces have no metric configured in /etc/config/network!"
-msgstr ""
+msgstr "警告: 某些接口没有在 /etc/config/network 中配置跃点数!"
msgid ""
"WARNING: some rules have a port configured with no or improper protocol "
"specified! Please configure a specific protocol!"
msgstr ""
+"警告: 某些规则指定了端口却没有配置或配置了不正确的协议,请重新指定协议!"
msgid ""
"WARNING: this and other interfaces have duplicate metrics configured in /etc/"
"config/network!"
-msgstr ""
+msgstr "警告: 此接口和其他接口在 /etc/config/network 中配置了相同的跃点数!"
msgid ""
"WARNING: this interface has a higher reliability requirement than there are "
"tracking IP addresses!"
-msgstr ""
+msgstr "警告: 此接口的追踪可靠性要求大于了追踪 IP 地址总数!"
msgid "WARNING: this interface has no default route in the main routing table!"
-msgstr ""
+msgstr "警告: 此接口在主路由表中没有默认路由!"
msgid ""
"WARNING: this interface has no metric configured in /etc/config/network!"
-msgstr ""
+msgstr "警告: 此接口没有在 /etc/config/network 中配置跃点数!"
msgid ""
"WARNING: this interface is configured incorrectly or not at all in /etc/"
"config/network!"
-msgstr ""
+msgstr "警告: 此接口配置不正确或未配置到 /etc/config/network!"
msgid ""
"WARNING: this policy's name is %d characters exceeding the maximum of 15!"
-msgstr ""
+msgstr "警告: 此策略的名称具有 %d 个字符,超过了 15 个字符!"
msgid ""
"WARNING: this rule is incorrectly configured with no or improper protocol "
"specified! Please configure a specific protocol!"
-msgstr ""
+msgstr "警告: 此规则没有配置或配置了不正确的协议,请重新指定协议!"
+
+msgid "Waiting for MWAN to %s..."
+msgstr "等待 MWAN %s..."
+
+msgid "Waiting for diagnostic results..."
+msgstr "等待诊断结果..."
msgid "Weight"
msgstr "比重"
@@ -493,10 +536,10 @@ msgid "always"
msgstr "总是"
msgid "blackhole (drop)"
-msgstr "黑洞 (丢弃)"
+msgstr "黑洞(丢弃)"
msgid "default (use main routing table)"
-msgstr "默认 (使用主路由表)"
+msgstr "默认(使用主路由表)"
msgid "ifdown"
msgstr "ifdown"
@@ -508,11 +551,4 @@ msgid "never"
msgstr "从不"
msgid "unreachable (reject)"
-msgstr "不可达 (拒绝)"
-
-#~ msgid ""
-#~ "This IP address will be pinged to dermine if the link is up or down. "
-#~ "Leave blank to assume interface is always online"
-#~ msgstr ""
-#~ "MWAN 将会通过 Ping 这些 IP 地址来确定接口是否上线。如果留空,则 MWAN 认为"
-#~ "该接口永远在线"
+msgstr "不可达(拒绝)"
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
index 04eee93051..2a8aceec08 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/apcups.lua
@@ -5,18 +5,34 @@ module("luci.statistics.rrdtool.definitions.apcups",package.seeall)
function rrdargs( graph, plugin, plugin_instance, dtype )
+ local voltagesdc = {
+ title = "%H: Voltages on APC UPS - Battery",
+ vlabel = "Volts DC",
+ alt_autoscale = true,
+ number_format = "%5.1lfV",
+ data = {
+ instances = {
+ voltage = { "battery" }
+ },
+
+ options = {
+ voltage = { title = "Battery voltage", noarea=true }
+ }
+ }
+ }
+
local voltages = {
- title = "%H: Voltages on APC UPS ",
- vlabel = "V",
+ title = "%H: Voltages on APC UPS - AC",
+ vlabel = "Volts AC",
+ alt_autoscale = true,
number_format = "%5.1lfV",
data = {
instances = {
- voltage = { "battery", "input", "output" }
+ voltage = { "input", "output" }
},
options = {
voltage_output = { color = "00e000", title = "Output voltage", noarea=true, overlay=true },
- voltage_battery = { color = "0000ff", title = "Battery voltage", noarea=true, overlay=true },
voltage_input = { color = "ffb000", title = "Input voltage", noarea=true, overlay=true }
}
}
@@ -97,5 +113,5 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
}
}
- return { voltages, percentload, charge_percent, temperature, timeleft, frequency }
+ return { voltages, voltagesdc, percentload, charge_percent, temperature, timeleft, frequency }
end
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index e4a8b8bda2..bd1d54739c 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -7,18 +7,20 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.3\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
-msgid "<br />&nbsp;Network Interface 'trm_wwan' created successfully."
-msgstr ""
-"<br />&nbsp;ネットワーク インターフェース 'trm_wwan' の作成に成功しました。"
-
msgid "Add Interface"
msgstr "インターフェースの追加"
+msgid "Add Uplink"
+msgstr "アップリンクの追加"
+
+msgid "Add Wireless Uplink Configuration"
+msgstr "無線アップリンク追加の設定"
+
msgid ""
"Additional trigger delay in seconds before travelmate processing begins."
msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間(秒)です。"
@@ -26,12 +28,8 @@ msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間
msgid "Advanced"
msgstr "詳細設定"
-msgid ""
-"Automatically create a new wireless wan uplink interface 'trm_wwan', "
-"configure it to use dhcp and"
-msgstr ""
-"新しい無線 WAN インターフェース 'trm_wwan' を自動的に作成し、 DHCP を使用する"
-"よう構成して"
+msgid "Back to overview"
+msgstr "概要へ戻る"
msgid ""
"Configuration of the travelmate package to to enable travel router "
@@ -45,6 +43,27 @@ msgstr "接続制限"
msgid "Create Uplink Interface"
msgstr "アップリンク インターフェースの作成"
+msgid ""
+"Create a new wireless wan uplink interface, configure it to use dhcp and"
+msgstr ""
+"新規の無線 WAN アップリンク インターフェースを作成し、 DHCP を使用するよう構"
+"成して"
+
+msgid "Delete"
+msgstr "削除"
+
+msgid "Delete this Uplink"
+msgstr "このアップリンクを削除"
+
+msgid "Device"
+msgstr "デバイス"
+
+msgid "Disabled"
+msgstr "無効"
+
+msgid "Edit"
+msgstr "編集"
+
msgid "Edit Firewall Configuration"
msgstr "ファイアウォール設定の編集"
@@ -57,6 +76,12 @@ msgstr "Travelmate 設定の編集"
msgid "Edit Wireless Configuration"
msgstr "無線設定の編集"
+msgid "Edit Wireless Uplink Configuration"
+msgstr "無線アップリンク設定の編集"
+
+msgid "Edit this Uplink"
+msgstr "このアップリンクを編集"
+
msgid "Enable 'automatic' mode"
msgstr "'automatic' モードの有効化"
@@ -66,15 +91,21 @@ msgstr "Travelmate の有効化"
msgid "Enable verbose debug logging"
msgstr "詳細なデバッグ ログの有効化"
+msgid "Encryption"
+msgstr "暗号化"
+
msgid "Extra options"
msgstr "拡張オプション"
+msgid "Find and join network on"
+msgstr "ネットワークの検索と参加:"
+
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">see online "
"documentation</a>"
msgstr ""
-"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a>を確"
-"認してください。"
+"詳細な情報は <a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> を"
+"確認してください。"
msgid "How long should travelmate wait for a successful wlan interface reload"
msgstr ""
@@ -82,26 +113,36 @@ msgstr ""
"す。"
msgid "How many times should travelmate try to connect to an Uplink"
-msgstr "Travelmate がアップリンクに対して接続を試行する回数です。"
+msgstr "Travelmate がアップリンクへの接続を試行する回数です。"
msgid "Input file not found, please check your configuration."
msgstr "入力ファイルが見つかりません。設定を確認してください。"
-msgid "Interface Setup"
-msgstr "インターフェース設定"
-
msgid "Interface Timeout"
msgstr "インターフェース タイムアウト"
+msgid "Interface Wizard"
+msgstr "インターフェース ウィザード"
+
msgid "Keep travelmate in an active state."
msgstr "Travelmate をアクティブ状態で維持します。"
msgid "Last rundate"
msgstr "最終実行日時"
+msgid "Mode"
+msgstr "モード"
+
+msgid "Name of the uplink interface that triggers travelmate processing."
+msgstr ""
+"Travelmate の処理のトリガーとなる、アップリンク インターフェースの名前です。"
+
msgid "Online Status"
msgstr "オンライン ステータス"
+msgid "Open"
+msgstr "オープン"
+
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルトの設定が適切でない場合、さらに設定するためのオプションです。"
@@ -112,11 +153,22 @@ msgstr "全体タイムアウト"
msgid "Overview"
msgstr "概要"
+msgid "Passphrase (%s)"
+msgstr "暗号フレーズ (%s)"
+
+msgid ""
+"Provides an overview of all configured uplink interfaces for travelmate. You "
+"can edit and delete existing interfaces or scan for new uplinks."
+msgstr ""
+"Travelmate における、全ての設定済みアップリンク インターフェースの一覧です。"
+"既存のインターフェースを編集または削除したり、新規アップリンクの追加のために"
+"スキャンを行うことができます。"
+
msgid "Radio selection"
msgstr "無線の選択"
-msgid "Restrict interface trigger to certain interface(s)"
-msgstr "インターフェース トリガーを特定のインターフェースに限定する"
+msgid "Repeat scan"
+msgstr "再スキャン"
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'"
msgstr "Travelmate が特定の無線に接続するようにします。例: 'radio0'"
@@ -124,26 +176,23 @@ msgstr "Travelmate が特定の無線に接続するようにします。例: 'r
msgid "Runtime information"
msgstr "実行情報"
-msgid ""
-"Scan &amp; Add new wireless stations via standard <a href=\"%s\">Wireless "
-"Setup</a>"
-msgstr ""
-"通常の<a href=\"%s\">無線設定</a>にて、新規の無線ステーションのスキャン及び追"
-"加を行います。"
+msgid "SSID"
+msgstr "SSID"
-msgid ""
-"Space separated list of interfaces that trigger travelmate processing. To "
-"disable event driven (re-)starts remove all entries."
-msgstr ""
-"Travelmate の処理のトリガーとなる、スペースで区切られたインターフェースのリス"
-"トです。処理を発生させるイベントを無効にするには、全てのエントリーを削除して"
-"空欄にします。"
+msgid "Scan"
+msgstr "スキャン:"
+
+msgid "Signal strength"
+msgstr "信号強度"
+
+msgid "Specify the secret encryption key here."
+msgstr "暗号キーを設定します。"
msgid "Station Interface"
msgstr "ステーション インターフェース"
msgid "Station Radio"
-msgstr "ステーション 無線"
+msgstr "ステーション電波"
msgid "Station SSID"
msgstr "ステーション SSID"
@@ -198,9 +247,42 @@ msgstr "Travelmate バージョン"
msgid "Trigger delay"
msgstr "トリガー遅延"
+msgid "Unknown"
+msgstr "不明"
+
+msgid "Uplink / Trigger interface"
+msgstr "アップリンク/トリガー インターフェース"
+
+msgid "Uplink Interface"
+msgstr "アップリンク インターフェース"
+
+msgid "Uplink SSID"
+msgstr "アップリンク SSID"
+
+msgid "Uplink interface"
+msgstr "アップリンク インターフェース"
+
msgid "View Logfile"
msgstr "ログファイルの確認"
+msgid "WEP"
+msgstr "WEP"
+
+msgid "WEP passphrase"
+msgstr "WEP 暗号キー"
+
+msgid "WPA / WPA2"
+msgstr "WPA / WPA2"
+
+msgid "WPA passphrase"
+msgstr "WPA 暗号キー"
+
+msgid "Wireless Scan"
+msgstr "無線スキャン"
+
+msgid "Wireless Stations"
+msgstr "無線ステーション"
+
msgid ""
"add it to the wan zone of the firewall. This step has only to be done once."
msgstr ""
@@ -210,126 +292,11 @@ msgstr ""
msgid "connected"
msgstr "接続済み"
+msgid "hidden"
+msgstr "(不明)"
+
msgid "n/a"
msgstr "利用不可"
msgid "not connected"
msgstr "未接続"
-
-#~ msgid "."
-#~ msgstr "。"
-
-#~ msgid ""
-#~ "Automatically create a new wireless wan interface, configure it to use "
-#~ "dhcp and add it to the wan zone of the firewall. This step has only to be "
-#~ "done once."
-#~ msgstr ""
-#~ "新しい無線 WAN インターフェースを自動的に作成し、DHCP を使用するよう構成し"
-#~ "てファイアウォールの wan ゾーンに追加します。このステップは、一度だけ実行"
-#~ "する必要があります。"
-
-#~ msgid "Direct Link: <a href=\"%s\">Wireless Setup</a>"
-#~ msgstr "ダイレクト リンク: <a href=\"%s\">無線設定</a>"
-
-#~ msgid "For further information"
-#~ msgstr "詳細情報は"
-
-#~ msgid "Name of the new wireless wan interface"
-#~ msgstr "新しい無線 WAN のインターフェース名"
-
-#~ msgid ""
-#~ "Network Interface '%s' created successfully. Feel free to scan & add new "
-#~ "stations via standard wireless setup."
-#~ msgstr ""
-#~ "ネットワーク インターフェース '%s' の作成に成功しました。通常の無線設定に"
-#~ "て、スキャン及び新規ステーションの追加が可能です。"
-
-#~ msgid "Setup WWAN Interface"
-#~ msgstr "WWAN インターフェース設定"
-
-#~ msgid ""
-#~ "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, "
-#~ "<code>0-9</code> and <code>_</code> (3-15 characters)."
-#~ msgstr ""
-#~ "使用可能文字: <code>A-Z</code>, <code>a-z</code>, <code>0-9</code> and "
-#~ "<code>_</code>(3 - 15文字)"
-
-#~ msgid "The given network interface name already exist"
-#~ msgstr "入力されたネットワーク インターフェース名は、既に存在しています。"
-
-#~ msgid "see online documentation"
-#~ msgstr "オンライン ドキュメントを確認してください"
-
-#~ msgid ""
-#~ "Brief advice: Create a wwan interface, configure it to use dhcp and add "
-#~ "it to the wan zone in firewall. Create the wifi interfaces to be used "
-#~ "('client' mode, assigned to wwan network, left as disabled). Travelmate "
-#~ "will try to connect to the known wifi client interfaces in the defined "
-#~ "order."
-#~ msgstr ""
-#~ "簡単な解説: 予めWWANインターフェースを作成し、DHCPを使用するよう構成して"
-#~ "ファイアウォールのWANゾーンに追加します。また、使用される無線インター"
-#~ "フェースを作成しておきます(\"クライアント\" モード、WWANに割り当て、無効"
-#~ "状態)。Travelmateは、登録されている順序で既知の無線クライアント インター"
-#~ "フェースへの接続を試行します。"
-
-#~ msgid ""
-#~ "Configuration of the Travelmate package to enable travel router "
-#~ "functionality."
-#~ msgstr "トラベル ルータ機能を有効にする、Travelmate パッケージの設定です。"
-
-#~ msgid "Debug logging"
-#~ msgstr "デバッグ ログ"
-
-#~ msgid "Default 20, range 10-60"
-#~ msgstr "既定値 20、範囲 10 - 60"
-
-#~ msgid "Default 3, range 1-10"
-#~ msgstr "既定値 3、範囲 1 - 10"
-
-#~ msgid "Disable this if you want to use iwinfo instead of iw"
-#~ msgstr "iw の代わりに iwinfo を使用したい場合、この設定を無効にします。"
-
-#~ msgid "Enable Travelmate"
-#~ msgstr "Travelmateの有効化"
-
-#~ msgid "Global options"
-#~ msgstr "全般オプション"
-
-#~ msgid "Link to detailed advice"
-#~ msgstr "詳細な解説へのリンク"
-
-#~ msgid "Max. number of connection retries to an uplink"
-#~ msgstr "確立までの接続試行回数"
-
-#~ msgid "Max. timeout in seconds for wlan interface reload"
-#~ msgstr "無線LANインターフェース リロード時の最大待機時間(秒)"
-
-#~ msgid "Restrict reload trigger to certain interface(s)"
-#~ msgstr "リロード トリガを特定のインターフェースに限定する"
-
-#~ msgid ""
-#~ "Space separated list of wwan interfaces that trigger reload action. To "
-#~ "disable reload trigger set it to 'false'. Default: empty"
-#~ msgstr ""
-#~ "リロード動作のトリガとなる、スペースで区切られたWWAN インターフェースのリ"
-#~ "ストです。リロードのトリガを無効にするには、'false' を設定します。既定値:"
-#~ "(空)"
-
-#~ msgid "Use iw for scanning"
-#~ msgstr "スキャンに iw を使用する"
-
-#~ msgid "Default 3, range 0-10. Set to 0 to allow unlimited retries"
-#~ msgstr "既定値 3、範囲 0 - 10。再試行回数を制限しない場合、0 に設定します。"
-
-#~ msgid "Default 30, range 5-60"
-#~ msgstr "既定値 30、範囲 5 - 60"
-
-#~ msgid "Default: empty = use all radios."
-#~ msgstr "デフォルト:(空)= 全ての無線を使用"
-
-#~ msgid "Loop timeout in seconds for wlan monitoring"
-#~ msgstr "無線LAN モニターのループ タイムアウト(秒)"
-
-#~ msgid "Use only one radio, e.g. 'radio0'"
-#~ msgstr "単一の無線のみ使用する 例: 'radio0'"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 4eff34e3e1..5e09759c4a 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -12,10 +12,13 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-msgid "<br />&nbsp;Network Interface 'trm_wwan' created successfully."
+msgid "Add Interface"
msgstr ""
-msgid "Add Interface"
+msgid "Add Uplink"
+msgstr ""
+
+msgid "Add Wireless Uplink Configuration"
msgstr ""
msgid ""
@@ -25,9 +28,7 @@ msgstr ""
msgid "Advanced"
msgstr ""
-msgid ""
-"Automatically create a new wireless wan uplink interface 'trm_wwan', "
-"configure it to use dhcp and"
+msgid "Back to overview"
msgstr ""
msgid ""
@@ -41,6 +42,25 @@ msgstr ""
msgid "Create Uplink Interface"
msgstr ""
+msgid ""
+"Create a new wireless wan uplink interface, configure it to use dhcp and"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this Uplink"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
msgid "Edit Firewall Configuration"
msgstr ""
@@ -53,6 +73,12 @@ msgstr ""
msgid "Edit Wireless Configuration"
msgstr ""
+msgid "Edit Wireless Uplink Configuration"
+msgstr ""
+
+msgid "Edit this Uplink"
+msgstr ""
+
msgid "Enable 'automatic' mode"
msgstr ""
@@ -62,9 +88,15 @@ msgstr ""
msgid "Enable verbose debug logging"
msgstr ""
+msgid "Encryption"
+msgstr ""
+
msgid "Extra options"
msgstr "Opções adicionais"
+msgid "Find and join network on"
+msgstr ""
+
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">see online "
"documentation</a>"
@@ -79,10 +111,10 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-msgid "Interface Setup"
+msgid "Interface Timeout"
msgstr ""
-msgid "Interface Timeout"
+msgid "Interface Wizard"
msgstr ""
msgid "Keep travelmate in an active state."
@@ -91,9 +123,18 @@ msgstr ""
msgid "Last rundate"
msgstr ""
+msgid "Mode"
+msgstr ""
+
+msgid "Name of the uplink interface that triggers travelmate processing."
+msgstr ""
+
msgid "Online Status"
msgstr ""
+msgid "Open"
+msgstr ""
+
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -104,10 +145,18 @@ msgstr ""
msgid "Overview"
msgstr ""
+msgid "Passphrase (%s)"
+msgstr ""
+
+msgid ""
+"Provides an overview of all configured uplink interfaces for travelmate. You "
+"can edit and delete existing interfaces or scan for new uplinks."
+msgstr ""
+
msgid "Radio selection"
msgstr ""
-msgid "Restrict interface trigger to certain interface(s)"
+msgid "Repeat scan"
msgstr ""
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'"
@@ -116,14 +165,16 @@ msgstr ""
msgid "Runtime information"
msgstr ""
-msgid ""
-"Scan &amp; Add new wireless stations via standard <a href=\"%s\">Wireless "
-"Setup</a>"
+msgid "SSID"
msgstr ""
-msgid ""
-"Space separated list of interfaces that trigger travelmate processing. To "
-"disable event driven (re-)starts remove all entries."
+msgid "Scan"
+msgstr ""
+
+msgid "Signal strength"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
msgstr ""
msgid "Station Interface"
@@ -175,9 +226,42 @@ msgstr ""
msgid "Trigger delay"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
+msgid "Uplink / Trigger interface"
+msgstr ""
+
+msgid "Uplink Interface"
+msgstr ""
+
+msgid "Uplink SSID"
+msgstr ""
+
+msgid "Uplink interface"
+msgstr ""
+
msgid "View Logfile"
msgstr ""
+msgid "WEP"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WPA / WPA2"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid "Wireless Scan"
+msgstr ""
+
+msgid "Wireless Stations"
+msgstr ""
+
msgid ""
"add it to the wan zone of the firewall. This step has only to be done once."
msgstr ""
@@ -185,6 +269,9 @@ msgstr ""
msgid "connected"
msgstr ""
+msgid "hidden"
+msgstr ""
+
msgid "n/a"
msgstr ""
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index 615c3a79ce..a0e5629696 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -1,10 +1,13 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-msgid "<br />&nbsp;Network Interface 'trm_wwan' created successfully."
+msgid "Add Interface"
msgstr ""
-msgid "Add Interface"
+msgid "Add Uplink"
+msgstr ""
+
+msgid "Add Wireless Uplink Configuration"
msgstr ""
msgid ""
@@ -14,9 +17,7 @@ msgstr ""
msgid "Advanced"
msgstr ""
-msgid ""
-"Automatically create a new wireless wan uplink interface 'trm_wwan', "
-"configure it to use dhcp and"
+msgid "Back to overview"
msgstr ""
msgid ""
@@ -30,6 +31,25 @@ msgstr ""
msgid "Create Uplink Interface"
msgstr ""
+msgid ""
+"Create a new wireless wan uplink interface, configure it to use dhcp and"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Delete this Uplink"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Disabled"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
msgid "Edit Firewall Configuration"
msgstr ""
@@ -42,6 +62,12 @@ msgstr ""
msgid "Edit Wireless Configuration"
msgstr ""
+msgid "Edit Wireless Uplink Configuration"
+msgstr ""
+
+msgid "Edit this Uplink"
+msgstr ""
+
msgid "Enable 'automatic' mode"
msgstr ""
@@ -51,9 +77,15 @@ msgstr ""
msgid "Enable verbose debug logging"
msgstr ""
+msgid "Encryption"
+msgstr ""
+
msgid "Extra options"
msgstr ""
+msgid "Find and join network on"
+msgstr ""
+
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">see online "
"documentation</a>"
@@ -68,10 +100,10 @@ msgstr ""
msgid "Input file not found, please check your configuration."
msgstr ""
-msgid "Interface Setup"
+msgid "Interface Timeout"
msgstr ""
-msgid "Interface Timeout"
+msgid "Interface Wizard"
msgstr ""
msgid "Keep travelmate in an active state."
@@ -80,9 +112,18 @@ msgstr ""
msgid "Last rundate"
msgstr ""
+msgid "Mode"
+msgstr ""
+
+msgid "Name of the uplink interface that triggers travelmate processing."
+msgstr ""
+
msgid "Online Status"
msgstr ""
+msgid "Open"
+msgstr ""
+
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -93,10 +134,18 @@ msgstr ""
msgid "Overview"
msgstr ""
+msgid "Passphrase (%s)"
+msgstr ""
+
+msgid ""
+"Provides an overview of all configured uplink interfaces for travelmate. You "
+"can edit and delete existing interfaces or scan for new uplinks."
+msgstr ""
+
msgid "Radio selection"
msgstr ""
-msgid "Restrict interface trigger to certain interface(s)"
+msgid "Repeat scan"
msgstr ""
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'"
@@ -105,14 +154,16 @@ msgstr ""
msgid "Runtime information"
msgstr ""
-msgid ""
-"Scan &amp; Add new wireless stations via standard <a href=\"%s\">Wireless "
-"Setup</a>"
+msgid "SSID"
msgstr ""
-msgid ""
-"Space separated list of interfaces that trigger travelmate processing. To "
-"disable event driven (re-)starts remove all entries."
+msgid "Scan"
+msgstr ""
+
+msgid "Signal strength"
+msgstr ""
+
+msgid "Specify the secret encryption key here."
msgstr ""
msgid "Station Interface"
@@ -164,9 +215,42 @@ msgstr ""
msgid "Trigger delay"
msgstr ""
+msgid "Unknown"
+msgstr ""
+
+msgid "Uplink / Trigger interface"
+msgstr ""
+
+msgid "Uplink Interface"
+msgstr ""
+
+msgid "Uplink SSID"
+msgstr ""
+
+msgid "Uplink interface"
+msgstr ""
+
msgid "View Logfile"
msgstr ""
+msgid "WEP"
+msgstr ""
+
+msgid "WEP passphrase"
+msgstr ""
+
+msgid "WPA / WPA2"
+msgstr ""
+
+msgid "WPA passphrase"
+msgstr ""
+
+msgid "Wireless Scan"
+msgstr ""
+
+msgid "Wireless Stations"
+msgstr ""
+
msgid ""
"add it to the wan zone of the firewall. This step has only to be done once."
msgstr ""
@@ -174,6 +258,9 @@ msgstr ""
msgid "connected"
msgstr ""
+msgid "hidden"
+msgstr ""
+
msgid "n/a"
msgstr ""