diff options
101 files changed, 2794 insertions, 1102 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua index 2cee30208..d80cb486e 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock.lua @@ -1,4 +1,4 @@ --- Copyright 2016 Openwrt.org +-- Copyright 2016 Hannu Nyman -- Licensed to the public under the Apache License 2.0. m = Map("adblock", translate("Adblock"), @@ -17,20 +17,6 @@ o3 = s:option(Value, "adb_whitelist", translate("Whitelist file"), o3.rmempty = false o3.datatype = "file" -fdns = s:option(Flag, "adb_forcedns", translate("Redirect all DNS queries to the local resolver"), - translate("When adblock is active, all DNS queries are redirected to the local resolver " .. - "in this server by default. You can disable that to allow queries to external DNS servers.")) -fdns.rmempty = false -fdns.default = fdns.enabled - --- Statistics - -t = m:section(NamedSection, "global", "adblock", translate("Statistics")) - -dat = t:option(DummyValue, "adb_lastrun", translate("Last update of the blocklists")) -tot = t:option(DummyValue, "adb_overall_count", translate("Total count of blocked domains")) -prc = t:option(DummyValue, "adb_percentage", translate("Percentage of blocked packets (before last update, IPv4/IPv6)")) - -- Blocklist options bl = m:section(TypedSection, "source", translate("Blocklist sources"), @@ -45,8 +31,6 @@ name = bl:option(Flag, "enabled", translate("Enabled")) name.rmempty = false des = bl:option(DummyValue, "adb_src_desc", translate("Description")) -cou = bl:option(DummyValue, "adb_src_count", translate("Count")) -upd = bl:option(DummyValue, "adb_src_timestamp", translate("List date/state")) -- Additional options @@ -65,39 +49,15 @@ o5.datatype = "directory" e = m:section(NamedSection, "global", "adblock", translate("Extra options"), translate("Options for further tweaking in case the defaults are not suitable for you.")) -a0 = e:option(Flag, "adb_restricted", translate("Do not write status info to flash"), - translate("Skip writing update status information to the config file. Status fields on this page will not be updated.")) -a0.default = 0 - -a1 = e:option(Value, "adb_nullport", translate("Port of the adblock uhttpd instance")) -a1.optional = true -a1.default = 65534 -a1.datatype = "port" - -a5 = e:option(Value, "adb_nullportssl", translate("Port of the adblock uhttpd instance for https links")) -a5.optional = true -a5.default = 65535 -a5.datatype = "port" - -a2 = e:option(Value, "adb_nullipv4", translate("IPv4 blackhole ip address")) -a2.optional = true -a2.default = "198.18.0.1" -a2.datatype = "ip4addr" - -a3 = e:option(Value, "adb_nullipv6", translate("IPv6 blackhole ip address")) -a3.optional = true -a3.default = "::ffff:c612:0001" -a3.datatype = "ip6addr" - -a4 = e:option(Value, "adb_fetchttl", translate("Timeout for blocklist fetch (seconds)")) -a4.optional = true -a4.default = 5 -a4.datatype = "range(2,60)" - -a7 = e:option(Value, "adb_lanif", translate("Name of the logical lan interface")) -a7.optional = true -a7.default = "lan" -a7.datatype = "network" +a = e:option(Flag, "adb_debug", translate("Enable verbose debug logging")) +a.default = a.disabled +a.rmempty = false + +a = e:option(Value, "adb_iface", translate("Restrict reload trigger to certain interface(s)"), + translate("Space separated list of wan interfaces that trigger reload action. " .. + "To disable reload trigger set it to 'false'. Default: empty")) +a.datatype = "network" +a.rmempty = true return m diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po new file mode 100644 index 000000000..a3c982f3d --- /dev/null +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -0,0 +1,139 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"Language: ja\n" + +msgid "" +"). Note that list URLs and Shallalist category selections are not " +"configurable via Luci." +msgstr "" +"）。これらのリストのURLおよびshallaリストのカテゴリー選択は、Luciによって設定" +"できないことに注意します。" + +msgid "Adblock" +msgstr "Adblock" + +msgid "Available blocklist sources (" +msgstr "利用可能なブロックリスト提供元です（" + +msgid "Backup directory" +msgstr "バックアップ ディレクトリ" + +msgid "Backup options" +msgstr "バックアップ オプション" + +msgid "Blocklist sources" +msgstr "ブロックリスト提供元" + +msgid "" +"Configuration of the adblock package to block ad/abuse domains by using DNS." +msgstr "" +"広告/不正ドメインをDNSを利用してブロックする、adblock パッケージの設定です。" + +msgid "Description" +msgstr "説明" + +msgid "Enable adblock" +msgstr "adblockの有効化" + +msgid "Enable blocklist backup" +msgstr "ブロックリスト バックアップの有効化" + +msgid "Enable verbose debug logging" +msgstr "詳細なデバッグ ログの有効化" + +msgid "Enabled" +msgstr "有効" + +msgid "Extra options" +msgstr "拡張設定" + +msgid "" +"File with whitelisted hosts/domains that are allowed despite being on a " +"blocklist." +msgstr "" +"ファイルのホワイトリスト ホスト/ドメインは、ブロックリストに登録されていても" +"許可されます。" + +msgid "Global options" +msgstr "一般設定" + +msgid "" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "デフォルト設定が適切でない場合、追加で設定するためのオプションです。" + +msgid "Restrict reload trigger to certain interface(s)" +msgstr "リロードトリガを特定のインターフェースに限定する" + +msgid "" +"Space separated list of wan interfaces that trigger reload action. To " +"disable reload trigger set it to 'false'. Default: empty" +msgstr "" +"リロード実行のトリガとなる、スペースで区切られたWANインターフェースのリストで" +"す。リロードトリガを無効にするには、 false を設定します。デフォルト:（空）" + +msgid "Whitelist file" +msgstr "ホワイトリスト ファイル" + +msgid "see list details" +msgstr "リストの詳細を見る" + +#~ msgid "Count" +#~ msgstr "カウント" + +#~ msgid "Do not write status info to flash" +#~ msgstr "ステータス情報をフラッシュに書き込まない" + +#~ msgid "Last update of the blocklists" +#~ msgstr "ブロックリストの最終更新日時" + +#~ msgid "List date/state" +#~ msgstr "リスト日時/状態" + +#~ msgid "Name of the logical lan interface" +#~ msgstr "論理LANインターフェース名" + +#~ msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" +#~ msgstr "ブロック済みパケットの割合（最終更新以前、IPv4/IPv6）" + +#~ msgid "Port of the adblock uhttpd instance" +#~ msgstr "adblock uhttpdインスタンスのポート" + +#~ msgid "Port of the adblock uhttpd instance for https links" +#~ msgstr "httpsリンク用adblock uhttpdインスタンスのポート" + +#~ msgid "Redirect all DNS queries to the local resolver" +#~ msgstr "全てのDNSクエリをローカルリゾルバにリダイレクト" + +#~ msgid "" +#~ "Skip writing update status information to the config file. Status fields " +#~ "on this page will not be updated." +#~ msgstr "" +#~ "更新ステータス情報をコンフィグファイルに書き込まず、スキップします。この" +#~ "ページのステータス画面は更新されなくなります。" + +#~ msgid "Statistics" +#~ msgstr "ステータス" + +#~ msgid "Timeout for blocklist fetch (seconds)" +#~ msgstr "ブロックリスト取得の制限時間（秒）" + +#~ msgid "Total count of blocked domains" +#~ msgstr "ブロック済みドメインの合計" + +#~ msgid "" +#~ "When adblock is active, all DNS queries are redirected to the local " +#~ "resolver in this server by default. You can disable that to allow queries " +#~ "to external DNS servers." +#~ msgstr "" +#~ "adblockがアクティブである時、全てのDNSクエリは既定でこのサーバー上のリゾル" +#~ "バにリダイレクトされます。外部DNSサーバーへのクエリを許可する場合、この設" +#~ "定を無効にすることもできます。" diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 9c0ca21f1..22a30e9a1 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -27,21 +27,18 @@ msgstr "" "Konfiguration av paket adblock för att blockera annons/otillåtna domäner " "genom att användning DNS." -msgid "Count" -msgstr "Räkna" - msgid "Description" msgstr "Beskrivning" -msgid "Do not write status info to flash" -msgstr "Skriv inte status info till flash" - msgid "Enable adblock" msgstr "Aktivera abblock" msgid "Enable blocklist backup" msgstr "Aktivera säkerhetskopiering av blockeringslistan" +msgid "Enable verbose debug logging" +msgstr "" + msgid "Enabled" msgstr "Aktiverad" @@ -56,55 +53,16 @@ msgstr "" msgid "Global options" msgstr "Globala alternativ" -msgid "IPv4 blackhole ip address" -msgstr "" - -msgid "IPv6 blackhole ip address" -msgstr "" - -msgid "Last update of the blocklists" -msgstr "" - -msgid "List date/state" -msgstr "" - -msgid "Name of the logical lan interface" -msgstr "" - msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" -msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" -msgstr "" - -msgid "Port of the adblock uhttpd instance" +msgid "Restrict reload trigger to certain interface(s)" msgstr "" -msgid "Port of the adblock uhttpd instance for https links" -msgstr "" - -msgid "Redirect all DNS queries to the local resolver" -msgstr "Dirigera om alla DNS-förfrågning till den lokala resolvern" - msgid "" -"Skip writing update status information to the config file. Status fields on " -"this page will not be updated." -msgstr "" - -msgid "Statistics" -msgstr "" - -msgid "Timeout for blocklist fetch (seconds)" -msgstr "" - -msgid "Total count of blocked domains" -msgstr "" - -msgid "" -"When adblock is active, all DNS queries are redirected to the local resolver " -"in this server by default. You can disable that to allow queries to external " -"DNS servers." +"Space separated list of wan interfaces that trigger reload action. To " +"disable reload trigger set it to 'false'. Default: empty" msgstr "" msgid "Whitelist file" @@ -112,3 +70,12 @@ msgstr "Vitlista fil" msgid "see list details" msgstr "se listans detaljer" + +#~ msgid "Count" +#~ msgstr "Räkna" + +#~ msgid "Do not write status info to flash" +#~ msgstr "Skriv inte status info till flash" + +#~ msgid "Redirect all DNS queries to the local resolver" +#~ msgstr "Dirigera om alla DNS-förfrågning till den lokala resolvern" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index eeb0d975b..6b2dbd13b 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -25,21 +25,18 @@ msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" -msgid "Count" -msgstr "" - msgid "Description" msgstr "" -msgid "Do not write status info to flash" -msgstr "" - msgid "Enable adblock" msgstr "" msgid "Enable blocklist backup" msgstr "" +msgid "Enable verbose debug logging" +msgstr "" + msgid "Enabled" msgstr "" @@ -54,55 +51,16 @@ msgstr "" msgid "Global options" msgstr "" -msgid "IPv4 blackhole ip address" -msgstr "" - -msgid "IPv6 blackhole ip address" -msgstr "" - -msgid "Last update of the blocklists" -msgstr "" - -msgid "List date/state" -msgstr "" - -msgid "Name of the logical lan interface" -msgstr "" - msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "" -msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" -msgstr "" - -msgid "Port of the adblock uhttpd instance" -msgstr "" - -msgid "Port of the adblock uhttpd instance for https links" -msgstr "" - -msgid "Redirect all DNS queries to the local resolver" -msgstr "" - -msgid "" -"Skip writing update status information to the config file. Status fields on " -"this page will not be updated." -msgstr "" - -msgid "Statistics" -msgstr "" - -msgid "Timeout for blocklist fetch (seconds)" -msgstr "" - -msgid "Total count of blocked domains" +msgid "Restrict reload trigger to certain interface(s)" msgstr "" msgid "" -"When adblock is active, all DNS queries are redirected to the local resolver " -"in this server by default. You can disable that to allow queries to external " -"DNS servers." +"Space separated list of wan interfaces that trigger reload action. To " +"disable reload trigger set it to 'false'. Default: empty" msgstr "" msgid "Whitelist file" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index e57921daa..2878d8afa 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -36,21 +36,18 @@ msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "Adblock 配置工具，通过 DNS 来拦截广告和阻止域名。" -msgid "Count" -msgstr "数量" - msgid "Description" msgstr "描述" -msgid "Do not write status info to flash" -msgstr "" - msgid "Enable adblock" msgstr "启用Adblock" msgid "Enable blocklist backup" msgstr "启用拦截规则备份" +msgid "Enable verbose debug logging" +msgstr "" + msgid "Enabled" msgstr "启用" @@ -65,61 +62,55 @@ msgstr "允许的主机/域名列表" msgid "Global options" msgstr "全局选项" -msgid "IPv4 blackhole ip address" -msgstr "IPv4禁止列表" - -msgid "IPv6 blackhole ip address" -msgstr "IPv6禁止列表" - -msgid "Last update of the blocklists" -msgstr "" - -msgid "List date/state" -msgstr "列表日期/状态" - -msgid "Name of the logical lan interface" -msgstr "LAN接口名称" - msgid "" "Options for further tweaking in case the defaults are not suitable for you." msgstr "在默认设置并不适合你时的额外选项。" -msgid "Percentage of blocked packets (before last update, IPv4/IPv6)" +msgid "Restrict reload trigger to certain interface(s)" msgstr "" -msgid "Port of the adblock uhttpd instance" -msgstr "Adblock uhttpd端口" - -msgid "Port of the adblock uhttpd instance for https links" +msgid "" +"Space separated list of wan interfaces that trigger reload action. To " +"disable reload trigger set it to 'false'. Default: empty" msgstr "" -msgid "Redirect all DNS queries to the local resolver" -msgstr "将所有DNS查询都重定向到本地解析器" +msgid "Whitelist file" +msgstr "白名单文件" + +msgid "see list details" +msgstr "查看列表详情" -msgid "" -"Skip writing update status information to the config file. Status fields on " -"this page will not be updated." -msgstr "" +#~ msgid "Count" +#~ msgstr "数量" -msgid "Statistics" -msgstr "" +#~ msgid "IPv4 blackhole ip address" +#~ msgstr "IPv4禁止列表" -msgid "Timeout for blocklist fetch (seconds)" -msgstr "列表查询超时时间（秒）" +#~ msgid "IPv6 blackhole ip address" +#~ msgstr "IPv6禁止列表" -msgid "Total count of blocked domains" -msgstr "阻止域名总数" +#~ msgid "List date/state" +#~ msgstr "列表日期/状态" -msgid "" -"When adblock is active, all DNS queries are redirected to the local resolver " -"in this server by default. You can disable that to allow queries to external " -"DNS servers." -msgstr "" -"当Adblock处于活动状态时，默认情况下会将所有的DNS查询重定向到此服务器的本地解" -"析器。您可以禁用以允许查询外部DNS服务器。" +#~ msgid "Name of the logical lan interface" +#~ msgstr "LAN接口名称" -msgid "Whitelist file" -msgstr "白名单文件" +#~ msgid "Port of the adblock uhttpd instance" +#~ msgstr "Adblock uhttpd端口" -msgid "see list details" -msgstr "查看列表详情" +#~ msgid "Redirect all DNS queries to the local resolver" +#~ msgstr "将所有DNS查询都重定向到本地解析器" + +#~ msgid "Timeout for blocklist fetch (seconds)" +#~ msgstr "列表查询超时时间（秒）" + +#~ msgid "Total count of blocked domains" +#~ msgstr "阻止域名总数" + +#~ msgid "" +#~ "When adblock is active, all DNS queries are redirected to the local " +#~ "resolver in this server by default. You can disable that to allow queries " +#~ "to external DNS servers." +#~ msgstr "" +#~ "当Adblock处于活动状态时，默认情况下会将所有的DNS查询重定向到此服务器的本地" +#~ "解析器。您可以禁用以允许查询外部DNS服务器。" diff --git a/applications/luci-app-commands/po/ja/commands.po b/applications/luci-app-commands/po/ja/commands.po index 3b01a35cf..99b5a452e 100644 --- a/applications/luci-app-commands/po/ja/commands.po +++ b/applications/luci-app-commands/po/ja/commands.po @@ -1,26 +1,27 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2013-10-05 17:15+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" +"Project-Id-Version: \n" +"PO-Revision-Date: 2016-12-21 11:59+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language-Team: none\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.8.11\n" +"POT-Creation-Date: \n" msgid "A short textual description of the configured command" msgstr "設定したコマンドの簡単な説明文を記載します" msgid "Access command with" -msgstr "" +msgstr "コマンドへのアクセス" msgid "" "Allow executing the command and downloading its output without prior " "authentication" -msgstr "" +msgstr "事前認証無しでのコマンドの実行と、結果出力のダウンロードを許可します。" msgid "Allow the user to provide additional command line arguments" msgstr "コマンドラインに対する引数の追記を許可するか設定します" @@ -88,7 +89,9 @@ msgstr "実行" msgid "" "This page allows you to configure custom shell commands which can be easily " "invoked from the web interface." -msgstr "このページでは、ウェブインターフェースから簡単にシェル・コマンドを実行することができます。" +msgstr "" +"このページでは、ウェブインターフェースから簡単にシェル・コマンドを実行するこ" +"とができます。" msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." diff --git a/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua index 968ac3624..2b3cee328 100644 --- a/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua +++ b/applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua @@ -22,6 +22,10 @@ end function o.write(self, section, value) value = value:gsub("\r\n?", "\n") fs.writefile("/etc/firewall.user", value) + require("luci.sys").call("/etc/init.d/firewall restart >/dev/null 2<&1") + require("nixio").syslog('info', 'Restarting firewall on custom /etc/firewall.user change') end +f.submit = translate("Restart Firewall") + return f diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po index 5d62f0265..913fb759e 100644 --- a/applications/luci-app-firewall/po/ca/firewall.po +++ b/applications/luci-app-firewall/po/ca/firewall.po @@ -295,6 +295,9 @@ msgstr "Redirigeix trànsit entrant coincidit al port donat en el host intern" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Redirigeix trànsit entrant coincidit al host intern especificat" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Restringeix la mascarada a les subxarxes de destí donades" diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po index 2d4b251d3..1ab1360f5 100644 --- a/applications/luci-app-firewall/po/cs/firewall.po +++ b/applications/luci-app-firewall/po/cs/firewall.po @@ -292,6 +292,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Přesměrovat vybraný příchozí provoz na uvedeného vnitřního hostitele." +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Omezit maškarádování na uvedené cílové podsítě" diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po index c9237d7d4..448f951fa 100644 --- a/applications/luci-app-firewall/po/de/firewall.po +++ b/applications/luci-app-firewall/po/de/firewall.po @@ -292,6 +292,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Gefilterte Verbindungen an den angegeben internen Host weiterleiten" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken" diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po index f54e3d617..2229bf09f 100644 --- a/applications/luci-app-firewall/po/el/firewall.po +++ b/applications/luci-app-firewall/po/el/firewall.po @@ -285,6 +285,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po index 6e3b9eb5e..9dc277dbe 100644 --- a/applications/luci-app-firewall/po/en/firewall.po +++ b/applications/luci-app-firewall/po/en/firewall.po @@ -285,6 +285,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Redirect matched incoming traffic to the specified internal host" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po index 4a3e18226..670b4db6f 100644 --- a/applications/luci-app-firewall/po/es/firewall.po +++ b/applications/luci-app-firewall/po/es/firewall.po @@ -294,6 +294,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Redirigir el tráfico de entrada que coincida a la máquina interna" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Restringir enmascaramiento a las subredes destino" diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po index 6d3111a28..cdff28296 100644 --- a/applications/luci-app-firewall/po/fr/firewall.po +++ b/applications/luci-app-firewall/po/fr/firewall.po @@ -290,6 +290,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Rediriger le trafic entrant correspondant vers l'hôte interne spécifié" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" "Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux " diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po index 54316ad11..ce0ad0405 100644 --- a/applications/luci-app-firewall/po/he/firewall.po +++ b/applications/luci-app-firewall/po/he/firewall.po @@ -275,6 +275,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po index 78c4b2693..c201e3da8 100644 --- a/applications/luci-app-firewall/po/hu/firewall.po +++ b/applications/luci-app-firewall/po/hu/firewall.po @@ -296,6 +296,9 @@ msgstr "Átirányítja az egyező bejövő forgalmat a belső gép megadott port msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Átirányítja az egyező bejövő forgalmat a megadott belső géphez" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Álcázás korlátozása a megadott cél alhálózatokra" diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po index 064f63d50..88535243b 100644 --- a/applications/luci-app-firewall/po/it/firewall.po +++ b/applications/luci-app-firewall/po/it/firewall.po @@ -272,8 +272,10 @@ msgstr "" msgid "" "Port forwarding allows remote computers on the Internet to connect to a " "specific computer or service within the private LAN." -msgstr "L'inoltro delle porte permette ai computer in remoto su Internet di" -"connettersi a uno specifico computer o servizio presente nella tua LAN privata" +msgstr "" +"L'inoltro delle porte permette ai computer in remoto su Internet " +"diconnettersi a uno specifico computer o servizio presente nella tua LAN " +"privata" msgid "Protocol" msgstr "Protocollo" @@ -285,6 +287,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" @@ -380,8 +385,9 @@ msgstr "" msgid "" "The firewall creates zones over your network interfaces to control network " "traffic flow." -msgstr "Il firewall crea delle zone nelle tue interfacce di rete per controllare" -"il flusso del traffico." +msgstr "" +"Il firewall crea delle zone nelle tue interfacce di rete per controllareil " +"flusso del traffico." msgid "" "The options below control the forwarding policies between this zone (%s) and " diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po index 4e88189eb..0e8d71c6b 100644 --- a/applications/luci-app-firewall/po/ja/firewall.po +++ b/applications/luci-app-firewall/po/ja/firewall.po @@ -1,26 +1,26 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-30 17:00+0200\n" -"PO-Revision-Date: 2012-11-14 17:32+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2016-12-24 02:55+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "%s in %s" -msgstr "" +msgstr "%s (%s)" msgid "%s%s with %s" msgstr "%s%s ,%s" msgid "%s, %s in %s" -msgstr "" +msgstr "%s, %s (%s)" msgid "(Unnamed Entry)" msgstr "(名前設定の無いエントリー)" @@ -142,10 +142,10 @@ msgid "Forward" msgstr "転送" msgid "Forward to" -msgstr "" +msgstr "転送先" msgid "Friday" -msgstr "" +msgstr "金曜日" msgid "From %s in %s" msgstr "送信元 %s (%s)" @@ -199,7 +199,7 @@ msgid "Masquerading" msgstr "マスカレード" msgid "Match" -msgstr "" +msgstr "対象" msgid "Match ICMP type" msgstr "ICMPタイプの一致" @@ -224,10 +224,10 @@ msgstr "" "フィックと一致したトラフィックが対象になります。" msgid "Monday" -msgstr "" +msgstr "月曜日" msgid "Month Days" -msgstr "" +msgstr "月間" msgid "Name" msgstr "名前" @@ -301,6 +301,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "ルールに一致した受信トラフィックを、設定された内部ホストへ転送します" +msgid "Restart Firewall" +msgstr "ファイアウォールの再起動" + msgid "Restrict Masquerading to given destination subnets" msgstr "設定された宛先サブネットへのマスカレードを制限する" @@ -334,7 +337,7 @@ msgid "SNAT port" msgstr "SNAT ポート" msgid "Saturday" -msgstr "" +msgstr "土曜日" # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Generated from applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua # @@ -394,19 +397,19 @@ msgid "Source zone" msgstr "送信元ゾーン" msgid "Start Date (yyyy-mm-dd)" -msgstr "" +msgstr "開始日 (yyyy-mm-dd)" msgid "Start Time (hh:mm:ss)" -msgstr "" +msgstr "開始時刻 (hh:mm:ss)" msgid "Stop Date (yyyy-mm-dd)" -msgstr "" +msgstr "停止日 (yyyy-mm-dd)" msgid "Stop Time (hh:mm:ss)" -msgstr "" +msgstr "停止時刻 (hh:mm:ss)" msgid "Sunday" -msgstr "" +msgstr "日曜日" msgid "" "The firewall creates zones over your network interfaces to control network " @@ -444,7 +447,6 @@ msgstr "" "このページでは、各トラフィックルールの送信元・宛先ホストの設定などの詳細設定" "を行うことができます。" -#, fuzzy msgid "" "This section defines common properties of %q. The <em>input</em> and " "<em>output</em> options set the default policies for traffic entering and " @@ -459,10 +461,10 @@ msgstr "" "のゾーンに属するかを設定します。" msgid "Thursday" -msgstr "" +msgstr "木曜日" msgid "Time in UTC" -msgstr "" +msgstr "UTC時刻を使用" msgid "To %s at %s on <var>this device</var>" msgstr "宛先 %s, %s (<var>デバイス</var>)" @@ -495,19 +497,19 @@ msgstr "" "設定することができます。" msgid "Tuesday" -msgstr "" +msgstr "火曜日" msgid "Via %s" -msgstr "" +msgstr "経由 %s" msgid "Via %s at %s" -msgstr "" +msgstr "経由 %s , %s" msgid "Wednesday" -msgstr "" +msgstr "水曜日" msgid "Week Days" -msgstr "" +msgstr "曜日" msgid "" "You may specify multiple by selecting \"-- custom --\" and then entering " @@ -550,4 +552,4 @@ msgid "reject" msgstr "拒否" msgid "traffic" -msgstr "" +msgstr "トラフィック" diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po index 185aeb936..b82e2c116 100644 --- a/applications/luci-app-firewall/po/ms/firewall.po +++ b/applications/luci-app-firewall/po/ms/firewall.po @@ -274,6 +274,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po index e39eee7e4..59167db54 100644 --- a/applications/luci-app-firewall/po/no/firewall.po +++ b/applications/luci-app-firewall/po/no/firewall.po @@ -291,6 +291,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Viderekoble matchet innkommende trafikk til den angitte interne vert" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Begrens Masquerading til oppgitt destinasjons subnett" diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po index 7a598d808..2eea8c31f 100644 --- a/applications/luci-app-firewall/po/pl/firewall.po +++ b/applications/luci-app-firewall/po/pl/firewall.po @@ -300,6 +300,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Przekieruj ruch przychodzący do wskazanego hosta w sieci wewnętrznej" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Ogranicz maskaradę do wskazanych sieci docelowych" diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po index c1cfb4287..2d601f857 100644 --- a/applications/luci-app-firewall/po/pt-br/firewall.po +++ b/applications/luci-app-firewall/po/pt-br/firewall.po @@ -295,6 +295,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Redireciona tráfego entrante para o computador interno especificado" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Restringe o mascaramento para uma subrede de destino específica" diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po index 70bf2fa3e..f55261671 100644 --- a/applications/luci-app-firewall/po/pt/firewall.po +++ b/applications/luci-app-firewall/po/pt/firewall.po @@ -297,6 +297,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Redirecionar o tráfego de entrada correspondente para o host interno" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po index 432a41b89..69b911e17 100644 --- a/applications/luci-app-firewall/po/ro/firewall.po +++ b/applications/luci-app-firewall/po/ro/firewall.po @@ -279,6 +279,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po index 294d9db6d..98bc92dd6 100644 --- a/applications/luci-app-firewall/po/ru/firewall.po +++ b/applications/luci-app-firewall/po/ru/firewall.po @@ -300,6 +300,9 @@ msgstr "Перенаправить входящий трафик на указа msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Перенаправить входящий трафик на указанный хост внутренней сети" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Использовать маскарадинг только для указанных подсетей-получателей" diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po index 59613a89a..f45e74b14 100644 --- a/applications/luci-app-firewall/po/sk/firewall.po +++ b/applications/luci-app-firewall/po/sk/firewall.po @@ -275,6 +275,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po index 79af5a2e8..2e169fb92 100644 --- a/applications/luci-app-firewall/po/sv/firewall.po +++ b/applications/luci-app-firewall/po/sv/firewall.po @@ -276,6 +276,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot index 7ea06e0bb..d1e8eeca1 100644 --- a/applications/luci-app-firewall/po/templates/firewall.pot +++ b/applications/luci-app-firewall/po/templates/firewall.pot @@ -268,6 +268,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po index 89cbfe152..1b5444f0f 100644 --- a/applications/luci-app-firewall/po/tr/firewall.po +++ b/applications/luci-app-firewall/po/tr/firewall.po @@ -275,6 +275,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po index b946d6b95..1c4117f3f 100644 --- a/applications/luci-app-firewall/po/uk/firewall.po +++ b/applications/luci-app-firewall/po/uk/firewall.po @@ -295,6 +295,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "Обмежити підміну заданими підмережами призначення" diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po index 93d6d6658..6c00a6f29 100644 --- a/applications/luci-app-firewall/po/vi/firewall.po +++ b/applications/luci-app-firewall/po/vi/firewall.po @@ -285,6 +285,9 @@ msgstr "" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "" diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po index 48d22b03e..d36eeeaa6 100644 --- a/applications/luci-app-firewall/po/zh-cn/firewall.po +++ b/applications/luci-app-firewall/po/zh-cn/firewall.po @@ -282,6 +282,9 @@ msgstr "重定向匹配的入站流量到内部主机的端口" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "重定向匹配的入站流量到的内部主机" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "要限制IP动态伪装的目标子网" diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po index b768d43b0..b89cfab7f 100644 --- a/applications/luci-app-firewall/po/zh-tw/firewall.po +++ b/applications/luci-app-firewall/po/zh-tw/firewall.po @@ -280,6 +280,9 @@ msgstr "重導向已匹配傳入流量到內部主機上的指定埠" msgid "Redirect matched incoming traffic to the specified internal host" msgstr "重導向已匹配傳入流量到內部主機上" +msgid "Restart Firewall" +msgstr "" + msgid "Restrict Masquerading to given destination subnets" msgstr "限制偽裝到已給予的目標子網路" diff --git a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua index 096724f73..435837444 100644 --- a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua +++ b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua @@ -1,19 +1,19 @@ -- Copyright 2015 Jonathan Bennett <jbennett@incomsystems.biz> -- Licensed to the public under the GNU General Public License v2. - +tmp = 0 m = Map("fwknopd", translate("Firewall Knock Operator")) s = m:section(TypedSection, "global", translate("Enable Uci/Luci control")) -- Set uci control on or off s.anonymous=true s:option(Flag, "uci_enabled", translate("Enable config overwrite"), translate("When unchecked, the config files in /etc/fwknopd will be used as is, ignoring any settings here.")) -qr = s:option(DummyValue, "note0", "dummy") -qr.template = "fwknopd-qr" -qr:depends("uci_enabled", "1") s = m:section(TypedSection, "access", translate("access.conf stanzas")) -- set the access.conf settings s.anonymous=true s.addremove=true -s.dynamic=true +qr = s:option(DummyValue, "note0", "dummy") +qr.tmp = tmp +qr.template = "fwknopd-qr" +qr:depends("uci_enabled", "1") s:option(Value, "SOURCE", "SOURCE", translate("Use ANY for any source ip")) k1 = s:option(Value, "KEY", "KEY", translate("Define the symmetric key used for decrypting an incoming SPA packet that is encrypted by the fwknop client with Rijndael.")) k1:depends("keytype", translate("Normal Key")) @@ -40,15 +40,13 @@ s:option(Value, "REQUIRE_SOURCE_ADDRESS", "REQUIRE_SOURCE_ADDRESS", translate("F This makes it impossible to use the -s command line argument on the fwknop client command line, so either -R \ has to be used to automatically resolve the external address (if the client behind a NAT) or the client must \ know the external IP and set it via the -a argument.")) -s:option(DummyValue, "note1", translate("Enter custom access.conf variables below:")) s = m:section(TypedSection, "config", translate("fwknopd.conf config options")) s.anonymous=true -s.dynamic=true s:option(Value, "MAX_SPA_PACKET_AGE", "MAX_SPA_PACKET_AGE", translate("Maximum age in seconds that an SPA packet will be accepted. defaults to 120 seconds")) s:option(Value, "PCAP_INTF", "PCAP_INTF", translate("Specify the ethernet interface on which fwknopd will sniff packets.")) s:option(Value, "ENABLE_IPT_FORWARDING", "ENABLE_IPT_FORWARDING", translate("Allow SPA clients to request access to services through an iptables firewall instead of just to it.")) -s:option(DummyValue, "note2", translate("Enter custom fwknopd.conf variables below:")) +s:option(Value, "ENABLE_NAT_DNS", "ENABLE_NAT_DNS", translate("Allow SPA clients to request forwarding destination by DNS name.")) return m diff --git a/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm b/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm index 9e6e8185f..5773f523e 100644 --- a/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm +++ b/applications/luci-app-fwknopd/luasrc/view/fwknopd-qr.htm @@ -1 +1,2 @@ -<% print(luci.sys.exec("sh /usr/sbin/gen-qr.sh")) %> +<% print(luci.sys.exec("sh /usr/sbin/gen-qr.sh " .. self.tmp)) %> +<% self.tmp = self.tmp + 1 %> diff --git a/applications/luci-app-fwknopd/po/en/fwknopd.po b/applications/luci-app-fwknopd/po/en/fwknopd.po index d75c99d52..fbdd8d753 100644 --- a/applications/luci-app-fwknopd/po/en/fwknopd.po +++ b/applications/luci-app-fwknopd/po/en/fwknopd.po @@ -17,6 +17,9 @@ msgstr "" "Allow SPA clients to request access to services through an iptables firewall " "instead of just to it." +msgid "Allow SPA clients to request forwarding destination by DNS name." +msgstr "" + msgid "Base 64 key" msgstr "Base 64 key" @@ -55,12 +58,6 @@ msgstr "Enable Uci/Luci control" msgid "Enable config overwrite" msgstr "Enable config overwrite" -msgid "Enter custom access.conf variables below:" -msgstr "Enter custom access.conf variables below:" - -msgid "Enter custom fwknopd.conf variables below:" -msgstr "Enter custom fwknopd.conf variables below:" - msgid "Firewall Knock Daemon" msgstr "Firewall Knock Daemon" @@ -111,3 +108,9 @@ msgstr "access.conf stanzas" msgid "fwknopd.conf config options" msgstr "fwknopd.conf config options" + +#~ msgid "Enter custom access.conf variables below:" +#~ msgstr "Enter custom access.conf variables below:" + +#~ msgid "Enter custom fwknopd.conf variables below:" +#~ msgstr "Enter custom fwknopd.conf variables below:" diff --git a/applications/luci-app-fwknopd/po/templates/fwknopd.pot b/applications/luci-app-fwknopd/po/templates/fwknopd.pot index 4fb616f25..1010ba70e 100644 --- a/applications/luci-app-fwknopd/po/templates/fwknopd.pot +++ b/applications/luci-app-fwknopd/po/templates/fwknopd.pot @@ -6,6 +6,9 @@ msgid "" "instead of just to it." msgstr "" +msgid "Allow SPA clients to request forwarding destination by DNS name." +msgstr "" + msgid "Base 64 key" msgstr "" @@ -34,12 +37,6 @@ msgstr "" msgid "Enable config overwrite" msgstr "" -msgid "Enter custom access.conf variables below:" -msgstr "" - -msgid "Enter custom fwknopd.conf variables below:" -msgstr "" - msgid "Firewall Knock Daemon" msgstr "" diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd index 01b85de25..65ef01245 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd @@ -16,6 +16,7 @@ uci set fwknopd.@access[0].hkeytype='Base 64 key' uci set fwknopd.@access[0].KEY_BASE64=`fwknopd --key-gen | awk '/^KEY/ {print $2;}'` uci set fwknopd.@access[0].HMAC_KEY_BASE64=`fwknopd --key-gen | awk '/^HMAC/ {print $2;}'` uci set fwknopd.@config[0].ENABLE_IPT_FORWARDING='y' +uci set fwknopd.@config[0].ENABLE_NAT_DNS='y' uci commit fwknopd rm -f /tmp/luci-indexcache diff --git a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh index 97493dafe..abca5d3e5 100644 --- a/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh +++ b/applications/luci-app-fwknopd/root/usr/sbin/gen-qr.sh @@ -1,9 +1,13 @@ #!/bin/sh +entry_num=0 +if [ "$1" != "" ]; then +entry_num=$1 +fi -key_base64=$(uci get fwknopd.@access[0].KEY_BASE64) -key=$(uci get fwknopd.@access[0].KEY) -hmac_key_base64=$(uci get fwknopd.@access[0].HMAC_KEY_BASE64) -hmac_key=$(uci get fwknopd.@access[0].HMAC_KEY) +key_base64=$(uci get fwknopd.@access[$entry_num].KEY_BASE64) +key=$(uci get fwknopd.@access[$entry_num].KEY) +hmac_key_base64=$(uci get fwknopd.@access[$entry_num].HMAC_KEY_BASE64) +hmac_key=$(uci get fwknopd.@access[$entry_num].HMAC_KEY) if [ $key_base64 != "" ]; then qr="KEY_BASE64:$key_base64" diff --git a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po new file mode 100644 index 000000000..7da344461 --- /dev/null +++ b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po @@ -0,0 +1,171 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"X-Generator: Poedit 1.8.11\n" + +msgid "Allow ringbuffer to exceed limit by this amount" +msgstr "リングバッファーがこの量だけ制限を超過することを許可します。" + +msgid "Ask for username and password on connect" +msgstr "接続時にユーザー名とパスワードを確認します。" + +msgid "Authentication required" +msgstr "認証が必要" + +msgid "Auto" +msgstr "自動" + +msgid "Automatic disabling of MJPEG mode" +msgstr "MJPEGモードの自動無効化" + +msgid "Blink" +msgstr "点滅" + +msgid "Check to save the stream to an mjpeg file" +msgstr "MJPEGファイルに保存するにはチェックします。" + +msgid "Command to run" +msgstr "実行するコマンド" + +msgid "Device" +msgstr "デバイス" + +msgid "Do not initalize dynctrls of Linux-UVC driver" +msgstr "Linux-UVCドライバのdynctrlsを初期化しません。" + +msgid "Don't initalize dynctrls" +msgstr "dynctrlsを初期化しない" + +msgid "Drop frames smaller then this limit" +msgstr "この制限よりも小さいフレームをドロップする" + +msgid "Enable MJPG-streamer" +msgstr "MJPG-streamerを有効化します。" + +msgid "Enable YUYV format" +msgstr "YUYV形式を有効化" + +msgid "Enabled" +msgstr "有効" + +msgid "Exceed" +msgstr "超過" + +msgid "" +"Execute command after saving picture. Mjpg-streamer parse the filename as " +"first parameter to your script." +msgstr "" +"画像保存後にコマンドを実行します。Mjpg-streamerは、ファイル名をスクリプトの最" +"初の引数として解釈します。" + +msgid "File input" +msgstr "ファイル入力" + +msgid "File output" +msgstr "ファイル出力" + +msgid "Folder" +msgstr "フォルダー" + +msgid "Folder that contains webpages" +msgstr "ウェブページを含むフォルダー" + +msgid "Frames per second" +msgstr "1秒当たりのフレーム数" + +msgid "General" +msgstr "一般設定" + +msgid "HTTP output" +msgstr "HTTP 出力" + +msgid "Input plugin" +msgstr "入力プラグイン" + +msgid "Interval between saving pictures" +msgstr "画像の保存間隔" + +msgid "JPEG compression quality" +msgstr "JPEG 圧縮品質" + +msgid "Led control" +msgstr "LED 制御" + +msgid "MJPG-streamer" +msgstr "MJPG-streamer" + +msgid "Max. number of pictures to hold" +msgstr "保持する画像の最大数です。" + +msgid "Mjpeg output" +msgstr "MJPEG 出力" + +msgid "Off" +msgstr "消灯" + +msgid "On" +msgstr "点灯" + +msgid "Output plugin" +msgstr "出力プラグイン" + +msgid "Password" +msgstr "パスワード" + +msgid "Plugin settings" +msgstr "プラグイン設定" + +msgid "Port" +msgstr "ポート" + +msgid "Resolution" +msgstr "解像度" + +msgid "Ring buffer size" +msgstr "リングバッファー サイズ" + +msgid "Set folder to save pictures" +msgstr "画像を保存するフォルダーを設定します。" + +msgid "Set the inteval in millisecond" +msgstr "間隔をミリ秒で設定します。" + +msgid "" +"Set the minimum size if the webcam produces small-sized garbage frames. May " +"happen under low light conditions" +msgstr "" +"もしウェブカメラが小さなサイズの余分なフレームを生成する場合は、最小サイズを" +"設定します。光量の低い条件下で発生することがあります。" + +msgid "" +"Set the quality in percent. This setting activates YUYV format, disables " +"MJPEG" +msgstr "" +"品質をパーセントで設定します。この設定はYUYV形式を有効にし、MJPEGを無効にしま" +"す。" + +msgid "TCP port for this HTTP server" +msgstr "このHTTPサーバーのTCPポートです。" + +msgid "UVC input" +msgstr "UVC 入力" + +msgid "Username" +msgstr "ユーザー名" + +msgid "WWW folder" +msgstr "WWW フォルダー" + +msgid "" +"mjpg streamer is a streaming application for Linux-UVC compatible webcams" +msgstr "" +"Mjpg streamerは、Linux-UVC互換ウェブカメラのためのストリーミング アプリケー" +"ションです。" diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index 9a997bdc1..0564bd4ea 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -87,8 +87,8 @@ function action_json() local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090 local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090 - jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 " .. v4_port .. ") 2>/dev/null" ) - jsonreq6 = utl.exec("(echo /status | nc ::1 " .. v6_port .. ") 2>/dev/null") + jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 " .. v4_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null" ) + jsonreq6 = utl.exec("(echo /status | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null") http.prepare_content("application/json") if not jsonreq4 or jsonreq4 == "" then jsonreq4 = "{}" @@ -375,8 +375,8 @@ function fetch_jsoninfo(otable) local v4_port = uci:get("olsrd", "olsrd_jsoninfo", "port") or 9090 local v6_port = uci:get("olsrd6", "olsrd_jsoninfo", "port") or 9090 - jsonreq4 = utl.exec("(echo /" .. otable .. " | nc 127.0.0.1 " .. v4_port .. ") 2>/dev/null") - jsonreq6 = utl.exec("(echo /" .. otable .. " | nc ::1 " .. v6_port .. ") 2>/dev/null") + jsonreq4 = utl.exec("(echo /" .. otable .. " | nc 127.0.0.1 " .. v4_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null") + jsonreq6 = utl.exec("(echo /" .. otable .. " | nc ::1 " .. v6_port .. " | sed -n '/^[}{ ]/p') 2>/dev/null") local jsondata4 = {} local jsondata6 = {} local data4 = {} diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm index 31dd7d05a..c077c2048 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm @@ -12,8 +12,8 @@ local i = 1 if luci.http.formvalue("status") == "1" then local rv = {} for k, link in ipairs(links) do - link.linkCost = tonumber(link.linkCost)/1024 or 0 - if link.linkCost == 4096 then + link.linkCost = tonumber(link.linkCost) or 0 + if link.linkCost == 4194304 then link.linkCost = 0 end local color = olsrtools.etx_color(link.linkCost) @@ -129,8 +129,8 @@ end <tbody id="olsr_neigh_table"> <% local i = 1 for k, link in ipairs(links) do - link.linkCost = tonumber(link.linkCost)/1024 or 0 - if link.linkCost == 4096 then + link.linkCost = tonumber(link.linkCost) or 0 + if link.linkCost == 4194304 then link.linkCost = 0 end diff --git a/applications/luci-app-p910nd/po/ja/p910nd.po b/applications/luci-app-p910nd/po/ja/p910nd.po index 42335cefa..28ffc3817 100644 --- a/applications/luci-app-p910nd/po/ja/p910nd.po +++ b/applications/luci-app-p910nd/po/ja/p910nd.po @@ -1,17 +1,17 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-19 19:36+0200\n" -"PO-Revision-Date: 2011-11-04 18:11+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2016-12-22 01:08+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.4\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "Bidirectional mode" msgstr "双方向モード" @@ -27,7 +27,7 @@ msgstr "" "るためのパッケージをインストールしてください。" msgid "Interface" -msgstr "" +msgstr "インターフェース" msgid "Port" msgstr "ポート番号" @@ -36,7 +36,7 @@ msgid "Settings" msgstr "設定" msgid "Specifies the interface to listen on." -msgstr "" +msgstr "待ち受けるインターフェースを指定します。" msgid "TCP listener port." msgstr "TCP接続待ちポート" diff --git a/applications/luci-app-privoxy/po/zh-cn/privoxy.po b/applications/luci-app-privoxy/po/zh-cn/privoxy.po index 75d1a921c..778422b8b 100644 --- a/applications/luci-app-privoxy/po/zh-cn/privoxy.po +++ b/applications/luci-app-privoxy/po/zh-cn/privoxy.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-privoxy\n" "POT-Creation-Date: 2015-06-10 20:16+0100\n" -"PO-Revision-Date: 2015-06-10 20:16+0100\n" +"PO-Revision-Date: 2017-01-05 18:01+0800\n" "Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n" "Language-Team: \n" -"Language: zh-cn\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.11\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,10 +21,10 @@ msgstr "当用户试图访问不受信任的页面时，错误页面所显示的 msgid "" "A URL to documentation about the local Privoxy setup, configuration or " "policies." -msgstr "指向Privoxy安装、设置和规则说明文档的URL" +msgstr "指向 Privoxy 安装、设置和规则说明文档的 URL" msgid "A directory where Privoxy can create temporary files." -msgstr "Privoxy存放临时文件的目录。" +msgstr "Privoxy 存放临时文件的目录。" msgid "Access Control" msgstr "访问控制" @@ -36,18 +36,18 @@ msgid "An alternative directory where the templates are loaded from." msgstr "可选的目录，放在里面的模板会被加载。" msgid "An email address to reach the Privoxy administrator." -msgstr "用于联系privoxy管理员的邮箱地址。" +msgstr "用于联系 Privoxy 管理员的邮箱地址。" msgid "" "Assumed server-side keep-alive timeout (in seconds) if not specified by the " "server." -msgstr "当服务端没有指定超时时间时假定的超时时间（单位秒）。" +msgstr "当服务端没有指定超时时间时假定的超时时间（单位：秒）。" msgid "Boot delay" -msgstr "" +msgstr "启动延时" msgid "CGI user interface" -msgstr "CGI用户界面" +msgstr "CGI 用户界面" msgid "Common Log Format" msgstr "通用日志格式" @@ -57,14 +57,14 @@ msgid "" "proxies. Note that parent proxies can severely decrease your privacy level. " "Also specified here are SOCKS proxies." msgstr "" -"在这里设置http请求所经过的多重代理链。注意父级代理可能严重降低你的隐私安全" -"度。在这里还可以设置SOCKS代理。" +"在这里设置 HTTP 请求所经过的多重代理链。注意：父级代理可能严重降低你的隐私安" +"全度。在这里还可以设置 SOCKS 代理。" msgid "Debug GIF de-animation" msgstr "GIF动画日志" msgid "Debug force feature" -msgstr "force feature日志" +msgstr "Force feature 日志" msgid "Debug redirects" msgstr "重定向日志" @@ -73,7 +73,7 @@ msgid "Debug regular expression filters" msgstr "正则表达式日志" msgid "Delay (in seconds) during system boot before Privoxy start" -msgstr "" +msgstr "Privoxy 自启动延迟时间（单位：秒）" msgid "Directory does not exist!" msgstr "目录不存在！" @@ -82,20 +82,20 @@ msgid "Disabled == Transparent Proxy Mode" msgstr "禁用 == 透明代理模式" msgid "Documentation" -msgstr "" +msgstr "记录信息" msgid "During delay ifup-events are not monitored !" -msgstr "" +msgstr "在延迟期间无法检测到 ifup 事件！" msgid "Enable proxy authentication forwarding" msgstr "允许转发代理认证" msgid "" "Enable/Disable autostart of Privoxy on system startup and interface events" -msgstr "开启/关闭Privoxy在系统启动或者设置界面更改时自动启动。" +msgstr "开启/关闭 Privoxy 在系统启动或接口事件时自动启动。" msgid "Enable/Disable filtering when Privoxy starts." -msgstr "Privoxy启动时开启/关闭过滤。" +msgstr "Privoxy 启动时开启/关闭过滤。" msgid "Enabled" msgstr "已开启" @@ -103,10 +103,10 @@ msgstr "已开启" msgid "" "Enabling this option is NOT recommended if there is no parent proxy that " "requires authentication!" -msgstr "父级代理不需要认证时不推荐开启这个选项！" +msgstr "如果没有需要认证的父级代理时，不推荐开启这个选项！" msgid "File '%s' not found inside Configuration Directory" -msgstr "文件 '%s' 没有在设置目录中找到！" +msgstr "在设置目录中未找到文件 '%S'！" msgid "File not found or empty" msgstr "文件不存在或为空" @@ -115,7 +115,7 @@ msgid "Files and Directories" msgstr "文件和目录" msgid "For help use link at the relevant option" -msgstr "在相应选项下的连接可获取帮助。" +msgstr "点击相应选项的连接可获取帮助。" msgid "Forwarding" msgstr "转发" @@ -123,15 +123,15 @@ msgstr "转发" msgid "" "If enabled, Privoxy hides the 'go there anyway' link. The user obviously " "should not be able to bypass any blocks." -msgstr "如果启用，Privoxy会隐藏'go there anyway'链接。用户显然不应能绕过屏蔽。" +msgstr "如果启用，Privoxy 会隐藏 'go there anyway' 链接，用户就不能绕过屏蔽。" msgid "" "If you intend to operate Privoxy for more users than just yourself, it might " "be a good idea to let them know how to reach you, what you block and why you " "do that, your policies, etc." msgstr "" -"如果除了你还有其他用户通过privoxy连接，让他们知道如何联系你、什么内容被屏蔽" -"了、你为什么要这么做、你所制定的规范等等是一个好主意。" +"如果除了你还有其他用户使用 Privoxy 连接，最好让他们知道如何联系你，你屏蔽什" +"么，你为什么这样做，你的政策等等。" msgid "Invalid email address" msgstr "邮箱地址无效" @@ -140,29 +140,29 @@ msgid "It is NOT recommended for the casual user." msgstr "不推荐新手使用。" msgid "Location of the Privoxy User Manual." -msgstr "Privoxy用户手册位置" +msgstr "Privoxy 用户手册位置" msgid "Log File Viewer" msgstr "日志查看器" msgid "Log all data read from the network" -msgstr "记录所有从网络接收的数据" +msgstr "记录所有接收的网络数据" msgid "Log all data written to the network" -msgstr "记录所有发送给网络的数据" +msgstr "记录所有发送的网络数据" msgid "Log the applying actions" -msgstr "记录被应用的规则" +msgstr "记录配置保存动作" msgid "" "Log the destination for each request Privoxy let through. See also 'Debug " "1024'." -msgstr "记录Privoxy所允许的所有请求。另请参考'Debug 1024'。" +msgstr "记录 Privoxy 允许的所有请求。另请参考 'Debug 1024'。" msgid "" "Log the destination for requests Privoxy didn't let through, and the reason " "why." -msgstr "记录被Privoxy拒绝的请求目标以及拒绝原因。" +msgstr "记录 Privoxy 拒绝的请求目标以及拒绝原因。" msgid "Logging" msgstr "日志" @@ -198,40 +198,40 @@ msgid "Maximum number of client connections that will be served." msgstr "客户端数量上限。" msgid "Maximum size (in KB) of the buffer for content filtering." -msgstr "内容过滤的最大缓冲（单位KB）。" +msgstr "内容过滤的最大缓冲（单位：KB）。" msgid "Miscellaneous" msgstr "杂项" msgid "NOT installed" -msgstr "" +msgstr "未安装" msgid "No trailing '/', please." -msgstr "路径结尾不要加'/' ." +msgstr "路径结尾不要加 '/' 。" msgid "Non-fatal errors - *we highly recommended enabling this*" -msgstr "非致命性错误 - * 建议开启 *" +msgstr "非致命性错误 - * 强烈建议开启 *" msgid "" "Number of seconds after which a socket times out if no data is received." -msgstr "socket连接未收到数据的超时时间。" +msgstr "Socket 连接未收到数据的超时时间。" msgid "" "Number of seconds after which an open connection will no longer be reused." -msgstr "一个开放的连接不再重复使用的超时时间。" +msgstr "开放的连接不再重复使用的超时时间。" msgid "" "Only when using 'external filters', Privoxy has to create temporary files." -msgstr "只有使用外置规则时，privoxy才需要创建临时文件。" +msgstr "只有使用外置规则时，Privoxy 才需要创建临时文件。" msgid "Please install current version !" -msgstr "" +msgstr "请安装当前版本！" msgid "Please press [Read] button" -msgstr "请点击[读取]按钮" +msgstr "请点击 [读取] 按钮" msgid "Please read Privoxy manual for details!" -msgstr "请阅读Privoxy手册以了解详情！" +msgstr "请阅读 Privoxy 手册以了解详情！" msgid "Please update to the current version!" msgstr "请升级到当前版本！" @@ -244,16 +244,16 @@ msgid "" "configuration, help and logging. This section of the configuration file " "tells Privoxy where to find those other files." msgstr "" -"Privoxy可以使用其他一些文件用于附加设置，帮助和日志。这个区域用来告诉Privoxy" -"从哪里找到这些文件。" +"Privoxy 可以使用其他一些文件用于附加设置，帮助和日志。这个区域用来告诉 " +"Privoxy 从哪里找到这些文件。" msgid "" "Privoxy is a non-caching web proxy with advanced filtering capabilities for " "enhancing privacy, modifying web page data and HTTP headers, controlling " "access, and removing ads and other obnoxious Internet junk." msgstr "" -"Privoxy是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和HTTP头，控" -"制访问，移除广告等。" +"Privoxy 是一个无缓存的网络代理，具有高级过滤功能，能够修改网页数据和 HTTP 请" +"求头，控制访问，移除广告等。" msgid "Read / Reread log file" msgstr "读取/刷新日志文件" @@ -265,13 +265,13 @@ msgid "Show each connection status" msgstr "显示每个连接的状态" msgid "Show header parsing" -msgstr "Show header parsing" +msgstr "显示请求头 解析" msgid "Software package '%s' is not installed." -msgstr "" +msgstr "软件包 '%s' 未安装" msgid "Software package '%s' is outdated." -msgstr "" +msgstr "软件包 '%s' 已过时" msgid "Start" msgstr "启动" @@ -289,7 +289,7 @@ msgid "Syntax:" msgstr "格式:" msgid "Syntax: Client header names delimited by spaces." -msgstr "格式: Client header names delimited by spaces." +msgstr "格式: 由空格分隔的客户端请求头名称。" msgid "Syntax: target_pattern http_parent[:port]" msgstr "格式: target_pattern http_parent[:port]" @@ -298,7 +298,7 @@ msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]" msgstr "格式: target_pattern socks_proxy[:port] http_parent[:port]" msgid "System" -msgstr "" +msgstr "系统" msgid "" "The actions file(s) to use. Multiple actionsfile lines are permitted, and " @@ -307,12 +307,12 @@ msgstr "所使用的规则文件。允许并且推荐使用多个规则文件。 msgid "" "The address and TCP port on which Privoxy will listen for client requests." -msgstr "Privoxy接收客户端请求时监听的地址和TCP端口。" +msgstr "Privoxy 接收客户端请求时监听的地址和 TCP 端口。" msgid "" "The compression level that is passed to the zlib library when compressing " "buffered content." -msgstr "使用zlib压缩缓冲内容时的压缩级别。" +msgstr "使用 zlib 压缩缓冲内容时的压缩级别。" msgid "" "The directory where all logging takes place (i.e. where the logfile is " @@ -334,14 +334,14 @@ msgid "The log file to use. File name, relative to log directory." msgstr "日志文件名称，与日志路径相对。" msgid "The order in which client headers are sorted before forwarding them." -msgstr "转发数据前，client headers的排序。" +msgstr "转发数据前，客户端请求头的排序。" msgid "" "The status code Privoxy returns for pages blocked with +handle-as-empty-" "document." msgstr "" -"当页面因为handle-as-empty-document规则被阻止时返回的状态码（选上为200 OK，不" -"选上为403 Forbidden）" +"当页面因为 handle-as-empty-document 规则被阻止时返回的状态码（选上为 200 OK，" +"不选上为 403 Forbidden）" msgid "" "The trust mechanism is an experimental feature for building white-lists and " @@ -361,19 +361,20 @@ msgstr "这个选项仅用于调试，开启后会极大地降低性能。" msgid "" "This option will be removed in future releases as it has been obsoleted by " "the more general header taggers." -msgstr "这个选项在以后的版本中将被移除，因为它被header taggers所取代了。" +msgstr "这个选项在以后的版本中将被移除，因为它被 header taggers 所取代了。" msgid "" "This tab controls the security-relevant aspects of Privoxy's configuration." -msgstr "这个标签用于设置与安全相关的Privoxy选项。" +msgstr "这个标签用于设置与安全相关的 Privoxy 选项。" msgid "" "Through which SOCKS proxy (and optionally to which parent HTTP proxy) " "specific requests should be routed." -msgstr "指定的请求应该通过哪一个SOCKS代理（并且通过哪一个HTTP父代理，可选）" +msgstr "" +"指定的请求应该通过哪一个 SOCKS 代理（并且通过哪一个 HTTP 父代理，可选）" msgid "To which parent HTTP proxy specific requests should be routed." -msgstr "请求应转发至哪一个父级HTTP代理。" +msgstr "请求应转发至哪一个父级 HTTP 代理。" msgid "User customizations" msgstr "用户自定义" @@ -382,10 +383,10 @@ msgid "Value is not a number" msgstr "输入值不是数字" msgid "Value not between 0 and 300" -msgstr "" +msgstr "输入值不在0和300之间" msgid "Value not between 0 and 9" -msgstr "输入值不在0和9之间。" +msgstr "输入值不在0和9之间" msgid "Value not between 1 and 4096" msgstr "输入值不在1和4096之间" @@ -408,7 +409,7 @@ msgstr "被拦截的请求是否应被当作有效的。" msgid "" "Whether or not Privoxy recognizes special HTTP headers to change toggle " "state." -msgstr "Privoxy是否识别特殊的HTTP头以切换状态。" +msgstr "Privoxy 是否识别特殊的 HTTP 请求头以切换状态。" msgid "Whether or not buffered content is compressed before delivery." msgstr "缓冲内容在传递之前是否压缩。" @@ -422,7 +423,7 @@ msgid "Whether or not pipelined requests should be served." msgstr "是否处理管道化的请求。" msgid "Whether or not proxy authentication through Privoxy should work." -msgstr "是否可以通过Privoxy进行代理验证。" +msgstr "是否可以通过 Privoxy 进行代理验证。" msgid "Whether or not the web-based actions file editor may be used." msgstr "是否使用基于网页的规则编辑器。" @@ -431,11 +432,11 @@ msgid "Whether or not the web-based toggle feature may be used." msgstr "是否启用基于网页的切换功能。" msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected." -msgstr "访问Privoxy CGI页面的请求是否可以被拦截或重定向。" +msgstr "访问 Privoxy CGI 页面的请求是否可以被拦截或重定向。" msgid "" "Whether the CGI interface should stay compatible with broken HTTP clients." -msgstr "CGI界面是否应兼容过时的HTTP客户端。" +msgstr "CGI 界面是否应兼容过时的HTTP客户端。" msgid "Whether to run only one server thread." msgstr "是否只运行一个服务线程。" diff --git a/applications/luci-app-qos/po/ja/qos.po b/applications/luci-app-qos/po/ja/qos.po index deeb23f60..a81a6e1ad 100644 --- a/applications/luci-app-qos/po/ja/qos.po +++ b/applications/luci-app-qos/po/ja/qos.po @@ -1,17 +1,17 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-25 22:10+0100\n" -"PO-Revision-Date: 2011-10-28 11:02+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2016-12-22 01:54+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.4\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "Calculate overhead" msgstr "オーバーヘッドを考慮する" @@ -23,7 +23,7 @@ msgid "Classification group" msgstr "区分グループ" msgid "Comment" -msgstr "" +msgstr "コメント" msgid "Destination host" msgstr "宛先ホスト" @@ -50,7 +50,7 @@ msgid "Protocol" msgstr "プロトコル" msgid "QoS" -msgstr "" +msgstr "QoS" msgid "Quality of Service" msgstr "Quality of Service" diff --git a/applications/luci-app-shairplay/po/ja/shairplay.po b/applications/luci-app-shairplay/po/ja/shairplay.po new file mode 100644 index 000000000..07fa7be6e --- /dev/null +++ b/applications/luci-app-shairplay/po/ja/shairplay.po @@ -0,0 +1,54 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2017-01-03 15:06+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Language-Team: \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"X-Poedit-Basepath: .\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "AO Device ID" +msgstr "オーディオ出力 デバイスID" + +msgid "AO Device Name" +msgstr "オーディオ出力 デバイス名" + +msgid "AO Driver" +msgstr "オーディオ出力 デバイスドライバー" + +msgid "Airport Name" +msgstr "Airport名" + +msgid "Default" +msgstr "デフォルト" + +msgid "Enabled" +msgstr "有効" + +msgid "HW Address" +msgstr "ハードウェア アドレス" + +msgid "Password" +msgstr "パスワード" + +msgid "Port" +msgstr "ポート" + +msgid "Respawn" +msgstr "リスポーン" + +msgid "Shairplay" +msgstr "" + +msgid "" +"Shairplay is a simple AirPlay server implementation, here you can configure " +"the settings." +msgstr "" +"Shairplayは、シンプルなAirPlay サーバー実装です。ここでは、設定を行うことがで" +"きます。" diff --git a/applications/luci-app-shairplay/po/templates/shairplay.pot b/applications/luci-app-shairplay/po/templates/shairplay.pot new file mode 100644 index 000000000..b3da99e0b --- /dev/null +++ b/applications/luci-app-shairplay/po/templates/shairplay.pot @@ -0,0 +1,40 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "AO Device ID" +msgstr "" + +msgid "AO Device Name" +msgstr "" + +msgid "AO Driver" +msgstr "" + +msgid "Airport Name" +msgstr "" + +msgid "Default" +msgstr "" + +msgid "Enabled" +msgstr "" + +msgid "HW Address" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Port" +msgstr "" + +msgid "Respawn" +msgstr "" + +msgid "Shairplay" +msgstr "" + +msgid "" +"Shairplay is a simple AirPlay server implementation, here you can configure " +"the settings." +msgstr "" diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua index fbc3884b4..b5633c15f 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/df.lua @@ -8,7 +8,6 @@ function rrdargs( graph, plugin, plugin_instance, dtype ) return { title = "%H: Disk space usage on %pi", vlabel = "Bytes", - per_instance = true, number_format = "%5.1lf%sB", data = { diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po index bc995a6fb..218712b53 100644 --- a/applications/luci-app-statistics/po/ja/statistics.po +++ b/applications/luci-app-statistics/po/ja/statistics.po @@ -1,65 +1,65 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-19 19:36+0200\n" -"PO-Revision-Date: 2012-04-20 08:55+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2016-12-23 15:07+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.4\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "Action (target)" -msgstr "" +msgstr "アクション（対象）" msgid "Add command for reading values" -msgstr "" +msgstr "値読み取りコマンドの追加" msgid "Add matching rule" -msgstr "" +msgstr "マッチング規則の追加" msgid "Add multiple hosts separated by space." -msgstr "" +msgstr "スペースで区切られた複数のホストを追加します。" msgid "Add notification command" -msgstr "" +msgstr "通知コマンドの追加" msgid "Aggregate number of connected users" -msgstr "" +msgstr "接続ユーザー数の総計" msgid "Base Directory" msgstr "ベース・ディレクトリ" msgid "Basic monitoring" -msgstr "" +msgstr "基本モニタリング" msgid "CPU Frequency" -msgstr "" +msgstr "CPU 周波数" msgid "CPU Frequency Plugin Configuration" -msgstr "" +msgstr "CPU 周波数プラグイン設定" msgid "CPU Plugin Configuration" -msgstr "" +msgstr "CPU プラグイン設定" msgid "CSV Output" -msgstr "" +msgstr "CSV 出力" msgid "CSV Plugin Configuration" msgstr "CSV プラグイン設定" msgid "Cache collected data for" -msgstr "" +msgstr "収集されたデータをキャッシュする" msgid "Cache flush interval" msgstr "" msgid "Chain" -msgstr "" +msgstr "チェイン" msgid "CollectLinks" msgstr "" @@ -78,12 +78,14 @@ msgid "" "different plugins. On this page you can change general settings for the " "collectd daemon." msgstr "" +"Collectd は、様々なソースから別々のプラグインを通してデータを収集する軽量デー" +"モンです。" msgid "Conntrack" -msgstr "" +msgstr "Conntrack" msgid "Conntrack Plugin Configuration" -msgstr "" +msgstr "Conntrack プラグイン設定" msgid "DF Plugin Configuration" msgstr "DF プラグイン設定" @@ -92,7 +94,7 @@ msgid "DNS" msgstr "DNS" msgid "DNS Plugin Configuration" -msgstr "" +msgstr "DNS プラグイン設定" msgid "Data collection interval" msgstr "データの収集間隔" @@ -101,7 +103,7 @@ msgid "Datasets definition file" msgstr "データベース定義ファイル" msgid "Destination ip range" -msgstr "" +msgstr "対象IPの範囲" msgid "Directory for collectd plugins" msgstr "collectd プラグインディレクトリ" @@ -113,13 +115,13 @@ msgid "Disk Plugin Configuration" msgstr "ディスクプラグイン設定" msgid "Disk Space Usage" -msgstr "" +msgstr "ディスクスペース使用量" msgid "Disk Usage" -msgstr "" +msgstr "ディスクの使用" msgid "Display Host »" -msgstr "" +msgstr "ホストを表示 »" msgid "Display timespan »" msgstr "時間帯表示 »" @@ -131,22 +133,22 @@ msgid "Email" msgstr "Eメール" msgid "Empty value = monitor all" -msgstr "" +msgstr "空の値 = 全てをモニターする" msgid "Enable this plugin" msgstr "プラグイン設定を有効にする" msgid "Entropy" -msgstr "" +msgstr "エントロピー" msgid "Entropy Plugin Configuration" -msgstr "" +msgstr "エントロピー プラグイン設定" msgid "Exec" msgstr "" msgid "Exec Plugin Configuration" -msgstr "" +msgstr "Exec プラグイン設定" msgid "Filter class monitoring" msgstr "" @@ -164,10 +166,10 @@ msgid "Gather compression statistics" msgstr "" msgid "General plugins" -msgstr "" +msgstr "一般プラグイン" msgid "Generate a separate graph for each logged user" -msgstr "" +msgstr "ログインユーザーごとの分離されたグラフを生成します。" msgid "Graphs" msgstr "グラフ" @@ -179,23 +181,30 @@ msgid "" "Here you can define external commands which will be started by collectd in " "order to read certain values. The values will be read from stdout." msgstr "" +"ここでは、特定の値を読み込むためにcollectによって順番に開始される外部コマンド" +"を設定することができます。値は標準出力から読み込まれます。" msgid "" "Here you can define external commands which will be started by collectd when " "certain threshold values have been reached. The values leading to invokation " "will be feeded to the the called programs stdin." msgstr "" +"ここでは、特定の閾値に到達したときにcollectによって開始される外部コマンドを設" +"定することができます。呼び出しにつながる値は、呼び出されたプログラムの標準入" +"力に送られます。" msgid "" "Here you can define various criteria by which the monitored iptables rules " "are selected." msgstr "" +"ここでは、モニターするiptable規則が選択される様々な基準を設定することができま" +"す。" msgid "Hold Ctrl to select multiple items or to deselect entries." -msgstr "" +msgstr "複数の項目を選択または解除するには、Ctrlキーを押したままにします。" msgid "Host" -msgstr "" +msgstr "ホスト" msgid "Hostname" msgstr "ホスト名" @@ -210,96 +219,99 @@ msgid "Ignore source addresses" msgstr "" msgid "Incoming interface" -msgstr "" +msgstr "着信インターフェース" msgid "Interface Plugin Configuration" -msgstr "" +msgstr "インターフェース プラグイン設定" msgid "Interfaces" -msgstr "" +msgstr "インターフェース" msgid "Interrupts" -msgstr "" +msgstr "割込み" msgid "Interval for pings" -msgstr "" +msgstr "ping間隔" msgid "Iptables Plugin Configuration" -msgstr "" +msgstr "Iptables プラグイン設定" msgid "Leave unselected to automatically determine interfaces to monitor." msgstr "" +"モニターするインターフェースを自動的に決定するには、未選択のままにします。" msgid "Listen host" -msgstr "" +msgstr "待ち受けホスト" msgid "Listen port" -msgstr "" +msgstr "待ち受けポート" msgid "Listener interfaces" -msgstr "" +msgstr "待ち受けインターフェース" msgid "Load Plugin Configuration" -msgstr "" +msgstr "負荷プラグイン設定" msgid "" "Max values for a period can be used instead of averages when not using 'only " "average RRAs'" msgstr "" +"'RRAの平均のみ' を使用しないとき、平均値の代わりに一定期間の最大値を使用でき" +"ます。" msgid "Maximum allowed connections" -msgstr "" +msgstr "許可された最大接続数" msgid "Memory" -msgstr "" +msgstr "メモリー" msgid "Memory Plugin Configuration" -msgstr "" +msgstr "メモリー プラグイン設定" msgid "Monitor all except specified" msgstr "設定値以外の全てのインターフェースをモニターする" msgid "Monitor all local listen ports" -msgstr "" +msgstr "ローカルの全待ち受けポートをモニターする" msgid "Monitor all sensors" -msgstr "" +msgstr "全てのセンサーをモニターする" msgid "Monitor device(s) / thermal zone(s)" msgstr "" msgid "Monitor devices" -msgstr "" +msgstr "デバイスをモニターする" msgid "Monitor disks and partitions" -msgstr "" +msgstr "ディスクとパーティションをモニターする" msgid "Monitor filesystem types" -msgstr "" +msgstr "ファイルシステム タイプをモニターする" msgid "Monitor hosts" -msgstr "" +msgstr "ホストをモニターする" msgid "Monitor interfaces" msgstr "モニターするインターフェースの設定" msgid "Monitor interrupts" -msgstr "" +msgstr "割込みをモニターする" msgid "Monitor local ports" -msgstr "" +msgstr "ローカルのポートをモニターする" msgid "Monitor mount points" -msgstr "" +msgstr "マウントポイントをモニターする" msgid "Monitor processes" -msgstr "" +msgstr "プロセスをモニターする" msgid "Monitor remote ports" -msgstr "" +msgstr "リモートのポートをモニターする" msgid "Name of the rule" -msgstr "" +msgstr "ルール名" msgid "Netlink" msgstr "Netlink" @@ -332,19 +344,19 @@ msgid "Only create average RRAs" msgstr "平均値のRRAsのみ作成する" msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" msgid "OpenVPN Plugin Configuration" -msgstr "" +msgstr "OpenVPN プラグイン設定" msgid "OpenVPN status files" -msgstr "" +msgstr "OpenVPN ステータスファイル" msgid "Options" msgstr "オプション" msgid "Outgoing interface" -msgstr "" +msgstr "送信インターフェース" msgid "Output plugins" msgstr "出力プラグイン" @@ -359,28 +371,28 @@ msgid "Port" msgstr "ポート" msgid "Processes" -msgstr "" +msgstr "プロセス" msgid "Processes Plugin Configuration" -msgstr "" +msgstr "プロセス プラグイン設定" msgid "Processes to monitor separated by space" msgstr "" msgid "Processor" -msgstr "" +msgstr "プロセッサー" msgid "Qdisc monitoring" -msgstr "" +msgstr "Qdisc モニタリング" msgid "RRD XFiles Factor" msgstr "" msgid "RRD heart beat interval" -msgstr "" +msgstr "RRD ハートビート間隔" msgid "RRD step interval" -msgstr "" +msgstr "RRD stepインターバル" msgid "RRDTool" msgstr "RRDTool" @@ -398,46 +410,46 @@ msgid "Seconds" msgstr "秒" msgid "Sensor list" -msgstr "" +msgstr "センサー一覧" msgid "Sensors" -msgstr "" +msgstr "センサー" msgid "Sensors Plugin Configuration" -msgstr "" +msgstr "センサー プラグイン設定" msgid "Server host" -msgstr "" +msgstr "サーバー ホスト" msgid "Server port" -msgstr "" +msgstr "サーバー ポート" msgid "Setup" -msgstr "" +msgstr "設定" msgid "Shaping class monitoring" msgstr "" msgid "Show max values instead of averages" -msgstr "" +msgstr "平均値の代わりに最大値を表示する" msgid "Socket file" -msgstr "" +msgstr "ソケット ファイル" msgid "Socket group" -msgstr "" +msgstr "ソケット グループ" msgid "Socket permissions" -msgstr "" +msgstr "ソケット パーミッション" msgid "Source ip range" -msgstr "" +msgstr "ソースIPの範囲" msgid "Specifies what information to collect about links." -msgstr "" +msgstr "リンクについて、どのような情報を収集するか設定します。" msgid "Specifies what information to collect about routes." -msgstr "" +msgstr "ルートについて、どのような情報を収集するか設定します。" msgid "Specifies what information to collect about the global topology." msgstr "" @@ -449,40 +461,40 @@ msgid "Splash Leases Plugin Configuration" msgstr "" msgid "Statistics" -msgstr "" +msgstr "統計" msgid "Storage directory" msgstr "保存先ディレクトリ" msgid "Storage directory for the csv files" -msgstr "" +msgstr "CSVファイルの保存先ディレクトリ" msgid "Store data values as rates instead of absolute values" -msgstr "" +msgstr "データ値を絶対値の代わりにレートとして保存します。" msgid "Stored timespans" -msgstr "" +msgstr "保存する期間の範囲" msgid "System Load" -msgstr "" +msgstr "システム負荷" msgid "TCP Connections" -msgstr "" +msgstr "TCP 接続" msgid "TCPConns Plugin Configuration" -msgstr "" +msgstr "TCP接続プラグイン設定" msgid "TTL for network packets" -msgstr "" +msgstr "ネットワークパケットのTTL" msgid "TTL for ping packets" -msgstr "" +msgstr "pingパケットのTTL" msgid "Table" -msgstr "" +msgstr "テーブル" msgid "The NUT plugin reads information about Uninterruptible Power Supplies." -msgstr "" +msgstr "NUT プラグインは、無停電電源装置についての情報を読み取ります。" msgid "" "The OLSRd plugin reads information about meshed networks from the txtinfo " @@ -493,34 +505,43 @@ msgid "" "The OpenVPN plugin gathers information about the current vpn connection " "status." msgstr "" +"OpenVPN プラグインは、現在のVPN接続ステータスについての情報を収集します。" msgid "" "The conntrack plugin collects statistics about the number of tracked " "connections." -msgstr "" +msgstr "Conntrack プラグインは、追跡された接続の数についての統計を収集します。" msgid "The cpu plugin collects basic statistics about the processor usage." -msgstr "" +msgstr "CPU プラグインは、プロセッサー使用についての基本的な統計を収集します。" msgid "" "The csv plugin stores collected data in csv file format for further " "processing by external programs." msgstr "" +"CSV プラグインは、外部プログラムがさらに利用するために、収集されたデータをCSV" +"ファイル形式で保存します。" msgid "" "The df plugin collects statistics about the disk space usage on different " "devices, mount points or filesystem types." msgstr "" +"df プラグインは、個別のデバイスまたはマウントポイント、ファイルシステム形式の" +"ディスク使用量についての統計を収集します。" msgid "" "The disk plugin collects detailled usage statistics for selected partitions " "or whole disks." msgstr "" +"ディスク プラグインは、選択されたパーティションまたはディスク全体の詳細な使用" +"統計を収集します。" msgid "" "The dns plugin collects detailled statistics about dns related traffic on " "selected interfaces." msgstr "" +"DNS プラグインは、選択されたインターフェースでのDNSに関連したトラフィックにつ" +"いての詳細な統計を収集します。" msgid "" "The email plugin creates a unix socket which can be used to transmit email-" @@ -528,14 +549,21 @@ msgid "" "to be used in conjunction with Mail::SpamAssasin::Plugin::Collectd but can " "be used in other ways as well." msgstr "" +"Eメール プラグインは、実行中のcollectd デーモンへの電子メール統計の送信に利用" +"可能なUNIX ソケットを作成するプラグインです。このプラグインは、メール、" +"SpamAssasin、プラグイン、Collectdを一緒に使うことを主に意図していますが、ほか" +"の方法にも同様に使用することができます。" msgid "The entropy plugin collects statistics about the available entropy." msgstr "" +"エントロピー プラグインは、利用可能なエントロピーについての統計を収集します。" msgid "" "The exec plugin starts external commands to read values from or to notify " "external processes when certain threshold values have been reached." msgstr "" +"Exec プラグインは、特定の閾値に到達したときに外部プロセスから値の読み込み、も" +"しくは外部プロセスへ通知する外部コマンドを開始します。" msgid "" "The interface plugin collects traffic statistics on selected interfaces." @@ -547,11 +575,15 @@ msgid "" "The iptables plugin will monitor selected firewall rules and collect " "informations about processed bytes and packets per rule." msgstr "" +"iptables プラグインは、選択されたファイアウォール規をモニターし、規則ごとの処" +"理されたバイト数とパケット数についての情報を収集します。" msgid "" "The irq plugin will monitor the rate of issues per second for each selected " "interrupt. If no interrupt is selected then all interrupts are monitored." msgstr "" +"IRQ プラグインは、選択された割り込みごとに1秒当たりの発行レートをモニターしま" +"す。選択された割り込みが無い場合、すべての割り込みがモニターされます。" msgid "" "The iwinfo plugin collects statistics about wireless signal strength, noise " @@ -563,12 +595,14 @@ msgid "The load plugin collects statistics about the general system load." msgstr "負荷プラグインは、システム負荷の統計情報を収集します。" msgid "The memory plugin collects statistics about the memory usage." -msgstr "" +msgstr "メモリー プラグインは、メモリー使用についての統計を収集します。" msgid "" "The netlink plugin collects extended informations like qdisc-, class- and " "filter-statistics for selected interfaces." msgstr "" +"Netlink プラグインは、選択されたインターフェースの qdisc- や class- 、filter-" +"statistics のような拡張的な情報を収集します。" msgid "" "The network plugin provides network based communication between different " @@ -576,16 +610,25 @@ msgid "" "client mode locally collected data is transferred to a collectd server " "instance, in server mode the local instance receives data from other hosts." msgstr "" +"ネットワークプラグインは、異なるcollectd間のネットワークベースの通信を提供し" +"ます。collectdは、クライアントモードとサーバーモードの両方で動作することがで" +"きます。クライアントモードでは、ローカルの収集データはcollectdサーバーに転送" +"され、サーバーモードではローカルのインスタンスは他のホストからデータを受信し" +"ます。" msgid "" "The ping plugin will send icmp echo replies to selected hosts and measure " "the roundtrip time for each host." msgstr "" +"ping プラグインは、ICMP Echo Replyを選択されたホストに送信し、各ホストとの往" +"復時間を計測します。" msgid "" "The processes plugin collects informations like cpu time, page faults and " "memory usage of selected processes." msgstr "" +"プロセス プラグインは、選択されたプロセスのCPU時間やページフォルト、メモリー" +"使用率のような情報を収集します。" msgid "" "The rrdtool plugin stores the collected data in rrd database files, the " @@ -593,11 +636,17 @@ msgid "" "values will result in a very high memory consumption in the temporary " "directory. This can render the device unusable!</strong>" msgstr "" +"rrdtool プラグインは、収集したデータをrrd データベースファイルに保存します。" +"これが統計図の基礎です。<br /><br /><strong>警告: 間違った値を設定すると、一" +"時的なディレクトリによってメモリー消費量が非常に高くなります。これはデバイス" +"を使用不能にする可能性があります！</strong>" msgid "" "The sensors plugin uses the Linux Sensors framework to gather environmental " "statistics." msgstr "" +"センサー プラグインは、環境統計の収集に Linux センサーフレームワークを使用し" +"ます。" msgid "" "The splash leases plugin uses libuci to collect statistics about splash " @@ -609,6 +658,9 @@ msgid "" "to gather data and <a href=\"http://oss.oetiker.ch/rrdtool/\">RRDtool</a> to " "render diagram images." msgstr "" +"statistics パッケージは、データの収集に<a href=\"https://collectd.org/" +"\">Collectd</a>を、統計図のレンダリングに<a href=\"http://oss.oetiker.ch/" +"rrdtool/\">RRDtool</a>を使用します。" msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -619,57 +671,64 @@ msgid "" "The thermal plugin will monitor temperature of the system. Data is typically " "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be " "read, e.g. thermal_zone1 )" -msgstr "" +msgstr "サーマル プラグインは、システムの温度をモニターします。" msgid "" "The unixsock plugin creates a unix socket which can be used to read " "collected data from a running collectd instance." msgstr "" +"unixsock プラグインは、実行中のcollectd インスタンスから収集データの読み取り" +"に使用可能なUNIX ソケットを作成します。" msgid "The uptime plugin collects statistics about the uptime of the system." -msgstr "" +msgstr "稼働時間 プラグインは、システムの稼働時間についての統計を収集します。" msgid "Thermal" -msgstr "" +msgstr "サーマル" msgid "Thermal Plugin Configuration" -msgstr "" +msgstr "サーマル プラグイン設定" msgid "This plugin collects statistics about the processor frequency scaling." msgstr "" +"このプラグインは、プロセッサー周波数スケーリングについての統計を収集します。" msgid "" "This section defines on which interfaces collectd will wait for incoming " "connections." msgstr "" +"このセクションでは、collectdが着信接続を待ち受けるインターフェースを設定しま" +"す。" msgid "" "This section defines to which servers the locally collected data is sent to." msgstr "" +"このセクションでは、ローカルに収集されたデータを送信するサーバーを設定しま" +"す。" msgid "Try to lookup fully qualified hostname" msgstr "" msgid "UPS" -msgstr "" +msgstr "UPS" msgid "UPS Plugin Configuration" -msgstr "" +msgstr "UPS プラグイン設定" msgid "UPS name in NUT ups@host format" -msgstr "" +msgstr "ups@host 形式のNUT内のUPS名" msgid "UnixSock" -msgstr "" +msgstr "UnixSock" msgid "Unixsock Plugin Configuration" -msgstr "" +msgstr "Unixsock プラグイン設定" msgid "Uptime" -msgstr "" +msgstr "稼働時間" msgid "Uptime Plugin Configuration" -msgstr "" +msgstr "稼働時間プラグイン設定" msgid "Use improved naming schema" msgstr "" @@ -678,13 +737,13 @@ msgid "Used PID file" msgstr "使用するPIDファイルの保存場所" msgid "User" -msgstr "" +msgstr "ユーザー" msgid "Verbose monitoring" -msgstr "" +msgstr "詳細モニタリング" msgid "Wireless" -msgstr "" +msgstr "無線" msgid "Wireless iwinfo Plugin Configuration" msgstr "無線LAN iwinfo プラグイン設定" @@ -692,18 +751,20 @@ msgstr "無線LAN iwinfo プラグイン設定" msgid "" "You can install additional collectd-mod-* plugins to enable more statistics." msgstr "" +"追加の collectd-mod-* プラグインをインストールすることで、より多くの統計を有" +"効にできます。" msgid "e.g. br-ff" -msgstr "" +msgstr "例: br-ff" msgid "e.g. br-lan" -msgstr "" +msgstr "例: br-lan" msgid "e.g. reject-with tcp-reset" -msgstr "" +msgstr "例: reject-with tcp-reset" msgid "max. 16 chars" -msgstr "" +msgstr "最大16文字" msgid "reduces rrd size" msgstr "rrdファイルのサイズを小さくします。" @@ -712,7 +773,7 @@ msgid "seconds; multiple separated by space" msgstr "" msgid "server interfaces" -msgstr "" +msgstr "サーバー インターフェース" #~ msgid "Collectd" #~ msgstr "Collectd" diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua index 9050ae968..fa44d4b52 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua @@ -18,17 +18,17 @@ o = s:option(Flag, "trm_enabled", translate("Enable Travelmate")) o.rmempty = false o.default = 0 -o = s:option(Value, "trm_loop", translate("Loop timeout in seconds for wlan monitoring"), - translate("Default 30, range 5-60")) +o = s:option(Value, "trm_maxwait", translate("Max. timeout in seconds for wlan interface reload"), + translate("Default 20, range 10-60")) o.rmempty = false -o.default = 30 -o.datatype = "range(5,60)" +o.default = 20 +o.datatype = "range(10,60)" o = s:option(Value, "trm_maxretry", translate("Max. number of connection retries to an uplink"), - translate("Default 3, range 0-10. Set to 0 to allow unlimited retries")) + translate("Default 3, range 1-10")) o.rmempty = false o.default = 3 -o.datatype = "range(0,10)" +o.datatype = "range(1,10)" -- Extra options @@ -38,8 +38,8 @@ a = e:option(Flag, "trm_debug", translate("Debug logging")) a.rmempty = true a.default = a.disabled -a = e:option(Value, "trm_device", translate("Use only one radio, e.g. 'radio0'"), - translate("Default: empty = use all radios.")) +a = e:option(Value, "trm_iface", translate("Restrict reload trigger to certain interface(s)"), + translate("Space separated list of wwan interfaces that trigger reload action. To disable reload trigger set it to 'false'. Default: empty")) a.rmempty = true a.default = "" a.datatype = "uciname" diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po new file mode 100644 index 000000000..de1aceed9 --- /dev/null +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -0,0 +1,91 @@ +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" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: ja\n" + +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 "Extra options" +msgstr "拡張オプション" + +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 "Travelmate" +msgstr "Travelmate" + +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/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot index 533b3e263..20628196b 100644 --- a/applications/luci-app-travelmate/po/templates/travelmate.pot +++ b/applications/luci-app-travelmate/po/templates/travelmate.pot @@ -16,13 +16,10 @@ msgstr "" msgid "Debug logging" msgstr "" -msgid "Default 3, range 0-10. Set to 0 to allow unlimited retries" +msgid "Default 20, range 10-60" msgstr "" -msgid "Default 30, range 5-60" -msgstr "" - -msgid "Default: empty = use all radios." +msgid "Default 3, range 1-10" msgstr "" msgid "Disable this if you want to use iwinfo instead of iw" @@ -40,17 +37,22 @@ msgstr "" msgid "Link to detailed advice" msgstr "" -msgid "Loop timeout in seconds for wlan monitoring" +msgid "Max. number of connection retries to an uplink" msgstr "" -msgid "Max. number of connection retries to an uplink" +msgid "Max. timeout in seconds for wlan interface reload" msgstr "" -msgid "Travelmate" +msgid "Restrict reload trigger to certain interface(s)" msgstr "" -msgid "Use iw for scanning" +msgid "" +"Space separated list of wwan interfaces that trigger reload action. To " +"disable reload trigger set it to 'false'. Default: empty" msgstr "" -msgid "Use only one radio, e.g. 'radio0'" +msgid "Travelmate" +msgstr "" + +msgid "Use iw for scanning" msgstr "" diff --git a/applications/luci-app-uhttpd/po/ja/uhttpd.po b/applications/luci-app-uhttpd/po/ja/uhttpd.po new file mode 100644 index 000000000..572903404 --- /dev/null +++ b/applications/luci-app-uhttpd/po/ja/uhttpd.po @@ -0,0 +1,213 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2017-01-01 18:11+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Language-Team: \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"X-Poedit-Basepath: .\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "" +"(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)" +msgstr "" +"(/old/path=/new/path) または (just /old/path which becomes /cgi-prefix/old/" +"path)" + +msgid "404 Error" +msgstr "404 エラー" + +msgid "A lightweight single-threaded HTTP(S) server" +msgstr "軽量なシングル スレッド HTTP(S) サーバーです。" + +msgid "Advanced Settings" +msgstr "詳細設定" + +msgid "Aliases" +msgstr "エイリアス" + +msgid "Base directory for files to be served" +msgstr "サーバーがホストするファイルのベースディレクトリです。" + +msgid "Bind to specific interface:port (by specifying interface address" +msgstr "" +"インターフェースのアドレスを使用して、特定のインターフェースとポートに関連付" +"けます。" + +msgid "CGI filetype handler" +msgstr "CGIファイル形式 ハンドラー" + +msgid "CGI is disabled if not present." +msgstr "指定しない場合、CGIは無効になります。" + +msgid "Config file (e.g. for credentials for Basic Auth)" +msgstr "設定ファイル（例: 基本認証用の資格情報）" + +msgid "Connection reuse" +msgstr "接続の再使用" + +msgid "Country" +msgstr "国" + +msgid "Disable JSON-RPC authorization via ubus session API" +msgstr "ubus セッションAPI経由のJSON-RPC認証を無効にする" + +msgid "Do not follow symlinks outside document root" +msgstr "ドキュメント ルート外へのシンボリックリンクを追随しない" + +msgid "Do not generate directory listings." +msgstr "ディレクトリの待ち受けを生成しない" + +msgid "Document root" +msgstr "ドキュメント ルート" + +msgid "E.g specify with index.html and index.php when using PHP" +msgstr "index.html や、PHPを使用しているときは index.php を設定します。" + +msgid "Embedded Lua interpreter is disabled if not present." +msgstr "指定しない場合、組込みLua インタープリタは無効になります。" + +msgid "Enable JSON-RPC Cross-Origin Resource Support" +msgstr "" + +msgid "For settings primarily geared to serving more than the web UI" +msgstr "主に、Web UI以上のものを提供することを対象とした設定です。" + +msgid "Full Web Server Settings" +msgstr "完全なWebサーバー設定" + +msgid "Full real path to handler for Lua scripts" +msgstr "Lua スクリプトへの絶対パス" + +msgid "General Settings" +msgstr "一般設定" + +msgid "HTTP listeners (address:port)" +msgstr "HTTP 待ち受け（アドレス:ポート）" + +msgid "HTTPS Certificate (DER Encoded)" +msgstr "HTTPS 証明書（DER エンコード）" + +msgid "HTTPS Private Key (DER Encoded)" +msgstr "HTTPS 秘密鍵（DER エンコード）" + +msgid "HTTPS listener (address:port)" +msgstr "HTTPS 待ち受け（アドレス:ポート）" + +msgid "Ignore private IPs on public interface" +msgstr "公開側インターフェースでのプライベートIPを無視する" + +msgid "Index page(s)" +msgstr "インデックス ページ" + +msgid "" +"Interpreter to associate with file endings ('suffix=handler', e.g. '.php=/" +"usr/bin/php-cgi')" +msgstr "" +"ファイル拡張子に関連付けるインタープリタです。（'suffix=handler'、例: '.php=/" +"usr/bin/php-cgi')" + +msgid "Length of key in bits" +msgstr "鍵のビット数" + +msgid "Location" +msgstr "場所" + +msgid "Maximum number of connections" +msgstr "最大接続数" + +msgid "Maximum number of script requests" +msgstr "スクリプトの最大リクエスト数" + +msgid "Maximum wait time for Lua, CGI, or ubus execution" +msgstr "LuaやCGI、ubus実行の最大待機時間" + +msgid "Maximum wait time for network activity" +msgstr "ネットワークアクティビティの最大待機時間" + +msgid "Override path for ubus socket" +msgstr "ubus ソケットのパスを上書きする" + +msgid "Path prefix for CGI scripts" +msgstr "CGI スクリプトのパスプレフィクス" + +msgid "" +"Prevent access from private (RFC1918) IPs on an interface if it has an " +"public IP address" +msgstr "" +"グローバル IPアドレスを持つインターフェースでは、プライベート IP (RFC1918) か" +"らのアクセスをブロックします。" + +msgid "Realm for Basic Auth" +msgstr "基本認証の領域名" + +msgid "Redirect all HTTP to HTTPS" +msgstr "全てのHTTPをHTTPSにリダイレクトする" + +msgid "Remove configuration for certificate and key" +msgstr "証明書と鍵の設定を削除する" + +msgid "Remove old certificate and key" +msgstr "古い証明書と鍵を削除する" + +msgid "Server Hostname" +msgstr "サーバー ホスト名" + +msgid "" +"Settings which are either rarely needed or which affect serving the WebUI" +msgstr "まれに必要とされる設定、またはWeb UIに影響する設定です。" + +msgid "State" +msgstr "ステータス" + +msgid "TCP Keepalive" +msgstr "TCP キープアライブ" + +msgid "This permanently deletes the cert, key, and configuration to use same." +msgstr "" + +msgid "Valid for # of Days" +msgstr "有効日数" + +msgid "" +"Virtual URL or CGI script to display on status '404 Not Found'. Must begin " +"with '/'" +msgstr "" + +msgid "Virtual path prefix for Lua scripts" +msgstr "Lua スクリプトへの仮想パスプレフィクス" + +msgid "Virtual path prefix for ubus via JSON-RPC integration" +msgstr "" + +msgid "Will not use HTTP authentication if not present" +msgstr "指定しない場合、HTTP 認証は使用されません。" + +msgid "a.k.a CommonName" +msgstr "共通名" + +msgid "uHTTPd" +msgstr "uHTTPd" + +msgid "uHTTPd Self-signed Certificate Parameters" +msgstr "uHTTPd 自己署名証明書 パラメーター" + +msgid "" +"uHTTPd will generate a new self-signed certificate using the configuration " +"shown below." +msgstr "uHTTPd は、以下に表示した設定で新しい自己署名証明書を生成します。" + +msgid "ubus integration is disabled if not present" +msgstr "" + +#~ msgid "" +#~ "Virtual URL or CGI script to display on status '404 Not Found'. Must " +#~ "begin with '/'" +#~ msgstr "" +#~ "'404 Not Found' ステータスを表示する、仮想URLまたはCGIスクリプトです。'/' " +#~ "から始まる必要があります。" diff --git a/applications/luci-app-uhttpd/po/templates/uhttpd.pot b/applications/luci-app-uhttpd/po/templates/uhttpd.pot new file mode 100644 index 000000000..5503450e0 --- /dev/null +++ b/applications/luci-app-uhttpd/po/templates/uhttpd.pot @@ -0,0 +1,186 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "" +"(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)" +msgstr "" + +msgid "404 Error" +msgstr "" + +msgid "A lightweight single-threaded HTTP(S) server" +msgstr "" + +msgid "Advanced Settings" +msgstr "" + +msgid "Aliases" +msgstr "" + +msgid "Base directory for files to be served" +msgstr "" + +msgid "Bind to specific interface:port (by specifying interface address" +msgstr "" + +msgid "CGI filetype handler" +msgstr "" + +msgid "CGI is disabled if not present." +msgstr "" + +msgid "Config file (e.g. for credentials for Basic Auth)" +msgstr "" + +msgid "Connection reuse" +msgstr "" + +msgid "Country" +msgstr "" + +msgid "Disable JSON-RPC authorization via ubus session API" +msgstr "" + +msgid "Do not follow symlinks outside document root" +msgstr "" + +msgid "Do not generate directory listings." +msgstr "" + +msgid "Document root" +msgstr "" + +msgid "E.g specify with index.html and index.php when using PHP" +msgstr "" + +msgid "Embedded Lua interpreter is disabled if not present." +msgstr "" + +msgid "Enable JSON-RPC Cross-Origin Resource Support" +msgstr "" + +msgid "For settings primarily geared to serving more than the web UI" +msgstr "" + +msgid "Full Web Server Settings" +msgstr "" + +msgid "Full real path to handler for Lua scripts" +msgstr "" + +msgid "General Settings" +msgstr "" + +msgid "HTTP listeners (address:port)" +msgstr "" + +msgid "HTTPS Certificate (DER Encoded)" +msgstr "" + +msgid "HTTPS Private Key (DER Encoded)" +msgstr "" + +msgid "HTTPS listener (address:port)" +msgstr "" + +msgid "Ignore private IPs on public interface" +msgstr "" + +msgid "Index page(s)" +msgstr "" + +msgid "" +"Interpreter to associate with file endings ('suffix=handler', e.g. '.php=/" +"usr/bin/php-cgi')" +msgstr "" + +msgid "Length of key in bits" +msgstr "" + +msgid "Location" +msgstr "" + +msgid "Maximum number of connections" +msgstr "" + +msgid "Maximum number of script requests" +msgstr "" + +msgid "Maximum wait time for Lua, CGI, or ubus execution" +msgstr "" + +msgid "Maximum wait time for network activity" +msgstr "" + +msgid "Override path for ubus socket" +msgstr "" + +msgid "Path prefix for CGI scripts" +msgstr "" + +msgid "" +"Prevent access from private (RFC1918) IPs on an interface if it has an " +"public IP address" +msgstr "" + +msgid "Realm for Basic Auth" +msgstr "" + +msgid "Redirect all HTTP to HTTPS" +msgstr "" + +msgid "Remove configuration for certificate and key" +msgstr "" + +msgid "Remove old certificate and key" +msgstr "" + +msgid "Server Hostname" +msgstr "" + +msgid "" +"Settings which are either rarely needed or which affect serving the WebUI" +msgstr "" + +msgid "State" +msgstr "" + +msgid "TCP Keepalive" +msgstr "" + +msgid "This permanently deletes the cert, key, and configuration to use same." +msgstr "" + +msgid "Valid for # of Days" +msgstr "" + +msgid "" +"Virtual URL or CGI script to display on status '404 Not Found'. Must begin " +"with '/'" +msgstr "" + +msgid "Virtual path prefix for Lua scripts" +msgstr "" + +msgid "Virtual path prefix for ubus via JSON-RPC integration" +msgstr "" + +msgid "Will not use HTTP authentication if not present" +msgstr "" + +msgid "a.k.a CommonName" +msgstr "" + +msgid "uHTTPd" +msgstr "" + +msgid "uHTTPd Self-signed Certificate Parameters" +msgstr "" + +msgid "" +"uHTTPd will generate a new self-signed certificate using the configuration " +"shown below." +msgstr "" + +msgid "ubus integration is disabled if not present" +msgstr "" diff --git a/applications/luci-app-upnp/po/ja/upnp.po b/applications/luci-app-upnp/po/ja/upnp.po index ec9208d25..f0aff7336 100644 --- a/applications/luci-app-upnp/po/ja/upnp.po +++ b/applications/luci-app-upnp/po/ja/upnp.po @@ -1,17 +1,17 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-19 19:36+0200\n" -"PO-Revision-Date: 2013-10-05 17:27+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2016-12-24 19:55+0900\n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.8.11\n" +"Language-Team: \n" msgid "" "ACLs specify which external ports may be redirected to which internal " @@ -30,7 +30,7 @@ msgid "Advanced Settings" msgstr "詳細設定" msgid "Allow adding forwards only to requesting ip addresses" -msgstr "" +msgstr "要求元IPアドレスへの転送のみ、追加を許可します。" msgid "Announced model number" msgstr "通知するモデル番号" @@ -136,18 +136,20 @@ msgid "UPnP lease file" msgstr "UPnP リースファイル" msgid "Universal Plug & Play" -msgstr "ユニバーサル プラグ & プレイ" +msgstr "ユニバーサル プラグ & プレイ" msgid "Uplink" msgstr "アップリンク" msgid "Value in KByte/s, informational only" -msgstr "" +msgstr "クライアントへの情報提供のみに使用される、KByte/sの値です。" #~ msgid "" #~ "UPNP allows clients in the local network to automatically configure the " #~ "router." -#~ msgstr "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータを構成することができます。" +#~ msgstr "" +#~ "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータ" +#~ "を構成することができます。" #~ msgid "enable" #~ msgstr "有効" diff --git a/applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua b/applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua index a33c7aab9..261cf36d0 100644 --- a/applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua +++ b/applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua @@ -12,21 +12,31 @@ -- -- Author: Nils Koenig <openwrt@newk.it> -module("luci.controller.wifischedule.wifi_schedule", package.seeall) +module("luci.controller.wifischedule.wifi_schedule", package.seeall) + +local fs = require "nixio.fs" +local sys = require "luci.sys" +local template = require "luci.template" +local i18n = require "luci.i18n" function index() - entry({"admin", "wifi_schedule"}, firstchild(), "Wifi Schedule", 60).dependent=false - entry({"admin", "wifi_schedule", "tab_from_cbi"}, cbi("wifischedule/wifi_schedule"), "Schedule", 1) - entry({"admin", "wifi_schedule", "wifi_schedule"}, call("wifi_schedule_log"), "View Logfile", 2) - entry({"admin", "wifi_schedule", "cronjob"}, call("view_crontab"), "View Cron Jobs", 3) + if not nixio.fs.access("/etc/config/wifi_schedule") then + return + end + entry({"admin", "services", "wifi_schedule"}, firstchild(), _("Wifi Schedule"), 60).dependent=false + entry({"admin", "services", "wifi_schedule", "tab_from_cbi"}, cbi("wifischedule/wifi_schedule"), _("Schedule"), 1) + entry({"admin", "services", "wifi_schedule", "wifi_schedule"}, call("wifi_schedule_log"), _("View Logfile"), 2) + entry({"admin", "services", "wifi_schedule", "cronjob"}, call("view_crontab"), _("View Cron Jobs"), 3) end function wifi_schedule_log() - local logfile = luci.sys.exec("cat /tmp/log/wifi_schedule.log") - luci.template.render("wifischedule/file_viewer", {title="Wifi Schedule Logfile", content=logfile}) + local logfile = fs.readfile("/tmp/log/wifi_schedule.log") or "" + template.render("wifischedule/file_viewer", + {title = i18n.translate("Wifi Schedule Logfile"), content = logfile}) end function view_crontab() - local crontab = luci.sys.exec("cat /etc/crontabs/root") - luci.template.render("wifischedule/file_viewer", {title="Cron Jobs", content=crontab}) + local crontab = fs.readfile("/etc/crontabs/root") or "" + template.render("wifischedule/file_viewer", + {title = i18n.translate("Cron Jobs"), content = crontab}) end diff --git a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua index 2cca476b4..1d301219a 100644 --- a/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua +++ b/applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua @@ -12,15 +12,11 @@ -- -- Author: Nils Koenig <openwrt@newk.it> -function file_exists(name) - local f=io.open(name,"r") - if f~=nil then io.close(f) return true else return false end -end - +local fs = require "nixio.fs" +local sys = require "luci.sys" function time_validator(self, value, desc) if value ~= nil then - h_str, m_str = string.match(value, "^(%d%d?):(%d%d?)$") h = tonumber(h_str) m = tonumber(m_str) @@ -32,21 +28,21 @@ function time_validator(self, value, desc) m <= 59) then return value end - end - return nil, translate("The value '" .. desc .. "' is invalid") + end + return nil, translatef("The value %s is invalid", desc) end -- ------------------------------------------------------------------------------------------------- -- BEGIN Map -m = Map("wifi_schedule", translate("Wifi Schedule"), translate("Defines a schedule when to turn on and off wifi.")) +m = Map("wifi_schedule", translate("Wifi Schedule"), translate("Defines a schedule when to turn on and off wifi.")) function m.on_commit(self) - luci.sys.exec("/usr/bin/wifi_schedule.sh cron") + sys.exec("/usr/bin/wifi_schedule.sh cron") end -- END Map -- BEGIN Global Section -global_section = m:section(TypedSection, "global", "Global Settings") +global_section = m:section(TypedSection, "global", translate("Global Settings")) global_section.optional = false global_section.rmempty = false global_section.anonymous = true @@ -54,13 +50,13 @@ global_section.anonymous = true -- BEGIN Global Enable Checkbox global_enable = global_section:option(Flag, "enabled", translate("Enable Wifi Schedule")) -global_enable.optional=false; -global_enable.rmempty = false; +global_enable.optional = false +global_enable.rmempty = false function global_enable.validate(self, value, global_section) if value == "1" then - if ( file_exists("/sbin/wifi") and - file_exists("/usr/bin/wifi_schedule.sh") )then + if ( fs.access("/sbin/wifi") and + fs.access("/usr/bin/wifi_schedule.sh") )then return value else return nil, translate("Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi") @@ -71,39 +67,38 @@ function global_enable.validate(self, value, global_section) end -- END Global Enable Checkbox - -- BEGIN Global Logging Checkbox global_logging = global_section:option(Flag, "logging", translate("Enable logging")) -global_logging.optional=false; -global_logging.rmempty = false; +global_logging.optional = false +global_logging.rmempty = false global_logging.default = 0 -- END Global Enable Checkbox -- BEGIN Global Activate WiFi Button enable_wifi = global_section:option(Button, "enable_wifi", translate("Activate wifi")) function enable_wifi.write() - luci.sys.exec("/usr/bin/wifi_schedule.sh start manual") + sys.exec("/usr/bin/wifi_schedule.sh start manual") end -- END Global Activate Wifi Button -- BEGIN Global Disable WiFi Gracefully Button disable_wifi_gracefully = global_section:option(Button, "disable_wifi_gracefully", translate("Disable wifi gracefully")) function disable_wifi_gracefully.write() - luci.sys.exec("/usr/bin/wifi_schedule.sh stop manual") + sys.exec("/usr/bin/wifi_schedule.sh stop manual") end --- END Global Disable Wifi Gracefully Button +-- END Global Disable Wifi Gracefully Button -- BEGIN Disable WiFi Forced Button disable_wifi_forced = global_section:option(Button, "disable_wifi_forced", translate("Disabled wifi forced")) function disable_wifi_forced.write() - luci.sys.exec("/usr/bin/wifi_schedule.sh forcestop manual") + sys.exec("/usr/bin/wifi_schedule.sh forcestop manual") end -- END Global Disable WiFi Forced Button -- BEGIN Global Unload Modules Checkbox global_unload_modules = global_section:option(Flag, "unload_modules", translate("Unload Modules (experimental; saves more power)")) -global_unload_modules.optional = false; -global_unload_modules.rmempty = false; +global_unload_modules.optional = false +global_unload_modules.rmempty = false global_unload_modules.default = 0 -- END Global Unload Modules Checkbox @@ -111,13 +106,13 @@ global_unload_modules.default = 0 -- BEGIN Modules modules = global_section:option(TextValue, "modules", "") modules:depends("unload_modules", global_unload_modules.enabled); -modules.wrap = "off" -modules.rows = 10 +modules.wrap = "off" +modules.rows = 10 function modules.cfgvalue(self, section) - mod=uci.get("wifi_schedule", section, "modules") + mod = uci.get("wifi_schedule", section, "modules") if mod == nil then - mod="" + mod = "" end return mod:gsub(" ", "\r\n") end @@ -131,45 +126,44 @@ function modules.write(self, section, value) end -- END Modules --- BEGIN Determine Modules +-- BEGIN Determine Modules determine_modules = global_section:option(Button, "determine_modules", translate("Determine Modules Automatically")) determine_modules:depends("unload_modules", global_unload_modules.enabled); function determine_modules.write(self, section) - output = luci.sys.exec("/usr/bin/wifi_schedule.sh getmodules") + output = sys.exec("/usr/bin/wifi_schedule.sh getmodules") modules:write(section, output) end -- END Determine Modules - -- BEGIN Section -d = m:section(TypedSection, "entry", "Schedule events") -d.addremove = true +d = m:section(TypedSection, "entry", translate("Schedule events")) +d.addremove = true --d.anonymous = true -- END Section -- BEGIN Enable Checkbox c = d:option(Flag, "enabled", translate("Enable")) -c.optional=false; c.rmempty = false; +c.optional = false +c.rmempty = false -- END Enable Checkbox - -- BEGIN Day(s) of Week dow = d:option(MultiValue, "daysofweek", translate("Day(s) of Week")) dow.optional = false dow.rmempty = false -dow:value("Monday") -dow:value("Tuesday") -dow:value("Wednesday") -dow:value("Thursday") -dow:value("Friday") -dow:value("Saturday") -dow:value("Sunday") +dow:value("Monday", translate("Monday")) +dow:value("Tuesday", translate("Tuesday")) +dow:value("Wednesday", translate("Wednesday")) +dow:value("Thursday", translate("Thursday")) +dow:value("Friday", translate("Friday")) +dow:value("Saturday", translate("Saturday")) +dow:value("Sunday", translate("Sunday")) -- END Day(s) of Weel -- BEGIN Start Wifi Dropdown starttime = d:option(Value, "starttime", translate("Start WiFi")) -starttime.optional=false; -starttime.rmempty = false; +starttime.optional = false +starttime.rmempty = false starttime:value("00:00") starttime:value("01:00") starttime:value("02:00") @@ -198,14 +192,12 @@ starttime:value("23:00") function starttime.validate(self, value, d) return time_validator(self, value, translate("Start Time")) end - -- END Start Wifi Dropdown - -- BEGIN Stop Wifi Dropdown -stoptime = d:option(Value, "stoptime", translate("Stop WiFi")) -stoptime.optional=false; -stoptime.rmempty = false; +stoptime = d:option(Value, "stoptime", translate("Stop WiFi")) +stoptime.optional = false +stoptime.rmempty = false stoptime:value("00:00") stoptime:value("01:00") stoptime:value("02:00") @@ -236,15 +228,14 @@ function stoptime.validate(self, value, d) end -- END Stop Wifi Dropdown - -- BEGIN Force Wifi Stop Checkbox force_wifi = d:option(Flag, "forcewifidown", translate("Force disabling wifi even if stations associated")) force_wifi.default = false -force_wifi.rmempty = false; +force_wifi.rmempty = false function force_wifi.validate(self, value, d) if value == "0" then - if file_exists("/usr/bin/iwinfo") then + if fs.access("/usr/bin/iwinfo") then return value else return nil, translate("Could not find required programm /usr/bin/iwinfo") @@ -255,5 +246,4 @@ function force_wifi.validate(self, value, d) end -- END Force Wifi Checkbox - return m diff --git a/applications/luci-app-wifischedule/po/ja/wifischedule.po b/applications/luci-app-wifischedule/po/ja/wifischedule.po new file mode 100644 index 000000000..3bc7864ad --- /dev/null +++ b/applications/luci-app-wifischedule/po/ja/wifischedule.po @@ -0,0 +1,112 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n" +"Language-Team: \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Activate wifi" +msgstr "WiFiのアクティブ化" + +msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" +msgstr "必須の /usr/bin/wifi_schedule.sh または /sbin/wifi が見つかりませんでした。" + +msgid "Could not find required programm /usr/bin/iwinfo" +msgstr "必須のプログラム /usr/bin/iwinfo が見つかりませんでした。" + +msgid "Cron Jobs" +msgstr "Cronジョブ" + +msgid "Day(s) of Week" +msgstr "曜日" + +msgid "Defines a schedule when to turn on and off wifi." +msgstr "WiFiのオンとオフを切り替えるスケジュールを設定します。" + +msgid "Determine Modules Automatically" +msgstr "モジュールを自動的に決定する" + +msgid "Disable wifi gracefully" +msgstr "WiFiの通常終了" + +msgid "Disabled wifi forced" +msgstr "WiFiの強制終了" + +msgid "Enable" +msgstr "有効" + +msgid "Enable Wifi Schedule" +msgstr "WiFi スケジュールの有効化" + +msgid "Enable logging" +msgstr "ログの有効化" + +msgid "Force disabling wifi even if stations associated" +msgstr "ステーションが関連付けられていてもWiFiを強制終了する" + +msgid "Friday" +msgstr "金曜日" + +msgid "Global Settings" +msgstr "全体設定" + +msgid "Monday" +msgstr "月曜日" + +msgid "Saturday" +msgstr "土曜日" + +msgid "Schedule" +msgstr "スケジュール" + +msgid "Schedule events" +msgstr "実行スケジュール" + +msgid "Start Time" +msgstr "開始時刻" + +msgid "Start WiFi" +msgstr "WiFiの開始" + +msgid "Stop Time" +msgstr "停止時刻" + +msgid "Stop WiFi" +msgstr "WiFiの停止" + +msgid "Sunday" +msgstr "日曜日" + +msgid "The value %s is invalid" +msgstr "%s の値が無効です" + +msgid "Thursday" +msgstr "木曜日" + +msgid "Tuesday" +msgstr "火曜日" + +msgid "Unload Modules (experimental; saves more power)" +msgstr "モジュールのアンロード（実験的、より省電力）" + +msgid "View Cron Jobs" +msgstr "Cronジョブの確認" + +msgid "View Logfile" +msgstr "ログファイルの確認" + +msgid "Wednesday" +msgstr "水曜日" + +msgid "Wifi Schedule" +msgstr "WiFi スケジュール" + +msgid "Wifi Schedule Logfile" +msgstr "WiFiスケジュール ログファイル" diff --git a/applications/luci-app-wifischedule/po/templates/wifischedule.pot b/applications/luci-app-wifischedule/po/templates/wifischedule.pot new file mode 100644 index 000000000..639c432e5 --- /dev/null +++ b/applications/luci-app-wifischedule/po/templates/wifischedule.pot @@ -0,0 +1,101 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Activate wifi" +msgstr "" + +msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" +msgstr "" + +msgid "Could not find required programm /usr/bin/iwinfo" +msgstr "" + +msgid "Cron Jobs" +msgstr "" + +msgid "Day(s) of Week" +msgstr "" + +msgid "Defines a schedule when to turn on and off wifi." +msgstr "" + +msgid "Determine Modules Automatically" +msgstr "" + +msgid "Disable wifi gracefully" +msgstr "" + +msgid "Disabled wifi forced" +msgstr "" + +msgid "Enable" +msgstr "" + +msgid "Enable Wifi Schedule" +msgstr "" + +msgid "Enable logging" +msgstr "" + +msgid "Force disabling wifi even if stations associated" +msgstr "" + +msgid "Friday" +msgstr "" + +msgid "Global Settings" +msgstr "" + +msgid "Monday" +msgstr "" + +msgid "Saturday" +msgstr "" + +msgid "Schedule" +msgstr "" + +msgid "Schedule events" +msgstr "" + +msgid "Start Time" +msgstr "" + +msgid "Start WiFi" +msgstr "" + +msgid "Stop Time" +msgstr "" + +msgid "Stop WiFi" +msgstr "" + +msgid "Sunday" +msgstr "" + +msgid "The value %s is invalid" +msgstr "" + +msgid "Thursday" +msgstr "" + +msgid "Tuesday" +msgstr "" + +msgid "Unload Modules (experimental; saves more power)" +msgstr "" + +msgid "View Cron Jobs" +msgstr "" + +msgid "View Logfile" +msgstr "" + +msgid "Wednesday" +msgstr "" + +msgid "Wifi Schedule" +msgstr "" + +msgid "Wifi Schedule Logfile" +msgstr "" diff --git a/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po b/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po new file mode 100644 index 000000000..ab3a8d0bf --- /dev/null +++ b/applications/luci-app-wifischedule/po/zh-cn/wifischedule.po @@ -0,0 +1,101 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8\n" + +msgid "Activate wifi" +msgstr "激活 WiFi" + +msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi" +msgstr "无法找到必需的 /usr/bin/wifi_schedule.sh 或 /sbin/wifi" + +msgid "Could not find required programm /usr/bin/iwinfo" +msgstr "无法找到必需程序：/usr/bin/iwinfo" + +msgid "Cron Jobs" +msgstr "计划任务" + +msgid "Day(s) of Week" +msgstr "星期" + +msgid "Defines a schedule when to turn on and off wifi." +msgstr "定义自动打开和关闭 WiFi 的计划表" + +msgid "Determine Modules Automatically" +msgstr "自动确定模块" + +msgid "Disable wifi gracefully" +msgstr "正常关闭 WiFi" + +msgid "Disabled wifi forced" +msgstr "强制关闭 WiFi" + +msgid "Enable" +msgstr "启用" + +msgid "Enable Wifi Schedule" +msgstr "启用 WiFi 计划" + +msgid "Enable logging" +msgstr "启用日志" + +msgid "Force disabling wifi even if stations associated" +msgstr "即使有设备连接也强制关闭 WiFi" + +msgid "Friday" +msgstr "星期五" + +msgid "Global Settings" +msgstr "全局设置" + +msgid "Monday" +msgstr "星期一" + +msgid "Saturday" +msgstr "星期六" + +msgid "Schedule" +msgstr "计划表" + +msgid "Schedule events" +msgstr "计划事件" + +msgid "Start Time" +msgstr "启动时间" + +msgid "Start WiFi" +msgstr "启动 WiFi" + +msgid "Stop Time" +msgstr "关闭时间" + +msgid "Stop WiFi" +msgstr "关闭 WiFi" + +msgid "Sunday" +msgstr "星期日" + +msgid "The value %s is invalid" +msgstr "%s 的值无效" + +msgid "Thursday" +msgstr "星期四" + +msgid "Tuesday" +msgstr "星期二" + +msgid "Unload Modules (experimental; saves more power)" +msgstr "卸载模块（实验性的，节省更多电量）" + +msgid "View Cron Jobs" +msgstr "查看计划任务" + +msgid "View Logfile" +msgstr "查看日志文件" + +msgid "Wednesday" +msgstr "星期三" + +msgid "Wifi Schedule" +msgstr "WiFi 计划" + +msgid "Wifi Schedule Logfile" +msgstr "WiFi 计划日志文件" diff --git a/collections/luci-ssl-openssl/Makefile b/collections/luci-ssl-openssl/Makefile index 37442a37d..b5f4b091b 100644 --- a/collections/luci-ssl-openssl/Makefile +++ b/collections/luci-ssl-openssl/Makefile @@ -11,7 +11,9 @@ LUCI_BASENAME:=ssl-openssl LUCI_TITLE:=LuCI with HTTPS support (OpenSSL as SSL backend) LUCI_DESCRIPTION:=LuCI with OpenSSL as the SSL backend (libustream-openssl). \ - Note: px5g still requires libpolarssl + Note: px5g still requires libmbedtls (in LEDE) or libpolarssl (in Openwrt). \ + In LEDE it is also possible to replace px5g with openssl-util as uhttpd can \ + also generate keys with openssl commandline tools if px5g is not installed. LUCI_DEPENDS:=+luci +libustream-openssl +px5g include ../../luci.mk diff --git a/collections/luci-ssl/Makefile b/collections/luci-ssl/Makefile index f25e3112d..8fb8ff462 100644 --- a/collections/luci-ssl/Makefile +++ b/collections/luci-ssl/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TYPE:=col LUCI_BASENAME:=ssl -LUCI_TITLE:=LuCI with HTTPS support (PolarSSL as SSL backend) -LUCI_DEPENDS:=+luci +libustream-polarssl +px5g +LUCI_TITLE:=LuCI with HTTPS support (mbedTLS as SSL backend) +LUCI_DEPENDS:=+luci +libustream-mbedtls +px5g include ../../luci.mk diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index 7fff870d4..1bfc8ed7d 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -8,6 +8,7 @@ config 'community' 'profile' option 'splash_prefix' '27' option 'latitude' '52.52075' option 'longitude' '13.40948' + option 'owm_api' 'http://util.berlin.freifunk.net' config 'defaults' 'wifi_device' option 'channel' '13' diff --git a/contrib/package/freifunk-common/Makefile b/contrib/package/freifunk-common/Makefile index c15f02dcf..d9bbd994a 100644 --- a/contrib/package/freifunk-common/Makefile +++ b/contrib/package/freifunk-common/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freifunk-common -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index ce7d40dac..753ff259f 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -15,8 +15,8 @@ LUCI_TITLE:=LuCI core libraries LUCI_DEPENDS:=+lua +libuci-lua +luci-lib-nixio +luci-lib-ip +rpcd +libubus-lua +luci-lib-jsonc PKG_SOURCE:=LuaSrcDiet-0.12.1.tar.bz2 -PKG_SOURCE_URL:=https://luasrcdiet.googlecode.com/files -PKG_MD5SUM:=8a0812701e29b6715e4d76f2f118264a +PKG_SOURCE_URL:=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luasrcdiet +PKG_MD5SUM:=ed7680f2896269ae8633756e7edcf09050812f78c8f49e280e63c30d14f35aea HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1 diff --git a/modules/luci-base/luasrc/sys/iptparser.lua b/modules/luci-base/luasrc/sys/iptparser.lua index a9dbc3082..7ff665e7a 100644 --- a/modules/luci-base/luasrc/sys/iptparser.lua +++ b/modules/luci-base/luasrc/sys/iptparser.lua @@ -31,29 +31,43 @@ function IptParser.__init__( self, family ) self._family = (tonumber(family) == 6) and 6 or 4 self._rules = { } self._chains = { } + self._tables = { } + + local t = self._tables + local s = self:_supported_tables(self._family) + + if s.filter then t[#t+1] = "filter" end + if s.nat then t[#t+1] = "nat" end + if s.mangle then t[#t+1] = "mangle" end + if s.raw then t[#t+1] = "raw" end if self._family == 4 then self._nulladdr = "0.0.0.0/0" - self._tables = { "filter", "nat", "mangle", "raw" } self._command = "iptables -t %s --line-numbers -nxvL" else self._nulladdr = "::/0" - self._tables = { "filter", "mangle", "raw" } - local ok, lines = pcall(io.lines, "/proc/net/ip6_tables_names") - if ok and lines then - local line - for line in lines do - if line == "nat" then - self._tables = { "filter", "nat", "mangle", "raw" } - end - end - end self._command = "ip6tables -t %s --line-numbers -nxvL" end self:_parse_rules() end +function IptParser._supported_tables( self, family ) + local tables = { } + local ok, lines = pcall(io.lines, + (family == 6) and "/proc/net/ip6_tables_names" + or "/proc/net/ip_tables_names") + + if ok and lines then + local line + for line in lines do + tables[line] = true + end + end + + return tables +end + -- search criteria as only argument. If args is nil or an empty table then all -- rules will be returned. -- diff --git a/modules/luci-base/luasrc/tools/webadmin.lua b/modules/luci-base/luasrc/tools/webadmin.lua index 8273175de..106810aa0 100644 --- a/modules/luci-base/luasrc/tools/webadmin.lua +++ b/modules/luci-base/luasrc/tools/webadmin.lua @@ -96,7 +96,7 @@ function iface_get_network(iface) if net.l3_device == iface or net.device == iface then -- cross check with uci to filter out @name style aliases local uciname = cur:get("network", net.interface, "ifname") - if not uciname or uciname:sub(1, 1) ~= "@" then + if type(uciname) == "string" and uciname:sub(1,1) ~= "@" or uciname then return net.interface end end diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 04d89d9dd..044339bc0 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -292,9 +292,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -402,6 +399,9 @@ msgstr "" msgid "Authentication" msgstr "Autenticació" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritzada" @@ -576,6 +576,9 @@ msgstr "Comprovació" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Suma de verificació" @@ -978,6 +981,9 @@ msgstr "Habilita l'<abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Habilita negociació IPv6 en la enllaç PPP" @@ -2402,6 +2408,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Calidad" @@ -2617,6 +2626,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 2fa177640..8c850a26e 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -292,9 +292,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -402,6 +399,9 @@ msgstr "" msgid "Authentication" msgstr "Autentizace" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritativní" @@ -575,6 +575,9 @@ msgstr "Kontrola" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Kontrolní součet" @@ -988,6 +991,9 @@ msgstr "Povolit <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Povolit dynamickou aktualizaci koncového bodu HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Na PPP spoji povolit vyjednání IPv6" @@ -2427,6 +2433,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Kvalita" @@ -2656,6 +2665,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2924,7 +2936,7 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" "Statické zápůjčky se používají pro přiřazení fixních IP adres a symbolických " -"jmen DHCP klientům. Jsou také vyžadvány pro nedynamické konfigurace " +"jmen DHCP klientům. Jsou také vyžadovány pro nedynamické konfigurace " "rozhraní, kde jsou povoleni pouze hosté s odpovídajícím nastavením." msgid "Status" @@ -2940,7 +2952,7 @@ msgid "Submit" msgstr "Odeslat" msgid "Suppress logging" -msgstr "" +msgstr "Potlačit logování" msgid "Suppress logging of the routine operation of these protocols" msgstr "" @@ -3227,8 +3239,8 @@ msgid "" "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" "abbr> in the local network" msgstr "" -"Toto je jedný <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" -"abbr>v mistní síti" +"Toto je jediný <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" +"abbr> v mistní síti" msgid "This is the plain username for logging into the account" msgstr "" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index d55c33fc2..e44d8bb23 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -291,9 +291,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -401,6 +398,9 @@ msgstr "" msgid "Authentication" msgstr "Authentifizierung" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Authoritativ" @@ -575,6 +575,9 @@ msgstr "Prüfen" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Prüfsumme" @@ -983,6 +986,9 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> aktivieren" msgid "Enable HE.net dynamic endpoint update" msgstr "Dynamisches HE.net IP-Adress-Update aktivieren" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Aushandeln von IPv6-Adressen auf der PPP-Verbindung aktivieren" @@ -2432,6 +2438,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Qualität" @@ -2662,6 +2671,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 5f9ea287e..a196f5b08 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -299,9 +299,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -409,6 +406,9 @@ msgstr "" msgid "Authentication" msgstr "Εξουσιοδότηση" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Κύριος" @@ -584,6 +584,9 @@ msgstr "Έλεγχος" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Άθροισμα Ελέγχου" @@ -1000,6 +1003,9 @@ msgstr "Ενεργοποίηση <abbr title=\"Spanning Tree Protocol\">STP</abb msgid "Enable HE.net dynamic endpoint update" msgstr "Ενεργοποίηση ενημέρωσης δυναμικού τερματικού σημείου HE.net." +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Ενεργοποίηση διαπραγμάτευσης IPv6 πάνω στη PPP ζεύξη" @@ -2433,6 +2439,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2648,6 +2657,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 6dc1de222..125314d83 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -290,9 +290,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -400,6 +397,9 @@ msgstr "" msgid "Authentication" msgstr "Authentication" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Authoritative" @@ -573,6 +573,9 @@ msgstr "Check" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Checksum" @@ -979,6 +982,9 @@ msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2399,6 +2405,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2614,6 +2623,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index f05fee8d7..da786b69d 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -296,9 +296,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -406,6 +403,9 @@ msgstr "" msgid "Authentication" msgstr "Autentificación" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autorizado" @@ -580,6 +580,9 @@ msgstr "Comprobar" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Comprobación" @@ -994,6 +997,9 @@ msgstr "Activar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Activar actualización dinámica de punto final HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Activar negociación IPv6 en el enlace PPP" @@ -2441,6 +2447,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Calidad" @@ -2668,6 +2677,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index b7fe5828e..cce8ee20a 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -302,9 +302,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -412,6 +409,9 @@ msgstr "" msgid "Authentication" msgstr "Authentification" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritaire" @@ -585,6 +585,9 @@ msgstr "Vérification" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Somme de contrôle" @@ -1004,6 +1007,9 @@ msgstr "Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Activer la mise à jour dynamique de l'extrémité du tunnel chez HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Activer la négociation IPv6 sur le lien PPP" @@ -2454,6 +2460,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Qualitée" @@ -2681,6 +2690,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2869,9 +2881,9 @@ msgid "" "instructions." msgstr "" "Désolé, il n'y a pas de gestion de mise à jour disponible, une nouvelle " -"image du micrologiciel doit être écrite manuellement. Reportez-vous S.V." -"P. au wiki pour connaître les instructions d'installation spécifiques à " -"votre matériel." +"image du micrologiciel doit être écrite manuellement. Reportez-vous S.V.P. " +"au wiki pour connaître les instructions d'installation spécifiques à votre " +"matériel." msgid "Sort" msgstr "Trier" @@ -3429,9 +3441,9 @@ msgid "" "compatible firmware image)." msgstr "" "Envoyer ici une image compatible avec le système de mise à jour pour " -"remplacer le micrologiciel actuel. Cochez \"Garder la configuration\" " -"pour maintenir la configuration actuelle (nécessite une image de " -"micrologiciel compatible)." +"remplacer le micrologiciel actuel. Cochez \"Garder la configuration\" pour " +"maintenir la configuration actuelle (nécessite une image de micrologiciel " +"compatible)." msgid "Upload archive..." msgstr "Envoi de l'archive…" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index a4920a19b..0b11005ca 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -289,9 +289,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -401,6 +398,9 @@ msgstr "" msgid "Authentication" msgstr "אימות" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "מוסמך" @@ -575,6 +575,9 @@ msgstr "לבדוק" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -964,6 +967,9 @@ msgstr "אפשר <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2366,6 +2372,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2582,6 +2591,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2764,8 +2776,8 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"סליחה, אין תמיכה בעדכון מערכת, ולכן קושחה חדשה חייבת להיצרב ידנית. אנא " -"פנה אל ה-wiki של OpenWrt/LEDE עבור הוראות ספציפיות למכשיר שלך." +"סליחה, אין תמיכה בעדכון מערכת, ולכן קושחה חדשה חייבת להיצרב ידנית. אנא פנה " +"אל ה-wiki של OpenWrt/LEDE עבור הוראות ספציפיות למכשיר שלך." msgid "Sort" msgstr "מיין" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index a813f7206..2b85df15a 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -295,9 +295,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -405,6 +402,9 @@ msgstr "" msgid "Authentication" msgstr "Hitelesítés" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Hiteles" @@ -580,6 +580,9 @@ msgstr "Ellenőrzés" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Ellenőrző összeg" @@ -997,6 +1000,9 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> engedélyezése" msgid "Enable HE.net dynamic endpoint update" msgstr "HE.net dinamikus végpont frissítésének engedélyezése" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "IPv6 egyeztetés engedélyezése a PPP linken" @@ -2444,6 +2450,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Minőség" @@ -2673,6 +2682,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -3418,8 +3430,7 @@ msgid "" msgstr "" "Itt tölthet fel egy új sysupgrade-kompatibilis képet a futó firmware " "lecseréléséhez. A jelenlegi beállítások megtartásához jelölje be a " -"\"Beállítások megtartása\" négyzetet (kompatibilis firmware kép " -"szükséges)." +"\"Beállítások megtartása\" négyzetet (kompatibilis firmware kép szükséges)." msgid "Upload archive..." msgstr "Archívum feltöltése..." diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 6bd6f0c43..2f5350dd7 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -302,9 +302,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -412,6 +409,9 @@ msgstr "" msgid "Authentication" msgstr "Autenticazione PEAP" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritativo" @@ -585,6 +585,9 @@ msgstr "Verifica" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Checksum" @@ -998,6 +1001,9 @@ msgstr "Abilita <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Abilitazione aggiornamento endpoint dinamico HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Attiva la negoziazione IPv6 sul collegamento PPP" @@ -2438,6 +2444,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2656,6 +2665,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -3367,9 +3379,9 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"Carica un'immagine sysupgrade compatibile quì per sostituire il firmware " -"in esecuzione. Attivare la spunta \"Mantieni Impostazioni\" per mantenere " -"la configurazione corrente (richiede un immagine del firmware compatibile)." +"Carica un'immagine sysupgrade compatibile quì per sostituire il firmware in " +"esecuzione. Attivare la spunta \"Mantieni Impostazioni\" per mantenere la " +"configurazione corrente (richiede un immagine del firmware compatibile)." msgid "Upload archive..." msgstr "Carica archivio..." diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 483aa8e3a..ed7241254 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2013-10-06 02:29+0200\n" -"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n" +"PO-Revision-Date: 2016-12-16 15:23+0900\n" +"Last-Translator: musashino205 <musashino.open@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.6\n" +"X-Generator: Poedit 1.5.7\n" msgid "%s is untagged in multiple VLANs!" -msgstr "" +msgstr "%s は複数のVLANにUntaggedしています!" msgid "(%d minute window, %d second interval)" msgstr "(%d 分幅, %d 秒間隔)" @@ -38,10 +38,10 @@ msgid "-- custom --" msgstr "-- 手動設定 --" msgid "-- match by device --" -msgstr "" +msgstr "-- デバイスで設定 --" msgid "-- match by label --" -msgstr "" +msgstr "-- ラベルで設定 --" msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -95,6 +95,7 @@ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-ゲートウェ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" msgstr "" +"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-サフィックス (16進数)" msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration" msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 設定" @@ -287,10 +288,7 @@ msgid "" msgstr "" msgid "Always announce default router" -msgstr "" - -msgid "An additional network will be created if you leave this checked." -msgstr "" +msgstr "常にデフォルト ルーターとして通知する" msgid "Annex" msgstr "" @@ -339,6 +337,8 @@ msgstr "" msgid "Announce as default router even if no public prefix is available." msgstr "" +"利用可能なパブリック プレフィクスが無くても、デフォルトのルーターとして通知し" +"ます。" msgid "Announced DNS domains" msgstr "" @@ -350,10 +350,10 @@ msgid "Anonymous Identity" msgstr "" msgid "Anonymous Mount" -msgstr "" +msgstr "アノニマス マウント" msgid "Anonymous Swap" -msgstr "" +msgstr "アノニマス スワップ" msgid "Antenna 1" msgstr "アンテナ 1" @@ -399,6 +399,9 @@ msgstr "" msgid "Authentication" msgstr "認証" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Authoritative" @@ -409,25 +412,25 @@ msgid "Auto Refresh" msgstr "自動更新" msgid "Automatic" -msgstr "" +msgstr "自動" msgid "Automatic Homenet (HNCP)" msgstr "" msgid "Automatically check filesystem for errors before mounting" -msgstr "" +msgstr "マウント実行前にファイルシステムのエラーを自動でチェックします。" msgid "Automatically mount filesystems on hotplug" -msgstr "" +msgstr "ホットプラグによってファイルシステムを自動的にマウントします。" msgid "Automatically mount swap on hotplug" -msgstr "" +msgstr "ホットプラグによってスワップ パーティションを自動的にマウントします。" msgid "Automount Filesystem" -msgstr "" +msgstr "ファイルシステム 自動マウント" msgid "Automount Swap" -msgstr "" +msgstr "スワップ 自動マウント" msgid "Available" msgstr "使用可" @@ -500,6 +503,7 @@ msgstr "" msgid "Bind only to specific interfaces rather than wildcard address." msgstr "" +"ワイルドカード アドレスではなく、特定のインターフェースのみにバインドします。" msgid "Bind the tunnel to this interface (optional)." msgstr "" @@ -535,6 +539,8 @@ msgid "" "Build/distribution specific feed definitions. This file will NOT be " "preserved in any sysupgrade." msgstr "" +"ビルド/ディストリビューション固有のフィード定義です。このファイルはsysupgrade" +"の際に引き継がれません。" msgid "Buttons" msgstr "ボタン" @@ -549,7 +555,7 @@ msgid "Cancel" msgstr "キャンセル" msgid "Category" -msgstr "" +msgstr "カテゴリー" msgid "Chain" msgstr "チェイン" @@ -570,6 +576,9 @@ msgid "Check" msgstr "チェック" msgid "Check fileystems before mount" +msgstr "マウント前にファイルシステムをチェックする" + +msgid "Check this option to delete the existing networks from this radio." msgstr "" msgid "Checksum" @@ -659,7 +668,7 @@ msgid "Connection Limit" msgstr "接続制限" msgid "Connection to server fails when TLS cannot be used" -msgstr "" +msgstr "TLSが使用できないとき、サーバーへの接続は失敗します。" msgid "Connections" msgstr "ネットワーク接続" @@ -701,9 +710,11 @@ msgid "" "Custom feed definitions, e.g. private feeds. This file can be preserved in a " "sysupgrade." msgstr "" +"プライベート フィードなどのカスタム フィード定義です。このファイルは" +"sysupgrade時に引き継ぐことができます。" msgid "Custom feeds" -msgstr "" +msgstr "カスタム フィード" msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" @@ -731,13 +742,13 @@ msgid "DHCPv6 Leases" msgstr "DHCPv6 リース" msgid "DHCPv6 client" -msgstr "" +msgstr "DHCPv6 クライアント" msgid "DHCPv6-Mode" -msgstr "" +msgstr "DHCPv6-モード" msgid "DHCPv6-Service" -msgstr "" +msgstr "DHCPv6-サービス" msgid "DNS" msgstr "DNS" @@ -758,7 +769,7 @@ msgid "DPD Idle Timeout" msgstr "" msgid "DS-Lite AFTR address" -msgstr "" +msgstr "DS-Lite AFTR アドレス" msgid "DSL" msgstr "" @@ -785,7 +796,7 @@ msgid "Default gateway" msgstr "デフォルトゲートウェイ" msgid "Default is stateless + stateful" -msgstr "" +msgstr "デフォルトは ステートレス + ステートフル です。" msgid "Default route" msgstr "" @@ -826,7 +837,7 @@ msgid "Device Configuration" msgstr "デバイス設定" msgid "Device is rebooting..." -msgstr "" +msgstr "デバイスを再起動中です..." msgid "Device unreachable" msgstr "" @@ -875,7 +886,7 @@ msgid "Distance to farthest network member in meters." msgstr "最も遠い端末との距離(メートル)を設定してください。" msgid "Distribution feeds" -msgstr "" +msgstr "ディストリビューション フィード" msgid "Diversity" msgstr "ダイバシティ" @@ -938,7 +949,7 @@ msgstr "" "す。" msgid "Dual-Stack Lite (RFC6333)" -msgstr "" +msgstr "Dual-Stack Lite (RFC6333)" msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" msgstr "" @@ -986,6 +997,9 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>を有効にする" msgid "Enable HE.net dynamic endpoint update" msgstr "HE.netの動的endpoint更新を有効にします" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "PPPリンクのIPv6ネゴシエーションを有効にする" @@ -1062,7 +1076,7 @@ msgid "Ethernet Switch" msgstr "イーサネットスイッチ" msgid "Exclude interfaces" -msgstr "" +msgstr "除外インターフェース" msgid "Expand hosts" msgstr "拡張ホスト設定" @@ -1078,7 +1092,7 @@ msgstr "" "code>)." msgid "External" -msgstr "" +msgstr "外部" msgid "External system log server" msgstr "外部システムログ・サーバー" @@ -1087,10 +1101,10 @@ msgid "External system log server port" msgstr "外部システムログ・サーバーポート" msgid "External system log server protocol" -msgstr "" +msgstr "外部システムログ・サーバー プロトコル" msgid "Extra SSH command options" -msgstr "" +msgstr "拡張 SSHコマンドオプション" msgid "Fast Frames" msgstr "ファスト・フレーム" @@ -1117,6 +1131,8 @@ msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" msgstr "" +"現在アタッチされている全てのファイルシステムとスワップを検索し、検出結果に基" +"づいてデフォルト設定を置き換えます。" msgid "Find and join network" msgstr "ネットワークを検索して参加" @@ -1137,7 +1153,7 @@ msgid "Firewall Status" msgstr "ファイアウォール・ステータス" msgid "Firmware File" -msgstr "" +msgstr "ファームウェア ファイル" msgid "Firmware Version" msgstr "ファームウェア・バージョン" @@ -1230,10 +1246,10 @@ msgid "General Setup" msgstr "一般設定" msgid "General options for opkg" -msgstr "" +msgstr "opkgの一般設定" msgid "Generate Config" -msgstr "" +msgstr "コンフィグ生成" msgid "Generate archive" msgstr "バックアップアーカイブの作成" @@ -1245,7 +1261,7 @@ msgid "Given password confirmation did not match, password not changed!" msgstr "入力されたパスワードが一致しません。パスワードは変更されませんでした!" msgid "Global Settings" -msgstr "" +msgstr "全体設定" msgid "Global network options" msgstr "" @@ -1260,7 +1276,7 @@ msgid "Group Password" msgstr "" msgid "Guest" -msgstr "" +msgstr "ゲスト" msgid "HE.net password" msgstr "HE.net パスワード" @@ -1269,7 +1285,7 @@ msgid "HE.net username" msgstr "" msgid "HT mode (802.11n)" -msgstr "" +msgstr "HT モード (802.11n)" msgid "Handler" msgstr "ハンドラ" @@ -1281,7 +1297,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" msgid "Heartbeat" -msgstr "" +msgstr "ハートビート" msgid "" "Here you can configure the basic aspects of your device like its hostname or " @@ -1301,7 +1317,7 @@ msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>の隠匿" msgid "Host" -msgstr "" +msgstr "ホスト" msgid "Host entries" msgstr "ホストエントリー" @@ -1323,7 +1339,7 @@ msgid "Hostnames" msgstr "ホスト名" msgid "Hybrid" -msgstr "" +msgstr "ハイブリッド" msgid "IKE DH Group" msgstr "" @@ -1362,7 +1378,7 @@ msgid "IPv4 only" msgstr "IPv4のみ" msgid "IPv4 prefix" -msgstr "" +msgstr "IPv4 プレフィクス" msgid "IPv4 prefix length" msgstr "IPv4 プレフィクス長" @@ -1371,7 +1387,7 @@ msgid "IPv4-Address" msgstr "IPv4-アドレス" msgid "IPv4-in-IPv4 (RFC2003)" -msgstr "" +msgstr "IPv4-in-IPv4 (RFC2003)" msgid "IPv6" msgstr "IPv6" @@ -1383,10 +1399,10 @@ msgid "IPv6 Neighbours" msgstr "" msgid "IPv6 Settings" -msgstr "" +msgstr "IPv6 設定" msgid "IPv6 ULA-Prefix" -msgstr "" +msgstr "IPv6 ULA-プレフィクス" msgid "IPv6 WAN Status" msgstr "IPv6 WAN ステータス" @@ -1535,7 +1551,7 @@ msgid "Interface is shutting down..." msgstr "インターフェース終了中..." msgid "Interface name" -msgstr "" +msgstr "インターフェース名" msgid "Interface not present or not connected yet." msgstr "インターフェースが存在しないか、接続していません" @@ -1550,7 +1566,7 @@ msgid "Interfaces" msgstr "インターフェース" msgid "Internal" -msgstr "" +msgstr "内部" msgid "Internal Server Error" msgstr "内部サーバーエラー" @@ -1567,13 +1583,12 @@ msgstr "無効なVLAN IDです! ユニークなIDを入力してください。" msgid "Invalid username and/or password! Please try again." msgstr "ユーザー名とパスワードが不正です! もう一度入力してください。" -#, fuzzy msgid "" "It appears that you are trying to flash an image that does not fit into the " "flash memory, please verify the image file!" msgstr "" -"更新しようとしたイメージファイルはこのフラッシュメモリに適合しません。もう一" -"度イメージファイルを確認してください!" +"更新しようとしたイメージファイルはこのフラッシュメモリに適合しません。イメー" +"ジファイルを確認してください!" msgid "Java Script required!" msgstr "JavaScriptを有効にしてください!" @@ -1585,7 +1600,7 @@ msgid "Join Network: Wireless Scan" msgstr "ネットワークに接続する: 無線LANスキャン" msgid "Joining Network: %q" -msgstr "" +msgstr "次のネットワークに参加: %q" msgid "Keep settings" msgstr "設定を保持する" @@ -1630,13 +1645,13 @@ msgid "Language and Style" msgstr "言語とスタイル" msgid "Latency" -msgstr "" +msgstr "レイテンシー" msgid "Leaf" msgstr "" msgid "Lease time" -msgstr "" +msgstr "リース時間" msgid "Lease validity time" msgstr "リース有効時間" @@ -1666,7 +1681,7 @@ msgid "Limit DNS service to subnets interfaces on which we are serving DNS." msgstr "" msgid "Limit listening to these interfaces, and loopback." -msgstr "" +msgstr "待ち受けをこれらのインターフェースとループバックに制限します。" msgid "Line Attenuation (LATN)" msgstr "" @@ -1691,7 +1706,7 @@ msgstr "" "リストを設定します" msgid "List of SSH key files for auth" -msgstr "" +msgstr "認証用 SSH暗号キー ファイルのリスト" msgid "List of domains to allow RFC1918 responses for" msgstr "RFC1918の応答を許可するリスト" @@ -1700,10 +1715,10 @@ msgid "List of hosts that supply bogus NX domain results" msgstr "" msgid "Listen Interfaces" -msgstr "" +msgstr "待ち受けインターフェース" msgid "Listen Port" -msgstr "" +msgstr "待ち受けポート" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "" @@ -1723,7 +1738,7 @@ msgid "Loading" msgstr "ロード中" msgid "Local IP address to assign" -msgstr "" +msgstr "割り当てるローカル IPアドレス" msgid "Local IPv4 address" msgstr "ローカル IPv4 アドレス" @@ -1750,6 +1765,8 @@ msgstr "" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" +"DHCP名とhostsファイルのエントリーに付される、ローカルドメインサフィックスで" +"す。" msgid "Local server" msgstr "ローカルサーバー" @@ -1763,7 +1780,7 @@ msgid "Localise queries" msgstr "ローカライズクエリ" msgid "Locked to channel %s used by: %s" -msgstr "" +msgstr "チャネル %s にロックされています。次で使用されています: %s" msgid "Log output level" msgstr "ログ出力レベル" @@ -1818,9 +1835,10 @@ msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" msgstr "" +"以下のようなコマンドを使用して、ルート ファイルシステムを複製してください:" msgid "Manual" -msgstr "" +msgstr "手動" msgid "Max. Attainable Data Rate (ATTNDR)" msgstr "" @@ -1847,6 +1865,8 @@ msgid "" "Maximum length of the name is 15 characters including the automatic protocol/" "bridge prefix (br-, 6in4-, pppoe- etc.)" msgstr "" +"名前の長さは、自動的に含まれるプロトコル/ブリッジ プレフィックス （br-, " +"6in4-, pppoe- など）と合わせて最大15文字です。" msgid "Maximum number of leased addresses." msgstr "リースするアドレスの最大数です" @@ -1882,7 +1902,7 @@ msgid "Mode" msgstr "モード" msgid "Model" -msgstr "" +msgstr "モデル" msgid "Modem device" msgstr "モデムデバイス" @@ -1916,7 +1936,7 @@ msgstr "" "表示しています。" msgid "Mount filesystems not specifically configured" -msgstr "" +msgstr "明確に設定されていないファイルシステムをマウントします。" msgid "Mount options" msgstr "マウントオプション" @@ -1925,7 +1945,7 @@ msgid "Mount point" msgstr "マウントポイント" msgid "Mount swap not specifically configured" -msgstr "" +msgstr "明確に設定されていないスワップ パーティションをマウントします。" msgid "Mounted file systems" msgstr "マウント中のファイルシステム" @@ -1949,10 +1969,10 @@ msgid "NAT-T Mode" msgstr "" msgid "NAT64 Prefix" -msgstr "" +msgstr "NAT64 プレフィクス" msgid "NDP-Proxy" -msgstr "" +msgstr "NDP-プロキシ" msgid "NT Domain" msgstr "" @@ -2042,7 +2062,7 @@ msgid "Non Pre-emtive CRC errors (CRC_P)" msgstr "" msgid "Non-wildcard" -msgstr "" +msgstr "非ワイルドカード" msgid "None" msgstr "なし" @@ -2123,7 +2143,7 @@ msgid "OpenConnect (CISCO AnyConnect)" msgstr "" msgid "Operating frequency" -msgstr "" +msgstr "動作周波数" msgid "Option changed" msgstr "変更されるオプション" @@ -2198,7 +2218,7 @@ msgid "Override TTL" msgstr "" msgid "Override default interface name" -msgstr "" +msgstr "デフォルトのインターフェース名を上書きします。" msgid "Override the gateway in DHCP responses" msgstr "DHCPレスポンス内のゲートウェイアドレスを上書きする" @@ -2244,7 +2264,7 @@ msgid "PPPoE" msgstr "PPPoE" msgid "PPPoSSH" -msgstr "" +msgstr "PPPoSSH" msgid "PPtP" msgstr "PPtP" @@ -2361,7 +2381,7 @@ msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" msgid "Preshared Key" -msgstr "" +msgstr "事前共有鍵" msgid "" "Presume peer to be dead after given amount of LCP echo failures, use 0 to " @@ -2371,7 +2391,7 @@ msgstr "" "を設定した場合、失敗しても無視します" msgid "Prevent listening on these interfaces." -msgstr "" +msgstr "これらのインターフェースでの待ち受けを停止します。" msgid "Prevents client-to-client communication" msgstr "クライアント同士の通信を制限します" @@ -2380,7 +2400,7 @@ msgid "Prism2/2.5/3 802.11b Wireless Controller" msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ" msgid "Private Key" -msgstr "" +msgstr "秘密鍵" msgid "Proceed" msgstr "続行" @@ -2416,11 +2436,14 @@ msgid "Pseudo Ad-Hoc (ahdemo)" msgstr "擬似アドホック (ahdemo)" msgid "Public Key" -msgstr "" +msgstr "公開鍵" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "クオリティ" @@ -2485,7 +2508,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "本当に全ての変更をリセットしますか?" -#, fuzzy msgid "" "Really shut down network?\\nYou might lose access to this device if you are " "connected via this interface." @@ -2581,13 +2603,13 @@ msgid "Replace wireless configuration" msgstr "無線設定を置換する" msgid "Request IPv6-address" -msgstr "" +msgstr "IPv6-アドレスのリクエスト" msgid "Request IPv6-prefix of length" msgstr "" msgid "Require TLS" -msgstr "" +msgstr "TLSが必要" msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" msgstr "DOCSIS 3.0を使用するいくつかのISPでは必要になります" @@ -2646,16 +2668,19 @@ msgid "Root directory for files served via TFTP" msgstr "TFTP経由でファイルを取り扱う際のルートディレクトリ" msgid "Root preparation" -msgstr "" +msgstr "ルートの準備" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" msgid "Router Advertisement-Service" -msgstr "" +msgstr "ルーター アドバタイズメント-サービス" msgid "Router Password" msgstr "ルーター・パスワード" @@ -2694,13 +2719,13 @@ msgid "SSH Access" msgstr "SSHアクセス" msgid "SSH server address" -msgstr "" +msgstr "SSH サーバーアドレス" msgid "SSH server port" -msgstr "" +msgstr "SSH サーバーポート" msgid "SSH username" -msgstr "" +msgstr "SSH ユーザー名" msgid "SSH-Keys" msgstr "SSHキー" @@ -2749,7 +2774,7 @@ msgid "Server Settings" msgstr "サーバー設定" msgid "Server password" -msgstr "" +msgstr "サーバー パスワード" msgid "" "Server password, enter the specific password of the tunnel when the username " @@ -2757,7 +2782,7 @@ msgid "" msgstr "" msgid "Server username" -msgstr "" +msgstr "サーバー ユーザー名" msgid "Service Name" msgstr "サービス名" @@ -2768,9 +2793,8 @@ msgstr "サービスタイプ" msgid "Services" msgstr "サービス" -#, fuzzy msgid "Set up Time Synchronization" -msgstr "時刻設定" +msgstr "時刻同期設定" msgid "Setup DHCP Server" msgstr "DHCPサーバーを設定" @@ -2803,7 +2827,7 @@ msgid "Size" msgstr "サイズ" msgid "Size (.ipk)" -msgstr "" +msgstr "サイズ (.ipk)" msgid "Skip" msgstr "スキップ" @@ -2837,9 +2861,9 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"申し訳ありません。現在このボードではsysupgradeがサポートがされていないた" -"め、ファームウェア更新は手動で行っていただく必要があります。wikiを" -"参照して、このデバイスのインストール手順を参照してください。" +"申し訳ありません。現在このボードではsysupgradeがサポートがされていないため、" +"ファームウェア更新は手動で行っていただく必要があります。wikiを参照して、この" +"デバイスのインストール手順を参照してください。" msgid "Sort" msgstr "ソート" @@ -2892,7 +2916,7 @@ msgid "Start priority" msgstr "優先順位" msgid "Startup" -msgstr "Startup" +msgstr "スタートアップ" msgid "Static IPv4 Routes" msgstr "IPv4 静的ルーティング" @@ -2940,7 +2964,7 @@ msgid "Suppress logging of the routine operation of these protocols" msgstr "" msgid "Swap" -msgstr "" +msgstr "スワップ" msgid "Swap Entry" msgstr "スワップ機能" @@ -3363,7 +3387,7 @@ msgid "Unmanaged" msgstr "Unmanaged" msgid "Unmount" -msgstr "" +msgstr "アンマウント" msgid "Unsaved Changes" msgstr "保存されていない変更" @@ -3379,9 +3403,9 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェア" -"イメージをアップロードしてください。\"設定の保持\"を有効にすると、現在の設" -"定を維持してアップデートを行います。ただし、OpenWrt/LEDE互換のファームウェアイ" +"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェアイ" +"メージをアップロードしてください。\"設定の保持\"を有効にすると、現在の設定を" +"維持してアップデートを行います。ただし、OpenWrt/LEDE互換のファームウェアイ" "メージがアップロードされた場合のみ、設定は保持されます。" msgid "Upload archive..." @@ -3412,16 +3436,16 @@ msgid "Use TTL on tunnel interface" msgstr "トンネルインターフェースのTTLを設定" msgid "Use as external overlay (/overlay)" -msgstr "" +msgstr "外部オーバーレイとして使用する (/overlay)" msgid "Use as root filesystem (/)" -msgstr "" +msgstr "ルート ファイルシステムとして使用する (/)" msgid "Use broadcast flag" msgstr "ブロードキャスト・フラグを使用する" msgid "Use builtin IPv6-management" -msgstr "" +msgstr "ビルトインのIPv6-マネジメントを使用する" msgid "Use custom DNS servers" msgstr "DNSサーバーを手動で設定" @@ -3553,7 +3577,7 @@ msgid "Warning" msgstr "警告" msgid "Warning: There are unsaved changes that will get lost on reboot!" -msgstr "" +msgstr "警告: 再起動すると消えてしまう、保存されていない設定があります！" msgid "Whether to create an IPv6 default route over the tunnel" msgstr "" @@ -3562,7 +3586,7 @@ msgid "Whether to route only packets from delegated prefixes" msgstr "" msgid "Width" -msgstr "" +msgstr "帯域幅" msgid "WireGuard VPN" msgstr "" @@ -3604,7 +3628,7 @@ msgid "Write received DNS requests to syslog" msgstr "受信したDNSリクエストをsyslogへ記録します" msgid "Write system log to file" -msgstr "" +msgstr "システムログをファイルに書き込む" msgid "XR Support" msgstr "XRサポート" @@ -3635,9 +3659,8 @@ msgstr "全て" msgid "auto" msgstr "自動" -#, fuzzy msgid "automatic" -msgstr "static" +msgstr "自動" msgid "baseT" msgstr "baseT" @@ -3661,7 +3684,7 @@ msgid "disable" msgstr "無効" msgid "disabled" -msgstr "" +msgstr "無効" msgid "expired" msgstr "期限切れ" @@ -3689,7 +3712,7 @@ msgid "hidden" msgstr "" msgid "hybrid mode" -msgstr "" +msgstr "ハイブリッド モード" msgid "if target is a network" msgstr "ターゲットがネットワークの場合" @@ -3740,13 +3763,13 @@ msgid "overlay" msgstr "" msgid "relay mode" -msgstr "" +msgstr "リレー モード" msgid "routed" msgstr "routed" msgid "server mode" -msgstr "" +msgstr "サーバー モード" msgid "skiplink1 Skip to navigation" msgstr "" @@ -3755,19 +3778,19 @@ msgid "skiplink2 Skip to content" msgstr "" msgid "stateful-only" -msgstr "" +msgstr "ステートフルのみ" msgid "stateless" -msgstr "" +msgstr "ステートレス" msgid "stateless + stateful" -msgstr "" +msgstr "ステートレス + ステートフル" msgid "tagged" msgstr "tagged" msgid "unknown" -msgstr "" +msgstr "不明" msgid "unlimited" msgstr "無期限" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index e6d18c04c..af52ee733 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -284,9 +284,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -394,6 +391,9 @@ msgstr "" msgid "Authentication" msgstr "" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "" @@ -569,6 +569,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -934,7 +937,6 @@ msgstr "" msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" msgstr "" -"" msgid "Dynamic tunnel" msgstr "" @@ -978,6 +980,9 @@ msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr> 활성화" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -1549,7 +1554,6 @@ msgstr "" msgid "Invalid username and/or password! Please try again." msgstr "" -#, fuzzy msgid "" "It appears that you are trying to flash an image that does not fit into the " "flash memory, please verify the image file!" @@ -2394,6 +2398,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -3075,7 +3082,6 @@ msgid "" "when finished." msgstr "" -#, fuzzy msgid "" "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a " "few minutes before you try to reconnect. It might be necessary to renew the " @@ -3712,9 +3718,3 @@ msgstr "" msgid "« Back" msgstr "" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "" - -#~ msgid "CPU" -#~ msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 74f03cd7a..8ba922f87 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -279,9 +279,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -389,6 +386,9 @@ msgstr "" msgid "Authentication" msgstr "Authentifizierung" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Pengesahan" @@ -559,6 +559,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Jumlah disemak " @@ -949,6 +952,9 @@ msgstr "Mengaktifkan <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2371,6 +2377,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2585,6 +2594,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index ed9d346e6..f9dad0a4e 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -288,9 +288,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -398,6 +395,9 @@ msgstr "" msgid "Authentication" msgstr "Godkjenning" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritativ" @@ -571,6 +571,9 @@ msgstr "Kontroller" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Kontrollsum" @@ -984,6 +987,9 @@ msgstr "Aktiver <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Aktiver HE,net dynamisk endepunkt oppdatering" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Aktiver IPv6 på PPP lenke" @@ -2419,6 +2425,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Kvalitet" @@ -2646,6 +2655,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -3383,8 +3395,8 @@ msgid "" "compatible firmware image)." msgstr "" "Last her opp en sysupgrade-kompatibel firmware som skal erstatte den " -"kjørende firmware. Merk av \"Behold innstillinger\" for å beholde " -"gjeldene konfigurasjon. (en kompatibel firmware er nødvendig)" +"kjørende firmware. Merk av \"Behold innstillinger\" for å beholde gjeldene " +"konfigurasjon. (en kompatibel firmware er nødvendig)" msgid "Upload archive..." msgstr "Last opp arkiv..." diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 4f15a3769..a78584cbb 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -303,9 +303,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -413,6 +410,9 @@ msgstr "" msgid "Authentication" msgstr "Uwierzytelnianie" +msgid "Authentication Type" +msgstr "" + # Nawet M$ tego nie tłumaczy;) msgid "Authoritative" msgstr "Autorytatywny" @@ -589,6 +589,9 @@ msgstr "Sprawdź" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Suma kontrolna" @@ -1011,6 +1014,9 @@ msgstr "Włącz <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Włącz dynamiczną aktualizację punktu końcowego sieci HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Włącz negocjację IPv6 na łączu PPP" @@ -2467,6 +2473,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Jakość" @@ -2695,6 +2704,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2883,9 +2895,9 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"Przepraszamy, ale nie ma wsparcia dla trybu sysupgrade. Nowy firmware " -"musi być wgrany ręcznie. Sprawdź stronę wiki, aby uzyskać instrukcję dla " -"danego urządzenia." +"Przepraszamy, ale nie ma wsparcia dla trybu sysupgrade. Nowy firmware musi " +"być wgrany ręcznie. Sprawdź stronę wiki, aby uzyskać instrukcję dla danego " +"urządzenia." msgid "Sort" msgstr "Posortuj" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index c257abd1b..0bcd6398d 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -303,9 +303,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -413,6 +410,9 @@ msgstr "" msgid "Authentication" msgstr "Autenticação" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritário" @@ -586,6 +586,9 @@ msgstr "Verificar" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Soma de verificação" @@ -1007,6 +1010,9 @@ msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Ativar a atualização de ponto final dinâmico HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Ativar a negociação de IPv6 no enlace PPP" @@ -2472,6 +2478,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Qualidade" @@ -2701,6 +2710,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2889,8 +2901,8 @@ msgid "" "instructions." msgstr "" "Sinto muito, não existe suporte para o sysupgrade. Uma nova imagem de " -"firmware deve ser gravada manualmente. Por favor, consulte a wiki " -"para instruções específicas da instalação deste dispositivo." +"firmware deve ser gravada manualmente. Por favor, consulte a wiki para " +"instruções específicas da instalação deste dispositivo." msgid "Sort" msgstr "Ordenar" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index 053419850..d8790dc1f 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -301,9 +301,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -411,6 +408,9 @@ msgstr "" msgid "Authentication" msgstr "Autenticação" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritário" @@ -584,6 +584,9 @@ msgstr "Verificar" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Checksum" @@ -1000,6 +1003,9 @@ msgstr "Ativar <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Ativar a atualização dinâmica de ponto final HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Ativar a negociação IPv6 no link PPP" @@ -2439,6 +2445,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Qualidade" @@ -2665,6 +2674,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index d25774706..4135c796a 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -287,9 +287,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -397,6 +394,9 @@ msgstr "" msgid "Authentication" msgstr "Autentificare" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Autoritare" @@ -567,6 +567,9 @@ msgstr "Verificare" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Suma de verificare" @@ -955,6 +958,9 @@ msgstr "Activeaza <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2363,6 +2369,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Calitate" @@ -2578,6 +2587,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 4ecad940e..e7045884b 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -300,9 +300,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -410,6 +407,9 @@ msgstr "" msgid "Authentication" msgstr "Аутентификация" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Авторитетный" @@ -584,6 +584,9 @@ msgstr "Проверить" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Контрольная сумма" @@ -1001,6 +1004,9 @@ msgstr "Включить <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Включить динамическое обновление оконечной точки HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Включить IPv6-согласование на PPP-соединении" @@ -2449,6 +2455,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Качество" @@ -2676,6 +2685,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2863,8 +2875,8 @@ msgid "" "instructions." msgstr "" "К сожалению, автоматическое обновление не поддерживается, новая прошивка " -"должна быть установлена вручную. Обратитесь к вики для получения " -"конкретных инструкций для вашего устройства." +"должна быть установлена вручную. Обратитесь к вики для получения конкретных " +"инструкций для вашего устройства." msgid "Sort" msgstr "Сортировка" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index a0a355fbb..f82402949 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -273,9 +273,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -383,6 +380,9 @@ msgstr "" msgid "Authentication" msgstr "" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "" @@ -553,6 +553,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -936,6 +939,9 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2338,6 +2344,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2551,6 +2560,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 785e90022..4e228082e 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -279,9 +279,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -389,6 +386,9 @@ msgstr "" msgid "Authentication" msgstr "" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "" @@ -559,6 +559,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -942,6 +945,9 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2344,6 +2350,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2557,6 +2566,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index f29f1e320..5a77cd293 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -266,9 +266,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -376,6 +373,9 @@ msgstr "" msgid "Authentication" msgstr "" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "" @@ -546,6 +546,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -929,6 +932,9 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2331,6 +2337,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2544,6 +2553,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 3d881f500..7f0ea7e16 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -286,9 +286,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -396,6 +393,9 @@ msgstr "" msgid "Authentication" msgstr "Kimlik doğrulama" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Yetkilendirme" @@ -566,6 +566,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "" @@ -949,6 +952,9 @@ msgstr "" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2351,6 +2357,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2564,6 +2573,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index b5d28c20d..29b1514e2 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -310,9 +310,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -420,6 +417,9 @@ msgstr "" msgid "Authentication" msgstr "Автентифікація" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Надійний" @@ -593,6 +593,9 @@ msgstr "Перевірити" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Контрольна сума" @@ -1010,6 +1013,9 @@ msgstr "Увімкнути <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "Увімкнути динамічне оновлення кінцевої точки HE.net" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань" @@ -2460,6 +2466,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "Якість" @@ -2689,6 +2698,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2876,8 +2888,8 @@ msgid "" "instructions." msgstr "" "На жаль, автоматичне оновлення системи не підтримується. Новий образ " -"прошивки повинен бути залитий вручну. Зверніться до Wiki за " -"інструкцією з інсталяції для конкретного пристрою." +"прошивки повинен бути залитий вручну. Зверніться до Wiki за інструкцією з " +"інсталяції для конкретного пристрою." msgid "Sort" msgstr "Сортування" @@ -3433,9 +3445,9 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"Відвантажити sysupgrade-сумісний образ, щоб замінити поточну прошивку. " -"Для збереження поточної конфігурації встановіть прапорець \"Зберегти " -"настройки\" (потрібен сумісний образ прошивки)." +"Відвантажити sysupgrade-сумісний образ, щоб замінити поточну прошивку. Для " +"збереження поточної конфігурації встановіть прапорець \"Зберегти настройки" +"\" (потрібен сумісний образ прошивки)." msgid "Upload archive..." msgstr "Відвантажити архів..." diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index cb5e401c6..0cc83bf5a 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -280,9 +280,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -390,6 +387,9 @@ msgstr "" msgid "Authentication" msgstr "Xác thực" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "Authoritative" @@ -560,6 +560,9 @@ msgstr "" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "Checksum" @@ -954,6 +957,9 @@ msgstr "Kích hoạt <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "" @@ -2374,6 +2380,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "" @@ -2589,6 +2598,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index bbcc7e7cf..7c00f8ff8 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -3,21 +3,21 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-12-21 23:08+0200\n" -"PO-Revision-Date: 2015-12-20 13:14+0800\n" -"Last-Translator: GuoGuo <gch981213@gmail.com>\n" +"PO-Revision-Date: 2017-01-07 21:46+0800\n" +"Last-Translator: Hsing-Wang Liao <kuoruan@gmail.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 1.8.11\n" "Language-Team: \n" msgid "%s is untagged in multiple VLANs!" -msgstr "" +msgstr "%s 在多个 VLAN 中未标记" msgid "(%d minute window, %d second interval)" -msgstr "(%d分钟信息，%d秒刷新)" +msgstr "(%d 分钟信息，%d 秒刷新)" msgid "(%s available)" msgstr "(%s 可用)" @@ -50,91 +50,89 @@ msgid "15 Minute Load:" msgstr "15分钟负载:" msgid "464XLAT (CLAT)" -msgstr "" +msgstr "464XLAT (CLAT)" msgid "5 Minute Load:" msgstr "5分钟负载:" msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" -msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>" +msgstr "<abbr title=\"基本服务集标识符\">BSSID</abbr>" msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port" -msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 查询端口" +msgstr "<abbr title=\"域名服务系统\">DNS</abbr> 查询端口" msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port" -msgstr "<abbr title=\"Domain Name System\">DNS</abbr> 服务器端口" +msgstr "<abbr title=\"域名服务系统\">DNS</abbr> 服务器端口" msgid "" "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the " "order of the resolvfile" -msgstr "将会按照指定的顺序查询<abbr title=\"Domain Name System\">DNS</abbr>" +msgstr "将会按照指定的顺序查询<abbr title=\"域名服务系统\">DNS</abbr>" msgid "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" -msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgstr "<abbr title=\"扩展服务集标识符\">ESSID</abbr>" msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address" -msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-地址" +msgstr "<abbr title=\"互联网协议第4版\">IPv4</abbr>-地址" msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway" -msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-网关" +msgstr "<abbr title=\"互联网协议第4版\">IPv4</abbr>-网关" msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask" -msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-子网掩码" +msgstr "<abbr title=\"互联网协议第4版\">IPv4</abbr>-子网掩码" msgid "" "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network " "(CIDR)" msgstr "" -"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-地址或超网() (<abbr " -"title=\"无类别域间路由\">CIDR</abbr>)" +"<abbr title=\"互联网协议第6版\">IPv6</abbr>-地址或超网(<abbr title=\"无类别域" +"间路由\">CIDR</abbr>)" msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway" -msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-网关" +msgstr "<abbr title=\"互联网协议第6版\">IPv6</abbr>-网关" msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Suffix (hex)" -msgstr "" -"<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-后缀（十六进制）" +msgstr "<abbr title=\"互联网协议第6版\">IPv6</abbr>-后缀（十六进制）" msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration" -msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>配置" +msgstr "<abbr title=\"发光二极管\">LED</abbr>配置" msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name" -msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>名称" +msgstr "<abbr title=\"发光二极管\">LED</abbr>名称" msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address" -msgstr "<abbr title=\"Media Access Control\">MAC</abbr>-地址" +msgstr "<abbr title=\"介质访问控制\">MAC</abbr>-地址" msgid "" "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration " "Protocol\">DHCP</abbr> leases" -msgstr "" -"最大<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>分配数量" +msgstr "最大<abbr title=\"动态主机配置协议\">DHCP</abbr>分配数量" msgid "" "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for " "Domain Name System\">EDNS0</abbr> packet size" -msgstr "最大<abbr title=\"DNS扩展名\">EDNS0</abbr>数据包大小" +msgstr "最大<abbr title=\"DNS扩展名机制\">EDNS0</abbr>数据包大小" msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries" -msgstr "<abbr title=\"maximal\">最大</abbr>并发查询数" +msgstr "最大并发查询数" msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" msgid "A43C + J43 + A43" -msgstr "" +msgstr "A43C + J43 + A43" msgid "A43C + J43 + A43 + V43" -msgstr "" +msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" msgid "AICCU (SIXXS)" -msgstr "" +msgstr "AICCU (SIXXS)" msgid "ANSI T1.413" -msgstr "" +msgstr "ANSI T1.413" msgid "APN" msgstr "APN" @@ -146,7 +144,7 @@ msgid "ARP retry threshold" msgstr "ARP重试阈值" msgid "ATM (Asynchronous Transfer Mode)" -msgstr "" +msgstr "ATM(异步传输模式)" msgid "ATM Bridges" msgstr "ATM桥接" @@ -169,10 +167,10 @@ msgid "ATM device number" msgstr "ATM设备号码" msgid "ATU-C System Vendor ID" -msgstr "" +msgstr "ATU-C系统供应商ID" msgid "AYIYA" -msgstr "" +msgstr "AYIYA" msgid "Access Concentrator" msgstr "接入集中器" @@ -190,10 +188,10 @@ msgid "Activate this network" msgstr "激活此网络" msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes" -msgstr "活动的<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-链路" +msgstr "活动的<abbr title=\"互联网协议第4版\">IPv4</abbr>-链路" msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes" -msgstr "活动的<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-链路" +msgstr "活动的<abbr title=\"互联网协议第6版\">IPv6</abbr>-链路" msgid "Active Connections" msgstr "活动连接" @@ -220,7 +218,7 @@ msgid "Additional Hosts files" msgstr "额外的HOSTS文件" msgid "Additional servers file" -msgstr "" +msgstr "额外的SERVERS文件" msgid "Address" msgstr "地址" @@ -235,7 +233,7 @@ msgid "Advanced Settings" msgstr "高级设置" msgid "Aggregate Transmit Power(ACTATP)" -msgstr "" +msgstr "总发射功率(ACTATP)" msgid "Alert" msgstr "警戒" @@ -243,13 +241,13 @@ msgstr "警戒" msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" -msgstr "" +msgstr "从最低可用地址开始顺序分配IP地址" msgid "Allocate IP sequentially" -msgstr "" +msgstr "顺序分配IP" msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication" -msgstr "允许<abbr title=\"Secure Shell\">SSH</abbr>密码验证" +msgstr "允许<abbr title=\"安全外壳协议\">SSH</abbr>密码验证" msgid "Allow all except listed" msgstr "仅允许列表外" @@ -264,7 +262,7 @@ msgid "Allow remote hosts to connect to local SSH forwarded ports" msgstr "允许远程主机连接到本地SSH转发端口" msgid "Allow root logins with password" -msgstr "root权限登录" +msgstr "允许root用户凭密码登录" msgid "Allow the <em>root</em> user to login with password" msgstr "允许<em>root</em>用户凭密码登录" @@ -274,68 +272,65 @@ msgid "" msgstr "允许127.0.0.0/8回环范围内的上行响应，例如：RBL服务" msgid "Allowed IPs" -msgstr "" +msgstr "允许的IP" msgid "" "Also see <a href=\"https://www.sixxs.net/faq/connectivity/?faq=comparison" "\">Tunneling Comparison</a> on SIXXS" msgstr "" "也请查看SIXXS上的<a href=\"https://www.sixxs.net/faq/connectivity/?" -"faq=comparison\">Tunneling Comparison</a> " +"faq=comparison\">隧道对比</a>" msgid "Always announce default router" msgstr "总是广播默认路由" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" -msgstr "" +msgstr "Annex" msgid "Annex A + L + M (all)" -msgstr "" +msgstr "Annex A + L + M (全部)" msgid "Annex A G.992.1" -msgstr "" +msgstr "Annex A G.992.1" msgid "Annex A G.992.2" -msgstr "" +msgstr "Annex A G.992.2" msgid "Annex A G.992.3" -msgstr "" +msgstr "Annex A G.992.3" msgid "Annex A G.992.5" -msgstr "" +msgstr "Annex A G.992.5" msgid "Annex B (all)" -msgstr "" +msgstr "Annex B (全部)" msgid "Annex B G.992.1" -msgstr "" +msgstr "Annex B G.992.1" msgid "Annex B G.992.3" -msgstr "" +msgstr "Annex B G.992.3" msgid "Annex B G.992.5" -msgstr "" +msgstr "Annex B G.992.5" msgid "Annex J (all)" -msgstr "" +msgstr "Annex J (全部)" msgid "Annex L G.992.3 POTS 1" -msgstr "" +msgstr "Annex L G.992.3 POTS 1" msgid "Annex M (all)" -msgstr "" +msgstr "Annex M (全部)" msgid "Annex M G.992.3" -msgstr "" +msgstr "Annex M G.992.3" msgid "Annex M G.992.5" -msgstr "" +msgstr "Annex M G.992.5" msgid "Announce as default router even if no public prefix is available." -msgstr "即使没有可用的公共前缀也广播默认路由" +msgstr "即使没有可用的公共前缀也广播默认路由。" msgid "Announced DNS domains" msgstr "广播的DNS域名" @@ -344,7 +339,7 @@ msgid "Announced DNS servers" msgstr "广播的DNS服务器" msgid "Anonymous Identity" -msgstr "" +msgstr "匿名身份" msgid "Anonymous Mount" msgstr "自动挂载未配置的磁盘分区" @@ -379,7 +374,7 @@ msgstr "分配接口..." msgid "" "Assign prefix parts using this hexadecimal subprefix ID for this interface." -msgstr "" +msgstr "指定此接口使用的十六进制子ID前缀部分" msgid "Associated Stations" msgstr "已连接站点" @@ -388,7 +383,7 @@ msgid "Atheros 802.11%s Wireless Controller" msgstr "Qualcomm/Atheros 802.11%s 无线网卡" msgid "Auth Group" -msgstr "" +msgstr "认证组" msgid "AuthGroup" msgstr "认证组" @@ -396,6 +391,9 @@ msgstr "认证组" msgid "Authentication" msgstr "认证" +msgid "Authentication Type" +msgstr "认证类型" + msgid "Authoritative" msgstr "授权的唯一DHCP服务器" @@ -415,10 +413,10 @@ msgid "Automatically check filesystem for errors before mounting" msgstr "在挂载前自动检查文件系统错误" msgid "Automatically mount filesystems on hotplug" -msgstr "通过hotplug自动挂载磁盘" +msgstr "通过Hotplug自动挂载磁盘" msgid "Automatically mount swap on hotplug" -msgstr "通过hotplug自动挂载Swap分区" +msgstr "通过Hotplug自动挂载Swap分区" msgid "Automount Filesystem" msgstr "自动挂载磁盘" @@ -436,13 +434,13 @@ msgid "Average:" msgstr "平均:" msgid "B43 + B43C" -msgstr "" +msgstr "B43 + B43C" msgid "B43 + B43C + V43" -msgstr "" +msgstr "B43 + B43C + V43" msgid "BR / DMR / AFTR" -msgstr "" +msgstr "BR / DMR / AFTR" msgid "BSSID" msgstr "BSSID" @@ -492,13 +490,13 @@ msgstr "" "备份文件。" msgid "Bind interface" -msgstr "" +msgstr "绑定接口" msgid "Bind only to specific interfaces rather than wildcard address." -msgstr "" +msgstr "仅绑定到特定接口，而不是全部地址。" msgid "Bind the tunnel to this interface (optional)." -msgstr "" +msgstr "将隧道绑定到此接口(可选)。" msgid "Bitrate" msgstr "传输速率" @@ -536,7 +534,7 @@ msgid "Buttons" msgstr "按键" msgid "CA certificate; if empty it will be saved after the first connection." -msgstr "CA证书.如果留空的话证书将在第一次连接时被保存." +msgstr "CA证书，如果留空的话证书将在第一次连接时被保存。" msgid "CPU usage (%)" msgstr "CPU使用率(%)" @@ -568,6 +566,9 @@ msgstr "检查" msgid "Check fileystems before mount" msgstr "在挂载前检查文件系统" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "校验值" @@ -587,7 +588,7 @@ msgid "Cipher" msgstr "算法" msgid "Cisco UDP encapsulation" -msgstr "" +msgstr "Cisco UDP封装" msgid "" "Click \"Generate archive\" to download a tar archive of the current " @@ -693,7 +694,7 @@ msgstr "自定义的软件源" msgid "" "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode" "\">LED</abbr>s if possible." -msgstr "自定义<abbr title=\"Light Emitting Diode\">LED</abbr>的活动状态。" +msgstr "自定义<abbr title=\"发光二极管\">LED</abbr>的活动状态。" msgid "DHCP Leases" msgstr "DHCP分配" @@ -729,34 +730,34 @@ msgid "DNS forwardings" msgstr "DNS转发" msgid "DNS-Label / FQDN" -msgstr "" +msgstr "DNS-Label / FQDN" msgid "DNSSEC" -msgstr "" +msgstr "DNSSEC" msgid "DNSSEC check unsigned" -msgstr "" +msgstr "DNSSEC未签名检查" msgid "DPD Idle Timeout" -msgstr "" +msgstr "DPD空闲超时" msgid "DS-Lite AFTR address" -msgstr "" +msgstr "DS-Lite AFTR地址" msgid "DSL" -msgstr "" +msgstr "DSL" msgid "DSL Status" -msgstr "" +msgstr "DSL状态" msgid "DSL line mode" -msgstr "" +msgstr "DSL线路模式" msgid "DUID" -msgstr "DUID（DHCP唯一标识符）" +msgstr "DUID (DHCP唯一标识符)" msgid "Data Rate" -msgstr "" +msgstr "数据速率" msgid "Debug" msgstr "调试" @@ -768,7 +769,7 @@ msgid "Default gateway" msgstr "默认网关" msgid "Default is stateless + stateful" -msgstr "" +msgstr "默认是无状态 + 有状态" msgid "Default route" msgstr "默认路由" @@ -829,17 +830,16 @@ msgstr "禁用" msgid "" "Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " "this interface." -msgstr "" -"禁用本接口的<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>。" +msgstr "禁用本接口的<abbr title=\"动态主机配置协议\">DHCP</abbr>。" msgid "Disable DNS setup" msgstr "停用DNS设定" msgid "Disable Encryption" -msgstr "" +msgstr "禁用加密" msgid "Disable HW-Beacon timer" -msgstr "停用 HW-Beacon 计时器" +msgstr "停用HW-Beacon计时器" msgid "Disabled" msgstr "禁用" @@ -888,7 +888,7 @@ msgid "Domain whitelist" msgstr "域名白名单" msgid "Don't Fragment" -msgstr "" +msgstr "禁止碎片" msgid "" "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without " @@ -908,14 +908,14 @@ msgid "" "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access " "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server" msgstr "" -"Dropbear提供了集成的<abbr title=\"Secure Copy\">SCP</abbr>服务器和基于<abbr " -"title=\"Secure Shell\">SSH</abbr>的shell访问" +"Dropbear提供了集成的<abbr title=\"安全复制\">SCP</abbr>服务器和基于<abbr " +"title=\"安全外壳协议\">SSH</abbr>的Shell访问" msgid "Dual-Stack Lite (RFC6333)" -msgstr "" +msgstr "Dual-Stack Lite (RFC6333)" msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" -msgstr "动态<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>" +msgstr "动态<abbr title=\"动态主机配置协议\">DHCP</abbr>" msgid "Dynamic tunnel" msgstr "动态隧道" @@ -926,10 +926,10 @@ msgid "" msgstr "动态分配DHCP地址。如果禁用，则只能为静态租用表中的客户端提供网络服务。" msgid "EA-bits length" -msgstr "" +msgstr "EA位长度" msgid "EAP-Method" -msgstr "EAP-Method" +msgstr "EAP类型" msgid "Edit" msgstr "修改" @@ -952,11 +952,14 @@ msgid "Enable" msgstr "启用" msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>" -msgstr "开启<abbr title=\"Spanning Tree Protocol\">STP</abbr>" +msgstr "开启<abbr title=\"生成树协议\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "启用HE.net动态终端更新" +msgid "Enable IPv6 negotiation" +msgstr "启用IPv6协商" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "在PPP链路上启用IPv6协商" @@ -967,7 +970,7 @@ msgid "Enable NTP client" msgstr "启用NTP客户端" msgid "Enable Single DES" -msgstr "" +msgstr "启用单个DES" msgid "Enable TFTP server" msgstr "启用TFTP服务器" @@ -976,7 +979,7 @@ msgid "Enable VLAN functionality" msgstr "启用VLAN" msgid "Enable WPS pushbutton, requires WPA(2)-PSK" -msgstr "启用WPS按键配置.要求使用WPA(2)-PSK" +msgstr "启用WPS按键配置，要求使用WPA(2)-PSK" msgid "Enable learning and aging" msgstr "启用智能交换学习" @@ -988,7 +991,7 @@ msgid "Enable mirroring of outgoing packets" msgstr "启用流出数据包镜像" msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." -msgstr "" +msgstr "启用封装数据包的DF(禁止碎片)标志。" msgid "Enable this mount" msgstr "启用挂载点" @@ -1012,10 +1015,10 @@ msgid "Encryption" msgstr "加密" msgid "Endpoint Host" -msgstr "" +msgstr "端点主机" msgid "Endpoint Port" -msgstr "" +msgstr "端点端口" msgid "Erasing..." msgstr "擦除中..." @@ -1024,7 +1027,7 @@ msgid "Error" msgstr "错误" msgid "Errored seconds (ES)" -msgstr "" +msgstr "错误秒数(ES)" msgid "Ethernet Adapter" msgstr "以太网适配器" @@ -1033,7 +1036,7 @@ msgid "Ethernet Switch" msgstr "以太网交换机" msgid "Exclude interfaces" -msgstr "" +msgstr "排除接口" msgid "Expand hosts" msgstr "扩展HOSTS文件中的主机后缀" @@ -1041,22 +1044,21 @@ msgstr "扩展HOSTS文件中的主机后缀" msgid "Expires" msgstr "到期时间" -#, fuzzy msgid "" "Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)." -msgstr "地址租期，最小2分钟(<code>2m</code>)。" +msgstr "租用地址的到期时间，最短2分钟(<code>2m</code>)。" msgid "External" -msgstr "" +msgstr "远程" msgid "External system log server" -msgstr "远程log服务器" +msgstr "远程日志服务器" msgid "External system log server port" -msgstr "远程log服务器端口" +msgstr "远程日志服务器端口" msgid "External system log server protocol" -msgstr "" +msgstr "远程日志服务器协议" msgid "Extra SSH command options" msgstr "额外的SSH命令选项" @@ -1108,7 +1110,7 @@ msgid "Firewall Status" msgstr "防火墙状态" msgid "Firmware File" -msgstr "" +msgstr "固件文件" msgid "Firmware Version" msgstr "固件版本" @@ -1147,16 +1149,16 @@ msgid "Force TKIP and CCMP (AES)" msgstr "TKIP和CCMP(AES)混合加密" msgid "Force use of NAT-T" -msgstr "" +msgstr "强制使用NAT-T" msgid "Form token mismatch" -msgstr "" +msgstr "表单令牌不匹配" msgid "Forward DHCP traffic" msgstr "转发DHCP数据包" msgid "Forward Error Correction Seconds (FECS)" -msgstr "" +msgstr "前向纠错秒数(FECS)" msgid "Forward broadcast traffic" msgstr "转发广播数据包" @@ -1180,6 +1182,8 @@ msgid "" "Further information about WireGuard interfaces and peers at <a href=\"http://" "wireguard.io\">wireguard.io</a>." msgstr "" +"有关WireGuard接口和Peer的更多信息：<a href=\"http://wireguard.io\">wireguard." +"io</a>" msgid "GHz" msgstr "GHz" @@ -1200,7 +1204,7 @@ msgid "General Setup" msgstr "基本设置" msgid "General options for opkg" -msgstr "opkg基础配置" +msgstr "Opkg基础配置" msgid "Generate Config" msgstr "生成配置" @@ -1227,7 +1231,7 @@ msgid "Go to relevant configuration page" msgstr "跳转到相关的配置页面" msgid "Group Password" -msgstr "" +msgstr "组密码" msgid "Guest" msgstr "访客" @@ -1239,7 +1243,7 @@ msgid "HE.net username" msgstr "HE.net用户名" msgid "HT mode (802.11n)" -msgstr "" +msgstr "HT模式(802.11n)" msgid "Handler" msgstr "处理程序" @@ -1248,7 +1252,7 @@ msgid "Hang Up" msgstr "挂起" msgid "Header Error Code Errors (HEC)" -msgstr "" +msgstr "头错误代码错误(HEC)" msgid "Heartbeat" msgstr "心跳" @@ -1267,10 +1271,10 @@ msgid "Hermes 802.11b Wireless Controller" msgstr "Hermes 802.11b 无线网卡" msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" -msgstr "隐藏<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>" +msgstr "隐藏<abbr title=\"扩展服务集标识符\">ESSID</abbr>" msgid "Host" -msgstr "" +msgstr "主机" msgid "Host entries" msgstr "主机目录" @@ -1294,7 +1298,7 @@ msgid "Hybrid" msgstr "混合" msgid "IKE DH Group" -msgstr "" +msgstr "IKE DH组" msgid "IP address" msgstr "IP地址" @@ -1339,7 +1343,7 @@ msgid "IPv4-Address" msgstr "IPv4-地址" msgid "IPv4-in-IPv4 (RFC2003)" -msgstr "" +msgstr "IPv4-in-IPv4 (RFC2003)" msgid "IPv6" msgstr "IPv6" @@ -1366,7 +1370,7 @@ msgid "IPv6 address delegated to the local tunnel endpoint (optional)" msgstr "绑定到本地隧道终点的IPv6地址(可选)" msgid "IPv6 assignment hint" -msgstr "" +msgstr "IPv6分配提示" msgid "IPv6 assignment length" msgstr "IPv6分配长度" @@ -1402,10 +1406,10 @@ msgid "Identity" msgstr "鉴权" msgid "If checked, 1DES is enaled" -msgstr "" +msgstr "选中以启用1DES" msgid "If checked, encryption is disabled" -msgstr "" +msgstr "选中以禁用加密" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" @@ -1449,12 +1453,14 @@ msgid "" "In order to prevent unauthorized access to the system, your request has been " "blocked. Click \"Continue »\" below to return to the previous page." msgstr "" +"为了防止对系统的未授权访问，您的请求已被阻止。点击下面的 “继续 »” 来返回上一" +"页。" msgid "Inactivity timeout" msgstr "活动超时" msgid "Inbound:" -msgstr "入站:" +msgstr "入站：" msgid "Info" msgstr "信息" @@ -1469,10 +1475,10 @@ msgid "Install" msgstr "安装" msgid "Install iputils-traceroute6 for IPv6 traceroute" -msgstr "安装iputils-traceroute6以进行IPv6 traceroute" +msgstr "安装 iputils-traceroute6 以进行IPv6 traceroute" msgid "Install package %q" -msgstr "安装软件包%q" +msgstr "安装软件包 %q" msgid "Install protocol extensions..." msgstr "安装扩展协议..." @@ -1496,10 +1502,10 @@ msgid "Interface is shutting down..." msgstr "正在关闭接口..." msgid "Interface name" -msgstr "" +msgstr "接口名称" msgid "Interface not present or not connected yet." -msgstr "接口不存在或未连接" +msgstr "接口不存在或未连接。" msgid "Interface reconnected" msgstr "接口已重新连接" @@ -1511,7 +1517,7 @@ msgid "Interfaces" msgstr "接口" msgid "Internal" -msgstr "" +msgstr "内部" msgid "Internal Server Error" msgstr "内部服务器错误" @@ -1520,19 +1526,18 @@ msgid "Invalid" msgstr "无效" msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed." -msgstr "无效的VLAN ID! 只有 %d 和 %d 之间的ID有效。" +msgstr "无效的VLAN ID！只有 %d 和 %d 之间的ID有效。" msgid "Invalid VLAN ID given! Only unique IDs are allowed" -msgstr "无效的VLAN ID! 只允许唯一的ID。" +msgstr "无效的VLAN ID！只允许唯一的ID。" msgid "Invalid username and/or password! Please try again." -msgstr "无效的用户名和/或密码! 请重试。" +msgstr "无效的用户名和/或密码！请重试。" -#, fuzzy msgid "" "It appears that you are trying to flash an image that does not fit into the " "flash memory, please verify the image file!" -msgstr "将要刷新的固件与本路由器不兼容，请重新验证固件文件。" +msgstr "你尝试刷写的固件与本路由器不兼容，请重新验证固件文件。" msgid "Java Script required!" msgstr "需要Java Script！" @@ -1541,10 +1546,10 @@ msgid "Join Network" msgstr "加入网络" msgid "Join Network: Wireless Scan" -msgstr "加入网络:搜索无线" +msgstr "加入网络：搜索无线" msgid "Joining Network: %q" -msgstr "" +msgstr "加入网络：%q" msgid "Keep settings" msgstr "保留配置" @@ -1589,13 +1594,13 @@ msgid "Language and Style" msgstr "语言和界面" msgid "Latency" -msgstr "" +msgstr "延迟" msgid "Leaf" -msgstr "叶子" +msgstr "叶状" msgid "Lease time" -msgstr "" +msgstr "租期" msgid "Lease validity time" msgstr "有效租期" @@ -1622,22 +1627,22 @@ msgid "Limit" msgstr "客户数" msgid "Limit DNS service to subnets interfaces on which we are serving DNS." -msgstr "" +msgstr "将DNS服务限制到我们提供DNS的子网接口。" msgid "Limit listening to these interfaces, and loopback." -msgstr "" +msgstr "仅监听这些接口和环回接口。" msgid "Line Attenuation (LATN)" -msgstr "" +msgstr "线路衰减(LATN)" msgid "Line Mode" -msgstr "" +msgstr "线路模式" msgid "Line State" msgstr "线路状态" msgid "Line Uptime" -msgstr "" +msgstr "线路运行时间" msgid "Link On" msgstr "活动链接" @@ -1648,7 +1653,7 @@ msgid "" msgstr "将指定的域名DNS解析转发到指定的DNS服务器（按照示例填写）" msgid "List of SSH key files for auth" -msgstr "" +msgstr "用于认证的SSH密钥文件列表" msgid "List of domains to allow RFC1918 responses for" msgstr "允许RFC1918响应的域名列表" @@ -1657,10 +1662,10 @@ msgid "List of hosts that supply bogus NX domain results" msgstr "允许虚假空域名响应的服务器列表" msgid "Listen Interfaces" -msgstr "" +msgstr "监听接口" msgid "Listen Port" -msgstr "" +msgstr "监听端口" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "监听指定的接口；未指定则监听全部" @@ -1678,7 +1683,7 @@ msgid "Loading" msgstr "加载中" msgid "Local IP address to assign" -msgstr "" +msgstr "要分配的本地IP地址" msgid "Local IPv4 address" msgstr "本地IPv4地址" @@ -1687,7 +1692,7 @@ msgid "Local IPv6 address" msgstr "本地IPv6地址" msgid "Local Service Only" -msgstr "" +msgstr "仅本地服务" msgid "Local Startup" msgstr "本地启动脚本" @@ -1698,11 +1703,10 @@ msgstr "本地时间" msgid "Local domain" msgstr "本地域名" -#, fuzzy msgid "" "Local domain specification. Names matching this domain are never forwarded " "and are resolved from DHCP or hosts files only" -msgstr "本地域名规则。从不转发和处理只源自DHCP或HOSTS文件的本地域名数据" +msgstr "本地域名规则。与此域匹配的名称从不转发，仅从DHCP或HOSTS文件解析" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "本地域名后缀将添加到DHCP和HOSTS文件条目" @@ -1719,7 +1723,7 @@ msgid "Localise queries" msgstr "本地化查询" msgid "Locked to channel %s used by: %s" -msgstr "信道道已被锁定为 %s,因为该信道被 %s 使用" +msgstr "信道道已被锁定为 %s，因为该信道被 %s 使用" msgid "Log output level" msgstr "日志记录等级" @@ -1737,7 +1741,7 @@ msgid "Logout" msgstr "退出" msgid "Loss of Signal Seconds (LOSS)" -msgstr "" +msgstr "信号丢失秒数(LOSS)" msgid "Lowest leased address as offset from the network address." msgstr "网络地址的起始分配基址。" @@ -1755,13 +1759,13 @@ msgid "MAC-List" msgstr "MAC-列表" msgid "MAP / LW4over6" -msgstr "" +msgstr "MAP / LW4over6" msgid "MB/s" msgstr "MB/s" msgid "MD5" -msgstr "" +msgstr "MD5" msgid "MHz" msgstr "MHz" @@ -1772,13 +1776,13 @@ msgstr "MTU" msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" -msgstr "请确认你已经复制过整个根文件系统,例如使用以下命令:" +msgstr "请确认你已经复制过整个根文件系统,例如使用以下命令：" msgid "Manual" -msgstr "" +msgstr "手动" msgid "Max. Attainable Data Rate (ATTNDR)" -msgstr "" +msgstr "最大可达数据速率(ATTNDR)" msgid "Maximum Rate" msgstr "最高速率" @@ -1790,7 +1794,7 @@ msgid "Maximum allowed number of concurrent DNS queries" msgstr "允许的最大并发DNS查询数" msgid "Maximum allowed size of EDNS.0 UDP packets" -msgstr "允许的最大EDNS.0 UDP报文大小" +msgstr "允许的最大EDNS.0 UDP数据包大小" msgid "Maximum amount of seconds to wait for the modem to become ready" msgstr "调制解调器就绪的最大等待时间(秒)" @@ -1802,6 +1806,7 @@ msgid "" "Maximum length of the name is 15 characters including the automatic protocol/" "bridge prefix (br-, 6in4-, pppoe- etc.)" msgstr "" +"名称的最大长度为15个字符，包括自动协议/网桥前缀(br-, 6in4-, pppoe- 等等)" msgid "Maximum number of leased addresses." msgstr "最大地址分配数量。" @@ -1831,7 +1836,7 @@ msgid "Mirror source port" msgstr "数据包镜像源端口" msgid "Missing protocol extension for proto %q" -msgstr "缺少协议%q的协议扩展" +msgstr "缺少协议 %q 的协议扩展" msgid "Mode" msgstr "模式" @@ -1899,16 +1904,16 @@ msgid "NAS ID" msgstr "NAS ID" msgid "NAT-T Mode" -msgstr "" +msgstr "NAT-T模式" msgid "NAT64 Prefix" -msgstr "" +msgstr "NAT64前缀" msgid "NDP-Proxy" msgstr "NDP-代理" msgid "NT Domain" -msgstr "" +msgstr "NT域" msgid "NTP server candidates" msgstr "候选NTP服务器" @@ -1950,7 +1955,7 @@ msgid "No DHCP Server configured for this interface" msgstr "本接口未配置DHCP服务器" msgid "No NAT-T" -msgstr "" +msgstr "无NAT-T" msgid "No chains in this table" msgstr "本表中没有链" @@ -1986,16 +1991,16 @@ msgid "Noise" msgstr "噪声" msgid "Noise Margin (SNR)" -msgstr "" +msgstr "噪声容限(SNR)" msgid "Noise:" msgstr "噪声:" msgid "Non Pre-emtive CRC errors (CRC_P)" -msgstr "" +msgstr "非抢占CRC错误(CRC_P)" msgid "Non-wildcard" -msgstr "" +msgstr "非通配符" msgid "None" msgstr "无" @@ -2016,7 +2021,7 @@ msgid "Note: Configuration files will be erased." msgstr "注意：配置文件将被删除。" msgid "Note: interface name length" -msgstr "" +msgstr "注意：接口名称长度" msgid "Notice" msgstr "注意" @@ -2025,7 +2030,7 @@ msgid "Nslookup" msgstr "Nslookup" msgid "OK" -msgstr "OK" +msgstr "确认" msgid "OPKG-Configuration" msgstr "OPKG-配置" @@ -2058,7 +2063,7 @@ msgid "One or more fields contain invalid values!" msgstr "一个或多个选项值有误！" msgid "One or more invalid/required values on tab" -msgstr "" +msgstr "选项卡上存在一个或多个无效/必需值" msgid "One or more required fields have no value!" msgstr "一个或多个必选项值为空！" @@ -2067,7 +2072,7 @@ msgid "Open list..." msgstr "打开列表..." msgid "OpenConnect (CISCO AnyConnect)" -msgstr "" +msgstr "开放连接(CISCO AnyConnect)" msgid "Operating frequency" msgstr "工作频率" @@ -2079,13 +2084,13 @@ msgid "Option removed" msgstr "移除的选项" msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "可选,设置这个选项会覆盖默认设定的服务器(tic.sixxs.net)" +msgstr "可选，设置这个选项会覆盖默认设定的服务器(tic.sixxs.net)" msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "可选,如果你的SIXXS账号拥有一个以上的隧道请设置此项." +msgstr "可选，如果你的SIXXS账号拥有一个以上的隧道请设置此项." msgid "Optional." -msgstr "" +msgstr "可选" msgid "" "Optional. Adds in an additional layer of symmetric-key cryptography for post-" @@ -2093,7 +2098,7 @@ msgid "" msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." -msgstr "" +msgstr "可选，为此Peer创建允许IP的路由。" msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " @@ -2101,30 +2106,32 @@ msgid "" msgstr "" msgid "Optional. Maximum Transmission Unit of tunnel interface." -msgstr "" +msgstr "可选，隧道接口的最大传输单元。" msgid "Optional. Port of peer." -msgstr "" +msgstr "可选，Peer的端口。" msgid "" "Optional. Seconds between keep alive messages. Default is 0 (disabled). " "Recommended value if this device is behind a NAT is 25." msgstr "" +"可选，Keep-Alive消息之间的秒数，默认为0(禁用)。如果此设备位于NAT之后，建议使" +"用的值为25。" msgid "Optional. UDP port used for outgoing and incoming packets." -msgstr "" +msgstr "可选，用于传出和传入数据包的UDP端口。" msgid "Options" msgstr "选项" msgid "Other:" -msgstr "其余:" +msgstr "其余：" msgid "Out" msgstr "出口" msgid "Outbound:" -msgstr "出站:" +msgstr "出站：" msgid "Outdoor Channels" msgstr "户外频道" @@ -2136,24 +2143,24 @@ msgid "Override MAC address" msgstr "克隆MAC地址" msgid "Override MTU" -msgstr "设置MTU" +msgstr "更新MTU" msgid "Override TOS" -msgstr "" +msgstr "更新TOS" msgid "Override TTL" -msgstr "" +msgstr "更新TTL" msgid "Override default interface name" -msgstr "" +msgstr "更新默认接口名称" msgid "Override the gateway in DHCP responses" -msgstr "更新网关" +msgstr "更新DHCP响应网关" msgid "" "Override the netmask sent to clients. Normally it is calculated from the " "subnet that is served." -msgstr "更新子网掩码。" +msgstr "更新发送到客户端的子网掩码。" msgid "Override the table used for internal routes" msgstr "更新内部路由表" @@ -2189,22 +2196,22 @@ msgid "PPPoE" msgstr "PPPoE" msgid "PPPoSSH" -msgstr "" +msgstr "PPPoSSH" msgid "PPtP" msgstr "PPtP" msgid "PSID offset" -msgstr "" +msgstr "PSID偏移" msgid "PSID-bits length" -msgstr "" +msgstr "PSID位长度" msgid "PTM/EFM (Packet Transfer Mode)" -msgstr "" +msgstr "PTM/EFM(分组传输模式)" msgid "Package libiwinfo required!" -msgstr "需要libiwinfo软件包！" +msgstr "需要 libiwinfo 软件包！" msgid "Package lists are older than 24 hours" msgstr "软件包列表已超过24小时未更新" @@ -2228,7 +2235,7 @@ msgid "Password of Private Key" msgstr "私有密钥" msgid "Password of inner Private Key" -msgstr "" +msgstr "内部私钥的密码" msgid "Password successfully changed!" msgstr "密码修改成功！" @@ -2246,25 +2253,25 @@ msgid "Path to executable which handles the button event" msgstr "处理按键动作的可执行文件路径" msgid "Path to inner CA-Certificate" -msgstr "" +msgstr "内部CA证书的路径" msgid "Path to inner Client-Certificate" -msgstr "" +msgstr "内部客户端证书的路径" msgid "Path to inner Private Key" -msgstr "" +msgstr "内部私钥的路径" msgid "Peak:" msgstr "峰值:" msgid "Peer IP address to assign" -msgstr "" +msgstr "要分配的Peer IP地址" msgid "Peers" -msgstr "" +msgstr "Peers" msgid "Perfect Forward Secrecy" -msgstr "" +msgstr "完全正向保密" msgid "Perform reboot" msgstr "执行重启" @@ -2273,7 +2280,7 @@ msgid "Perform reset" msgstr "执行复位" msgid "Persistent Keep Alive" -msgstr "" +msgstr "持续Keep-Alive" msgid "Phy Rate:" msgstr "物理速率:" @@ -2300,13 +2307,13 @@ msgid "Port status:" msgstr "端口状态：" msgid "Power Management Mode" -msgstr "" +msgstr "电源管理模式" msgid "Pre-emtive CRC errors (CRCP_P)" -msgstr "" +msgstr "抢占式CRC错误(CRCP_P)" msgid "Preshared Key" -msgstr "" +msgstr "预共享密钥" msgid "" "Presume peer to be dead after given amount of LCP echo failures, use 0 to " @@ -2314,7 +2321,7 @@ msgid "" msgstr "在指定数量的LCP响应故障后假定链路已断开，0为忽略故障" msgid "Prevent listening on these interfaces." -msgstr "" +msgstr "防止监听这些接口。" msgid "Prevents client-to-client communication" msgstr "禁止客户端间通信" @@ -2323,7 +2330,7 @@ msgid "Prism2/2.5/3 802.11b Wireless Controller" msgstr "Prism2/2.5/3 802.11b 无线网卡" msgid "Private Key" -msgstr "" +msgstr "私钥" msgid "Proceed" msgstr "执行" @@ -2332,7 +2339,7 @@ msgid "Processes" msgstr "系统进程" msgid "Profile" -msgstr "" +msgstr "配置文件" msgid "Prot." msgstr "协议" @@ -2359,16 +2366,19 @@ msgid "Pseudo Ad-Hoc (ahdemo)" msgstr "伪装Ad-Hoc(ahdemo)" msgid "Public Key" -msgstr "" +msgstr "公钥" msgid "Public prefix routed to this device for distribution to clients." -msgstr "" +msgstr "分配到此设备的公共前缀，用以分发到客户端。" + +msgid "QMI Cellular" +msgstr "QMI蜂窝" msgid "Quality" msgstr "质量" msgid "RFC3947 NAT-T mode" -msgstr "" +msgstr "RFC3947 NAT-T模式" msgid "RTS/CTS Threshold" msgstr "RTS/CTS阈值" @@ -2411,33 +2421,31 @@ msgid "" "Really delete this interface? The deletion cannot be undone!\\nYou might " "lose access to this device if you are connected via this interface." msgstr "" -"确定要删除此接口？删除操作无法撤销！\\\n" -"删除此接口，可能导致无法再访问路由器！" +"确定要删除此接口？删除操作无法撤销！\\n删除此接口，可能导致无法再访问路由器！" msgid "" "Really delete this wireless network? The deletion cannot be undone!\\nYou " "might lose access to this device if you are connected via this network." msgstr "" -"确定要删除此无线网络？删除操作无法撤销！\\\n" -"删除此无线网络，可能导致无法再访问路由器！" +"确定要删除此无线网络？删除操作无法撤销！\\n删除此无线网络，可能导致无法再访问" +"路由器！" msgid "Really reset all changes?" msgstr "确定要放弃所有更改？" -#, fuzzy msgid "" "Really shut down network?\\nYou might lose access to this device if you are " "connected via this interface." msgstr "" -"确定要关闭此网络？\\\n" -"关闭此网络，可能导致无法再访问路由器！" +"确定要关闭此网络？\\n如果你正在使用此接口连接路由器，关闭此网络可能导致连接断" +"开！" msgid "" "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " "you are connected via this interface." msgstr "" -"确定要关闭接口\"%s\" ？\\\n" -"删除此网络，可能导致无法再访问路由器！" +"确定要关闭接口 \"%s\"？\\n如果你正在使用此接口连接路由器，关闭此网络可能导致" +"连接断开！" msgid "Really switch protocol?" msgstr "确定要切换协议？" @@ -2503,7 +2511,7 @@ msgid "Remote IPv4 address" msgstr "远程IPv4地址" msgid "Remote IPv4 address or FQDN" -msgstr "" +msgstr "远程IPv4地址或FQDN" msgid "Remove" msgstr "移除" @@ -2527,24 +2535,26 @@ msgid "Require TLS" msgstr "必须使用TLS" msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" -msgstr "某些ISP需要，例如:同轴线网络DOCSIS 3" +msgstr "某些ISP需要，例如：同轴线网络DOCSIS 3" msgid "Required. Base64-encoded private key for this interface." -msgstr "" +msgstr "必须，此接口的Base64编码私钥。" msgid "" "Required. IP addresses and prefixes that this peer is allowed to use inside " "the tunnel. Usually the peer's tunnel IP addresses and the networks the peer " "routes through the tunnel." msgstr "" +"必须，允许该Peer在隧道中使用的IP地址和前缀，通常是该Peer的隧道IP地址和通过隧" +"道的路由网络。" msgid "Required. Public key of peer." -msgstr "" +msgstr "必须，Peer的公钥。" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " "come from unsigned domains" -msgstr "" +msgstr "需要上级支持DNSSEC，验证未签名的域响应确实是来自未签名的域。" msgid "Reset" msgstr "复位" @@ -2586,13 +2596,16 @@ msgid "Root preparation" msgstr "" msgid "Route Allowed IPs" -msgstr "" +msgstr "路由允许的IP" + +msgid "Route type" +msgstr "路由类型" msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" +msgstr "下行接口的路由IPv6前缀" msgid "Router Advertisement-Service" -msgstr "" +msgstr "路由器广告服务" msgid "Router Password" msgstr "主机密码" @@ -2612,18 +2625,18 @@ msgid "Run filesystem check" msgstr "文件系统检查" msgid "SHA256" -msgstr "" +msgstr "SHA256" msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" -msgstr "" +msgstr "SIXXS仅支持TIC，对于使用IP协议41(RFC4213)的静态隧道，使用6in4" msgid "SIXXS-handle[/Tunnel-ID]" msgstr "" msgid "SNR" -msgstr "" +msgstr "SNR" msgid "SSH Access" msgstr "SSH访问" @@ -2665,7 +2678,7 @@ msgid "Section removed" msgstr "移除的区域" msgid "See \"mount\" manpage for details" -msgstr "详参\"mount\"联机帮助" +msgstr "详参 \"mount\" 联机帮助" msgid "" "Send LCP echo requests at the given interval in seconds, only effective in " @@ -2701,7 +2714,6 @@ msgstr "服务类型" msgid "Services" msgstr "服务" -#, fuzzy msgid "Set up Time Synchronization" msgstr "设置时间同步" @@ -2709,7 +2721,7 @@ msgid "Setup DHCP Server" msgstr "配置DHCP服务器" msgid "Severely Errored Seconds (SES)" -msgstr "" +msgstr "严重误码秒(SES)" msgid "Short GI" msgstr "" @@ -2727,7 +2739,7 @@ msgid "Signal" msgstr "信号" msgid "Signal Attenuation (SATN)" -msgstr "" +msgstr "信号衰减(SATN)" msgid "Signal:" msgstr "信号:" @@ -2736,7 +2748,7 @@ msgid "Size" msgstr "大小" msgid "Size (.ipk)" -msgstr "" +msgstr "大小(.ipk)" msgid "Skip" msgstr "跳过" @@ -2770,7 +2782,7 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"抱歉，您的设备暂不支持sysupgrade升级，需手动更新固件。请参考Wiki中关于此设备" +"抱歉，您的设备暂不支持Sysupgrade升级，需手动更新固件。请参考Wiki中关于此设备" "的固件更新说明。" msgid "Sort" @@ -2802,17 +2814,17 @@ msgid "" msgstr "指定假设主机已丢失的最大时间(秒)" msgid "Specify a TOS (Type of Service)." -msgstr "" +msgstr "指定TOS(服务类型)。" msgid "" "Specify a TTL (Time to Live) for the encapsulating packet other than the " "default (64)." -msgstr "" +msgstr "为封装数据包设置TTL(生存时间)，缺省值：64" msgid "" "Specify an MTU (Maximum Transmission Unit) other than the default (1280 " "bytes)." -msgstr "" +msgstr "设置MTU(最大传输单位)，缺省值：1280 bytes" msgid "Specify the secret encryption key here." msgstr "在此指定密钥。" @@ -2866,10 +2878,10 @@ msgid "Submit" msgstr "提交" msgid "Suppress logging" -msgstr "" +msgstr "不记录日志" msgid "Suppress logging of the routine operation of these protocols" -msgstr "" +msgstr "不记录这些协议的常规操作日志。" msgid "Swap" msgstr "交换区" @@ -2884,14 +2896,14 @@ msgid "Switch %q" msgstr "交换机 %q" msgid "Switch %q (%s)" -msgstr "交换机%q (%s)" +msgstr "交换机 %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." -msgstr "" +msgstr "交换机 %q 具有未知的拓扑结构 - VLAN设置可能不正确。" msgid "Switch VLAN" -msgstr "" +msgstr "VLAN交换机" msgid "Switch protocol" msgstr "切换协议" @@ -2936,7 +2948,7 @@ msgid "Target" msgstr "对象" msgid "Target network" -msgstr "" +msgstr "目标网络" msgid "Terminate" msgstr "关闭" @@ -2965,7 +2977,7 @@ msgstr "HE.net客户端更新设置已经被改变,您现在必须使用用户 msgid "" "The IPv4 address or the fully-qualified domain name of the remote tunnel end." -msgstr "" +msgstr "远程隧道端的IPv4地址或完整域名。" msgid "" "The IPv6 prefix assigned to the provider, usually ends with <code>::</code>" @@ -2984,17 +2996,15 @@ msgstr "由于以下错误，配置文件无法被加载：" msgid "" "The device file of the memory or partition (<abbr title=\"for example\">e.g." "</abbr> <code>/dev/sda1</code>)" -msgstr "" -"存储器或分区的设备节点，(<abbr title=\"for example\">例如</abbr> <code>/dev/" -"sda1</code>)" +msgstr "存储器或分区的设备节点，(例如：<code>/dev/sda1</code>)" msgid "" "The filesystem that was used to format the memory (<abbr title=\"for example" "\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></" "samp>)" msgstr "" -"用于格式化存储器的文件系统，(<abbr title=\"for example\">例如</abbr> " -"<samp><abbr title=\"Third Extended Filesystem\">ext4</abbr></samp>)" +"用于格式化存储器的文件系统，(例如：<samp><abbr title=\"第三代扩展文件系统" +"\">ext3</abbr></samp>)" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " @@ -3014,11 +3024,10 @@ msgstr "系统中的活跃连接。" msgid "The given network name is not unique" msgstr "给定的网络名重复" -#, fuzzy msgid "" "The hardware is not multi-SSID capable and the existing configuration will " "be replaced if you proceed." -msgstr "本机的硬件不支持多SSID，继续进行将会覆盖现有配置。" +msgstr "本机的硬件不支持多SSID，如果继续，现有配置将被替换。" msgid "" "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 " @@ -3029,7 +3038,7 @@ msgid "The length of the IPv6 prefix in bits" msgstr "bit格式的IPv6前缀长度" msgid "The local IPv4 address over which the tunnel is created (optional)." -msgstr "" +msgstr "所创建隧道的本地IPv4地址(可选)。" msgid "" "The network ports on this device can be combined to several <abbr title=" @@ -3039,16 +3048,15 @@ msgid "" "segments. Often there is by default one Uplink port for a connection to the " "next greater network like the internet and other ports for a local network." msgstr "" -"本设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</abbr>，" -"并支持电脑间的直接通讯。<abbr title=\"Virtual Local Area Network\">VLAN</" -"abbr>也常用于分割不同网段。默认通常是一条上行端口连接ISP，其余端口为本地子" -"网。" +"本设备可以划分为多个<abbr title=\"虚拟局域网\">VLAN</abbr>，并支持电脑间的直" +"接通讯。<abbr title=\"虚拟局域网\">VLAN</abbr>也常用于分割不同网段。默认通常" +"是一条上行端口连接ISP，其余端口为本地子网。" msgid "The selected protocol needs a device assigned" msgstr "所选的协议需要分配设备" msgid "The submitted security token is invalid or already expired!" -msgstr "" +msgstr "提交的安全令牌无效或已过期！" msgid "" "The system is erasing the configuration partition now and will reboot itself " @@ -3067,7 +3075,7 @@ msgstr "" msgid "" "The tunnel end-point is behind NAT, defaults to disabled and only applies to " "AYIYA" -msgstr "" +msgstr "隧道端点在NAT之后，默认为禁用，仅适用于AYIYA" msgid "" "The uploaded image file does not contain a supported format. Make sure that " @@ -3089,7 +3097,7 @@ msgstr "没有待生效的更改！" msgid "" "There is no device assigned yet, please attach a network device in the " "\"Physical Settings\" tab" -msgstr "尚未分配设备，请在\"物理设置\"选项卡中选择网络设备" +msgstr "尚未分配设备，请在“物理设置”选项卡中选择网络设备" msgid "" "There is no password set on this router. Please configure a root password to " @@ -3104,6 +3112,8 @@ msgid "" "'server=1.2.3.4' fordomain-specific or full upstream <abbr title=\"Domain " "Name System\">DNS</abbr> servers." msgstr "" +"此文件可能包含类似'server=/domain/1.2.3.4'或'server=1.2.3.4'的行，来解析特定" +"域名或指定上游<abbr title=\"域名服务系统\">DNS</abbr>服务器。" msgid "" "This is a list of shell glob patterns for matching files and directories to " @@ -3116,7 +3126,7 @@ msgstr "" msgid "" "This is either the \"Update Key\" configured for the tunnel or the account " "password if no update key has been configured" -msgstr "如果更新密钥没有设置的话,隧道的\"更新密钥\"或者账户密码必须填写." +msgstr "如果更新密钥没有设置的话,隧道的“更新密钥”或者账户密码必须填写。" msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " @@ -3131,19 +3141,17 @@ msgstr "隧道代理分配的本地终端地址，通常以<code>:2</code>结尾 msgid "" "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" "abbr> in the local network" -msgstr "" -"这是内网中唯一的<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" -"abbr>服务器" +msgstr "这是内网中唯一的<abbr title=\"动态主机配置协议\">DHCP</abbr>服务器" msgid "This is the plain username for logging into the account" msgstr "登录账户时填写的用户名" msgid "" "This is the prefix routed to you by the tunnel broker for use by clients" -msgstr "" +msgstr "这是隧道代理分配给你的路由前缀，供客户端使用" msgid "This is the system crontab in which scheduled tasks can be defined." -msgstr "自定义系统crontab中的计划任务。" +msgstr "自定义系统Crontab中的计划任务。" msgid "" "This is usually the address of the nearest PoP operated by the tunnel broker" @@ -3256,7 +3264,7 @@ msgid "Unable to dispatch" msgstr "无法调度" msgid "Unavailable Seconds (UAS)" -msgstr "" +msgstr "不可用秒数(UAS)" msgid "Unknown" msgstr "未知" @@ -3283,7 +3291,7 @@ msgid "" "Upload a sysupgrade-compatible image here to replace the running firmware. " "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." -msgstr "上传兼容的sysupgrade固件以刷新当前系统。" +msgstr "上传兼容的Sysupgrade固件以刷新当前系统。" msgid "Upload archive..." msgstr "上传备份..." @@ -3313,7 +3321,7 @@ msgid "Use TTL on tunnel interface" msgstr "隧道接口的TTL" msgid "Use as external overlay (/overlay)" -msgstr "作为外部overlay使用(/overlay)" +msgstr "作为外部Overlay使用(/overlay)" msgid "Use as root filesystem (/)" msgstr "作为跟文件系统使用(/)" @@ -3322,7 +3330,7 @@ msgid "Use broadcast flag" msgstr "使用广播标签" msgid "Use builtin IPv6-management" -msgstr "" +msgstr "使用内置的IPv6管理" msgid "Use custom DNS servers" msgstr "使用自定义的DNS服务器" @@ -3365,19 +3373,19 @@ msgid "VC-Mux" msgstr "VC-Mux" msgid "VDSL" -msgstr "" +msgstr "VDSL" msgid "VLANs on %q" -msgstr "%q上的VLAN" +msgstr "%q 上的VLAN" msgid "VLANs on %q (%s)" -msgstr "%q (%s)上的VLAN" +msgstr "%q (%s) 上的VLAN" msgid "VPN Local address" -msgstr "" +msgstr "VPN本地地址" msgid "VPN Local port" -msgstr "" +msgstr "VPN本地端口" msgid "VPN Server" msgstr "VPN服务器" @@ -3389,7 +3397,7 @@ msgid "VPN Server's certificate SHA1 hash" msgstr "VPN服务器证书的SHA1哈希值" msgid "VPNC (CISCO 3000 (and others) VPN)" -msgstr "" +msgstr "VPNC (CISCO 3000 和其他VPN)" msgid "Vendor" msgstr "" @@ -3398,10 +3406,10 @@ msgid "Vendor Class to send when requesting DHCP" msgstr "请求DHCP时发送的Vendor Class" msgid "Verbose" -msgstr "" +msgstr "详细" msgid "Verbose logging by aiccu daemon" -msgstr "" +msgstr "aiccu守护程序详细日志" msgid "Verify" msgstr "验证" @@ -3436,7 +3444,7 @@ msgstr "" msgid "" "Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "在NTP同步之前等待时间.设置为0表示同步之前不等待(可选)" +msgstr "在NTP同步之前等待时间，设置为0表示同步之前不等待(可选)" msgid "Waiting for changes to be applied..." msgstr "正在应用更改..." @@ -3454,10 +3462,10 @@ msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "警告：有一些未保存的配置将在重启后丢失！" msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" +msgstr "是否通过隧道创建IPv6缺省路由" msgid "Whether to route only packets from delegated prefixes" -msgstr "" +msgstr "是否仅路由来自分发前缀的数据包" msgid "Width" msgstr "频宽" @@ -3502,7 +3510,7 @@ msgid "Write received DNS requests to syslog" msgstr "将收到的DNS请求写入系统日志" msgid "Write system log to file" -msgstr "" +msgstr "将系统日志写入文件" msgid "XR Support" msgstr "XR支持" @@ -3524,8 +3532,8 @@ msgid "" "upgrade it to at least version 7 or use another browser like Firefox, Opera " "or Safari." msgstr "" -"你的Internet Explorer已经老到无法正常显示这个页面了!请至少更新到IE7或者使用诸" -"如Firefox Opera Safari之类的浏览器." +"你的Internet Explorer已经老到无法正常显示这个页面了！请至少更新到IE7或者使用" +"诸如Firefox Opera Safari之类的浏览器。" msgid "any" msgstr "任意" @@ -3566,8 +3574,7 @@ msgstr "过期时间" msgid "" "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</" "abbr>-leases will be stored" -msgstr "" -"存放<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>租约的文件" +msgstr "存放<abbr title=\"动态主机配置协议\">DHCP</abbr>租约的文件" msgid "forward" msgstr "转发" @@ -3603,16 +3610,16 @@ msgid "kbit/s" msgstr "kbit/s" msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file" -msgstr "本地<abbr title=\"Domain Name System\">DNS</abbr>解析文件" +msgstr "本地<abbr title=\"域名服务系统\">DNS</abbr>解析文件" msgid "minimum 1280, maximum 1480" -msgstr "最小值1280,最大值1480" +msgstr "最小值1280，最大值1480" msgid "navigation Navigation" -msgstr "" +msgstr "导航" msgid "no" -msgstr "no" +msgstr "" msgid "no link" msgstr "未连接" @@ -3621,7 +3628,7 @@ msgid "none" msgstr "无" msgid "not present" -msgstr "" +msgstr "不存在" msgid "off" msgstr "关" @@ -3633,7 +3640,7 @@ msgid "open" msgstr "开放式" msgid "overlay" -msgstr "" +msgstr "覆盖" msgid "relay mode" msgstr "中继模式" @@ -3645,19 +3652,19 @@ msgid "server mode" msgstr "服务器模式" msgid "skiplink1 Skip to navigation" -msgstr "" +msgstr "skiplink1 跳转到导航" msgid "skiplink2 Skip to content" -msgstr "" +msgstr "skiplink2 跳到内容" msgid "stateful-only" -msgstr "" +msgstr "有状态的" msgid "stateless" -msgstr "" +msgstr "无状态的" msgid "stateless + stateful" -msgstr "" +msgstr "有状态和无状态的" msgid "tagged" msgstr "关联" @@ -3672,7 +3679,7 @@ msgid "unspecified" msgstr "未指定" msgid "unspecified -or- create:" -msgstr "未指定 // 创建:" +msgstr "未指定或创建：" msgid "untagged" msgstr "不关联" @@ -3683,11 +3690,14 @@ msgstr "是" msgid "« Back" msgstr "« 后退" +#~ msgid "An additional network will be created if you leave this checked." +#~ msgstr "如果选中此复选框，则会创建一个附加网络。" + #~ msgid "An additional network will be created if you leave this unchecked." #~ msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置" #~ msgid "Join Network: Settings" -#~ msgstr "加入网络:设置" +#~ msgstr "加入网络：设置" #~ msgid "CPU" #~ msgstr "CPU" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index deed439b7..15ffafc2b 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -283,9 +283,6 @@ msgstr "" msgid "Always announce default router" msgstr "" -msgid "An additional network will be created if you leave this checked." -msgstr "" - msgid "Annex" msgstr "" @@ -393,6 +390,9 @@ msgstr "" msgid "Authentication" msgstr "認證" +msgid "Authentication Type" +msgstr "" + msgid "Authoritative" msgstr "授權" @@ -565,6 +565,9 @@ msgstr "檢查" msgid "Check fileystems before mount" msgstr "" +msgid "Check this option to delete the existing networks from this radio." +msgstr "" + msgid "Checksum" msgstr "效驗碼" @@ -966,6 +969,9 @@ msgstr "啟用 <abbr title=\"Spanning Tree Protocol\">STP</abbr>" msgid "Enable HE.net dynamic endpoint update" msgstr "啟用HE.net服務代管動態更新" +msgid "Enable IPv6 negotiation" +msgstr "" + msgid "Enable IPv6 negotiation on the PPP link" msgstr "啟用PPP連結上的IPv6交涉" @@ -2379,6 +2385,9 @@ msgstr "" msgid "Public prefix routed to this device for distribution to clients." msgstr "" +msgid "QMI Cellular" +msgstr "" + msgid "Quality" msgstr "品質" @@ -2603,6 +2612,9 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" +msgid "Route type" +msgstr "" + msgid "Routed IPv6 prefix for downstream interfaces" msgstr "" @@ -2785,8 +2797,8 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"抱歉, 沒有sysupgrade支援出現, 新版韌體映像檔必須手動更新. 請回歸" -"wiki找尋特定設備安裝指引." +"抱歉, 沒有sysupgrade支援出現, 新版韌體映像檔必須手動更新. 請回歸wiki找尋特定" +"設備安裝指引." msgid "Sort" msgstr "分類" @@ -3307,8 +3319,8 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"上傳一個sysupgrade-相容的映像檔在這以便替代正執行中的韌體. 勾選\"保持設定" -"\"以保留目前設定值(必須要是OpenWrt/LEDE相容性韌體映像檔)." +"上傳一個sysupgrade-相容的映像檔在這以便替代正執行中的韌體. 勾選\"保持設定\"以" +"保留目前設定值(必須要是OpenWrt/LEDE相容性韌體映像檔)." msgid "Upload archive..." msgstr "上傳壓縮檔..." diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua index 24db1e4ff..ad575e0d2 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/status.lua @@ -24,8 +24,10 @@ function index() entry({"admin", "status", "realtime", "bandwidth"}, template("admin_status/bandwidth"), _("Traffic"), 2).leaf = true entry({"admin", "status", "realtime", "bandwidth_status"}, call("action_bandwidth")).leaf = true - entry({"admin", "status", "realtime", "wireless"}, template("admin_status/wireless"), _("Wireless"), 3).leaf = true - entry({"admin", "status", "realtime", "wireless_status"}, call("action_wireless")).leaf = true + if nixio.fs.access("/etc/config/wireless") then + entry({"admin", "status", "realtime", "wireless"}, template("admin_status/wireless"), _("Wireless"), 3).leaf = true + entry({"admin", "status", "realtime", "wireless_status"}, call("action_wireless")).leaf = true + end entry({"admin", "status", "realtime", "connections"}, template("admin_status/connections"), _("Connections"), 4).leaf = true entry({"admin", "status", "realtime", "connections_status"}, call("action_connections")).leaf = true diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua index cf8cfb5d2..5478afa3e 100644 --- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -52,6 +52,7 @@ function action_clock_status() luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{ date.year, date.month, date.day, date.hour, date.min, date.sec }) + luci.sys.call("/etc/init.d/sysfixtime restart") end end diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index 05b27a9f0..8277deb2f 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -16,7 +16,7 @@ if not iw then return end -m = SimpleForm("network", translate("Joining Network: %q", http.formvalue("join"))) +m = SimpleForm("network", translatef("Joining Network: %q", http.formvalue("join"))) m.cancel = translate("Back to scan results") m.reset = false @@ -44,7 +44,7 @@ m.hidden = { if iw and iw.mbssid_support then replace = m:field(Flag, "replace", translate("Replace wireless configuration"), - translate("An additional network will be created if you leave this checked.")) + translate("Check this option to delete the existing networks from this radio.")) function replace.cfgvalue() return "0" end else diff --git a/protocols/luci-proto-qmi/Makefile b/protocols/luci-proto-qmi/Makefile new file mode 100644 index 000000000..8b2b5e37e --- /dev/null +++ b/protocols/luci-proto-qmi/Makefile @@ -0,0 +1,14 @@ +# +# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> +# +# This is free software, licensed under the Apache License, Version 2.0 . +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=Support for QMI +LUCI_DEPENDS:=+uqmi + +include ../../luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua new file mode 100644 index 000000000..e11201d21 --- /dev/null +++ b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua @@ -0,0 +1,45 @@ +-- Copyright 2016 David Thornley <david.thornley@touchstargroup.com> +-- Licensed to the public under the Apache License 2.0. + +local map, section, net = ... + +local device, apn, pincode, username, password +local auth, ipv6 + + +device = section:taboption("general", Value, "device", translate("Modem device")) +device.rmempty = false + +local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*") + +if device_suggestions then + local node + for node in device_suggestions do + device:value(node) + end +end + + +apn = section:taboption("general", Value, "apn", translate("APN")) + + +pincode = section:taboption("general", Value, "pincode", translate("PIN")) + + +username = section:taboption("general", Value, "username", translate("PAP/CHAP username")) + + +password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) +password.password = true + +auth = section:taboption("general", Value, "auth", translate("Authentication Type")) +auth:value("", translate("-- Please choose --")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") + +if luci.model.network:has_ipv6() then + ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation")) + ipv6.default = ipv6.disabled +end diff --git a/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua new file mode 100644 index 000000000..cca8af109 --- /dev/null +++ b/protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua @@ -0,0 +1,51 @@ +-- Copyright 2016 David Thornley <david.thornley@touchstargroup.com> +-- Licensed to the public under the Apache License 2.0. + +local netmod = luci.model.network +local interface = luci.model.network.interface +local proto = netmod:register_protocol("qmi") + +function proto.get_i18n(self) + return luci.i18n.translate("QMI Cellular") +end + +function proto.ifname(self) + local base = netmod._M.protocol + local ifname = base.ifname(self) -- call base class "protocol.ifname(self)" + + -- Note: ifname might be nil if the adapter could not be determined through ubus (default name to qmi-wan in this case) + if ifname == nil then + ifname = "qmi-" .. self.sid + end + return ifname +end + +function proto.get_interface(self) + return interface(self:ifname(), self) +end + +function proto.opkg_package(self) + return "uqmi" +end + +function proto.is_installed(self) + return nixio.fs.access("/lib/netifd/proto/qmi.sh") +end + +function proto.is_floating(self) + return true +end + +function proto.is_virtual(self) + return true +end + +function proto.get_interfaces(self) + return nil +end + +function proto.contains_interface(self, ifc) + return (netmod:ifnameof(ifc) == self:ifname()) +end + +netmod:register_pattern_virtual("^qmi-%w") diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index 1d712e453..8d0c434a9 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -500,6 +500,8 @@ select, select { padding: initial; + background: #fff; + box-shadow: inset 0 -1px 3px rgba(0, 0, 0, 0.1); } input[type=checkbox], input[type=radio] { |