From: Hannu Nyman Date: Wed, 26 Apr 2017 11:52:16 +0000 (+0300) Subject: Merge pull request #1124 from dibdot/app-adblock X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=415b99de5a5c5e023a81cc6399ee474993996284;hp=0e80aba7b19064e6a400adc1e21ad951c7cbda58 Merge pull request #1124 from dibdot/app-adblock luci-app-adblock: sync with 2.6.1 --- diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po index 39bc18349..3b8f0da8d 100644 --- a/applications/luci-app-adblock/po/ja/adblock.po +++ b/applications/luci-app-adblock/po/ja/adblock.po @@ -8,7 +8,7 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.12\n" +"X-Generator: Poedit 2.0\n" "Language: ja\n" msgid "." @@ -26,6 +26,9 @@ msgstr "Adblock ログファイル" msgid "Adblock version" msgstr "Adblock バージョン" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "Adblock の処理が開始されるまでの、追加の遅延時間（秒）です。" + msgid "Advanced" msgstr "詳細設定" @@ -50,7 +53,7 @@ msgstr "データ収集中です..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "" -"DNSの利用によって広告/不正ドメインをブロックする、adblock パッケージの設定で" +"DNS の利用によって広告/不正ドメインをブロックする、Adblock パッケージの設定で" "す。" msgid "DNS backend" @@ -59,6 +62,9 @@ msgstr "DNS バックエンド" msgid "Description" msgstr "説明" +msgid "Download Utility (SSL Library)" +msgstr "ダウンロード ユーティリティ（SSL ライブラリ）" + msgid "Edit Blacklist" msgstr "ブラックリストの編集" @@ -69,7 +75,7 @@ msgid "Edit Whitelist" msgstr "ホワイトリストの編集" msgid "Enable adblock" -msgstr "Adblockの有効化" +msgstr "Adblock の有効化" msgid "Enable blocklist backup" msgstr "ブロックリスト バックアップの有効化" @@ -80,6 +86,13 @@ msgstr "詳細なデバッグ ログの有効化" msgid "Enabled" msgstr "有効" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" +"SSLで保護されているブロックリストの取得には、適切なSSL ライブラリが必要です。" +"例: 'libustream-ssl' または wget 'ビルトイン'" + msgid "For further information" msgstr "詳細な情報は" @@ -95,22 +108,25 @@ msgstr "最終実行日時" msgid "Loading" msgstr "読込中" +msgid "No" +msgstr "いいえ" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." msgstr "" -"リストのURL及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクションで" -"設定することができます。" +"リストの URL 及び \"Shalla\" リストのカテゴリー設定は、'詳細設定' セクション" +"で設定することができます。" msgid "Overview" msgstr "概要" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" -"一行に一つのドメインを追加してください。'#' から始まるコメントを記述できます" -"が、IPアドレスやワイルドカード、正規表現を設定値として使用することはできませ" +"1行に1つのドメインを追加してください。'#' から始まるコメントを記述できます" +"が、IP アドレスやワイルドカード、正規表現を設定値として使用することはできませ" "ん。" msgid "Query" @@ -119,24 +135,34 @@ msgstr "検索" msgid "Query domains" msgstr "ドメインの検索" -msgid "Restrict interface reload trigger to certain interface(s)" -msgstr "リロード トリガを特定のインターフェースに限定する" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "インターフェース トリガーを特定のインターフェースに限定する" + +msgid "Resume adblock" +msgstr "Adblock の再開" msgid "Runtime information" msgstr "実行情報" +msgid "SSL req." +msgstr "SSL 必須" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" -"リロードのトリガとなる、スペースで区切られたインターフェースのリストで" -"す。'false' に設定した場合、全てのリロード トリガは無効になります。" +"Adblock の処理のトリガーとなる、スペースで区切られたインターフェースのリスト" +"です。処理を発生させるイベントを無効にするには、全てのエントリーを削除して空" +"欄にします。" msgid "Status" msgstr "ステータス" msgid "Suspend / Resume adblock" -msgstr "Adblockの一時停止/再開" +msgstr "Adblock の一時停止/再開" + +msgid "Suspend adblock" +msgstr "Adblock の一時停止" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." @@ -170,8 +196,11 @@ msgid "" "This form shows the syslog output, pre-filtered for adblock related messages " "only." msgstr "" -"このフォームには、システムログ内のAdblockに関連するメッセージのみが表示されま" -"す。" +"このフォームには、システムログ内の Adblock に関連するメッセージのみが表示され" +"ます。" + +msgid "Trigger delay" +msgstr "トリガー遅延" msgid "View Logfile" msgstr "ログファイルを見る" @@ -179,9 +208,49 @@ msgstr "ログファイルを見る" msgid "Waiting for command to complete..." msgstr "コマンドの完了をお待ちください..." +msgid "Yes" +msgstr "はい" + +msgid "active" +msgstr "動作中" + +msgid "n/a" +msgstr "利用不可" + +msgid "no domains blocked" +msgstr "ブロックされたドメインはありません" + msgid "see online documentation" msgstr "オンライン ドキュメントを確認してください" +msgid "suspended" +msgstr "一時停止中" + +#~ msgid "Restrict interface reload trigger to certain interface(s)" +#~ msgstr "リロード トリガを特定のインターフェースに限定する" + +#~ msgid "" +#~ "Space separated list of interfaces that trigger a reload action. To " +#~ "disable reload trigger at all remove all entries." +#~ msgstr "" +#~ "リロードのトリガとなる、スペースで区切られたインターフェースのリストです。" +#~ "リロード トリガを無効にするには、全てのエントリーを削除して空欄にします。" + +#~ msgid "" +#~ "Space separated list of interfaces that trigger a reload action. To " +#~ "disable reload trigger at all set it to 'false'." +#~ msgstr "" +#~ "リロードのトリガとなる、スペースで区切られたインターフェースのリストで" +#~ "す。'false' に設定した場合、全てのリロード トリガは無効になります。" + +#~ msgid "" +#~ "Please add only one domain per line. Comments introduced with '#' are " +#~ "allowed - ip addresses, wildcards & regex are not." +#~ msgstr "" +#~ "一行に一つのドメインを追加してください。'#' から始まるコメントを記述できま" +#~ "すが、IPアドレスやワイルドカード、正規表現を設定値として使用することはでき" +#~ "ません。" + #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " #~ "configurable via Luci." diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po index 013768773..60668675e 100644 --- a/applications/luci-app-adblock/po/pt-br/adblock.po +++ b/applications/luci-app-adblock/po/pt-br/adblock.po @@ -27,6 +27,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -60,6 +63,9 @@ msgstr "" msgid "Description" msgstr "Descrição" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -81,6 +87,11 @@ msgstr "Habilite registros detalhados para depuração" msgid "Enabled" msgstr "Habilitado" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -96,6 +107,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -106,7 +120,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -115,15 +129,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -132,6 +152,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "
" @@ -157,15 +180,33 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" +msgid "suspended" +msgstr "" + #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " #~ "configurable via Luci." diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po index 9fcc36d26..bc4a59929 100644 --- a/applications/luci-app-adblock/po/sv/adblock.po +++ b/applications/luci-app-adblock/po/sv/adblock.po @@ -16,6 +16,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -49,6 +52,9 @@ msgstr "" msgid "Description" msgstr "Beskrivning" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -70,6 +76,11 @@ msgstr "" msgid "Enabled" msgstr "Aktiverad" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -85,6 +96,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -95,7 +109,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -104,15 +118,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -121,6 +141,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "
" @@ -146,15 +169,33 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" +msgid "suspended" +msgstr "" + #~ msgid "Available blocklist sources (" #~ msgstr "Tillgängliga källor för blockeringslistor (" diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot index 928276889..d847a69ba 100644 --- a/applications/luci-app-adblock/po/templates/adblock.pot +++ b/applications/luci-app-adblock/po/templates/adblock.pot @@ -16,6 +16,9 @@ msgstr "" msgid "Adblock version" msgstr "" +msgid "Additional trigger delay in seconds before adblock processing begins." +msgstr "" + msgid "Advanced" msgstr "" @@ -47,6 +50,9 @@ msgstr "" msgid "Description" msgstr "" +msgid "Download Utility (SSL Library)" +msgstr "" + msgid "Edit Blacklist" msgstr "" @@ -68,6 +74,11 @@ msgstr "" msgid "Enabled" msgstr "" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." +msgstr "" + msgid "For further information" msgstr "" @@ -83,6 +94,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "No" +msgstr "" + msgid "" "Note that list URLs and Shallalist category selections are configurable in " "the 'Advanced' section." @@ -93,7 +107,7 @@ msgstr "" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" @@ -102,15 +116,21 @@ msgstr "" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Resume adblock" msgstr "" msgid "Runtime information" msgstr "" +msgid "SSL req." +msgstr "" + msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" @@ -119,6 +139,9 @@ msgstr "" msgid "Suspend / Resume adblock" msgstr "" +msgid "Suspend adblock" +msgstr "" + msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." "
" @@ -144,11 +167,29 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "" + msgid "View Logfile" msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Yes" +msgstr "" + +msgid "active" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "no domains blocked" +msgstr "" + msgid "see online documentation" msgstr "" + +msgid "suspended" +msgstr "" diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po index 277be1a6a..28f37df28 100644 --- a/applications/luci-app-adblock/po/zh-cn/adblock.po +++ b/applications/luci-app-adblock/po/zh-cn/adblock.po @@ -1,19 +1,20 @@ +# liushuyu , 2017. msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: kuoruan@gmail.com\n" -"Language-Team: none\n" +"PO-Revision-Date: 2017-04-15 21:35-0600\n" +"Last-Translator: liushuyu \n" +"Language-Team: Chinese \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.8.5\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=1; plural=0;\n" msgid "." -msgstr "" +msgstr "." msgid "Adblock" msgstr "Adblock" @@ -22,16 +23,19 @@ msgid "Adblock Domain Query" msgstr "" msgid "Adblock Logfile" -msgstr "" +msgstr "Adblock 日志文件" msgid "Adblock version" +msgstr "Adblock 版本" + +msgid "Additional trigger delay in seconds before adblock processing begins." msgstr "" msgid "Advanced" -msgstr "" +msgstr "高级" msgid "Available blocklist sources." -msgstr "" +msgstr "可用的 blocklist 来源" msgid "Backup directory" msgstr "备份目录" @@ -46,26 +50,29 @@ msgid "Blocklist sources" msgstr "拦截列表来源" msgid "Collecting data..." -msgstr "" +msgstr "正在收集数据..." msgid "" "Configuration of the adblock package to block ad/abuse domains by using DNS." msgstr "Adblock 配置工具，通过 DNS 来拦截广告和阻止域名。" msgid "DNS backend" -msgstr "" +msgstr "DNS 后端" msgid "Description" msgstr "描述" -msgid "Edit Blacklist" +msgid "Download Utility (SSL Library)" msgstr "" +msgid "Edit Blacklist" +msgstr "编辑黑名单" + msgid "Edit Configuration" -msgstr "" +msgstr "编辑设置" msgid "Edit Whitelist" -msgstr "" +msgstr "编辑白名单" msgid "Enable adblock" msgstr "启用Adblock" @@ -74,25 +81,33 @@ msgid "Enable blocklist backup" msgstr "启用拦截规则备份" msgid "Enable verbose debug logging" -msgstr "" +msgstr "启用详细调试输出" msgid "Enabled" msgstr "启用" -msgid "For further information" +msgid "" +"For SSL protected blocklist sources you need a suitable SSL library, e.g. " +"'libustream-ssl' or the wget 'built-in'." msgstr "" +msgid "For further information" +msgstr "更多信息" + msgid "Input file not found, please check your configuration." msgstr "" msgid "Invalid domain specified!" -msgstr "" +msgstr "无效域名！" msgid "Last rundate" msgstr "" msgid "Loading" -msgstr "" +msgstr "加载中" + +msgid "No" +msgstr "否" msgid "" "Note that list URLs and Shallalist category selections are configurable in " @@ -100,35 +115,44 @@ msgid "" msgstr "" msgid "Overview" -msgstr "" +msgstr "总览" msgid "" "Please add only one domain per line. Comments introduced with '#' are " -"allowed - ip addresses, wildcards & regex are not." +"allowed - ip addresses, wildcards and regex are not." msgstr "" msgid "Query" -msgstr "" +msgstr "查询" msgid "Query domains" msgstr "" -msgid "Restrict interface reload trigger to certain interface(s)" +msgid "Restrict interface trigger to certain interface(s)" msgstr "" +msgid "Resume adblock" +msgstr "恢复 Adblock" + msgid "Runtime information" +msgstr "运行信息" + +msgid "SSL req." msgstr "" msgid "" -"Space separated list of interfaces that trigger a reload action. To disable " -"reload trigger at all set it to 'false'." +"Space separated list of interfaces that trigger adblock processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" msgid "Status" -msgstr "" +msgstr "状态" msgid "Suspend / Resume adblock" -msgstr "" +msgstr "暂停/恢复 Adblock" + +msgid "Suspend adblock" +msgstr "暂停 Adblock" msgid "" "This form allows you to modify the content of the adblock blacklist (%s)." @@ -155,14 +179,32 @@ msgid "" "only." msgstr "" +msgid "Trigger delay" +msgstr "触发延迟" + msgid "View Logfile" -msgstr "" +msgstr "查看日志文件" msgid "Waiting for command to complete..." +msgstr "正在执行命令..." + +msgid "Yes" +msgstr "是" + +msgid "active" +msgstr "已启用" + +msgid "n/a" msgstr "" +msgid "no domains blocked" +msgstr "没有被拦截的域名" + msgid "see online documentation" -msgstr "" +msgstr "查看在线文档" + +msgid "suspended" +msgstr "已暂停" #~ msgid "" #~ "). Note that list URLs and Shallalist category selections are not " diff --git a/applications/luci-app-clamav/po/zh-cn/clamav.po b/applications/luci-app-clamav/po/zh-cn/clamav.po new file mode 100644 index 000000000..6a2c5dfd5 --- /dev/null +++ b/applications/luci-app-clamav/po/zh-cn/clamav.po @@ -0,0 +1,131 @@ +# liushuyu , 2017. +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2017-04-15 21:37-0600\n" +"Language-Team: Chinese \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.1\n" +"Last-Translator: liushuyu \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: zh_CN\n" + +msgid "10" +msgstr "10" + +msgid "1024" +msgstr "1024" + +msgid "15" +msgstr "15" + +msgid "150M" +msgstr "150M" + +msgid "1M" +msgstr "1M" + +msgid "20" +msgstr "20" + +msgid "2048" +msgstr "2048" + +msgid "2M" +msgstr "2M" + +msgid "50M" +msgstr "50M" + +msgid "512K" +msgstr "512K" + +msgid "600" +msgstr "600" + +msgid "Block encrypted archives" +msgstr "拦截加密的归档文件" + +msgid "ClamAV" +msgstr "ClamAV" + +msgid "Database check every N sec" +msgstr "每 N 秒检测一次数据库" + +msgid "Detect broken executables" +msgstr "检测破损的可执行文件" + +msgid "Detect possibly unwanted apps" +msgstr "检测不受欢迎的软件" + +msgid "Enable verbose logging" +msgstr "启用详细日志输出" + +msgid "Follow directory symlinks" +msgstr "跟随目录符号链接" + +msgid "Follow file symlinks" +msgstr "跟随文件符号链接" + +msgid "Log" +msgstr "日志" + +msgid "Log additional infection info" +msgstr "记录详细的感染信息" + +msgid "Log time with each message" +msgstr "记录消息时间戳" + +msgid "Max directory scan depth" +msgstr "最大扫描深度" + +msgid "Max number of threads" +msgstr "最大线程数" + +msgid "Max size of log file" +msgstr "最大日志大小" + +msgid "Max size of scanned file" +msgstr "最大可扫描的文件大小" + +msgid "No" +msgstr "否" + +msgid "Port range, highest port" +msgstr "端口范围，最大端口" + +msgid "Port range, lowest port" +msgstr "端口范围，最小端口" + +msgid "Scan ELF files" +msgstr "扫描 ELF 文件" + +msgid "Scan MS Office and .msi files" +msgstr "扫描 MS Office 文档和 .msi 安装包文件" + +msgid "Scan RFC1341 messages split over many emails" +msgstr "扫描符合 RFC1341 邮件分离规范的邮件" + +msgid "Scan archives" +msgstr "扫描归档文件" + +msgid "Scan emails" +msgstr "扫描电子邮件" + +msgid "Scan pdf files" +msgstr "扫描 PDF 文件" + +msgid "Scan portable executables" +msgstr "扫描 PE (Windows) 可执行文件" + +msgid "Scan swf files" +msgstr "扫描 SWF 文件" + +msgid "Settings" +msgstr "设置" + +msgid "Yes" +msgstr "是" diff --git a/applications/luci-app-dynapoint/Makefile b/applications/luci-app-dynapoint/Makefile index d16ef4a8f..83512dba5 100644 --- a/applications/luci-app-dynapoint/Makefile +++ b/applications/luci-app-dynapoint/Makefile @@ -9,9 +9,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for DynaPoint LUCI_DEPENDS:=+dynapoint -PKG_NAME:=luci-app-dynapoint -PKG_VERSION:=1.0 -PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Tobias Ilte include ../../luci.mk diff --git a/applications/luci-app-fwknopd/Makefile b/applications/luci-app-fwknopd/Makefile index 3fbd88ad6..ba7a8568e 100644 --- a/applications/luci-app-fwknopd/Makefile +++ b/applications/luci-app-fwknopd/Makefile @@ -8,8 +8,6 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Fwknopd config - web config for the firewall knock daemon LUCI_DEPENDS:=+fwknopd +qrencode -PKG_VERSION:=1.0 -PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Jonathan Bennett include ../../luci.mk diff --git a/applications/luci-app-mwan3/Makefile b/applications/luci-app-mwan3/Makefile index 758ec90a0..d65cd3af1 100644 --- a/applications/luci-app-mwan3/Makefile +++ b/applications/luci-app-mwan3/Makefile @@ -11,7 +11,8 @@ LUCI_DEPENDS:=+mwan3 +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio LUCI_PKGARCH:=all PKG_LICENSE:=GPLv2 -PKG_MAINTAINER:=Aedan Renner +PKG_MAINTAINER:=Aedan Renner \ + Florian Eckert include ../../luci.mk diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index 3d5a23dd0..d3fd15069 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -64,9 +64,9 @@ function index() end function getInterfaceStatus(ruleNumber, interfaceName) - if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then + if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then if ut.trim(sys.exec(ip .. "route list table " .. ruleNumber)) ~= "" then - if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then + if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then return "online" else return "notMonitored" @@ -102,7 +102,7 @@ function interfaceStatus() wansid = {} for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do - local wanInterfaceName = ut.trim(sys.exec("uci -p /var/state get network." .. wanName .. ".ifname")) + local wanInterfaceName = ut.trim(sys.exec("uci -q -p /var/state get network." .. wanName .. ".ifname")) if wanInterfaceName == "" then wanInterfaceName = "X" end @@ -115,7 +115,7 @@ function interfaceStatus() end -- overview status log - local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x'")) + local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x' 2>/dev/null")) if mwanLog ~= "" then mArray.mwanlog = { mwanLog } end @@ -163,7 +163,7 @@ function diagnosticsData(interface, tool, task) results = "MWAN3 started" end else - local interfaceDevice = ut.trim(sys.exec("uci -p /var/state get network." .. interface .. ".ifname")) + local interfaceDevice = ut.trim(sys.exec("uci -q -p /var/state get network." .. interface .. ".ifname")) if interfaceDevice ~= "" then if tool == "ping" then local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'")) @@ -172,7 +172,7 @@ function diagnosticsData(interface, tool, task) local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway results = pingCommand .. "\n\n" .. sys.exec(pingCommand) else - local tracked = ut.trim(sys.exec("uci -p /var/state get mwan3." .. interface .. ".track_ip")) + local tracked = ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interface .. ".track_ip")) if tracked ~= "" then for z in tracked:gmatch("[^ ]+") do local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z @@ -301,7 +301,7 @@ function troubleshootingData() mArray.iprule = { ipRuleShow } -- ip route list table 1-250 - local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), "" + local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' 2>/dev/null | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), "" if routeList ~= "" then for line in routeList:gmatch("[^\r\n]+") do routeString = routeString .. line .. "\n" .. sys.exec(ip .. "route list table " .. line) @@ -313,7 +313,7 @@ function troubleshootingData() mArray.routelist = { routeString } -- default firewall output policy - local firewallOut = ut.trim(sys.exec("uci -p /var/state get firewall.@defaults[0].output")) + local firewallOut = ut.trim(sys.exec("uci -q -p /var/state get firewall.@defaults[0].output")) if firewallOut == "" then firewallOut = "No data found" end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua index a8e68a01b..7e863a371 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -59,24 +59,24 @@ end function interfaceWarnings() -- display status and warning messages at the top of the page local warnings = "" if interfaceNumber <= 250 then - warnings = "There are currently " .. interfaceNumber .. " of 250 supported interfaces configured" + warnings = "" .. translatef("There are currently %d of 250 supported interfaces configured", interfaceNumber) .. "" else - warnings = "WARNING: " .. interfaceNumber .. " interfaces are configured exceeding the maximum of 250!" + warnings = "" .. translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", interfaceNumber) .. "" end if errorReliabilityList ~= " " then - warnings = warnings .. "

WARNING: some interfaces have a higher reliability requirement than there are tracking IP addresses!" + warnings = warnings .. "

" .. translate("WARNING: some interfaces have a higher reliability requirement than there are tracking IP addresses!") .. "" end if errorRouteList ~= " " then - warnings = warnings .. "

WARNING: some interfaces have no default route in the main routing table!" + warnings = warnings .. "

" .. translate("WARNING: some interfaces have no default route in the main routing table!") .. "" end if errorNetConfigList ~= " " then - warnings = warnings .. "

WARNING: some interfaces are configured incorrectly or not at all in /etc/config/network!" + warnings = warnings .. "

" .. translate("WARNING: some interfaces are configured incorrectly or not at all in /etc/config/network!") .. "" end if errorNoMetricList ~= " " then - warnings = warnings .. "

WARNING: some interfaces have no metric configured in /etc/config/network!" + warnings = warnings .. "

" .. translate("WARNING: some interfaces have no metric configured in /etc/config/network!") .. "" end if errorDuplicateMetricList ~= " " then - warnings = warnings .. "

WARNING: some interfaces have duplicate metrics configured in /etc/config/network!" + warnings = warnings .. "

" .. translate("WARNING: some interfaces have duplicate metrics configured in /etc/config/network!") .. "" end return warnings end @@ -99,7 +99,7 @@ interfaceCheck() m5 = Map("mwan3", translate("MWAN Interface Configuration"), - translate(interfaceWarnings())) + interfaceWarnings()) m5:append(Template("mwan/config_css")) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index 387ff01a8..e7c16fdfd 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -50,21 +50,21 @@ end function interfaceWarnings() -- display warning messages at the top of the page local warns, lineBreak = "", "" if errorReliability == 1 then - warns = "WARNING: this interface has a higher reliability requirement than there are tracking IP addresses!" + warns = "" .. translate("WARNING: this interface has a higher reliability requirement than there are tracking IP addresses!") .. "" lineBreak = "

" end if errorRoute == 1 then - warns = warns .. lineBreak .. "WARNING: this interface has no default route in the main routing table!" + warns = warns .. lineBreak .. "" .. translate("WARNING: this interface has no default route in the main routing table!") .. "" lineBreak = "

" end if errorNetConfig == 1 then - warns = warns .. lineBreak .. "WARNING: this interface is configured incorrectly or not at all in /etc/config/network!" + warns = warns .. lineBreak .. "" .. translate("WARNING: this interface is configured incorrectly or not at all in /etc/config/network!") .. "" lineBreak = "

" end if errorNoMetric == 1 then - warns = warns .. lineBreak .. "WARNING: this interface has no metric configured in /etc/config/network!" + warns = warns .. lineBreak .. "" .. translate("WARNING: this interface has no metric configured in /etc/config/network!") .. "" elseif errorDuplicateMetric == 1 then - warns = warns .. lineBreak .. "WARNING: this and other interfaces have duplicate metrics configured in /etc/config/network!" + warns = warns .. lineBreak .. "" .. translate("WARNING: this and other interfaces have duplicate metrics configured in /etc/config/network!") .. "" end return warns end @@ -87,8 +87,8 @@ errorReliability = 0 interfaceCheck() -m5 = Map("mwan3", translate("MWAN Interface Configuration - " .. arg[1]), - translate(interfaceWarnings())) +m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1]), + interfaceWarnings()) m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "interface") @@ -102,6 +102,11 @@ enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled")) enabled:value("1", translate("Yes")) enabled:value("0", translate("No")) +family = mwan_interface:option(ListValue, "family", translate("Internet Protocol")) + family.default = "ipv4" + family:value("ipv4", translate("IPv4")) + family:value("ipv6", translate("IPv6")) + track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking IP"), translate("This IP address will be pinged to dermine if the link is up or down. Leave blank to assume interface is always online")) track_ip.datatype = "ipaddr" @@ -119,33 +124,80 @@ count = mwan_interface:option(ListValue, "count", translate("Ping count")) count:value("4") count:value("5") +size = mwan_interface:option(Value, "size", translate("Ping size")) + size.default = "56" + size:value("8") + size:value("24") + size:value("56") + size:value("120") + size:value("248") + size:value("504") + size:value("1016") + size:value("1472") + size:value("2040") + size.datatype = "range(1, 65507)" + size.rmempty = false + size.optional = false + timeout = mwan_interface:option(ListValue, "timeout", translate("Ping timeout")) timeout.default = "2" - timeout:value("1", translate("1 second")) - timeout:value("2", translate("2 seconds")) - timeout:value("3", translate("3 seconds")) - timeout:value("4", translate("4 seconds")) - timeout:value("5", translate("5 seconds")) - timeout:value("6", translate("6 seconds")) - timeout:value("7", translate("7 seconds")) - timeout:value("8", translate("8 seconds")) - timeout:value("9", translate("9 seconds")) - timeout:value("10", translate("10 seconds")) + timeout:value("1", translatef("%d second", 1)) + timeout:value("2", translatef("%d seconds", 2)) + timeout:value("3", translatef("%d seconds", 3)) + timeout:value("4", translatef("%d seconds", 4)) + timeout:value("5", translatef("%d seconds", 5)) + timeout:value("6", translatef("%d seconds", 6)) + timeout:value("7", translatef("%d seconds", 7)) + timeout:value("8", translatef("%d seconds", 8)) + timeout:value("9", translatef("%d seconds", 9)) + timeout:value("10", translatef("%d seconds", 10)) interval = mwan_interface:option(ListValue, "interval", translate("Ping interval")) interval.default = "5" - interval:value("1", translate("1 second")) - interval:value("3", translate("3 seconds")) - interval:value("5", translate("5 seconds")) - interval:value("10", translate("10 seconds")) - interval:value("20", translate("20 seconds")) - interval:value("30", translate("30 seconds")) - interval:value("60", translate("1 minute")) - interval:value("300", translate("5 minutes")) - interval:value("600", translate("10 minutes")) - interval:value("900", translate("15 minutes")) - interval:value("1800", translate("30 minutes")) - interval:value("3600", translate("1 hour")) + interval:value("1", translatef("%d second", 1)) + interval:value("3", translatef("%d seconds", 3)) + interval:value("5", translatef("%d seconds", 5)) + interval:value("10", translatef("%d seconds", 10)) + interval:value("20", translatef("%d seconds", 20)) + interval:value("30", translatef("%d seconds", 30)) + interval:value("60", translatef("%d minute", 1)) + interval:value("300", translatef("%d minutes", 5)) + interval:value("600", translatef("%d minutes", 10)) + interval:value("900", translatef("%d minutes", 15)) + interval:value("1800", translatef("%d minutes", 30)) + interval:value("3600", translatef("%d hour", 1)) + +failure = mwan_interface:option(Value, "failure_interval", translate("Failure interval"), + translate("Ping interval during failure detection")) + failure.default = "5" + failure:value("1", translatef("%d second", 1)) + failure:value("3", translatef("%d seconds", 3)) + failure:value("5", translatef("%d seconds", 5)) + failure:value("10", translatef("%d seconds", 10)) + failure:value("20", translatef("%d seconds", 20)) + failure:value("30", translatef("%d seconds", 30)) + failure:value("60", translatef("%d minute", 1)) + failure:value("300", translatef("%d minutes", 5)) + failure:value("600", translatef("%d minutes", 10)) + failure:value("900", translatef("%d minutes", 15)) + failure:value("1800", translatef("%d minutes", 30)) + failure:value("3600", translatef("%d hour", 1)) + +recovery = mwan_interface:option(Value, "recovery_interval", translate("Recovery interval"), + translate("Ping interval during failure recovering")) + recovery.default = "5" + recovery:value("1", translatef("%d second", 1)) + recovery:value("3", translatef("%d seconds", 3)) + recovery:value("5", translatef("%d seconds", 5)) + recovery:value("10", translatef("%d seconds", 10)) + recovery:value("20", translatef("%d seconds", 20)) + recovery:value("30", translatef("%d seconds", 30)) + recovery:value("60", translatef("%d minute", 1)) + recovery:value("300", translatef("%d minutes", 5)) + recovery:value("600", translatef("%d minutes", 10)) + recovery:value("900", translatef("%d minutes", 15)) + recovery:value("1800", translatef("%d minutes", 30)) + recovery:value("3600", translatef("%d hour", 1)) down = mwan_interface:option(ListValue, "down", translate("Interface down"), translate("Interface will be deemed down after this many failed ping tests")) @@ -175,6 +227,14 @@ up = mwan_interface:option(ListValue, "up", translate("Interface up"), up:value("9") up:value("10") +flush = mwan_interface:option(ListValue, "flush_conntrack", translate("Flush conntrack table"), + translate("Flush global firewall conntrack table on interface events")) + flush.default = "never" + flush:value("ifup", translate("ifup")) + flush:value("ifdown", translate("ifdown")) + flush:value("never", translate("never")) + flush:value("always", translate("always")) + metric = mwan_interface:option(DummyValue, "metric", translate("Metric"), translate("This displays the metric assigned to this interface in /etc/config/network")) metric.rawhtml = true diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua index 181d22e06..eb6f417af 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua @@ -14,7 +14,7 @@ dsp = require "luci.dispatcher" arg[1] = arg[1] or "" -m5 = Map("mwan3", translate("MWAN Member Configuration - ") .. arg[1]) +m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1])) m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "member") diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index e141d696a..08c3f69de 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -13,7 +13,7 @@ end function policyWarn() -- display status and warning messages at the top of the page if nameTooLong == 1 then - return "WARNING: Some policies have names exceeding the maximum of 15 characters!" + return "" .. translate("WARNING: Some policies have names exceeding the maximum of 15 characters!") .. "" else return "" end @@ -30,7 +30,7 @@ policyCheck() m5 = Map("mwan3", translate("MWAN Policy Configuration"), - translate(policyWarn())) + policyWarn()) m5:append(Template("mwan/config_css")) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua index f48a104c6..06a0fec66 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua @@ -9,7 +9,7 @@ end function policyWarn() -- display status and warning messages at the top of the page if nameTooLong == 1 then - return "WARNING: this policy's name is " .. policyNameLength .. " characters exceeding the maximum of 15!" + return "" .. translatef("WARNING: this policy's name is %d characters exceeding the maximum of 15!", policyNameLength) .. "" else return "" end @@ -32,8 +32,8 @@ nameTooLong = 0 policyCheck() -m5 = Map("mwan3", translate("MWAN Policy Configuration - " .. arg[1]), - translate(policyWarn())) +m5 = Map("mwan3", translatef("MWAN Policy Configuration - %s", arg[1]), + policyWarn()) m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "policy") diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua index a22e01054..412f369eb 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -17,7 +17,7 @@ end function ruleWarn() -- display warning messages at the top of the page if error_protocol_list ~= " " then - return "WARNING: some rules have a port configured with no or improper protocol specified! Please configure a specific protocol!" + return "" .. translate("WARNING: some rules have a port configured with no or improper protocol specified! Please configure a specific protocol!") .. "" else return "" end @@ -34,7 +34,7 @@ ruleCheck() m5 = Map("mwan3", translate("MWAN Rule Configuration"), - translate(ruleWarn())) + ruleWarn()) m5:append(Template("mwan/config_css")) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua index f7fb341e1..25a96f5c8 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua @@ -13,7 +13,7 @@ end function ruleWarn() -- display warning message at the top of the page if error_protocol == 1 then - return "WARNING: this rule is incorrectly configured with no or improper protocol specified! Please configure a specific protocol!" + return "" .. translate("WARNING: this rule is incorrectly configured with no or improper protocol specified! Please configure a specific protocol!") .. "" else return "" end @@ -45,8 +45,8 @@ error_protocol = 0 ruleCheck() -m5 = Map("mwan3", translate("MWAN Rule Configuration - ") .. arg[1], - translate(ruleWarn())) +m5 = Map("mwan3", translatef("MWAN Rule Configuration - %s", arg[1]), + ruleWarn()) m5.redirect = dsp.build_url("admin", "network", "mwan", "configuration", "rule") diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po new file mode 100644 index 000000000..cae45b8a2 --- /dev/null +++ b/applications/luci-app-mwan3/po/ja/mwan3.po @@ -0,0 +1,562 @@ +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 2.0\n" +"Last-Translator: INAGAKI Hiroshi \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: ja\n" + +msgid "%d hour" +msgstr "%d 時間" + +msgid "%d minute" +msgstr "%d 分" + +msgid "%d minutes" +msgstr "%d 分" + +msgid "%d second" +msgstr "%d 秒" + +msgid "%d seconds" +msgstr "%d 秒" + +msgid "" +"Acceptable values: 1-100. This many Tracking IP addresses must respond for " +"the link to be deemed up" +msgstr "" +"利用可能な値: 1-100。上記の追跡 IP の合計個数のうち、Up 状態と判定するために" +"に必要な、レスポンスが返された追跡 IP アドレスの個数です。" + +msgid "Acceptable values: 1-1000. Defaults to 1 if not set" +msgstr "利用可能な値: 1-1000。空欄の場合のデフォルトは1です。" + +msgid "Advanced" +msgstr "詳細設定" + +msgid "Check IP rules" +msgstr "IP ルールのチェック" + +msgid "Check routing table" +msgstr "ルーティング テーブルのチェック" + +msgid "Configuration" +msgstr "設定" + +msgid "Currently Configured Interfaces" +msgstr "設定済みインターフェース" + +msgid "Currently Configured Members" +msgstr "設定済みメンバー" + +msgid "Currently Configured Policies" +msgstr "設定済みポリシー" + +msgid "Destination address" +msgstr "宛先アドレス" + +msgid "Destination port" +msgstr "宛先ポート" + +msgid "Detailed Status" +msgstr "詳細ステータス" + +msgid "Diagnostic Results" +msgstr "診断結果" + +msgid "Diagnostics" +msgstr "診断機能" + +msgid "" +"Downed interface will be deemed up after this many successful ping tests" +msgstr "" +"Down 状態のインターフェースが Up 状態と判断されるまでに要する ping テストの成" +"功回数です。" + +msgid "Enabled" +msgstr "有効" + +msgid "Errors" +msgstr "エラー" + +msgid "Failure interval" +msgstr "障害検出 インターバル" + +msgid "Flush conntrack table" +msgstr "" + +msgid "Flush global firewall conntrack table on interface events" +msgstr "" + +msgid "Hotplug Script" +msgstr "ホットプラグ スクリプト" + +msgid "Hotplug ifdown" +msgstr "ホットプラグ ifdown" + +msgid "Hotplug ifup" +msgstr "ホットプラグ ifup" + +msgid "IPset" +msgstr "IPset" + +msgid "IPv4" +msgstr "IPv4" + +msgid "IPv6" +msgstr "IPv6" + +msgid "Interface" +msgstr "インターフェース" + +msgid "Interface Status" +msgstr "インターフェース ステータス" + +msgid "Interface down" +msgstr "インターフェース Down" + +msgid "Interface up" +msgstr "インターフェース Up" + +msgid "Interface will be deemed down after this many failed ping tests" +msgstr "" +"インターフェースが Down 状態と判断されるまでに要する ping テストの失敗回数で" +"す。" + +msgid "Interfaces" +msgstr "インターフェース" + +msgid "Internet Protocol" +msgstr "インターネット プロトコル" + +msgid "Last resort" +msgstr "最終手段" + +msgid "Load Balancing" +msgstr "負荷分散" + +msgid "Loading" +msgstr "読込中" + +msgid "MWAN Config" +msgstr "MWAN 設定" + +msgid "MWAN Detailed Status" +msgstr "MWAN 詳細ステータス" + +msgid "MWAN Interface Configuration" +msgstr "MWAN インターフェース設定" + +msgid "MWAN Interface Configuration - %s" +msgstr "MWAN インターフェース設定 - %s" + +msgid "MWAN Interface Diagnostics" +msgstr "MWAN インターフェース診断" + +msgid "MWAN Interface Live Status" +msgstr "MWAN インターフェース Live ステータス" + +msgid "MWAN Interface Systemlog" +msgstr "MWAN インターフェース システムログ" + +msgid "MWAN Member Configuration" +msgstr "MWAN メンバー設定" + +msgid "MWAN Member Configuration - %s" +msgstr "MWAN メンバー設定 - %s" + +msgid "MWAN Policy Configuration" +msgstr "MWAN ポリシー設定" + +msgid "MWAN Policy Configuration - %s" +msgstr "MWAN ポリシー設定 - %s" + +msgid "MWAN Rule Configuration" +msgstr "MWAN ルール設定" + +msgid "MWAN Rule Configuration - %s" +msgstr "MWAN ルール設定 - %s" + +msgid "MWAN Service Control" +msgstr "MWAN サービス コントロール" + +msgid "" +"MWAN supports up to 250 physical and/or logical interfaces
MWAN " +"requires that all interfaces have a unique metric configured in /etc/config/" +"network
Names must match the interface name found in /etc/config/" +"network (see advanced tab)
Names may contain characters A-Z, a-z, 0-9, " +"_ and no spaces
Interfaces may not share the same name as configured " +"members, policies or rules" +msgstr "" +"MWAN は、250個までの物理または論理、あるいは両方のインターフェースをサポート" +"します。
MWAN は、全てのインターフェースが /etc/config/network で設定さ" +"れるユニークなメトリックを持つことを必要とします。
下記 \"インターフェー" +"ス\" の名前は、 /etc/config/network に存在するインターフェース名と同じでなけ" +"ればなりません（詳細設定タブを確認）。
名前は A-Z, a-z, 0-9, _ を含むこ" +"とができますが、スペースは使用できません。
インターフェースには、設定済" +"みのメンバーやポリシー、ルールと同じ名前を使用することはできません。" + +msgid "" +"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " +"as a portrange (eg \"1024:2048\") without quotes" +msgstr "" +"単一または複数のポート（例: \"22\" または \"80,443\"）、あるいはポートの範囲" +"（例: \"1024:2048\"）を、クオーテーション無しで指定することができます。" + +msgid "Member used" +msgstr "使用されるメンバー" + +msgid "Members" +msgstr "メンバー" + +msgid "" +"Members are profiles attaching a metric and weight to an MWAN interface
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Members " +"may not share the same name as configured interfaces, policies or rules" +msgstr "" +"メンバーは、MWAN インターフェースのメトリックおよびウエイトを関連付けたプロ" +"ファイルです。
名前は A-Z, a-z, 0-9, _ を含むことができますが、スペース" +"は使用できません。
メンバーには、設定済みのインターフェースやポリシー、" +"ルールと同じ名前を使用することはできません。" + +msgid "Members assigned" +msgstr "アサイン済みメンバー" + +msgid "Metric" +msgstr "メトリック" + +msgid "" +"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" +"youtube.com/youtube\")" +msgstr "" +"IPset ルールの名前です。このルールは、 /etc/dnsmasq.conf で必要です。（例: " +"\"ipset=/youtube.com/youtube\")" + +msgid "Network Config" +msgstr "ネットワーク設定" + +msgid "No" +msgstr "いいえ" + +msgid "Overview" +msgstr "概要" + +msgid "Ping count" +msgstr "Ping 回数" + +msgid "Ping default gateway" +msgstr "Ping デフォルト ゲートウェイ" + +msgid "Ping interval" +msgstr "Ping インターバル" + +msgid "Ping interval during failure detection" +msgstr "障害検出動作中の Ping 実行間隔です。" + +msgid "Ping interval during failure recovering" +msgstr "障害復旧中の Ping 実行間隔です。" + +msgid "Ping size" +msgstr "Ping サイズ" + +msgid "Ping timeout" +msgstr "Ping タイムアウト" + +msgid "Ping tracking IP" +msgstr "Ping トラッキング IP" + +msgid "Policies" +msgstr "ポリシー" + +msgid "" +"Policies are profiles grouping one or more members controlling how MWAN " +"distributes traffic
Member interfaces with lower metrics are used " +"first. Interfaces with the same metric load-balance
Load-balanced " +"member interfaces distribute more traffic out those with higher weights
Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " +"15 characters or less
Policies may not share the same name as " +"configured interfaces, members or rules" +msgstr "" +"ポリシーは、MWANがどのようにトラフィックの分配を行うかを制御する、1つ以上のメ" +"ンバーをグループ化するプロファイルです。
最小のメトリックを持つメンバー " +"インターフェースが最初に使用されます。同じメトリックを持つ複数のインター" +"フェースでは、負荷分散を行います。
負荷分散に設定されたメンバー インター" +"フェースでは、ウェイトの値が大きい方により多くのトラフィックを分配します。" +"
名前は A-Z, a-z, 0-9, _ を含むことができますが、スペースは使用できませ" +"ん。また、15文字以内でなければなりません。
ポリシーでは、設定済みのイン" +"ターフェースやメンバー、ルールと同じ名前を使用することはできません。" + +msgid "Policy assigned" +msgstr "アサイン済みポリシー" + +msgid "Protocol" +msgstr "プロトコル" + +msgid "Recovery interval" +msgstr "障害復旧 インターバル" + +msgid "Restart MWAN" +msgstr "MWAN の再起動" + +msgid "Restore default hotplug script" +msgstr "デフォルトのホットプラグ スクリプトの復元" + +msgid "Restore..." +msgstr "復元..." + +msgid "Rules" +msgstr "ルール" + +msgid "" +"Rules specify which traffic will use a particular MWAN policy based on IP " +"address, port or protocol
Rules are matched from top to bottom. Rules " +"below a matching rule are ignored. Traffic not matching any rule is routed " +"using the main routing table
Traffic destined for known (other than " +"default) networks is handled by the main routing table. Traffic matching a " +"rule, but all WAN interfaces for that policy are down will be blackholed
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Rules may " +"not share the same name as configured interfaces, members or policies" +msgstr "" +"ルールは IP アドレスやポート、プロトコルを基に、トラフィックがどの MWAN ポリ" +"シーを使用するかを設定します。
ルールは上から下へマッチングが行われ、合" +"致したルールより下のルールは無視されます。全てのルールに合致しないトラフィッ" +"クは、メインのルーティング テーブルを使用してルートが決定されます。
既知" +"（デフォルト以外）のネットワークへのトラフィックは、メインのルーティング テー" +"ブルによって制御されます。ルールに合致したトラフィックでも、当該ポリシーの全 " +"WAN インターフェースが Down 状態の場合は blackhole 状態となります。
名前" +"は A-Z, a-z, 0-9, _ を含むことができますが、スペースは使用できません。
" +"ルールは、設定済みのインターフェースやメンバー、ポリシーと同じ名前を使用する" +"ことはできません。" + +msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" +msgstr "秒。利用可能な値: 1-1000000。空欄の場合のデフォルト値は600です。" + +msgid "Source address" +msgstr "送信元アドレス" + +msgid "Source port" +msgstr "送信元ポート" + +msgid "Start MWAN" +msgstr "MWAN の起動" + +msgid "Sticky" +msgstr "Sticky" + +msgid "Sticky timeout" +msgstr "Sticky タイムアウト" + +msgid "Stop MWAN" +msgstr "MWAN の停止" + +msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" +msgstr "CIDR 表記のサポート（例: \"192.168.100.0/24\"）" + +msgid "There are currently %d of 250 supported interfaces configured" +msgstr "現在、250個中 %d 個のサポートされたインターフェースが設定済みです。" + +msgid "" +"This IP address will be pinged to dermine if the link is up or down. Leave " +"blank to assume interface is always online" +msgstr "" +"これらは、リンクの Up または Down を判定するために Ping が送信されるIP アドレ" +"スです。常にオンラインとする場合、空欄のままにします。" + +msgid "" +"This displays the metric assigned to this interface in /etc/config/network" +msgstr "" +"/etc/config/network で、このインターフェースに割り当てられたメトリックです。" + +msgid "This section allows you to modify the contents of /etc/config/mwan3" +msgstr "" +"このセクションでは、 /etc/config/mwan3 の内容を変更することができます。" + +msgid "This section allows you to modify the contents of /etc/config/network" +msgstr "" +"このセクションでは、 /etc/config/network の内容を変更することができます。" + +msgid "This section allows you to modify the contents of /etc/config/wireless" +msgstr "" +"このセクションでは、 /etc/config/wireless の内容を変更することができます。" + +msgid "" +"This section allows you to modify the contents of /etc/hotplug.d/iface/16-" +"mwancustom
This is useful for running system commands and/or scripts " +"based on interface ifup or ifdown hotplug events

Notes:
The " +"first line of the script must be "#!/bin/sh" without quotes
Lines beginning with # are comments and are not executed

Available variables:
$ACTION is the hotplug event (ifup, ifdown)
" +"$INTERFACE is the interface name (wan1, wan2, etc.)
$DEVICE is the " +"device name attached to the interface (eth0.1, eth1, etc.)" +msgstr "" +"このセクションでは、 /etc/hotplug.d/iface/16-mwancustom の内容を変更すること" +"ができます。
これは、インターフェースの ifup または ifdown ホットプラグ " +"イベント時にシステムコマンドまたはスクリプト、もしくはその両方を実行すること" +"に役立ちます。

注意:
スクリプトの1行目は、"#!bin/sh" " +"である必要があります（クオーテーション不要）。
# で始まる行はコメントと" +"して認識され、実行されません。

利用可能な変数:
$ACTION - ホッ" +"トプラグ イベント (ifup, ifdown)
$INTERFACE - インターフェース名（wan1, " +"wan2, その他）
$DEVICE - インターフェースにアタッチされたデバイスの名前" +"（eth0.1, eth1, その他）" + +msgid "Tracking IP" +msgstr "追跡 IP" + +msgid "Tracking reliability" +msgstr "追跡の信頼性" + +msgid "Traffic Rules" +msgstr "トラフィック ルール" + +msgid "" +"Traffic from the same source IP address that previously matched this rule " +"within the sticky timeout period will use the same WAN interface" +msgstr "" +"以前このルールにマッチした同じアクセス元 IP アドレスからのトラフィックが、再" +"度 Sticky 制限時間内にマッチした場合には、同じ WAN インターフェースが使用され" +"ます。" + +msgid "Troubleshooting" +msgstr "トラブルシューティング" + +msgid "Troubleshooting Data" +msgstr "トラブルシューティング データ" + +msgid "View the contents of /etc/protocols for protocol descriptions" +msgstr "プロトコルの説明については、 /etc/protocols の内容を確認してください。" + +msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgstr "" +"警告: %d 個のインターフェースが、最大個数の 250個 を超えて設定されています！" + +msgid "" +"WARNING: Some policies have names exceeding the maximum of 15 characters!" +msgstr "" +"警告: 最大文字数の 15 文字を超える名前が設定されているポリシーがあります！" + +msgid "" +"WARNING: some interfaces are configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" +"警告: 設定を誤っているか、もしくは完全に設定されていないインターフェースがあ" +"ります！" + +msgid "" +"WARNING: some interfaces have a higher reliability requirement than there " +"are tracking IP addresses!" +msgstr "" +"警告: 追跡 IP アドレスの個数より大きい追跡信頼性の値が設定されたインター" +"フェースがあります！" + +msgid "" +"WARNING: some interfaces have duplicate metrics configured in /etc/config/" +"network!" +msgstr "" +"警告: /etc/config/network で、重複するメトリックを設定されているインター" +"フェースがあります！" + +msgid "" +"WARNING: some interfaces have no default route in the main routing table!" +msgstr "" +"警告: メインのルーティング テーブルで、デフォルト ルートを設定されていないイ" +"ンターフェースがあります！" + +msgid "" +"WARNING: some interfaces have no metric configured in /etc/config/network!" +msgstr "" +"警告: /etc/config/network で、メトリックを設定されていないインターフェースが" +"あります！" + +msgid "" +"WARNING: some rules have a port configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" +"警告: 不適切なプロトコルが指定されている、または何も指定されていないポートを" +"設定されたルールがあります！プロトコルを指定し直してください！" + +msgid "" +"WARNING: this and other interfaces have duplicate metrics configured in /etc/" +"config/network!" +msgstr "" +"警告: これと他のインターフェースで重複するメトリックが /etc/config/network に" +"設定されています！" + +msgid "" +"WARNING: this interface has a higher reliability requirement than there are " +"tracking IP addresses!" +msgstr "" +"警告: このインターフェースは、追跡 IP アドレスの個数より大きい追跡信頼性の値" +"を設定されています！" + +msgid "WARNING: this interface has no default route in the main routing table!" +msgstr "" +"警告: このインターフェースは、メインのルーティング テーブルにデフォルト ルー" +"トが設定されていません！" + +msgid "" +"WARNING: this interface has no metric configured in /etc/config/network!" +msgstr "" +"警告: このインターフェースは、 /etc/config/network でメトリックが設定されてい" +"ません！" + +msgid "" +"WARNING: this interface is configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" +"警告: このインターフェースは /etc/config/network で設定が誤っているか、もしく" +"は完全に設定されていません！" + +msgid "" +"WARNING: this policy's name is %d characters exceeding the maximum of 15!" +msgstr "" +"警告: このポリシーの名前は、最大文字数 15 文字を超える %d 文字が設定されてい" +"ます！" + +msgid "" +"WARNING: this rule is incorrectly configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" +"警告: このルールは不適切なプロトコルが指定されているか、または何も指定されて" +"いません！プロトコルを指定し直してください！" + +msgid "Weight" +msgstr "ウエイト" + +msgid "" +"When all policy members are offline use this behavior for matched traffic" +msgstr "" +"ポリシーの全メンバーがオフラインの場合、合致したトラフィックに対してこのふる" +"まいが使用されます。" + +msgid "Wireless Config" +msgstr "無線設定" + +msgid "Yes" +msgstr "はい" + +msgid "always" +msgstr "always" + +msgid "blackhole (drop)" +msgstr "blackhole (drop)" + +msgid "default (use main routing table)" +msgstr "デフォルト（メインのルーティング テーブルを使用）" + +msgid "ifdown" +msgstr "ifdown" + +msgid "ifup" +msgstr "ifup" + +msgid "never" +msgstr "never" + +msgid "unreachable (reject)" +msgstr "unreachable (reject)" diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot new file mode 100644 index 000000000..0bda248fa --- /dev/null +++ b/applications/luci-app-mwan3/po/templates/mwan3.pot @@ -0,0 +1,464 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "%d hour" +msgstr "" + +msgid "%d minute" +msgstr "" + +msgid "%d minutes" +msgstr "" + +msgid "%d second" +msgstr "" + +msgid "%d seconds" +msgstr "" + +msgid "" +"Acceptable values: 1-100. This many Tracking IP addresses must respond for " +"the link to be deemed up" +msgstr "" + +msgid "Acceptable values: 1-1000. Defaults to 1 if not set" +msgstr "" + +msgid "Advanced" +msgstr "" + +msgid "Check IP rules" +msgstr "" + +msgid "Check routing table" +msgstr "" + +msgid "Configuration" +msgstr "" + +msgid "Currently Configured Interfaces" +msgstr "" + +msgid "Currently Configured Members" +msgstr "" + +msgid "Currently Configured Policies" +msgstr "" + +msgid "Destination address" +msgstr "" + +msgid "Destination port" +msgstr "" + +msgid "Detailed Status" +msgstr "" + +msgid "Diagnostic Results" +msgstr "" + +msgid "Diagnostics" +msgstr "" + +msgid "" +"Downed interface will be deemed up after this many successful ping tests" +msgstr "" + +msgid "Enabled" +msgstr "" + +msgid "Errors" +msgstr "" + +msgid "Failure interval" +msgstr "" + +msgid "Flush conntrack table" +msgstr "" + +msgid "Flush global firewall conntrack table on interface events" +msgstr "" + +msgid "Hotplug Script" +msgstr "" + +msgid "Hotplug ifdown" +msgstr "" + +msgid "Hotplug ifup" +msgstr "" + +msgid "IPset" +msgstr "" + +msgid "IPv4" +msgstr "" + +msgid "IPv6" +msgstr "" + +msgid "Interface" +msgstr "" + +msgid "Interface Status" +msgstr "" + +msgid "Interface down" +msgstr "" + +msgid "Interface up" +msgstr "" + +msgid "Interface will be deemed down after this many failed ping tests" +msgstr "" + +msgid "Interfaces" +msgstr "" + +msgid "Internet Protocol" +msgstr "" + +msgid "Last resort" +msgstr "" + +msgid "Load Balancing" +msgstr "" + +msgid "Loading" +msgstr "" + +msgid "MWAN Config" +msgstr "" + +msgid "MWAN Detailed Status" +msgstr "" + +msgid "MWAN Interface Configuration" +msgstr "" + +msgid "MWAN Interface Configuration - %s" +msgstr "" + +msgid "MWAN Interface Diagnostics" +msgstr "" + +msgid "MWAN Interface Live Status" +msgstr "" + +msgid "MWAN Interface Systemlog" +msgstr "" + +msgid "MWAN Member Configuration" +msgstr "" + +msgid "MWAN Member Configuration - %s" +msgstr "" + +msgid "MWAN Policy Configuration" +msgstr "" + +msgid "MWAN Policy Configuration - %s" +msgstr "" + +msgid "MWAN Rule Configuration" +msgstr "" + +msgid "MWAN Rule Configuration - %s" +msgstr "" + +msgid "MWAN Service Control" +msgstr "" + +msgid "" +"MWAN supports up to 250 physical and/or logical interfaces
MWAN " +"requires that all interfaces have a unique metric configured in /etc/config/" +"network
Names must match the interface name found in /etc/config/" +"network (see advanced tab)
Names may contain characters A-Z, a-z, 0-9, " +"_ and no spaces
Interfaces may not share the same name as configured " +"members, policies or rules" +msgstr "" + +msgid "" +"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " +"as a portrange (eg \"1024:2048\") without quotes" +msgstr "" + +msgid "Member used" +msgstr "" + +msgid "Members" +msgstr "" + +msgid "" +"Members are profiles attaching a metric and weight to an MWAN interface
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Members " +"may not share the same name as configured interfaces, policies or rules" +msgstr "" + +msgid "Members assigned" +msgstr "" + +msgid "Metric" +msgstr "" + +msgid "" +"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" +"youtube.com/youtube\")" +msgstr "" + +msgid "Network Config" +msgstr "" + +msgid "No" +msgstr "" + +msgid "Overview" +msgstr "" + +msgid "Ping count" +msgstr "" + +msgid "Ping default gateway" +msgstr "" + +msgid "Ping interval" +msgstr "" + +msgid "Ping interval during failure detection" +msgstr "" + +msgid "Ping interval during failure recovering" +msgstr "" + +msgid "Ping size" +msgstr "" + +msgid "Ping timeout" +msgstr "" + +msgid "Ping tracking IP" +msgstr "" + +msgid "Policies" +msgstr "" + +msgid "" +"Policies are profiles grouping one or more members controlling how MWAN " +"distributes traffic
Member interfaces with lower metrics are used " +"first. Interfaces with the same metric load-balance
Load-balanced " +"member interfaces distribute more traffic out those with higher weights
Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " +"15 characters or less
Policies may not share the same name as " +"configured interfaces, members or rules" +msgstr "" + +msgid "Policy assigned" +msgstr "" + +msgid "Protocol" +msgstr "" + +msgid "Recovery interval" +msgstr "" + +msgid "Restart MWAN" +msgstr "" + +msgid "Restore default hotplug script" +msgstr "" + +msgid "Restore..." +msgstr "" + +msgid "Rules" +msgstr "" + +msgid "" +"Rules specify which traffic will use a particular MWAN policy based on IP " +"address, port or protocol
Rules are matched from top to bottom. Rules " +"below a matching rule are ignored. Traffic not matching any rule is routed " +"using the main routing table
Traffic destined for known (other than " +"default) networks is handled by the main routing table. Traffic matching a " +"rule, but all WAN interfaces for that policy are down will be blackholed
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Rules may " +"not share the same name as configured interfaces, members or policies" +msgstr "" + +msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" +msgstr "" + +msgid "Source address" +msgstr "" + +msgid "Source port" +msgstr "" + +msgid "Start MWAN" +msgstr "" + +msgid "Sticky" +msgstr "" + +msgid "Sticky timeout" +msgstr "" + +msgid "Stop MWAN" +msgstr "" + +msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" +msgstr "" + +msgid "There are currently %d of 250 supported interfaces configured" +msgstr "" + +msgid "" +"This IP address will be pinged to dermine if the link is up or down. Leave " +"blank to assume interface is always online" +msgstr "" + +msgid "" +"This displays the metric assigned to this interface in /etc/config/network" +msgstr "" + +msgid "This section allows you to modify the contents of /etc/config/mwan3" +msgstr "" + +msgid "This section allows you to modify the contents of /etc/config/network" +msgstr "" + +msgid "This section allows you to modify the contents of /etc/config/wireless" +msgstr "" + +msgid "" +"This section allows you to modify the contents of /etc/hotplug.d/iface/16-" +"mwancustom
This is useful for running system commands and/or scripts " +"based on interface ifup or ifdown hotplug events

Notes:
The " +"first line of the script must be "#!/bin/sh" without quotes
Lines beginning with # are comments and are not executed

Available variables:
$ACTION is the hotplug event (ifup, ifdown)
" +"$INTERFACE is the interface name (wan1, wan2, etc.)
$DEVICE is the " +"device name attached to the interface (eth0.1, eth1, etc.)" +msgstr "" + +msgid "Tracking IP" +msgstr "" + +msgid "Tracking reliability" +msgstr "" + +msgid "Traffic Rules" +msgstr "" + +msgid "" +"Traffic from the same source IP address that previously matched this rule " +"within the sticky timeout period will use the same WAN interface" +msgstr "" + +msgid "Troubleshooting" +msgstr "" + +msgid "Troubleshooting Data" +msgstr "" + +msgid "View the contents of /etc/protocols for protocol descriptions" +msgstr "" + +msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgstr "" + +msgid "" +"WARNING: Some policies have names exceeding the maximum of 15 characters!" +msgstr "" + +msgid "" +"WARNING: some interfaces are configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: some interfaces have a higher reliability requirement than there " +"are tracking IP addresses!" +msgstr "" + +msgid "" +"WARNING: some interfaces have duplicate metrics configured in /etc/config/" +"network!" +msgstr "" + +msgid "" +"WARNING: some interfaces have no default route in the main routing table!" +msgstr "" + +msgid "" +"WARNING: some interfaces have no metric configured in /etc/config/network!" +msgstr "" + +msgid "" +"WARNING: some rules have a port configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" + +msgid "" +"WARNING: this and other interfaces have duplicate metrics configured in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: this interface has a higher reliability requirement than there are " +"tracking IP addresses!" +msgstr "" + +msgid "WARNING: this interface has no default route in the main routing table!" +msgstr "" + +msgid "" +"WARNING: this interface has no metric configured in /etc/config/network!" +msgstr "" + +msgid "" +"WARNING: this interface is configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: this policy's name is %d characters exceeding the maximum of 15!" +msgstr "" + +msgid "" +"WARNING: this rule is incorrectly configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" + +msgid "Weight" +msgstr "" + +msgid "" +"When all policy members are offline use this behavior for matched traffic" +msgstr "" + +msgid "Wireless Config" +msgstr "" + +msgid "Yes" +msgstr "" + +msgid "always" +msgstr "" + +msgid "blackhole (drop)" +msgstr "" + +msgid "default (use main routing table)" +msgstr "" + +msgid "ifdown" +msgstr "" + +msgid "ifup" +msgstr "" + +msgid "never" +msgstr "" + +msgid "unreachable (reject)" +msgstr "" diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po new file mode 100644 index 000000000..b8948b316 --- /dev/null +++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po @@ -0,0 +1,510 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"Last-Translator: Hsing-Wang Liao \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: zh_CN\n" + +msgid "%d hour" +msgstr "%d 小时" + +msgid "%d minute" +msgstr "%d 分钟" + +msgid "%d minutes" +msgstr "%d 分钟" + +msgid "%d second" +msgstr "%d 秒" + +msgid "%d seconds" +msgstr "%d 秒" + +msgid "" +"Acceptable values: 1-100. This many Tracking IP addresses must respond for " +"the link to be deemed up" +msgstr "" +"接受的值: 1-100。这个设置项指定了当多少个IP地址能够连通时接口会被认为在线" + +msgid "Acceptable values: 1-1000. Defaults to 1 if not set" +msgstr "接受的值: 1-100。如果不填写，默认值为 1" + +msgid "Advanced" +msgstr "高级" + +msgid "Check IP rules" +msgstr "检查IP规则" + +msgid "Check routing table" +msgstr "检查路由表" + +msgid "Configuration" +msgstr "配置" + +msgid "Currently Configured Interfaces" +msgstr "当前配置的接口" + +msgid "Currently Configured Members" +msgstr "当前配置的成员" + +msgid "Currently Configured Policies" +msgstr "当前配置的策略" + +msgid "Destination address" +msgstr "目标地址" + +msgid "Destination port" +msgstr "目标端口" + +msgid "Detailed Status" +msgstr "详细状态" + +msgid "Diagnostic Results" +msgstr "诊断结果" + +msgid "Diagnostics" +msgstr "诊断" + +msgid "" +"Downed interface will be deemed up after this many successful ping tests" +msgstr "当 Ping 成功次数达到这个数值后，已经被认为离线的接口将会重新上线" + +msgid "Enabled" +msgstr "启用" + +msgid "Errors" +msgstr "错误" + +msgid "Failure interval" +msgstr "故障检测间隔" + +msgid "Flush conntrack table" +msgstr "刷新连接跟踪表" + +msgid "Flush global firewall conntrack table on interface events" +msgstr "在接口事件触发时刷新全局防火墙连接跟踪表" + +msgid "Hotplug Script" +msgstr "Hotplug 脚本" + +msgid "Hotplug ifdown" +msgstr "Hotplug ifdown" + +msgid "Hotplug ifup" +msgstr "Hotplug ifup" + +msgid "IPset" +msgstr "IPset" + +msgid "IPv4" +msgstr "IPv4" + +msgid "IPv6" +msgstr "IPv6" + +msgid "Interface" +msgstr "接口" + +msgid "Interface Status" +msgstr "接口状态" + +msgid "Interface down" +msgstr "接口离线" + +msgid "Interface up" +msgstr "接口上线" + +msgid "Interface will be deemed down after this many failed ping tests" +msgstr "当 Ping 失败次数达到这个数值后接口会被认为离线" + +msgid "Interfaces" +msgstr "接口" + +msgid "Internet Protocol" +msgstr "互联网协议" + +msgid "Last resort" +msgstr "备用成员" + +msgid "Load Balancing" +msgstr "负载均衡" + +msgid "Loading" +msgstr "载入中" + +msgid "MWAN Config" +msgstr "MWAN 配置文件" + +msgid "MWAN Detailed Status" +msgstr "MWAN 详细状态" + +msgid "MWAN Interface Configuration" +msgstr "MWAN 接口配置" + +msgid "MWAN Interface Configuration - %s" +msgstr "MWAN 接口配置 - %s" + +msgid "MWAN Interface Diagnostics" +msgstr "MWAN 接口诊断" + +msgid "MWAN Interface Live Status" +msgstr "MWAN 接口实时状态" + +msgid "MWAN Interface Systemlog" +msgstr "MWAN 接口系统日志" + +msgid "MWAN Member Configuration" +msgstr "MWAN 成员配置" + +msgid "MWAN Member Configuration - %s" +msgstr "MWAN 成员配置 - %s" + +msgid "MWAN Policy Configuration" +msgstr "MWAN 策略配置" + +msgid "MWAN Policy Configuration - %s" +msgstr "MWAN 策略配置 - %s" + +msgid "MWAN Rule Configuration" +msgstr "MWAN 规则配置" + +msgid "MWAN Rule Configuration - %s" +msgstr "MWAN 规则配置 - %s" + +msgid "MWAN Service Control" +msgstr "MWAN 服务控制" + +msgid "" +"MWAN supports up to 250 physical and/or logical interfaces
MWAN " +"requires that all interfaces have a unique metric configured in /etc/config/" +"network
Names must match the interface name found in /etc/config/" +"network (see advanced tab)
Names may contain characters A-Z, a-z, 0-9, " +"_ and no spaces
Interfaces may not share the same name as configured " +"members, policies or rules" +msgstr "" +"MWAN 支持最多 250 个物理或逻辑接口。
MWAN 要求所有接口必须在 /etc/" +"config/network 中设定唯一的网关跃点。
名称必须与 /etc/config/network 中" +"的接口名称匹配。(可查看“高级”选项卡)
名称允许包括A-Z、a-z、0-9、_ 但是不" +"能有空格。
接口不应该与成员、策略、规则中的任意一个设置项使用相同的名称" + +msgid "" +"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or " +"as a portrange (eg \"1024:2048\") without quotes" +msgstr "" +"可以输入一个或多个端口 (例如 \"22\" 或者 \"80,443\") 或者是一个端口范围 (例" +"如 \"1024:2048\") 不含引号" + +msgid "Member used" +msgstr "使用的成员" + +msgid "Members" +msgstr "成员" + +msgid "" +"Members are profiles attaching a metric and weight to an MWAN interface
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Members " +"may not share the same name as configured interfaces, policies or rules" +msgstr "" +"“成员”用来设置每一个 MWAN 接口的跃点数 (即接口优先级) 和所占比重。
名称" +"允许包括 A-Z、 a-、0-9、_ 但是不能有空格。
成员不应该与接口、策略、规则" +"中的任意一个设置项使用相同的名称" + +msgid "Members assigned" +msgstr "分配的成员" + +msgid "Metric" +msgstr "跃点数" + +msgid "" +"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/" +"youtube.com/youtube\")" +msgstr "" +"匹配 IPset 规则列表名称。需要先配置 /etc/dnsmasq.conf 中的 IPset 规则 (例如: " +"\"ipset=/youtube.com/youtube\")" + +msgid "Network Config" +msgstr "网络配置文件" + +msgid "No" +msgstr "否" + +msgid "Overview" +msgstr "概况" + +msgid "Ping count" +msgstr "Ping 计数" + +msgid "Ping default gateway" +msgstr "Ping 默认网关" + +msgid "Ping interval" +msgstr "Ping 间隔" + +msgid "Ping interval during failure detection" +msgstr "故障检测期间的 Ping 间隔" + +msgid "Ping interval during failure recovering" +msgstr "故障恢复期间的 Ping 间隔" + +msgid "Ping size" +msgstr "Ping 大小" + +msgid "Ping timeout" +msgstr "Ping 超时" + +msgid "Ping tracking IP" +msgstr "Ping 跟踪 IP" + +msgid "Policies" +msgstr "策略" + +msgid "" +"Policies are profiles grouping one or more members controlling how MWAN " +"distributes traffic
Member interfaces with lower metrics are used " +"first. Interfaces with the same metric load-balance
Load-balanced " +"member interfaces distribute more traffic out those with higher weights
Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be " +"15 characters or less
Policies may not share the same name as " +"configured interfaces, members or rules" +msgstr "" +"“策略”把成员进行分组，告诉 MWAN 如何分配“规则”中使用这一策略的流量
拥有" +"较低跃点数的成员将会被优先使用。拥有相同跃点数的成员把流量进行负载均衡。
进行负载均衡的成员之间拥有较高比重的成员将会被分配到更多流量。
名称允许" +"包括A-Z、a-z、0-9、_ 但是不能有空格。名称应该在 15 个字符以内
策略不应该" +"与接口、成员、规则中的任意一个设置项使用相同的名称" + +msgid "Policy assigned" +msgstr "分配的策略" + +msgid "Protocol" +msgstr "通信协议" + +msgid "Recovery interval" +msgstr "故障恢复间隔" + +msgid "Restart MWAN" +msgstr "重启 MWAN" + +msgid "Restore default hotplug script" +msgstr "恢复默认的 hotplug 脚本" + +msgid "Restore..." +msgstr "恢复..." + +msgid "Rules" +msgstr "规则" + +msgid "" +"Rules specify which traffic will use a particular MWAN policy based on IP " +"address, port or protocol
Rules are matched from top to bottom. Rules " +"below a matching rule are ignored. Traffic not matching any rule is routed " +"using the main routing table
Traffic destined for known (other than " +"default) networks is handled by the main routing table. Traffic matching a " +"rule, but all WAN interfaces for that policy are down will be blackholed
Names may contain characters A-Z, a-z, 0-9, _ and no spaces
Rules may " +"not share the same name as configured interfaces, members or policies" +msgstr "" +"“规则”基于 IP 地址、协议、端口把流量划分到指定的“策略”中。
规则按照从上" +"到下的顺序进行匹配。除了第一条能够匹配一次通信的规则以外，其它规则将被忽略。" +"不匹配任何规则的通信将会由系统默认路由表进行。
来自已知的网络的转发流量" +"由系统默认路由表接手，然后 MWAN 从中匹配出相应的流量并转移到 MWAN 自己的路由" +"表。但是所有被划分到一个无法使用的策略的流量将会无法正常进行路由。
名称" +"允许包括A-Z、a-z、0-9、_ 但是不能有空格。
规则不应该与接口、成员、策略中" +"的任意一个设置项使用相同的名称" + +msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set" +msgstr "单位为秒。接受的值: 1-1000000。留空则使用默认值 600 秒" + +msgid "Source address" +msgstr "源地址" + +msgid "Source port" +msgstr "源端口" + +msgid "Start MWAN" +msgstr "启动 MWAN" + +msgid "Sticky" +msgstr "粘滞模式" + +msgid "Sticky timeout" +msgstr "粘滞超时" + +msgid "Stop MWAN" +msgstr "停止 MWAN" + +msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes" +msgstr "支持 CIDR 记法 (例如: \"192.168.100.0/24\") 不含引号" + +msgid "There are currently %d of 250 supported interfaces configured" +msgstr "" + +msgid "" +"This IP address will be pinged to dermine if the link is up or down. Leave " +"blank to assume interface is always online" +msgstr "" +"MWAN 将会通过 Ping 这些 IP 地址来确定接口是否上线。如果留空，则 MWAN 认为该接" +"口永远在线" + +msgid "" +"This displays the metric assigned to this interface in /etc/config/network" +msgstr "这里显示了这个接口在 /etc/config/network 中配置的跃点数" + +msgid "This section allows you to modify the contents of /etc/config/mwan3" +msgstr "这里允许你修改 /etc/config/mwan3 的内容" + +msgid "This section allows you to modify the contents of /etc/config/network" +msgstr "这里允许你修改 /etc/config/network 的内容" + +msgid "This section allows you to modify the contents of /etc/config/wireless" +msgstr "这里允许你修改 /etc/config/wireless 的内容" + +msgid "" +"This section allows you to modify the contents of /etc/hotplug.d/iface/16-" +"mwancustom
This is useful for running system commands and/or scripts " +"based on interface ifup or ifdown hotplug events

Notes:
The " +"first line of the script must be "#!/bin/sh" without quotes
Lines beginning with # are comments and are not executed

Available variables:
$ACTION is the hotplug event (ifup, ifdown)
" +"$INTERFACE is the interface name (wan1, wan2, etc.)
$DEVICE is the " +"device name attached to the interface (eth0.1, eth1, etc.)" +msgstr "" +"这里允许你修改/etc/hotplug.d/iface/16-mwancustom 的内容
这可以在接口 " +"ifup 或 ifdown Hotplug 事件时运行系统命令或脚本

注意:
脚本的" +"第一行必须是 "#!/bin/sh" 不含引号
以＃开头的行是注释，不会执行" +"

可用变量:
$ACTION 是 Hotplug 事件 (ifup, ifdown)
" +"$INTERFACE 是接口名称 (wan1、wan2 等)
$DEVICE 是连接到接口的设备名称 " +"(eth0.1、eth1 等)" + +msgid "Tracking IP" +msgstr "跟踪的 IP" + +msgid "Tracking reliability" +msgstr "跟踪可靠性" + +msgid "Traffic Rules" +msgstr "流量规则" + +msgid "" +"Traffic from the same source IP address that previously matched this rule " +"within the sticky timeout period will use the same WAN interface" +msgstr "" +"来自相同源 IP 的流量，如果已经匹配过此规则并且在粘滞超时时间内，将会使用相同" +"的 WAN 接口" + +msgid "Troubleshooting" +msgstr "故障排除" + +msgid "Troubleshooting Data" +msgstr "故障排除数据" + +msgid "View the contents of /etc/protocols for protocol descriptions" +msgstr "请查看 /etc/protocols 获取可选协议详情" + +msgid "WARNING: %d interfaces are configured exceeding the maximum of 250!" +msgstr "" + +msgid "" +"WARNING: Some policies have names exceeding the maximum of 15 characters!" +msgstr "" + +msgid "" +"WARNING: some interfaces are configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: some interfaces have a higher reliability requirement than there " +"are tracking IP addresses!" +msgstr "" + +msgid "" +"WARNING: some interfaces have duplicate metrics configured in /etc/config/" +"network!" +msgstr "" + +msgid "" +"WARNING: some interfaces have no default route in the main routing table!" +msgstr "" + +msgid "" +"WARNING: some interfaces have no metric configured in /etc/config/network!" +msgstr "" + +msgid "" +"WARNING: some rules have a port configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" + +msgid "" +"WARNING: this and other interfaces have duplicate metrics configured in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: this interface has a higher reliability requirement than there are " +"tracking IP addresses!" +msgstr "" + +msgid "WARNING: this interface has no default route in the main routing table!" +msgstr "" + +msgid "" +"WARNING: this interface has no metric configured in /etc/config/network!" +msgstr "" + +msgid "" +"WARNING: this interface is configured incorrectly or not at all in /etc/" +"config/network!" +msgstr "" + +msgid "" +"WARNING: this policy's name is %d characters exceeding the maximum of 15!" +msgstr "" + +msgid "" +"WARNING: this rule is incorrectly configured with no or improper protocol " +"specified! Please configure a specific protocol!" +msgstr "" + +msgid "Weight" +msgstr "比重" + +msgid "" +"When all policy members are offline use this behavior for matched traffic" +msgstr "当所有策略成员都无法使用的时候，对使用该策略的流量使用这个操作" + +msgid "Wireless Config" +msgstr "无线配置" + +msgid "Yes" +msgstr "是" + +msgid "always" +msgstr "总是" + +msgid "blackhole (drop)" +msgstr "黑洞 (丢弃)" + +msgid "default (use main routing table)" +msgstr "默认 (使用主路由表)" + +msgid "ifdown" +msgstr "ifdown" + +msgid "ifup" +msgstr "ifup" + +msgid "never" +msgstr "从不" + +msgid "unreachable (reject)" +msgstr "不可达 (拒绝)" diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua index d0771e583..7865881cb 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua @@ -367,123 +367,122 @@ local knownParams = { "server", "10.200.200.0 255.255.255.0", translate("Configure server mode"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "server_bridge", "10.200.200.1 255.255.255.0 10.200.200.200 10.200.200.250", translate("Configure server bridge"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { DynamicList, "push", { "redirect-gateway", "comp-lzo" }, translate("Push options to peer"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "push_reset", 0, translate("Don't inherit global push options"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "disable", 0, translate("Client is disabled"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "ifconfig_pool", "10.200.200.100 10.200.200.150 255.255.255.0", translate("Set aside a pool of subnets"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "ifconfig_pool_persist", "/etc/openvpn/ipp.txt 600", translate("Persist/unpersist ifconfig-pool"), - { server_mode="1" } }, + { client="0" }, { client="" } }, -- deprecated and replaced by --topology p2p -- { Flag, -- "ifconfig_pool_linear", -- 0, -- translate("Use individual addresses rather than /30 subnets"), - -- { server_mode="1" } }, + -- { client="0" }, { client="" } }, { Value, "ifconfig_push", "10.200.200.1 255.255.255.255", translate("Push an ifconfig option to remote"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "iroute", "10.200.200.0 255.255.255.0", translate("Route subnet to client"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "client_to_client", 0, translate("Allow client-to-client traffic"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "duplicate_cn", 0, translate("Allow multiple clients with same certificate"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "client_config_dir", "/etc/openvpn/ccd", translate("Directory for custom client config files"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "ccd_exclusive", 0, translate("Refuse connection if no custom client config"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "tmp_dir", "/var/run/openvpn", translate("Temporary directory for client-connect return file"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "hash_size", "256 256", translate("Set size of real and virtual address hash tables"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "bcast_buffers", 256, translate("Number of allocated broadcast buffers"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "tcp_queue_limit", 64, translate("Maximum number of queued TCP output packets"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "max_clients", 10, translate("Allowed maximum of connected clients"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "max_routes_per_client", 256, translate("Allowed maximum of internal"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Value, "connect_freq", "3 10", translate("Allowed maximum of new connections"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "client_cert_not_required", 0, translate("Don't require client certificate"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "username_as_common_name", 0, translate("Use username as common name"), - { server_mode="1" } }, + { client="0" }, { client="" } }, { Flag, "client", 0, - translate("Configure client mode"), - { server_mode="0" }, { server_mode="" } }, + translate("Configure client mode") }, { Flag, "pull", 0, @@ -511,7 +510,7 @@ local knownParams = { { client="1" } }, { Flag, "remote_random", - 1, + 0, translate("Randomly choose remote server"), { client="1" } }, { ListValue, diff --git a/applications/luci-app-openvpn/po/zh-cn/openvpn.po b/applications/luci-app-openvpn/po/zh-cn/openvpn.po index 899b4d238..3904ac4bf 100644 --- a/applications/luci-app-openvpn/po/zh-cn/openvpn.po +++ b/applications/luci-app-openvpn/po/zh-cn/openvpn.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:35+0200\n" -"PO-Revision-Date: 2013-10-10 06:09+0200\n" -"Last-Translator: Tanyingyu \n" +"PO-Revision-Date: 2017-04-14 17:26-0600\n" +"Last-Translator: liushuyu \n" "Language-Team: QQ Group 75543259 \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: Pootle 2.0.6\n" +"X-Generator: Poedit 2.0.1\n" msgid "%s" msgstr "%s" @@ -498,13 +498,13 @@ msgid "Temporary directory for client-connect return file" msgstr "客户端连接返回文件的临时目录" msgid "The highest supported TLS version" -msgstr "" +msgstr "最高支持的 TLS 版本" msgid "The key direction for 'tls-auth' and 'secret' options" msgstr "" msgid "The lowest supported TLS version" -msgstr "" +msgstr "最低支持的 TLS 版本" msgid "Timeframe for key exchange" msgstr "密钥交换时间表" diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po index ff75c8bf1..7926595b6 100644 --- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po +++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po @@ -34,7 +34,9 @@ msgid "Force Router DNS server to all local devices" msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制" msgid "Forces Router DNS use on local devices, also known as DNS Hijacking" -msgstr "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、DNS ハイジャックとしても知られています。" +msgstr "" +"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、" +"DNS ハイジャックとしても知られています。" msgid "Individual domains to be blacklisted" msgstr "ブラックリストに登録する、個々のドメインです。" diff --git a/applications/luci-app-statistics/po/zh-cn/rrdtool.po b/applications/luci-app-statistics/po/zh-cn/rrdtool.po index 4e6ee4b4d..d55398ace 100644 --- a/applications/luci-app-statistics/po/zh-cn/rrdtool.po +++ b/applications/luci-app-statistics/po/zh-cn/rrdtool.po @@ -2,16 +2,17 @@ # generated from ./applications/luci-statistics/luasrc/i18n/rrdtool.en.lua msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2014-07-23 02:08+0200\n" -"Last-Translator: Tanyingyu \n" +"Project-Id-Version: \n" +"PO-Revision-Date: 2017-04-15 21:41-0600\n" +"Last-Translator: liushuyu \n" "Language-Team: none\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: Pootle 2.0.6\n" +"X-Generator: Poedit 2.0.1\n" +"POT-Creation-Date: \n" #. %H: Wireless - Signal Noise Ratio #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:1 @@ -36,12 +37,12 @@ msgstr "信号强度" #. %H: Wireless - Signal Quality #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:5 msgid "stat_dg_title_wireless__signal_quality" -msgstr "无线信号质量" +msgstr "%H: 无线 - 信号质量" #. n #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:6 msgid "stat_dg_label_wireless__signal_quality" -msgstr "无线信号质量" +msgstr "n" #. Signal Quality #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:7 @@ -51,7 +52,7 @@ msgstr "信号质量" #. %H: ICMP Roundtrip Times #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:8 msgid "stat_dg_title_ping" -msgstr "ping" +msgstr "%H: ICMP 往返时间" #. ms #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:9 @@ -61,299 +62,299 @@ msgstr "响应" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:10 msgid "stat_ds_ping" -msgstr "ping" +msgstr "%di" #. %H: Firewall - Processed Packets #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:11 msgid "stat_dg_title_iptables__ipt_packets" -msgstr "iptables包" +msgstr "%H: 防火墙 - 已处理的数据包" #. Packets/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:12 msgid "stat_dg_label_iptables__ipt_packets" -msgstr "" +msgstr "Packets/s" #. Chain \"%di\" #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:13 msgid "stat_ds_ipt_packets" -msgstr "" +msgstr "Chain \\\"%di\\\"" #. %H: Netlink - Transfer on %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:14 msgid "stat_dg_title_netlink__if_octets" -msgstr "" +msgstr "%H: Netlink - %pi 上的数据传输" #. Bytes/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:15 msgid "stat_dg_label_netlink__if_octets" -msgstr "" +msgstr "字节/秒" #. Bytes (%ds) #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:16 msgid "stat_ds_if_octets" -msgstr "" +msgstr "字节 (%ds)" #. %H: Netlink - Packets on %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:17 msgid "stat_dg_title_netlink__if_packets" -msgstr "" +msgstr "%H: Netlink - %pi 的数据包" #. Packets/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:18 msgid "stat_dg_label_netlink__if_packets" -msgstr "" +msgstr "Packets/s" #. Processed (%ds) #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:19 msgid "stat_ds_if_packets" -msgstr "" +msgstr "已处理 (%ds)" #. Dropped (%ds) #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:20 msgid "stat_ds_if_dropped" -msgstr "" +msgstr "丢弃 (%ds)" #. Errors (%ds) #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:21 msgid "stat_ds_if_errors" -msgstr "" +msgstr "错误 (%ds)" #. %H: Netlink - Multicast on %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:22 msgid "stat_dg_title_netlink__if_multicast" -msgstr "" +msgstr "%H: Netlink - %pi 上的多播" #. Packets/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:23 msgid "stat_dg_label_netlink__if_multicast" -msgstr "" +msgstr "Packets/s" #. Packets #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:24 msgid "stat_ds_if_multicast" -msgstr "" +msgstr "数据包" #. %H: Netlink - Collisions on %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:25 msgid "stat_dg_title_netlink__if_collisions" -msgstr "" +msgstr "%H: Netlink - %pi 上的 Collisions" #. Collisions/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:26 msgid "stat_dg_label_netlink__if_collisions" -msgstr "" +msgstr "Collisions/s" #. Collisions #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:27 msgid "stat_ds_if_collisions" -msgstr "" +msgstr "Collisions" #. %H: Netlink - Errors on %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:28 msgid "stat_dg_title_netlink__if_tx_errors" -msgstr "" +msgstr "%H: Netlink - %pi 上发生的错误" #. Errors/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:29 msgid "stat_dg_label_netlink__if_tx_errors" -msgstr "" +msgstr "错误/秒" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:30 msgid "stat_ds_if_tx_errors" -msgstr "" +msgstr "%di" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:31 msgid "stat_ds_if_rx_errors" -msgstr "" +msgstr "%di" #. %H: Processes #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:32 msgid "stat_dg_title_processes" -msgstr "" +msgstr "%H: 进程" #. Processes/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:33 msgid "stat_dg_label_processes" -msgstr "" +msgstr "进程/秒" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:34 msgid "stat_ds_ps_state" -msgstr "" +msgstr "%di" #. %H: Process %pi - used cpu time #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:35 msgid "stat_dg_title_processes__ps_cputime" -msgstr "" +msgstr "%H: 进程 %s - 占用的 CPU 时间" #. Jiffies #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:36 msgid "stat_dg_label_processes__ps_cputime" -msgstr "" +msgstr "Jiffies" #. system #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:37 msgid "stat_ds_ps_cputime__syst" -msgstr "" +msgstr "系统" #. user #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:38 msgid "stat_ds_ps_cputime__user" -msgstr "" +msgstr "用户" #. %H: Process %pi - threads and processes #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:39 msgid "stat_dg_title_processes__ps_count" -msgstr "" +msgstr "%H: 进程 %pi - 进程与线程" #. Count #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:40 msgid "stat_dg_label_processes__ps_count" -msgstr "" +msgstr "个" #. %ds #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:41 msgid "stat_ds_ps_count" -msgstr "" +msgstr "%ds" #. %H: Process %pi - page faults #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:42 msgid "stat_dg_title_processes__ps_pagefaults" -msgstr "" +msgstr "%H: 进程 %pi - 分页错误" #. Pagefaults #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:43 msgid "stat_dg_label_processes__ps_pagefaults" -msgstr "" +msgstr "分页错误" #. page faults #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:44 msgid "stat_ds_ps_pagefaults" -msgstr "" +msgstr "分页错误" #. %H: Process %pi - virtual memory size #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:45 msgid "stat_dg_title_processes__ps_rss" -msgstr "" +msgstr "%H: 进程 %pi - 虚拟内存大小" #. Bytes #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:46 msgid "stat_dg_label_processes__ps_rss" -msgstr "" +msgstr "字节" #. virtual memory #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:47 msgid "stat_ds_ps_rss" -msgstr "" +msgstr "虚拟内存" #. %H: Usage on Processor #%pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:48 msgid "stat_dg_title_cpu" -msgstr "" +msgstr "%H: 对处理器 #%pi 的占用" #. % #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:49 msgid "stat_dg_label_cpu" -msgstr "" +msgstr "%" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:50 msgid "stat_ds_cpu" -msgstr "" +msgstr "%di" #. %H: Transfer on %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:51 msgid "stat_dg_title_interface__if_octets" -msgstr "" +msgstr "%H: %di 上的数据传输情况" #. Bytes/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:52 msgid "stat_dg_label_interface__if_octets" -msgstr "" +msgstr "字节/秒" #. %H: Packets on %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:53 msgid "stat_dg_title_interface__if_packets" -msgstr "" +msgstr "%H: %di 上的数据包" #. Packets/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:54 msgid "stat_dg_label_interface__if_packets" -msgstr "" +msgstr "Packets/s" #. %H: TCP-Connections to Port %pi #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:55 msgid "stat_dg_title_tcpconns" -msgstr "" +msgstr "%H: 到端口 %pi 的 TCP 连接" #. Connections/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:56 msgid "stat_dg_label_tcpconns" -msgstr "" +msgstr "连接/秒" #. %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:57 msgid "stat_ds_tcp_connections" -msgstr "" +msgstr "%di" #. %H: Disk Space Usage on %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:58 msgid "stat_dg_title_df" -msgstr "" +msgstr "%H: %di 上的磁盘占用情况" #. Bytes #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:59 msgid "stat_dg_label_df" -msgstr "" +msgstr "字节" #. %ds #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:60 msgid "stat_ds_df__free" -msgstr "" +msgstr "%ds" #. %ds #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:61 msgid "stat_ds_df__used" -msgstr "" +msgstr "%ds" #. %H: Interrupts #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:62 msgid "stat_dg_title_irq" -msgstr "" +msgstr "%H: 中断" #. Issues/s #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:63 msgid "stat_dg_label_irq" -msgstr "" +msgstr "Issues/s" #. IRQ %di #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:64 msgid "stat_ds_irq" -msgstr "" +msgstr "IRQ %di" #. %H: System Load #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:65 msgid "stat_dg_title_load" -msgstr "" +msgstr "%H: 系统负载" #. Load #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:66 msgid "stat_dg_label_load" -msgstr "" +msgstr "负载" #. 1 min #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:67 msgid "stat_ds_load__shortterm" -msgstr "" +msgstr "1 分钟" #. 5 min #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:68 msgid "stat_ds_load__midterm" -msgstr "" +msgstr "5 分钟" #. 15 min #: applications/luci-statistics/luasrc/i18n/rrdtool.en.lua:69 msgid "stat_ds_load__longterm" -msgstr "" +msgstr "15 分钟" diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po index a55f73fb1..a12385117 100644 --- a/applications/luci-app-statistics/po/zh-cn/statistics.po +++ b/applications/luci-app-statistics/po/zh-cn/statistics.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-06-10 03:40+0200\n" -"PO-Revision-Date: 2014-06-13 15:04+0200\n" -"Last-Translator: phantasm131 \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2017-04-15 21:46-0600\n" +"Last-Translator: liushuyu \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: Pootle 2.0.6\n" +"X-Generator: Poedit 2.0.1\n" +"Language-Team: \n" msgid "Action (target)" msgstr "动作（目标）" @@ -38,10 +38,10 @@ msgid "Basic monitoring" msgstr "基本监控" msgid "CPU Frequency" -msgstr "" +msgstr "CPU 频率" msgid "CPU Frequency Plugin Configuration" -msgstr "" +msgstr "CPU 频率插件配置" msgid "CPU Plugin Configuration" msgstr "CPU插件配置" @@ -133,16 +133,16 @@ msgid "Email" msgstr "电子邮件" 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 "Exec" @@ -166,7 +166,7 @@ msgid "Gather compression statistics" msgstr "" msgid "General plugins" -msgstr "" +msgstr "通用插件" msgid "Generate a separate graph for each logged user" msgstr "" @@ -198,7 +198,7 @@ msgid "" msgstr "在这里，你可以定义各种监控iptables规则临界值。" msgid "Hold Ctrl to select multiple items or to deselect entries." -msgstr "" +msgstr "按住 Ctrl 键来选择或取消选择多个项目。" msgid "Host" msgstr "主机" @@ -269,10 +269,10 @@ msgid "Monitor all local listen ports" msgstr "监测所有本地监听端口" msgid "Monitor all sensors" -msgstr "" +msgstr "监控所有传感器" msgid "Monitor device(s) / thermal zone(s)" -msgstr "" +msgstr "监控设备/温感区域" msgid "Monitor devices" msgstr "监测设备" @@ -329,6 +329,8 @@ msgid "" "Note: as pages are rendered by user 'nobody', the *.rrd files, the storage " "directory and all its parent directories need to be world readable." msgstr "" +"注意：由于页面是以 'nobody' 身份生成的，因此 *.rrd 文件以及包含此文件的所有父" +"目录必须全局可读。" msgid "Number of threads for data collection" msgstr "收集程序使用线程数" @@ -343,13 +345,13 @@ 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 "选项" @@ -409,13 +411,13 @@ msgid "Seconds" msgstr "秒" msgid "Sensor list" -msgstr "" +msgstr "传感器列表" msgid "Sensors" -msgstr "" +msgstr "传感器" msgid "Sensors Plugin Configuration" -msgstr "" +msgstr "传感器插件配置" msgid "Server host" msgstr "服务器主机" @@ -424,7 +426,7 @@ msgid "Server port" msgstr "服务器端口" msgid "Setup" -msgstr "" +msgstr "设置" msgid "Shaping class monitoring" msgstr "整形类监控" @@ -503,7 +505,7 @@ msgstr "OLSRd插件通过txtinfo获取meshed网络信息。" msgid "" "The OpenVPN plugin gathers information about the current vpn connection " "status." -msgstr "" +msgstr "OpenVPN 插件可以获取 VPN 连接当前状态" msgid "" "The conntrack plugin collects statistics about the number of tracked " @@ -629,6 +631,9 @@ msgid "" "to gather data and RRDtool to " "render diagram images." msgstr "" +"Statistics 软件包使用 Collectd 来收集数" +"据，并用 RRDtool 生成统计图" +"表。" msgid "" "The tcpconns plugin collects informations about open tcp connections on " @@ -640,6 +645,8 @@ msgid "" "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be " "read, e.g. thermal_zone1 )" msgstr "" +"温感插件将会监控系统温度。数据主要取自 /sys/class/thermal/*/temp ('*' 表示温" +"感设备的名字，比如 thermal_zone1) 。" msgid "" "The unixsock plugin creates a unix socket which can be used to read " @@ -650,13 +657,13 @@ msgid "The uptime plugin collects statistics about the uptime of the system." msgstr "" msgid "Thermal" -msgstr "" +msgstr "温感" msgid "Thermal Plugin Configuration" -msgstr "" +msgstr "温感插件配置" msgid "This plugin collects statistics about the processor frequency scaling." -msgstr "" +msgstr "此插件会获取 CPU 频率调整的数据。" msgid "" "This section defines on which interfaces collectd will wait for incoming " @@ -686,13 +693,13 @@ msgid "Unixsock Plugin Configuration" msgstr "Unixsock插件配置" msgid "Uptime" -msgstr "" +msgstr "运行时间" msgid "Uptime Plugin Configuration" -msgstr "" +msgstr "运行时间插件配置" msgid "Use improved naming schema" -msgstr "" +msgstr "使用更高级的命名规则" msgid "Used PID file" msgstr "正在使用的PID文件" @@ -711,7 +718,7 @@ msgstr "无线iwinfo插件配置" msgid "" "You can install additional collectd-mod-* plugins to enable more statistics." -msgstr "" +msgstr "您可以安装更多的 collectd-mod-* 插件以获得更多的统计数据。" msgid "e.g. br-ff" msgstr "例如：br-ff" diff --git a/applications/luci-app-travelmate/Makefile b/applications/luci-app-travelmate/Makefile index f4b1b0a4e..6170f9d4c 100644 --- a/applications/luci-app-travelmate/Makefile +++ b/applications/luci-app-travelmate/Makefile @@ -1,11 +1,11 @@ -# -# This is free software, licensed under the Apache License, Version 2.0 . +# Copyright 2017 Dirk Brenken (dev@brenken.org) +# This is free software, licensed under the Apache License, Version 2.0 # include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Travelmate -LUCI_DEPENDS:=+travelmate +LUCI_DEPENDS:=+travelmate +luci-lib-jsonc LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua index 27c19c4e5..4286b80d7 100644 --- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua +++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua @@ -1,11 +1,29 @@ --- Licensed to the public under the Apache License 2.0. +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 module("luci.controller.travelmate", package.seeall) +local fs = require("nixio.fs") +local util = require("luci.util") +local template = require("luci.template") +local i18n = require("luci.i18n") + function index() if not nixio.fs.access("/etc/config/travelmate") then return end + entry({"admin", "services", "travelmate"}, firstchild(), _("Travelmate"), 30).dependent = false + entry({"admin", "services", "travelmate", "tab_from_cbi"}, cbi("travelmate/overview_tab"), _("Overview"), 10).leaf = true + entry({"admin", "services", "travelmate", "logfile"}, call("logread"), _("View Logfile"), 20).leaf = true + entry({"admin", "services", "travelmate", "advanced"}, firstchild(), _("Advanced"), 100) + entry({"admin", "services", "travelmate", "advanced", "setup"}, cbi("travelmate/setup_tab"), _("Setup WWAN Interface"), 110).leaf = true + entry({"admin", "services", "travelmate", "advanced", "configuration"}, cbi("travelmate/configuration_tab"), _("Edit Travelmate Configuration"), 120).leaf = true + entry({"admin", "services", "travelmate", "advanced", "cfg_wireless"}, cbi("travelmate/cfg_wireless_tab"), _("Edit Wireless Configuration"), 130).leaf = true + entry({"admin", "services", "travelmate", "advanced", "cfg_network"}, cbi("travelmate/cfg_network_tab"), _("Edit Network Configuration"), 140).leaf = true + entry({"admin", "services", "travelmate", "advanced", "cfg_firewall"}, cbi("travelmate/cfg_firewall_tab"), _("Edit Firewall Configuration"), 150).leaf = true +end - entry({"admin", "services", "travelmate"}, cbi("travelmate"), _("Travelmate"), 60) +function logread() + local logfile = util.trim(util.exec("logread -e 'travelmate'")) + template.render("travelmate/logread", {title = i18n.translate("Travelmate Logfile"), content = logfile}) end diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua deleted file mode 100644 index fa44d4b52..000000000 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate.lua +++ /dev/null @@ -1,53 +0,0 @@ --- Licensed to the public under the Apache License 2.0. - -m = Map("travelmate", translate("Travelmate"), - translate("Configuration of the Travelmate package to enable travel router functionality. ") .. [[

]] .. - translate("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. ") .. - [[]] - .. translate("Link to detailed advice") - .. [[]] ) - --- General options - -s = m:section(NamedSection, "global", "travelmate", translate("Global options")) - -o = s:option(Flag, "trm_enabled", translate("Enable Travelmate")) -o.rmempty = false -o.default = 0 - -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 = 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 1-10")) -o.rmempty = false -o.default = 3 -o.datatype = "range(1,10)" - --- Extra options - -e = m:section(NamedSection, "global", "travelmate", translate("Extra options")) - -a = e:option(Flag, "trm_debug", translate("Debug logging")) -a.rmempty = true -a.default = a.disabled - -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" - -a = e:option(Flag, "trm_iw", translate("Use iw for scanning"), - translate("Disable this if you want to use iwinfo instead of iw")) -a.rmempty = true -a.default = a.enabled - -return m - diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua new file mode 100644 index 000000000..009ed805d --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua @@ -0,0 +1,36 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local fs = require("nixio.fs") +local util = require("luci.util") +local trminput = "/etc/config/firewall" + +if not nixio.fs.access(trminput) then + m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) + return m +end + +m = SimpleForm("input", nil) +m:append(Template("travelmate/config_css")) +m.reset = false + +s = m:section(SimpleSection, nil, + translate("This form allows you to modify the content of the main firewall configuration file (/etc/config/firewall).")) + +f = s:option(TextValue, "data") +f.rows = 20 +f.rmempty = true + +function f.cfgvalue() + return nixio.fs.readfile(trminput) or "" +end + +function f.write(self, section, data) + return nixio.fs.writefile(trminput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end + +function s.handle(self, state, data) + return true +end + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua new file mode 100644 index 000000000..4d43637d9 --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua @@ -0,0 +1,36 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local fs = require("nixio.fs") +local util = require("luci.util") +local trminput = "/etc/config/network" + +if not nixio.fs.access(trminput) then + m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) + return m +end + +m = SimpleForm("input", nil) +m:append(Template("travelmate/config_css")) +m.reset = false + +s = m:section(SimpleSection, nil, + translate("This form allows you to modify the content of the main network configuration file (/etc/config/network).")) + +f = s:option(TextValue, "data") +f.rows = 20 +f.rmempty = true + +function f.cfgvalue() + return nixio.fs.readfile(trminput) or "" +end + +function f.write(self, section, data) + return nixio.fs.writefile(trminput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end + +function s.handle(self, state, data) + return true +end + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua new file mode 100644 index 000000000..a025c1379 --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua @@ -0,0 +1,36 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local fs = require("nixio.fs") +local util = require("luci.util") +local trminput = "/etc/config/wireless" + +if not nixio.fs.access(trminput) then + m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) + return m +end + +m = SimpleForm("input", nil) +m:append(Template("travelmate/config_css")) +m.reset = false + +s = m:section(SimpleSection, nil, + translate("This form allows you to modify the content of the main wireless configuration file (/etc/config/wireless).")) + +f = s:option(TextValue, "data") +f.rows = 20 +f.rmempty = true + +function f.cfgvalue() + return nixio.fs.readfile(trminput) or "" +end + +function f.write(self, section, data) + return nixio.fs.writefile(trminput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end + +function s.handle(self, state, data) + return true +end + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua new file mode 100644 index 000000000..6e9e2872f --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua @@ -0,0 +1,36 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local fs = require("nixio.fs") +local util = require("luci.util") +local trminput = "/etc/config/travelmate" + +if not nixio.fs.access(trminput) then + m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) + return m +end + +m = SimpleForm("input", nil) +m:append(Template("travelmate/config_css")) +m.reset = false + +s = m:section(SimpleSection, nil, + translate("This form allows you to modify the content of the main travelmate configuration file (/etc/config/travelmate).")) + +f = s:option(TextValue, "data") +f.rows = 20 +f.rmempty = true + +function f.cfgvalue() + return nixio.fs.readfile(trminput) or "" +end + +function f.write(self, section, data) + return nixio.fs.writefile(trminput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") +end + +function s.handle(self, state, data) + return true +end + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua new file mode 100644 index 000000000..085d413d9 --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua @@ -0,0 +1,129 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local fs = require("nixio.fs") +local uci = require("uci") +local sys = require("luci.sys") +local json = require("luci.jsonc") +local trminput = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json" +local parse = json.parse(fs.readfile(trminput) or "") + +m = Map("travelmate", translate("Travelmate"), + translate("Configuration of the travelmate package to to enable travel router functionality. ") + .. translate("For further information ") + .. [[]] + .. translate("see online documentation") + .. [[]] + .. translate(".")) + +-- Main travelmate options + +s = m:section(NamedSection, "global", "travelmate") + +o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate")) +o1.default = o1.disabled +o1.rmempty = false + +o2 = s:option(Flag, "trm_automatic", translate("Enable 'automatic' mode"), + translate("Keep travelmate in an active state.")) +o2.default = o2.enabled +o2.rmempty = false + +o3 = s:option(Value, "trm_iface", translate("Restrict interface trigger to certain interface(s)"), + translate("Space separated list of interfaces that trigger travelmate processing. ".. + "To disable event driven (re-)starts remove all entries.")) +o3.rmempty = true + +o4 = s:option(Value, "trm_triggerdelay", translate("Trigger delay"), + translate("Additional trigger delay in seconds before travelmate processing begins.")) +o4.default = 2 +o4.datatype = "range(1,90)" +o4.rmempty = false + +o5 = s:option(Flag, "trm_debug", translate("Enable verbose debug logging")) +o5.default = o5.disabled +o5.rmempty = false + +-- Runtime information + +ds = s:option(DummyValue, "_dummy", translate("Runtime information")) +ds.template = "cbi/nullsection" + +dv1 = s:option(DummyValue, "status", translate("Online Status")) +dv1.template = "travelmate/runtime" +if parse == nil then + dv1.value = translate("n/a") +elseif parse.data.station_connection == "true" then + dv1.value = translate("connected") +else + dv1.value = translate("not connected") +end + +dv2 = s:option(DummyValue, "travelmate_version", translate("Travelmate version")) +dv2.template = "travelmate/runtime" +if parse ~= nil then + dv2.value = parse.data.travelmate_version or translate("n/a") +else + dv2.value = translate("n/a") +end + +dv3 = s:option(DummyValue, "station_ssid", translate("Station SSID")) +dv3.template = "travelmate/runtime" +if parse ~= nil then + dv3.value = parse.data.station_ssid or translate("n/a") +else + dv3.value = translate("n/a") +end + +dv4 = s:option(DummyValue, "station_interface", translate("Station Interface")) +dv4.template = "travelmate/runtime" +if parse ~= nil then + dv4.value = parse.data.station_interface or translate("n/a") +else + dv4.value = translate("n/a") +end + +dv5 = s:option(DummyValue, "station_radio", translate("Station Radio")) +dv5.template = "travelmate/runtime" +if parse ~= nil then + dv5.value = parse.data.station_radio or translate("n/a") +else + dv5.value = translate("n/a") +end + +dv6 = s:option(DummyValue, "last_rundate", translate("Last rundate")) +dv6.template = "travelmate/runtime" +if parse ~= nil then + dv6.value = parse.data.last_rundate or translate("n/a") +else + dv6.value = translate("n/a") +end + +-- Extra options + +e = m:section(NamedSection, "global", "travelmate", translate("Extra options"), +translate("Options for further tweaking in case the defaults are not suitable for you.")) + +e1 = e:option(Value, "trm_radio", translate("Radio selection"), + translate("Restrict travelmate to a dedicated radio, e.g. 'radio0'")) +e1.rmempty = true + +e2 = e:option(Value, "trm_maxretry", translate("Connection Limit"), + translate("How many times should travelmate try to connect to an Uplink")) +e2.default = 3 +e2.datatype = "range(1,10)" +e2.rmempty = false + +e3 = e:option(Value, "trm_maxwait", translate("Interface Timeout"), + translate("How long should travelmate wait for a successful wlan interface reload")) +e3.default = 30 +e3.datatype = "range(5,60)" +e3.rmempty = false + +e4 = e:option(Value, "trm_timeout", translate("Overall Timeout"), + translate("Timeout in seconds between retries in 'automatic' mode")) +e4.default = 60 +e4.datatype = "range(5,300)" +e4.rmempty = false + +return m diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/setup_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/setup_tab.lua new file mode 100644 index 000000000..6cd030ce6 --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/setup_tab.lua @@ -0,0 +1,55 @@ +-- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- This is free software, licensed under the Apache License, Version 2.0 + +local nw = require("luci.model.network").init() +local fw = require("luci.model.firewall").init() +local util = require("luci.util") +local uci = require("luci.model.uci").cursor() + +m = SimpleForm("network", translate("Interface Setup"), + translate("Automatically create a new wireless wan interface, configure it to use dhcp and " .. + "add it to the wan zone of the firewall. This step has only to be done once.")) +m.reset = false + +iface = m:field(Value, "netname", translate("Name of the new wireless wan interface"), + translate("The allowed characters are: A-Z, a-z, " .. + "0-9 and _ (3-15 characters).")) +iface.default = "wwan" +iface.datatype = "and(uciname,minlength(3),maxlength(15))" + +function iface.validate(self, value, section) + local value = iface:formvalue(section) + local name = uci.get("network", value) + if name then + iface:add_error(section, translate("The given network interface name already exist")) + else + iface.datatype = false + iface.default = iface.disabled + f = m:field(DummyValue, "textfield", " ", translatef("Direct Link: " + .. "" + .. "Wireless Setup", luci.dispatcher.build_url("admin/network/wireless"))) + f.default = translatef("Network Interface '%s' created successfully." .. + " Feel free to scan & add new stations via standard wireless setup.", value) + f.disabled = true + end + return value +end + +function iface.write(self, section, value) + local name = iface:formvalue(section) + if name then + local net = nw:add_network(name, { proto = "dhcp" }) + if net then + nw:save("network") + nw:commit("network") + local zone = fw:get_zone_by_network("wan") + if zone then + zone:add_network(name) + fw:save("firewall") + fw:commit("firewall") + end + end + end +end + +return m diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm new file mode 100644 index 000000000..53493a18f --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/config_css.htm @@ -0,0 +1,10 @@ + diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm new file mode 100644 index 000000000..7f6ff7776 --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/logread.htm @@ -0,0 +1,15 @@ +<%# +Copyright 2017 Dirk Brenken (dev@brenken.org) +This is free software, licensed under the Apache License, Version 2.0 +-%> + +<%+header%> + +
+
+
<%:This form shows the syslog output, pre-filtered for travelmate related messages only.%>
+ +
+
+ +<%+footer%> diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm new file mode 100644 index 000000000..ee3a4553a --- /dev/null +++ b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm @@ -0,0 +1,10 @@ +<%# +Copyright 2017 Dirk Brenken (dev@brenken.org) +This is free software, licensed under the Apache License, Version 2.0 +-%> + +<%+cbi/valueheader%> + + + +<%+cbi/valuefooter%> diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po index de1aceed9..edb041e2b 100644 --- a/applications/luci-app-travelmate/po/ja/travelmate.po +++ b/applications/luci-app-travelmate/po/ja/travelmate.po @@ -7,73 +7,280 @@ msgstr "" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "Last-Translator: INAGAKI Hiroshi \n" "Plural-Forms: nplurals=1; plural=0;\n" "Language: ja\n" +msgid "." +msgstr "。" + msgid "" -"Brief advice: Create a wwan interface, configure it to use dhcp and add it " -"to the wan zone in firewall. Create the wifi interfaces to be used ('client' " -"mode, assigned to wwan network, left as disabled). Travelmate will try to " -"connect to the known wifi client interfaces in the defined order." +"Additional trigger delay in seconds before travelmate processing begins." +msgstr "Travelmate の処理が開始されるまでの、追加の遅延時間（秒）です。" + +msgid "Advanced" +msgstr "詳細設定" + +msgid "" +"Automatically create a new wireless wan interface, configure it to use dhcp " +"and add it to the wan zone of the firewall. This step has only to be done " +"once." msgstr "" -"簡単な解説: 予めWWANインターフェースを作成し、DHCPを使用するよう構成してファ" -"イアウォールのWANゾーンに追加します。また、使用される無線インターフェースを作" -"成しておきます（\"クライアント\" モード、WWANに割り当て、無効状態）。" -"Travelmateは、登録されている順序で既知の無線クライアント インターフェースへの" -"接続を試行します。" +"新しい無線 WAN インターフェースを自動的に作成し、DHCP を使用するよう構成して" +"ファイアウォールの wan ゾーンに追加します。このステップは、一度だけ実行する必" +"要があります。" msgid "" -"Configuration of the Travelmate package to enable travel router " +"Configuration of the travelmate package to to enable travel router " "functionality." -msgstr "トラベル ルータ機能を有効にする、Travelmate パッケージの設定です。" +msgstr "" +"トラベル ルーター機能を有効化するための、 Travelmate パッケージの設定です。" + +msgid "Connection Limit" +msgstr "接続制限" + +msgid "Direct Link: Wireless Setup" +msgstr "ダイレクト リンク: 無線設定" + +msgid "Edit Firewall Configuration" +msgstr "ファイアウォール設定の編集" + +msgid "Edit Network Configuration" +msgstr "ネットワーク設定の編集" -msgid "Debug logging" -msgstr "デバッグ ログ" +msgid "Edit Travelmate Configuration" +msgstr "Travelmate 設定の編集" -msgid "Default 20, range 10-60" -msgstr "既定値 20、範囲 10 - 60" +msgid "Edit Wireless Configuration" +msgstr "無線設定の編集" -msgid "Default 3, range 1-10" -msgstr "既定値 3、範囲 1 - 10" +msgid "Enable 'automatic' mode" +msgstr "'automatic' モードの有効化" -msgid "Disable this if you want to use iwinfo instead of iw" -msgstr "iw の代わりに iwinfo を使用したい場合、この設定を無効にします。" +msgid "Enable travelmate" +msgstr "Travelmate の有効化" -msgid "Enable Travelmate" -msgstr "Travelmateの有効化" +msgid "Enable verbose debug logging" +msgstr "詳細なデバッグ ログの有効化" msgid "Extra options" msgstr "拡張オプション" -msgid "Global options" -msgstr "全般オプション" +msgid "For further information" +msgstr "詳細情報は" + +msgid "How long should travelmate wait for a successful wlan interface reload" +msgstr "" +"無線LAN インターフェースのリロードが成功するまでの、Travelmate の待機時間で" +"す。" + +msgid "How many times should travelmate try to connect to an Uplink" +msgstr "Travelmate がアップリンクに対して接続を試行する回数です。" + +msgid "Input file not found, please check your configuration." +msgstr "入力ファイルが見つかりません。設定を確認してください。" + +msgid "Interface Setup" +msgstr "インターフェース設定" + +msgid "Interface Timeout" +msgstr "インターフェース タイムアウト" + +msgid "Keep travelmate in an active state." +msgstr "Travelmate をアクティブ状態で維持します。" + +msgid "Last rundate" +msgstr "最終実行日時" + +msgid "Name of the new wireless wan interface" +msgstr "新しい無線 WAN のインターフェース名" -msgid "Link to detailed advice" -msgstr "詳細な解説へのリンク" +msgid "" +"Network Interface '%s' created successfully. Feel free to scan & add new " +"stations via standard wireless setup." +msgstr "" +"ネットワーク インターフェース '%s' の作成に成功しました。通常の無線設定にて、" +"スキャン及び新規ステーションの追加が可能です。" + +msgid "Online Status" +msgstr "オンライン ステータス" + +msgid "" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "デフォルトの設定が適切でない場合、さらに設定するためのオプションです。" + +msgid "Overall Timeout" +msgstr "全体タイムアウト" + +msgid "Overview" +msgstr "概要" + +msgid "Radio selection" +msgstr "無線の選択" + +msgid "Restrict interface trigger to certain interface(s)" +msgstr "インターフェース トリガーを特定のインターフェースに限定する" -msgid "Max. number of connection retries to an uplink" -msgstr "確立までの接続試行回数" +msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'" +msgstr "Travelmate が特定の無線に接続するようにします。例: 'radio0'" -msgid "Max. timeout in seconds for wlan interface reload" -msgstr "無線LANインターフェース リロード時の最大待機時間（秒）" +msgid "Runtime information" +msgstr "実行情報" -msgid "Restrict reload trigger to certain interface(s)" -msgstr "リロード トリガを特定のインターフェースに限定する" +msgid "Setup WWAN Interface" +msgstr "WWAN インターフェース設定" msgid "" -"Space separated list of wwan interfaces that trigger reload action. To " -"disable reload trigger set it to 'false'. Default: empty" +"Space separated list of interfaces that trigger travelmate processing. To " +"disable event driven (re-)starts remove all entries." msgstr "" -"リロード動作のトリガとなる、スペースで区切られたWWAN インターフェースのリスト" -"です。リロードのトリガを無効にするには、'false' を設定します。既定値:（空）" +"Travelmate の処理のトリガーとなる、スペースで区切られたインターフェースのリス" +"トです。処理を発生させるイベントを無効にするには、全てのエントリーを削除して" +"空欄にします。" + +msgid "Station Interface" +msgstr "ステーション インターフェース" + +msgid "Station Radio" +msgstr "ステーション 無線" + +msgid "Station SSID" +msgstr "ステーション SSID" + +msgid "" +"The allowed characters are: A-Z, a-z, 0-9 and _ (3-15 characters)." +msgstr "" +"使用可能文字: A-Z, a-z, 0-9 and " +"_（3 - 15文字)" + +msgid "The given network interface name already exist" +msgstr "入力されたネットワーク インターフェース名は、既に存在しています。" + +msgid "" +"This form allows you to modify the content of the main firewall " +"configuration file (/etc/config/firewall)." +msgstr "" +"このフォームでは、ファイアウォール 設定ファイル (/etc/config/firewall) の内容" +"を変更することができます。" + +msgid "" +"This form allows you to modify the content of the main network configuration " +"file (/etc/config/network)." +msgstr "" +"このフォームでは、ネットワーク 設定ファイル (/etc/config/network) の内容を変" +"更することができます。" + +msgid "" +"This form allows you to modify the content of the main travelmate " +"configuration file (/etc/config/travelmate)." +msgstr "" +"このフォームでは、 Travelmate 設定ファイル (/etc/config/travelmate) の内容を" +"変更することができます。" + +msgid "" +"This form allows you to modify the content of the main wireless " +"configuration file (/etc/config/wireless)." +msgstr "" +"このフォームでは、無線 設定ファイル (/etc/config/wireless) の内容を変更するこ" +"とができます。" + +msgid "" +"This form shows the syslog output, pre-filtered for travelmate related " +"messages only." +msgstr "" +"このフォームには、システムログ内の Travelmate に関するメッセージのみが表示さ" +"れます。" + +msgid "Timeout in seconds between retries in 'automatic' mode" +msgstr "'automatic' モード時に接続を再試行する間隔（秒）です。" msgid "Travelmate" msgstr "Travelmate" -msgid "Use iw for scanning" -msgstr "スキャンに iw を使用する" +msgid "Travelmate Logfile" +msgstr "Travelmate ログファイル" + +msgid "Travelmate version" +msgstr "Travelmate バージョン" + +msgid "Trigger delay" +msgstr "トリガー遅延" + +msgid "View Logfile" +msgstr "ログファイルの確認" + +msgid "connected" +msgstr "接続済み" + +msgid "n/a" +msgstr "利用不可" + +msgid "not connected" +msgstr "未接続" + +msgid "see online documentation" +msgstr "オンライン ドキュメントを確認してください" + +#~ msgid "" +#~ "Brief advice: Create a wwan interface, configure it to use dhcp and add " +#~ "it to the wan zone in firewall. Create the wifi interfaces to be used " +#~ "('client' mode, assigned to wwan network, left as disabled). Travelmate " +#~ "will try to connect to the known wifi client interfaces in the defined " +#~ "order." +#~ msgstr "" +#~ "簡単な解説: 予めWWANインターフェースを作成し、DHCPを使用するよう構成して" +#~ "ファイアウォールのWANゾーンに追加します。また、使用される無線インター" +#~ "フェースを作成しておきます（\"クライアント\" モード、WWANに割り当て、無効" +#~ "状態）。Travelmateは、登録されている順序で既知の無線クライアント インター" +#~ "フェースへの接続を試行します。" + +#~ msgid "" +#~ "Configuration of the Travelmate package to enable travel router " +#~ "functionality." +#~ msgstr "トラベル ルータ機能を有効にする、Travelmate パッケージの設定です。" + +#~ msgid "Debug logging" +#~ msgstr "デバッグ ログ" + +#~ msgid "Default 20, range 10-60" +#~ msgstr "既定値 20、範囲 10 - 60" + +#~ msgid "Default 3, range 1-10" +#~ msgstr "既定値 3、範囲 1 - 10" + +#~ msgid "Disable this if you want to use iwinfo instead of iw" +#~ msgstr "iw の代わりに iwinfo を使用したい場合、この設定を無効にします。" + +#~ msgid "Enable Travelmate" +#~ msgstr "Travelmateの有効化" + +#~ msgid "Global options" +#~ msgstr "全般オプション" + +#~ msgid "Link to detailed advice" +#~ msgstr "詳細な解説へのリンク" + +#~ msgid "Max. number of connection retries to an uplink" +#~ msgstr "確立までの接続試行回数" + +#~ msgid "Max. timeout in seconds for wlan interface reload" +#~ msgstr "無線LANインターフェース リロード時の最大待機時間（秒）" + +#~ msgid "Restrict reload trigger to certain interface(s)" +#~ msgstr "リロード トリガを特定のインターフェースに限定する" + +#~ msgid "" +#~ "Space separated list of wwan interfaces that trigger reload action. To " +#~ "disable reload trigger set it to 'false'. Default: empty" +#~ msgstr "" +#~ "リロード動作のトリガとなる、スペースで区切られたWWAN インターフェースのリ" +#~ "ストです。リロードのトリガを無効にするには、'false' を設定します。既定値:" +#~ "（空）" + +#~ msgid "Use iw for scanning" +#~ msgstr "スキャンに iw を使用する" #~ msgid "Default 3, range 0-10. Set to 0 to allow unlimited retries" #~ msgstr "既定値 3、範囲 0 - 10。再試行回数を制限しない場合、0 に設定します。" diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po index bcfc1cfa2..906c698dd 100644 --- a/applications/luci-app-travelmate/po/pt-br/travelmate.po +++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po @@ -12,67 +12,251 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "Language: pt_BR\n" +msgid "." +msgstr "" + +msgid "" +"Additional trigger delay in seconds before travelmate processing begins." +msgstr "" + +msgid "Advanced" +msgstr "" + msgid "" -"Brief advice: Create a wwan interface, configure it to use dhcp and add it " -"to the wan zone in firewall. Create the wifi interfaces to be used ('client' " -"mode, assigned to wwan network, left as disabled). Travelmate will try to " -"connect to the known wifi client interfaces in the defined order." +"Automatically create a new wireless wan interface, configure it to use dhcp " +"and add it to the wan zone of the firewall. This step has only to be done " +"once." msgstr "" -"Breve conselho: Crie uma interface wwan, configure-a para usar DHCP e " -"adicione-a à zona wan no firewall. Crie as interfaces wifi a serem usadas " -"(modo 'cliente', atribuído à rede wwan, deixado como desativado). O " -"Travelmate tentará se conectar às interfaces de cliente wifi conhecidas na " -"ordem definida." msgid "" -"Configuration of the Travelmate package to enable travel router " +"Configuration of the travelmate package to to enable travel router " "functionality." msgstr "" -"Configuração do pacote Travelmate para permitir a funcionalidade de roteador " -"de viagem." -msgid "Debug logging" -msgstr "Registros(log) para depuração" +msgid "Connection Limit" +msgstr "" + +msgid "Direct Link: Wireless Setup" +msgstr "" + +msgid "Edit Firewall Configuration" +msgstr "" + +msgid "Edit Network Configuration" +msgstr "" + +msgid "Edit Travelmate Configuration" +msgstr "" -msgid "Default 20, range 10-60" -msgstr "Padrão 20, faixa 10-60" +msgid "Edit Wireless Configuration" +msgstr "" -msgid "Default 3, range 1-10" -msgstr "Padrão 3, faixa 1-10" +msgid "Enable 'automatic' mode" +msgstr "" -msgid "Disable this if you want to use iwinfo instead of iw" -msgstr "Desabilite isto se você quer usar o iwinfo ao invés do iw" +msgid "Enable travelmate" +msgstr "" -msgid "Enable Travelmate" -msgstr "Habilitar o Travelmate" +msgid "Enable verbose debug logging" +msgstr "" msgid "Extra options" msgstr "Opções adicionais" -msgid "Global options" -msgstr "Opções Globais" +msgid "For further information" +msgstr "" + +msgid "How long should travelmate wait for a successful wlan interface reload" +msgstr "" + +msgid "How many times should travelmate try to connect to an Uplink" +msgstr "" + +msgid "Input file not found, please check your configuration." +msgstr "" + +msgid "Interface Setup" +msgstr "" + +msgid "Interface Timeout" +msgstr "" + +msgid "Keep travelmate in an active state." +msgstr "" + +msgid "Last rundate" +msgstr "" + +msgid "Name of the new wireless wan interface" +msgstr "" + +msgid "" +"Network Interface '%s' created successfully. Feel free to scan & add new " +"stations via standard wireless setup." +msgstr "" + +msgid "Online Status" +msgstr "" + +msgid "" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "" + +msgid "Overall Timeout" +msgstr "" + +msgid "Overview" +msgstr "" + +msgid "Radio selection" +msgstr "" + +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'" +msgstr "" + +msgid "Runtime information" +msgstr "" + +msgid "Setup WWAN Interface" +msgstr "" + +msgid "" +"Space separated list of interfaces that trigger travelmate processing. To " +"disable event driven (re-)starts remove all entries." +msgstr "" + +msgid "Station Interface" +msgstr "" + +msgid "Station Radio" +msgstr "" + +msgid "Station SSID" +msgstr "" + +msgid "" +"The allowed characters are: A-Z, a-z, 0-9 and _ (3-15 characters)." +msgstr "" -msgid "Link to detailed advice" -msgstr "Endereço para conselhos detalhados" +msgid "The given network interface name already exist" +msgstr "" -msgid "Max. number of connection retries to an uplink" -msgstr "Máximo número de tentativas de conexão para um enlace" +msgid "" +"This form allows you to modify the content of the main firewall " +"configuration file (/etc/config/firewall)." +msgstr "" + +msgid "" +"This form allows you to modify the content of the main network configuration " +"file (/etc/config/network)." +msgstr "" -msgid "Max. timeout in seconds for wlan interface reload" -msgstr "Tempo limite máximo em segundos para recarregar a interface wlan" +msgid "" +"This form allows you to modify the content of the main travelmate " +"configuration file (/etc/config/travelmate)." +msgstr "" -msgid "Restrict reload trigger to certain interface(s)" -msgstr "Restringir o gatilho de recarga para somente alguma(s) interface(s)" +msgid "" +"This form allows you to modify the content of the main wireless " +"configuration file (/etc/config/wireless)." +msgstr "" msgid "" -"Space separated list of wwan interfaces that trigger reload action. To " -"disable reload trigger set it to 'false'. Default: empty" +"This form shows the syslog output, pre-filtered for travelmate related " +"messages only." +msgstr "" + +msgid "Timeout in seconds between retries in 'automatic' mode" msgstr "" -"Lista separada por espaços de interfaces wwan que acionam a ação de recarga. " -"Para desabilitar o gatilho de recarga, defina-o como 'false'. Padrão: vazio" msgid "Travelmate" msgstr "Travelmate" -msgid "Use iw for scanning" -msgstr "Use o iw para escaneamento" +msgid "Travelmate Logfile" +msgstr "" + +msgid "Travelmate version" +msgstr "" + +msgid "Trigger delay" +msgstr "" + +msgid "View Logfile" +msgstr "" + +msgid "connected" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "not connected" +msgstr "" + +msgid "see online documentation" +msgstr "" + +#~ msgid "" +#~ "Brief advice: Create a wwan interface, configure it to use dhcp and add " +#~ "it to the wan zone in firewall. Create the wifi interfaces to be used " +#~ "('client' mode, assigned to wwan network, left as disabled). Travelmate " +#~ "will try to connect to the known wifi client interfaces in the defined " +#~ "order." +#~ msgstr "" +#~ "Breve conselho: Crie uma interface wwan, configure-a para usar DHCP e " +#~ "adicione-a à zona wan no firewall. Crie as interfaces wifi a serem usadas " +#~ "(modo 'cliente', atribuído à rede wwan, deixado como desativado). O " +#~ "Travelmate tentará se conectar às interfaces de cliente wifi conhecidas " +#~ "na ordem definida." + +#~ msgid "" +#~ "Configuration of the Travelmate package to enable travel router " +#~ "functionality." +#~ msgstr "" +#~ "Configuração do pacote Travelmate para permitir a funcionalidade de " +#~ "roteador de viagem." + +#~ msgid "Debug logging" +#~ msgstr "Registros(log) para depuração" + +#~ msgid "Default 20, range 10-60" +#~ msgstr "Padrão 20, faixa 10-60" + +#~ msgid "Default 3, range 1-10" +#~ msgstr "Padrão 3, faixa 1-10" + +#~ msgid "Disable this if you want to use iwinfo instead of iw" +#~ msgstr "Desabilite isto se você quer usar o iwinfo ao invés do iw" + +#~ msgid "Enable Travelmate" +#~ msgstr "Habilitar o Travelmate" + +#~ msgid "Global options" +#~ msgstr "Opções Globais" + +#~ msgid "Link to detailed advice" +#~ msgstr "Endereço para conselhos detalhados" + +#~ msgid "Max. number of connection retries to an uplink" +#~ msgstr "Máximo número de tentativas de conexão para um enlace" + +#~ msgid "Max. timeout in seconds for wlan interface reload" +#~ msgstr "Tempo limite máximo em segundos para recarregar a interface wlan" + +#~ msgid "Restrict reload trigger to certain interface(s)" +#~ msgstr "Restringir o gatilho de recarga para somente alguma(s) interface(s)" + +#~ msgid "" +#~ "Space separated list of wwan interfaces that trigger reload action. To " +#~ "disable reload trigger set it to 'false'. Default: empty" +#~ msgstr "" +#~ "Lista separada por espaços de interfaces wwan que acionam a ação de " +#~ "recarga. Para desabilitar o gatilho de recarga, defina-o como 'false'. " +#~ "Padrão: vazio" + +#~ msgid "Use iw for scanning" +#~ msgstr "Use o iw para escaneamento" diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot index 20628196b..4542ec85e 100644 --- a/applications/luci-app-travelmate/po/templates/travelmate.pot +++ b/applications/luci-app-travelmate/po/templates/travelmate.pot @@ -1,58 +1,190 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "." +msgstr "" + msgid "" -"Brief advice: Create a wwan interface, configure it to use dhcp and add it " -"to the wan zone in firewall. Create the wifi interfaces to be used ('client' " -"mode, assigned to wwan network, left as disabled). Travelmate will try to " -"connect to the known wifi client interfaces in the defined order." +"Additional trigger delay in seconds before travelmate processing begins." +msgstr "" + +msgid "Advanced" msgstr "" msgid "" -"Configuration of the Travelmate package to enable travel router " +"Automatically create a new wireless wan interface, configure it to use dhcp " +"and add it to the wan zone of the firewall. This step has only to be done " +"once." +msgstr "" + +msgid "" +"Configuration of the travelmate package to to enable travel router " "functionality." msgstr "" -msgid "Debug logging" +msgid "Connection Limit" +msgstr "" + +msgid "Direct Link: Wireless Setup" +msgstr "" + +msgid "Edit Firewall Configuration" msgstr "" -msgid "Default 20, range 10-60" +msgid "Edit Network Configuration" msgstr "" -msgid "Default 3, range 1-10" +msgid "Edit Travelmate Configuration" msgstr "" -msgid "Disable this if you want to use iwinfo instead of iw" +msgid "Edit Wireless Configuration" msgstr "" -msgid "Enable Travelmate" +msgid "Enable 'automatic' mode" +msgstr "" + +msgid "Enable travelmate" +msgstr "" + +msgid "Enable verbose debug logging" msgstr "" msgid "Extra options" msgstr "" -msgid "Global options" +msgid "For further information" +msgstr "" + +msgid "How long should travelmate wait for a successful wlan interface reload" +msgstr "" + +msgid "How many times should travelmate try to connect to an Uplink" +msgstr "" + +msgid "Input file not found, please check your configuration." +msgstr "" + +msgid "Interface Setup" +msgstr "" + +msgid "Interface Timeout" msgstr "" -msgid "Link to detailed advice" +msgid "Keep travelmate in an active state." msgstr "" -msgid "Max. number of connection retries to an uplink" +msgid "Last rundate" msgstr "" -msgid "Max. timeout in seconds for wlan interface reload" +msgid "Name of the new wireless wan interface" +msgstr "" + +msgid "" +"Network Interface '%s' created successfully. Feel free to scan & add new " +"stations via standard wireless setup." msgstr "" -msgid "Restrict reload trigger to certain interface(s)" +msgid "Online Status" msgstr "" msgid "" -"Space separated list of wwan interfaces that trigger reload action. To " -"disable reload trigger set it to 'false'. Default: empty" +"Options for further tweaking in case the defaults are not suitable for you." +msgstr "" + +msgid "Overall Timeout" +msgstr "" + +msgid "Overview" +msgstr "" + +msgid "Radio selection" +msgstr "" + +msgid "Restrict interface trigger to certain interface(s)" +msgstr "" + +msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'" +msgstr "" + +msgid "Runtime information" +msgstr "" + +msgid "Setup WWAN Interface" +msgstr "" + +msgid "" +"Space separated list of interfaces that trigger travelmate processing. To " +"disable event driven (re-)starts remove all entries." +msgstr "" + +msgid "Station Interface" +msgstr "" + +msgid "Station Radio" +msgstr "" + +msgid "Station SSID" +msgstr "" + +msgid "" +"The allowed characters are: A-Z, a-z, 0-9 and _ (3-15 characters)." +msgstr "" + +msgid "The given network interface name already exist" +msgstr "" + +msgid "" +"This form allows you to modify the content of the main firewall " +"configuration file (/etc/config/firewall)." +msgstr "" + +msgid "" +"This form allows you to modify the content of the main network configuration " +"file (/etc/config/network)." +msgstr "" + +msgid "" +"This form allows you to modify the content of the main travelmate " +"configuration file (/etc/config/travelmate)." +msgstr "" + +msgid "" +"This form allows you to modify the content of the main wireless " +"configuration file (/etc/config/wireless)." +msgstr "" + +msgid "" +"This form shows the syslog output, pre-filtered for travelmate related " +"messages only." +msgstr "" + +msgid "Timeout in seconds between retries in 'automatic' mode" msgstr "" msgid "Travelmate" msgstr "" -msgid "Use iw for scanning" +msgid "Travelmate Logfile" +msgstr "" + +msgid "Travelmate version" +msgstr "" + +msgid "Trigger delay" +msgstr "" + +msgid "View Logfile" +msgstr "" + +msgid "connected" +msgstr "" + +msgid "n/a" +msgstr "" + +msgid "not connected" +msgstr "" + +msgid "see online documentation" msgstr "" diff --git a/applications/luci-app-uhttpd/Makefile b/applications/luci-app-uhttpd/Makefile index 9a2cf462e..301477066 100644 --- a/applications/luci-app-uhttpd/Makefile +++ b/applications/luci-app-uhttpd/Makefile @@ -11,16 +11,9 @@ LUCI_TITLE:=uHTTPd Webserver Configuration LUCI_DEPENDS:=+uhttpd LUCI_PKGARCH:=all -PKG_NAME:=luci-app-uhttpd -PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Daniel Dickinson -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - -include $(INCLUDE_DIR)/package.mk - LUA_TARGET:=source include ../../luci.mk diff --git a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp index a338c75d3..e9636f9a2 100755 --- a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp +++ b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp @@ -3,7 +3,7 @@ uci -q batch <<-EOF >/dev/null delete ucitrack.@upnpd[-1] add ucitrack upnpd - set ucitrack.@upnpd[-1]=miniupnpd + set ucitrack.@upnpd[-1].init=miniupnpd commit ucitrack EOF diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po index 5adc5ed4f..9f3fa2a67 100644 --- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po +++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po @@ -18,8 +18,8 @@ msgstr "Domínios para evitar a VPN" msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" -msgid "Enable VPN Bypass" -msgstr "Habilitar o VPN Bypass" +msgid "Enable/start service" +msgstr "" msgid "Local IP Addresses to Bypass" msgstr "" @@ -61,6 +61,9 @@ msgstr "Configurações do VPN Bypass" msgid "for syntax" msgstr "" +#~ msgid "Enable VPN Bypass" +#~ msgstr "Habilitar o VPN Bypass" + #~ msgid "Configuration of VPN Bypass Settings" #~ msgstr "Configurações do VPN Bypass" diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po new file mode 100644 index 000000000..e873a8389 --- /dev/null +++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po @@ -0,0 +1,73 @@ +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 2.0.1\n" +"Last-Translator: liushuyu \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: zh_CN\n" + +msgid "Allowed IPs" +msgstr "允许的 IP" + +msgid "Collecting data..." +msgstr "正在收集数据..." + +msgid "Configuration" +msgstr "配置" + +msgid "Data Received" +msgstr "已接收" + +msgid "Data Transmitted" +msgstr "已发送" + +msgid "Endpoint" +msgstr "传输端点" + +msgid "Firewall Mark" +msgstr "防火墙标识" + +msgid "Interface" +msgstr "接口" + +msgid "Interface does not have a public key!" +msgstr "接口没有配置公钥！" + +msgid "Latest Handshake" +msgstr "上次握手" + +msgid "Listen Port" +msgstr "监听端口" + +msgid "Never" +msgstr "从不" + +msgid "Peer" +msgstr "对端" + +msgid "Persistent Keepalive" +msgstr "Keepalive 间隔（秒）" + +msgid "Public Key" +msgstr "公钥" + +msgid "WireGuard Status" +msgstr "WireGuard 状态" + +msgid "h ago" +msgstr "小时前" + +msgid "m ago" +msgstr "分钟前" + +msgid "over a day ago" +msgstr "超过一天前" + +msgid "s ago" +msgstr "秒前" diff --git a/luci.mk b/luci.mk index 137886f1b..7674825b4 100644 --- a/luci.mk +++ b/luci.mk @@ -56,7 +56,7 @@ PKG_VERSION?=$(if $(DUMP),x,$(strip $(shell \ elif git log -1 >/dev/null 2>/dev/null; then \ revision="svn-r$$(LC_ALL=C git log -1 | sed -ne 's/.*git-svn-id: .*@\([0-9]\+\) .*/\1/p')"; \ if [ "$$revision" = "svn-r" ]; then \ - set -- $$(git log -1 --format="%ct %h"); \ + set -- $$(git log -1 --format="%ct %h" --abbrev=7); \ secs="$$(($$1 % 86400))"; \ yday="$$(date --utc --date="@$$1" "+%y.%j")"; \ revision="$$(printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2")"; \ diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 465d7df3d..2d32b39b1 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -59,42 +59,42 @@ TZ = { { 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Anguilla', 'AST4' }, { 'America/Antigua', 'AST4' }, - { 'America/Araguaina', 'BRT3' }, - { 'America/Argentina/Buenos Aires', 'ART3' }, - { 'America/Argentina/Catamarca', 'ART3' }, - { 'America/Argentina/Cordoba', 'ART3' }, - { 'America/Argentina/Jujuy', 'ART3' }, - { 'America/Argentina/La Rioja', 'ART3' }, - { 'America/Argentina/Mendoza', 'ART3' }, - { 'America/Argentina/Rio Gallegos', 'ART3' }, - { 'America/Argentina/Salta', 'ART3' }, - { 'America/Argentina/San Juan', 'ART3' }, - { 'America/Argentina/San Luis', 'ART3' }, - { 'America/Argentina/Tucuman', 'ART3' }, - { 'America/Argentina/Ushuaia', 'ART3' }, + { 'America/Araguaina', '<-03>3' }, + { 'America/Argentina/Buenos Aires', '<-03>3' }, + { 'America/Argentina/Catamarca', '<-03>3' }, + { 'America/Argentina/Cordoba', '<-03>3' }, + { 'America/Argentina/Jujuy', '<-03>3' }, + { 'America/Argentina/La Rioja', '<-03>3' }, + { 'America/Argentina/Mendoza', '<-03>3' }, + { 'America/Argentina/Rio Gallegos', '<-03>3' }, + { 'America/Argentina/Salta', '<-03>3' }, + { 'America/Argentina/San Juan', '<-03>3' }, + { 'America/Argentina/San Luis', '<-03>3' }, + { 'America/Argentina/Tucuman', '<-03>3' }, + { 'America/Argentina/Ushuaia', '<-03>3' }, { 'America/Aruba', 'AST4' }, - { 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M3.4.0/0' }, + { 'America/Asuncion', '<-04>4<-03>,M10.1.0/0,M3.4.0/0' }, { 'America/Atikokan', 'EST5' }, - { 'America/Bahia', 'BRT3' }, + { 'America/Bahia', '<-03>3' }, { 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' }, { 'America/Barbados', 'AST4' }, - { 'America/Belem', 'BRT3' }, + { 'America/Belem', '<-03>3' }, { 'America/Belize', 'CST6' }, { 'America/Blanc-Sablon', 'AST4' }, - { 'America/Boa Vista', 'AMT4' }, - { 'America/Bogota', 'COT5' }, + { 'America/Boa Vista', '<-04>4' }, + { 'America/Bogota', '<-05>5' }, { 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, + { 'America/Campo Grande', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' }, { 'America/Cancun', 'EST5' }, - { 'America/Caracas', 'VET4' }, - { 'America/Cayenne', 'GFT3' }, + { 'America/Caracas', '<-04>4' }, + { 'America/Cayenne', '<-03>3' }, { 'America/Cayman', 'EST5' }, { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' }, { 'America/Costa Rica', 'CST6' }, { 'America/Creston', 'MST7' }, - { 'America/Cuiaba', 'AMT4AMST,M10.3.0/0,M2.3.0/0' }, + { 'America/Cuiaba', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' }, { 'America/Curacao', 'AST4' }, { 'America/Danmarkshavn', 'GMT0' }, { 'America/Dawson', 'PST8PDT,M3.2.0,M11.1.0' }, @@ -103,19 +103,19 @@ TZ = { { 'America/Detroit', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Dominica', 'AST4' }, { 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'America/Eirunepe', 'ACT5' }, + { 'America/Eirunepe', '<-05>5' }, { 'America/El Salvador', 'CST6' }, { 'America/Fort Nelson', 'MST7' }, - { 'America/Fortaleza', 'BRT3' }, + { 'America/Fortaleza', '<-03>3' }, { 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' }, - { 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' }, + { 'America/Godthab', '<-03>3<-02>,M3.5.0/-2,M10.5.0/-1' }, { 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' }, { 'America/Grand Turk', 'AST4' }, { 'America/Grenada', 'AST4' }, { 'America/Guadeloupe', 'AST4' }, { 'America/Guatemala', 'CST6' }, - { 'America/Guayaquil', 'ECT5' }, - { 'America/Guyana', 'GYT4' }, + { 'America/Guayaquil', '<-05>5' }, + { 'America/Guyana', '<-04>4' }, { 'America/Halifax', 'AST4ADT,M3.2.0,M11.1.0' }, { 'America/Havana', 'CST5CDT,M3.2.0/0,M11.1.0/1' }, { 'America/Hermosillo', 'MST7' }, @@ -134,13 +134,13 @@ TZ = { { 'America/Kentucky/Louisville', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Kentucky/Monticello', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Kralendijk', 'AST4' }, - { 'America/La Paz', 'BOT4' }, - { 'America/Lima', 'PET5' }, + { 'America/La Paz', '<-04>4' }, + { 'America/Lima', '<-05>5' }, { 'America/Los Angeles', 'PST8PDT,M3.2.0,M11.1.0' }, { 'America/Lower Princes', 'AST4' }, - { 'America/Maceio', 'BRT3' }, + { 'America/Maceio', '<-03>3' }, { 'America/Managua', 'CST6' }, - { 'America/Manaus', 'AMT4' }, + { 'America/Manaus', '<-04>4' }, { 'America/Marigot', 'AST4' }, { 'America/Martinique', 'AST4' }, { 'America/Matamoros', 'CST6CDT,M3.2.0,M11.1.0' }, @@ -149,39 +149,40 @@ TZ = { { 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' }, { 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' }, - { 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' }, + { 'America/Miquelon', '<-03>3<-02>,M3.2.0,M11.1.0' }, { 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' }, { 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' }, - { 'America/Montevideo', 'UYT3' }, + { 'America/Montevideo', '<-03>3' }, { 'America/Montserrat', 'AST4' }, { 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Nipigon', 'EST5EDT,M3.2.0,M11.1.0' }, { 'America/Nome', 'AKST9AKDT,M3.2.0,M11.1.0' }, - { 'America/Noronha', 'FNT2' }, + { 'America/Noronha', '<-02>2' }, { 'America/North Dakota/Beulah', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/North Dakota/Center', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/North Dakota/New Salem', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Ojinaga', 'MST7MDT,M3.2.0,M11.1.0' }, { 'America/Panama', 'EST5' }, { 'America/Pangnirtung', 'EST5EDT,M3.2.0,M11.1.0' }, - { 'America/Paramaribo', 'SRT3' }, + { 'America/Paramaribo', '<-03>3' }, { 'America/Phoenix', 'MST7' }, { 'America/Port of Spain', 'AST4' }, - { 'America/Port-au-Prince', 'EST5' }, - { 'America/Porto Velho', 'AMT4' }, + { 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' }, + { 'America/Porto Velho', '<-04>4' }, { 'America/Puerto Rico', 'AST4' }, + { 'America/Punta Arenas', '<-03>3' }, { 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Rankin Inlet', 'CST6CDT,M3.2.0,M11.1.0' }, - { 'America/Recife', 'BRT3' }, + { 'America/Recife', '<-03>3' }, { 'America/Regina', 'CST6' }, { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' }, - { 'America/Rio Branco', 'ACT5' }, - { 'America/Santarem', 'BRT3' }, - { 'America/Santiago', 'CLT4CLST,M8.2.6/24,M5.2.6/24' }, + { 'America/Rio Branco', '<-05>5' }, + { 'America/Santarem', '<-03>3' }, + { 'America/Santiago', '<-04>4<-03>,M8.2.6/24,M5.2.6/24' }, { 'America/Santo Domingo', 'AST4' }, - { 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' }, - { 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' }, + { 'America/Sao Paulo', '<-03>3<-02>,M10.3.0/0,M2.3.0/0' }, + { 'America/Scoresbysund', '<-01>1<+00>,M3.5.0/0,M10.5.0/1' }, { 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/St Barthelemy', 'AST4' }, { 'America/St Johns', 'NST3:30NDT,M3.2.0,M11.1.0' }, @@ -204,16 +205,16 @@ TZ = { { 'Antarctica/Casey', '<+11>-11' }, { 'Antarctica/Davis', '<+07>-7' }, { 'Antarctica/DumontDUrville', '<+10>-10' }, - { 'Antarctica/Macquarie', 'MIST-11' }, + { 'Antarctica/Macquarie', '<+11>-11' }, { 'Antarctica/Mawson', '<+05>-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, - { 'Antarctica/Palmer', 'CLT4CLST,M8.2.6/24,M5.2.6/24' }, + { 'Antarctica/Palmer', '<-03>3' }, { 'Antarctica/Rothera', '<-03>3' }, { 'Antarctica/Syowa', '<+03>-3' }, { 'Antarctica/Troll', '<+00>0<+02>-2,M3.5.0/1,M10.5.0/3' }, { 'Antarctica/Vostok', '<+06>-6' }, { 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' }, - { 'Asia/Aden', 'AST-3' }, + { 'Asia/Aden', '<+03>-3' }, { 'Asia/Almaty', '<+06>-6' }, { 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' }, { 'Asia/Anadyr', '<+12>-12' }, @@ -221,99 +222,99 @@ TZ = { { 'Asia/Aqtobe', '<+05>-5' }, { 'Asia/Ashgabat', '<+05>-5' }, { 'Asia/Atyrau', '<+05>-5' }, - { 'Asia/Baghdad', 'AST-3' }, - { 'Asia/Bahrain', 'AST-3' }, + { 'Asia/Baghdad', '<+03>-3' }, + { 'Asia/Bahrain', '<+03>-3' }, { 'Asia/Baku', '<+04>-4' }, - { 'Asia/Bangkok', 'ICT-7' }, + { 'Asia/Bangkok', '<+07>-7' }, { 'Asia/Barnaul', '<+07>-7' }, { 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' }, { 'Asia/Bishkek', '<+06>-6' }, - { 'Asia/Brunei', 'BNT-8' }, + { 'Asia/Brunei', '<+08>-8' }, { 'Asia/Chita', '<+09>-9' }, - { 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' }, + { 'Asia/Choibalsan', '<+08>-8' }, { 'Asia/Colombo', '<+0530>-5:30' }, { 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' }, - { 'Asia/Dhaka', 'BDT-6' }, - { 'Asia/Dili', 'TLT-9' }, - { 'Asia/Dubai', 'GST-4' }, + { 'Asia/Dhaka', '<+06>-6' }, + { 'Asia/Dili', '<+09>-9' }, + { 'Asia/Dubai', '<+04>-4' }, { 'Asia/Dushanbe', '<+05>-5' }, { 'Asia/Famagusta', '<+03>-3' }, { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.5.6/1' }, { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.5.6/1' }, - { 'Asia/Ho Chi Minh', 'ICT-7' }, + { 'Asia/Ho Chi Minh', '<+07>-7' }, { 'Asia/Hong Kong', 'HKT-8' }, - { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' }, + { 'Asia/Hovd', '<+07>-7' }, { 'Asia/Irkutsk', '<+08>-8' }, { 'Asia/Jakarta', 'WIB-7' }, { 'Asia/Jayapura', 'WIT-9' }, { 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' }, - { 'Asia/Kabul', 'AFT-4:30' }, + { 'Asia/Kabul', '<+0430>-4:30' }, { 'Asia/Kamchatka', '<+12>-12' }, { 'Asia/Karachi', 'PKT-5' }, - { 'Asia/Kathmandu', 'NPT-5:45' }, + { 'Asia/Kathmandu', '<+0545>-5:45' }, { 'Asia/Khandyga', '<+09>-9' }, { 'Asia/Kolkata', 'IST-5:30' }, { 'Asia/Krasnoyarsk', '<+07>-7' }, - { 'Asia/Kuala Lumpur', 'MYT-8' }, - { 'Asia/Kuching', 'MYT-8' }, - { 'Asia/Kuwait', 'AST-3' }, + { 'Asia/Kuala Lumpur', '<+08>-8' }, + { 'Asia/Kuching', '<+08>-8' }, + { 'Asia/Kuwait', '<+03>-3' }, { 'Asia/Macau', 'CST-8' }, { 'Asia/Magadan', '<+11>-11' }, { 'Asia/Makassar', 'WITA-8' }, - { 'Asia/Manila', 'PHT-8' }, - { 'Asia/Muscat', 'GST-4' }, + { 'Asia/Manila', '<+08>-8' }, + { 'Asia/Muscat', '<+04>-4' }, { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Asia/Novokuznetsk', '<+07>-7' }, { 'Asia/Novosibirsk', '<+07>-7' }, { 'Asia/Omsk', '<+06>-6' }, { 'Asia/Oral', '<+05>-5' }, - { 'Asia/Phnom Penh', 'ICT-7' }, + { 'Asia/Phnom Penh', '<+07>-7' }, { 'Asia/Pontianak', 'WIB-7' }, { 'Asia/Pyongyang', 'KST-8:30' }, - { 'Asia/Qatar', 'AST-3' }, + { 'Asia/Qatar', '<+03>-3' }, { 'Asia/Qyzylorda', '<+06>-6' }, - { 'Asia/Riyadh', 'AST-3' }, + { 'Asia/Riyadh', '<+03>-3' }, { 'Asia/Sakhalin', '<+11>-11' }, { 'Asia/Samarkand', '<+05>-5' }, { 'Asia/Seoul', 'KST-9' }, { 'Asia/Shanghai', 'CST-8' }, - { 'Asia/Singapore', 'SGT-8' }, + { 'Asia/Singapore', '<+08>-8' }, { 'Asia/Srednekolymsk', '<+11>-11' }, { 'Asia/Taipei', 'CST-8' }, { 'Asia/Tashkent', '<+05>-5' }, { 'Asia/Tbilisi', '<+04>-4' }, - { 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' }, - { 'Asia/Thimphu', 'BTT-6' }, + { 'Asia/Tehran', '<+0330>-3:30<+0430>,J80/0,J264/0' }, + { 'Asia/Thimphu', '<+06>-6' }, { 'Asia/Tokyo', 'JST-9' }, { 'Asia/Tomsk', '<+07>-7' }, - { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' }, - { 'Asia/Urumqi', 'XJT-6' }, + { 'Asia/Ulaanbaatar', '<+08>-8' }, + { 'Asia/Urumqi', '<+06>-6' }, { 'Asia/Ust-Nera', '<+10>-10' }, - { 'Asia/Vientiane', 'ICT-7' }, + { 'Asia/Vientiane', '<+07>-7' }, { 'Asia/Vladivostok', '<+10>-10' }, { 'Asia/Yakutsk', '<+09>-9' }, - { 'Asia/Yangon', 'MMT-6:30' }, + { 'Asia/Yangon', '<+0630>-6:30' }, { 'Asia/Yekaterinburg', '<+05>-5' }, { 'Asia/Yerevan', '<+04>-4' }, - { 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' }, + { 'Atlantic/Azores', '<-01>1<+00>,M3.5.0/0,M10.5.0/1' }, { 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' }, { 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' }, - { 'Atlantic/Cape Verde', 'CVT1' }, + { 'Atlantic/Cape Verde', '<-01>1' }, { 'Atlantic/Faroe', 'WET0WEST,M3.5.0/1,M10.5.0' }, { 'Atlantic/Madeira', 'WET0WEST,M3.5.0/1,M10.5.0' }, { 'Atlantic/Reykjavik', 'GMT0' }, - { 'Atlantic/South Georgia', 'GST2' }, + { 'Atlantic/South Georgia', '<-02>2' }, { 'Atlantic/St Helena', 'GMT0' }, - { 'Atlantic/Stanley', 'FKST3' }, + { 'Atlantic/Stanley', '<-03>3' }, { 'Australia/Adelaide', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' }, { 'Australia/Brisbane', 'AEST-10' }, { 'Australia/Broken Hill', 'ACST-9:30ACDT,M10.1.0,M4.1.0/3' }, { 'Australia/Currie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Australia/Darwin', 'ACST-9:30' }, - { 'Australia/Eucla', 'ACWST-8:45' }, + { 'Australia/Eucla', '<+0845>-8:45' }, { 'Australia/Hobart', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Australia/Lindeman', 'AEST-10' }, - { 'Australia/Lord Howe', 'LHST-10:30LHDT-11,M10.1.0,M4.1.0' }, + { 'Australia/Lord Howe', '<+1030>-10:30<+11>-11,M10.1.0,M4.1.0' }, { 'Australia/Melbourne', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Australia/Perth', 'AWST-8' }, { 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, @@ -378,53 +379,52 @@ TZ = { { 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Zurich', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Indian/Antananarivo', 'EAT-3' }, - { 'Indian/Chagos', 'IOT-6' }, - { 'Indian/Christmas', 'CXT-7' }, - { 'Indian/Cocos', 'CCT-6:30' }, + { 'Indian/Chagos', '<+06>-6' }, + { 'Indian/Christmas', '<+07>-7' }, + { 'Indian/Cocos', '<+0630>-6:30' }, { 'Indian/Comoro', 'EAT-3' }, { 'Indian/Kerguelen', '<+05>-5' }, - { 'Indian/Mahe', 'SCT-4' }, - { 'Indian/Maldives', 'MVT-5' }, - { 'Indian/Mauritius', 'MUT-4' }, + { 'Indian/Mahe', '<+04>-4' }, + { 'Indian/Maldives', '<+05>-5' }, + { 'Indian/Mauritius', '<+04>-4' }, { 'Indian/Mayotte', 'EAT-3' }, - { 'Indian/Reunion', 'RET-4' }, - { 'Pacific/Apia', 'WSST-13WSDT,M9.5.0/3,M4.1.0/4' }, + { 'Indian/Reunion', '<+04>-4' }, + { 'Pacific/Apia', '<+13>-13<+14>,M9.5.0/3,M4.1.0/4' }, { 'Pacific/Auckland', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, - { 'Pacific/Bougainville', 'BST-11' }, - { 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' }, - { 'Pacific/Chuuk', 'CHUT-10' }, - { 'Pacific/Easter', 'EAST6EASST,M8.2.6/22,M5.2.6/22' }, - { 'Pacific/Efate', 'VUT-11' }, - { 'Pacific/Enderbury', 'PHOT-13' }, - { 'Pacific/Fakaofo', 'TKT-13' }, - { 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' }, - { 'Pacific/Funafuti', 'TVT-12' }, - { 'Pacific/Galapagos', 'GALT6' }, - { 'Pacific/Gambier', 'GAMT9' }, - { 'Pacific/Guadalcanal', 'SBT-11' }, + { 'Pacific/Bougainville', '<+11>-11' }, + { 'Pacific/Chatham', '<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45' }, + { 'Pacific/Chuuk', '<+10>-10' }, + { 'Pacific/Easter', '<-06>6<-05>,M8.2.6/22,M5.2.6/22' }, + { 'Pacific/Efate', '<+11>-11' }, + { 'Pacific/Enderbury', '<+13>-13' }, + { 'Pacific/Fakaofo', '<+13>-13' }, + { 'Pacific/Fiji', '<+12>-12<+13>,M11.1.0,M1.3.0/3' }, + { 'Pacific/Funafuti', '<+12>-12' }, + { 'Pacific/Galapagos', '<-06>6' }, + { 'Pacific/Gambier', '<-09>9' }, + { 'Pacific/Guadalcanal', '<+11>-11' }, { 'Pacific/Guam', 'ChST-10' }, { 'Pacific/Honolulu', 'HST10' }, - { 'Pacific/Johnston', 'HST10' }, - { 'Pacific/Kiritimati', 'LINT-14' }, - { 'Pacific/Kosrae', 'KOST-11' }, - { 'Pacific/Kwajalein', 'MHT-12' }, - { 'Pacific/Majuro', 'MHT-12' }, - { 'Pacific/Marquesas', 'MART9:30' }, + { 'Pacific/Kiritimati', '<+14>-14' }, + { 'Pacific/Kosrae', '<+11>-11' }, + { 'Pacific/Kwajalein', '<+12>-12' }, + { 'Pacific/Majuro', '<+12>-12' }, + { 'Pacific/Marquesas', '<-0930>9:30' }, { 'Pacific/Midway', 'SST11' }, - { 'Pacific/Nauru', 'NRT-12' }, - { 'Pacific/Niue', 'NUT11' }, - { 'Pacific/Norfolk', 'NFT-11' }, - { 'Pacific/Noumea', 'NCT-11' }, + { 'Pacific/Nauru', '<+12>-12' }, + { 'Pacific/Niue', '<-11>11' }, + { 'Pacific/Norfolk', '<+11>-11' }, + { 'Pacific/Noumea', '<+11>-11' }, { 'Pacific/Pago Pago', 'SST11' }, - { 'Pacific/Palau', 'PWT-9' }, - { 'Pacific/Pitcairn', 'PST8' }, - { 'Pacific/Pohnpei', 'PONT-11' }, - { 'Pacific/Port Moresby', 'PGT-10' }, - { 'Pacific/Rarotonga', 'CKT10' }, + { 'Pacific/Palau', '<+09>-9' }, + { 'Pacific/Pitcairn', '<-08>8' }, + { 'Pacific/Pohnpei', '<+11>-11' }, + { 'Pacific/Port Moresby', '<+10>-10' }, + { 'Pacific/Rarotonga', '<-10>10' }, { 'Pacific/Saipan', 'ChST-10' }, - { 'Pacific/Tahiti', 'TAHT10' }, - { 'Pacific/Tarawa', 'GILT-12' }, + { 'Pacific/Tahiti', '<-10>10' }, + { 'Pacific/Tarawa', '<+12>-12' }, { 'Pacific/Tongatapu', '<+13>-13<+14>,M11.1.0,M1.3.0/3' }, - { 'Pacific/Wake', 'WAKT-12' }, - { 'Pacific/Wallis', 'WFT-12' }, + { 'Pacific/Wake', '<+12>-12' }, + { 'Pacific/Wallis', '<+12>-12' }, } diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index e5da7c644..cf5afeb9d 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -16,123 +16,30 @@ OFFSET = { akst = -32400, -- AKST akdt = -28800, -- AKDT ast = -14400, -- AST - brt = -10800, -- BRT - art = -10800, -- ART - pyt = -14400, -- PYT - pyst = -10800, -- PYST est = -18000, -- EST cst = -21600, -- CST cdt = -18000, -- CDT - amt = -14400, -- AMT - cot = -18000, -- COT mst = -25200, -- MST mdt = -21600, -- MDT - vet = -14400, -- VET - gft = -10800, -- GFT pst = -28800, -- PST pdt = -25200, -- PDT - act = -18000, -- ACT - wgt = -10800, -- WGT - wgst = -7200, -- WGST - ect = -18000, -- ECT - gyt = -14400, -- GYT - bot = -14400, -- BOT - pet = -18000, -- PET - pmst = -10800, -- PMST - pmdt = -7200, -- PMDT - uyt = -10800, -- UYT - fnt = -7200, -- FNT - srt = -10800, -- SRT - clt = -14400, -- CLT - clst = -10800, -- CLST - egt = -3600, -- EGT - egst = 0, -- EGST nst = -12600, -- NST ndt = -9000, -- NDT - mist = 39600, -- MIST nzst = 43200, -- NZST nzdt = 46800, -- NZDT - ict = 25200, -- ICT - bnt = 28800, -- BNT - chot = 28800, -- CHOT - chost = 32400, -- CHOST - bdt = 21600, -- BDT - tlt = 32400, -- TLT - gst = 14400, -- GST hkt = 28800, -- HKT - hovt = 25200, -- HOVT - hovst = 28800, -- HOVST wib = 25200, -- WIB wit = 32400, -- WIT ist = 7200, -- IST idt = 10800, -- IDT - aft = 16200, -- AFT pkt = 18000, -- PKT - npt = 20700, -- NPT - myt = 28800, -- MYT wita = 28800, -- WITA - pht = 28800, -- PHT kst = 30600, -- KST - sgt = 28800, -- SGT - irst = 12600, -- IRST - irdt = 16200, -- IRDT - btt = 21600, -- BTT jst = 32400, -- JST - ulat = 28800, -- ULAT - ulast = 32400, -- ULAST - xjt = 21600, -- XJT - mmt = 23400, -- MMT - azot = -3600, -- AZOT - azost = 0, -- AZOST - cvt = -3600, -- CVT - fkst = -10800, -- FKST acst = 34200, -- ACST acdt = 37800, -- ACDT aest = 36000, -- AEST - acwst = 31500, -- ACWST - lhst = 37800, -- LHST - lhdt = 39600, -- LHDT awst = 28800, -- AWST msk = 10800, -- MSK - iot = 21600, -- IOT - cxt = 25200, -- CXT - cct = 23400, -- CCT - sct = 14400, -- SCT - mvt = 18000, -- MVT - mut = 14400, -- MUT - ret = 14400, -- RET - wsst = 46800, -- WSST - wsdt = 50400, -- WSDT - bst = 39600, -- BST - chast = 45900, -- CHAST - chadt = 49500, -- CHADT - chut = 36000, -- CHUT - east = -21600, -- EAST - easst = -18000, -- EASST - vut = 39600, -- VUT - phot = 46800, -- PHOT - tkt = 46800, -- TKT - fjt = 43200, -- FJT - fjst = 46800, -- FJST - tvt = 43200, -- TVT - galt = -21600, -- GALT - gamt = -32400, -- GAMT - sbt = 39600, -- SBT - lint = 50400, -- LINT - kost = 39600, -- KOST - mht = 43200, -- MHT - mart = -34200, -- MART sst = -39600, -- SST - nrt = 43200, -- NRT - nut = -39600, -- NUT - nft = 39600, -- NFT - nct = 39600, -- NCT - pwt = 32400, -- PWT - pont = 39600, -- PONT - pgt = 36000, -- PGT - ckt = -36000, -- CKT - taht = -36000, -- TAHT - gilt = 43200, -- GILT - wakt = 43200, -- WAKT - wft = 43200, -- WFT } diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 66eef394a..32763bfec 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1193,6 +1193,9 @@ msgstr "Força el TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Força el TKIP i el CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1981,6 +1984,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2396,6 +2402,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2808,6 +2820,11 @@ msgstr "Tipus de servei" msgid "Services" msgstr "Serveis" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Sincronització de hora" diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 7f0391aa7..e87805abf 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1205,6 +1205,9 @@ msgstr "Vynutit TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Vynutit TKIP a CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2003,6 +2006,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2419,6 +2425,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2848,6 +2860,11 @@ msgstr "Typ služby" msgid "Services" msgstr "Služby" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Nastavit synchronizaci času" diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 99be0b629..fb5d02e1a 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -271,8 +271,8 @@ msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" msgstr "" -"IP-Adressen sequenziell vergeben, beginnend mit der kleinsten " -"verfügbaren Adresse" +"IP-Adressen sequenziell vergeben, beginnend mit der kleinsten verfügbaren " +"Adresse" msgid "Allocate IP sequentially" msgstr "IPs sequenziell vergeben" @@ -1205,6 +1205,9 @@ msgstr "Erzwinge TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Erzwinge TKIP und CCMP (AES)" +msgid "Force link" +msgstr "Erzwinge Verbindung" + msgid "Force use of NAT-T" msgstr "" @@ -2008,6 +2011,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2426,6 +2432,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2857,6 +2869,13 @@ msgstr "Service-Typ" msgid "Services" msgstr "Dienste" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" +"Schnittstelleneigenschaften werden unabhängig vom Link gesetzt (ist die " +"Option ausgewählt, so werden die Hotplug-Skripte bei Änderung nicht aufgerufen)" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Zeitsynchronisierung einrichten" diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 93cdb98c1..3ddf7c674 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1219,6 +1219,9 @@ msgstr "Επιβολή TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Επιβολή TKIP και CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2011,6 +2014,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2426,6 +2432,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2841,6 +2853,11 @@ msgstr "Είδος Υπηρεσίας" msgid "Services" msgstr "Υπηρεσίες" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 561cfec5f..57aa012a4 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1194,6 +1194,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1978,6 +1981,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2393,6 +2399,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2805,6 +2817,11 @@ msgstr "" msgid "Services" msgstr "Services" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index b5de1f2c8..eb6273364 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1212,6 +1212,9 @@ msgstr "Forzar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forzar TKIP y CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2017,6 +2020,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2433,6 +2439,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2861,6 +2873,11 @@ msgstr "Tipo de servicio" msgid "Services" msgstr "Servicios" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Sincronización horaria" diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index e525c9a4b..d8e3f4c73 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1224,6 +1224,9 @@ msgstr "Forcer TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forcer TKIP et CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2031,6 +2034,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2446,6 +2452,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2875,6 +2887,11 @@ msgstr "Type du service" msgid "Services" msgstr "Services" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurer la synchronisation de l'heure" diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 8b222ef84..d938fe7ef 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1179,6 +1179,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1951,6 +1954,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2360,6 +2366,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2771,6 +2783,11 @@ msgstr "" msgid "Services" msgstr "שירותים" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "סנכרון זמן" diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 14a6e754f..23996762c 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1215,6 +1215,9 @@ msgstr "TKIP kényszerítése" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP és CCMP (AES) kényszerítése" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2020,6 +2023,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2436,6 +2442,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2866,6 +2878,11 @@ msgstr "Szolgáltatás típusa" msgid "Services" msgstr "Szolgáltatások" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Idő szinkronizálás beállítása" diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index c0bfdc2e9..6bb2a83c4 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1215,6 +1215,9 @@ msgstr "Forza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forza TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2018,6 +2021,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2432,6 +2438,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2847,6 +2859,11 @@ msgstr "" msgid "Services" msgstr "Servizi" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index 975ad9cb2..d4a31c654 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2017-02-11 03:28+0900\n" +"PO-Revision-Date: 2017-04-03 02:32+0900\n" "Last-Translator: INAGAKI Hiroshi \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: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0\n" "Language-Team: \n" msgid "%s is untagged in multiple VLANs!" @@ -38,13 +38,13 @@ msgid "-- custom --" msgstr "-- 手動設定 --" msgid "-- match by device --" -msgstr "-- デバイスで設定 --" +msgstr "-- デバイスを指定 --" msgid "-- match by label --" -msgstr "-- ラベルで設定 --" +msgstr "-- ラベルを指定 --" msgid "-- match by uuid --" -msgstr "-- UUIDで設定 --" +msgstr "-- UUIDを指定 --" msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -56,7 +56,7 @@ msgid "4-character hexadecimal ID" msgstr "" msgid "464XLAT (CLAT)" -msgstr "" +msgstr "464XLAT (CLAT)" msgid "5 Minute Load:" msgstr "過去5分の負荷:" @@ -65,7 +65,7 @@ msgid "6-octet identifier as a hex string - no colons" msgstr "" msgid "802.11r Fast Transition" -msgstr "" +msgstr "802.11r 高速ローミング" msgid "802.11w Association SA Query maximum timeout" msgstr "802.11w アソシエーションSAクエリの最大タイムアウト時間です。" @@ -225,7 +225,7 @@ msgstr "" "稼働中の IPv6-経路情報" msgid "Active Connections" -msgstr "アクティブコネクション" +msgstr "アクティブ コネクション" msgid "Active DHCP Leases" msgstr "アクティブなDHCPリース" @@ -255,7 +255,7 @@ msgid "Address" msgstr "アドレス" msgid "Address to access local relay bridge" -msgstr "ローカル・リレーブリッジにアクセスするためのIPアドレス" +msgstr "ローカル リレーブリッジにアクセスするためのIPアドレス" msgid "Administration" msgstr "管理画面" @@ -439,7 +439,7 @@ msgid "Automatic Homenet (HNCP)" msgstr "" msgid "Automatically check filesystem for errors before mounting" -msgstr "マウント実行前にファイルシステムのエラーを自動でチェックします。" +msgstr "マウント実行前にファイルシステムのエラーを自動的にチェックします。" msgid "Automatically mount filesystems on hotplug" msgstr "ホットプラグによってファイルシステムを自動的にマウントします。" @@ -496,7 +496,7 @@ msgid "Backup / Restore" msgstr "バックアップ / 復元" msgid "Backup file list" -msgstr "バックアップ・ファイルリスト" +msgstr "バックアップファイル リスト" msgid "Bad address specified!" msgstr "無効なアドレスです!" @@ -512,9 +512,9 @@ msgid "" "configuration files marked by opkg, essential base files and the user " "defined backup patterns." msgstr "" -"以下はバックアップの際に含まれるファイルリストです。このリストは、opkgによっ" -"て認識されている設定ファイル、重要なベースファイル、ユーザーが設定した正規表" -"現に一致したファイルの一覧です。" +"以下は、バックアップの際に含まれるファイルのリストです。このリストは、opkgに" +"よって認識されている設定ファイル、重要なベースファイル、ユーザーが設定した正" +"規表現に一致したファイルの一覧です。" msgid "Bind interface" msgstr "" @@ -536,10 +536,10 @@ msgid "Bridge" msgstr "ブリッジ" msgid "Bridge interfaces" -msgstr "ブリッジインターフェース" +msgstr "ブリッジ インターフェース" msgid "Bridge unit number" -msgstr "ブリッジユニット番号" +msgstr "ブリッジ ユニット番号" msgid "Bring up on boot" msgstr "デフォルトで起動する" @@ -564,7 +564,7 @@ msgid "Buttons" msgstr "ボタン" msgid "CA certificate; if empty it will be saved after the first connection." -msgstr "" +msgstr "CA証明書（空白の場合、初回の接続後に保存されます。）" msgid "CPU usage (%)" msgstr "CPU使用率 (%)" @@ -609,10 +609,10 @@ msgid "" "fill out the create field to define a new zone and attach the " "interface to it." msgstr "" -"このインターフェースに設定するファイウォール・ゾーンを選択してください。" -"設定しないを選択すると、設定済みのゾーンを削除します。また、作成フィールドにゾーン名を入力すると、新しくゾーンを作成し、このインターフェー" -"スに設定します。" +"このインターフェースに設定するファイウォール ゾーンを選択してください。設" +"定しないを選択すると、設定済みのゾーンを削除します。また、作成" +"フィールドにゾーン名を入力すると、新しくゾーンを作成し、このインターフェース" +"に設定します。" msgid "" "Choose the network(s) you want to attach to this wireless interface or fill " @@ -632,10 +632,10 @@ msgid "" "configuration files. To reset the firmware to its initial state, click " "\"Perform reset\" (only possible with squashfs images)." msgstr "" -"\"バックアップアーカイブの作成\"をクリックすると、現在の設定ファイルをtar形式" -"のアーカイブファイルとしてダウンロードします。設定のリセットを行う場合、\"設" -"定リセット\"をクリックしてください。(ただし、squashfsをお使いの場合のみ使用可" -"能です)" +"\"バックアップ アーカイブの作成\"をクリックすると、現在の設定ファイルをtar形" +"式のアーカイブファイルとしてダウンロードします。設定のリセットを行う場" +"合、\"設定リセット\"をクリックしてください。(ただし、squashfsをお使いの場合の" +"み使用可能です)" msgid "Client" msgstr "クライアント" @@ -702,7 +702,7 @@ msgid "Cover the following interfaces" msgstr "インターフェースの指定" msgid "Create / Assign firewall-zone" -msgstr "ファイアウォールゾーンの作成 / 割り当て" +msgstr "ファイアウォール ゾーンの作成 / 割り当て" msgid "Create Interface" msgstr "インターフェースの作成" @@ -776,7 +776,7 @@ msgid "DNS-Label / FQDN" msgstr "" msgid "DNSSEC" -msgstr "" +msgstr "DNSSEC" msgid "DNSSEC check unsigned" msgstr "" @@ -791,7 +791,7 @@ msgid "DSL" msgstr "DSL" msgid "DSL Status" -msgstr "" +msgstr "DSL ステータス" msgid "DSL line mode" msgstr "" @@ -809,7 +809,7 @@ msgid "Default %d" msgstr "標準設定 %d" msgid "Default gateway" -msgstr "デフォルトゲートウェイ" +msgstr "デフォルト ゲートウェイ" msgid "Default is stateless + stateful" msgstr "デフォルトは ステートレス + ステートフル です。" @@ -893,7 +893,7 @@ msgid "Discard upstream RFC1918 responses" msgstr "RFC1918の応答を破棄します" msgid "Displaying only packages containing" -msgstr "右記の表示を含んだパッケージのみを表示中" +msgstr "右記の文字列を含んだパッケージのみを表示中" msgid "Distance Optimization" msgstr "距離の最適化" @@ -923,16 +923,16 @@ msgstr "" "無効なリプライをキャッシュしません (例：存在しないドメインからの返答など)" msgid "Do not forward requests that cannot be answered by public name servers" -msgstr "パブリックDNSサーバーが返答できなかったリクエストを転送しません" +msgstr "パブリック DNSサーバーが返答できなかったリクエストを転送しません" msgid "Do not forward reverse lookups for local networks" -msgstr "ローカルネットワークへの逆引きを転送しません" +msgstr "ローカル ネットワークへの逆引きを転送しません" msgid "Domain required" msgstr "ドメイン必須" msgid "Domain whitelist" -msgstr "ドメイン・ホワイトリスト" +msgstr "ドメイン ホワイトリスト" msgid "Don't Fragment" msgstr "" @@ -948,7 +948,7 @@ msgid "Download and install package" msgstr "パッケージのダウンロードとインストール" msgid "Download backup" -msgstr "バックアップアーカイブのダウンロード" +msgstr "バックアップ アーカイブのダウンロード" msgid "Dropbear Instance" msgstr "Dropbear設定" @@ -965,8 +965,7 @@ msgid "Dual-Stack Lite (RFC6333)" msgstr "Dual-Stack Lite (RFC6333)" msgid "Dynamic DHCP" -msgstr "" -"ダイナミック DHCP" +msgstr "動的 DHCP" msgid "Dynamic tunnel" msgstr "動的トンネル機能" @@ -1014,10 +1013,10 @@ msgid "Enable IPv6 negotiation" msgstr "IPv6 ネゴシエーションの有効化" msgid "Enable IPv6 negotiation on the PPP link" -msgstr "PPPリンクのIPv6ネゴシエーションを有効にする" +msgstr "PPPリンクのIPv6 ネゴシエーションを有効にする" msgid "Enable Jumbo Frame passthrough" -msgstr "ジャンボフレーム・パススルーを有効にする" +msgstr "ジャンボフレーム パススルーを有効にする" msgid "Enable NTP client" msgstr "NTPクライアント機能を有効にする" @@ -1035,7 +1034,7 @@ msgid "Enable WPS pushbutton, requires WPA(2)-PSK" msgstr "WPS プッシュボタンを有効化するには、WPA(2)-PSKが必要です。" msgid "Enable learning and aging" -msgstr "ラーニング・エイジング機能を有効にする" +msgstr "ラーニング エイジング機能を有効にする" msgid "Enable mirroring of incoming packets" msgstr "" @@ -1064,7 +1063,7 @@ msgid "" msgstr "" msgid "Enables the Spanning Tree Protocol on this bridge" -msgstr "スパニングツリー・プロトコルを有効にする" +msgstr "スパニングツリー プロトコルを有効にする" msgid "Encapsulation mode" msgstr "カプセル化モード" @@ -1118,10 +1117,10 @@ msgid "External R1 Key Holder List" msgstr "" msgid "External system log server" -msgstr "外部システムログ・サーバー" +msgstr "外部システムログ サーバー" msgid "External system log server port" -msgstr "外部システムログ・サーバーポート" +msgstr "外部システムログ・サーバー ポート" msgid "External system log server protocol" msgstr "外部システムログ・サーバー プロトコル" @@ -1145,7 +1144,7 @@ msgid "Filter private" msgstr "プライベートフィルター" msgid "Filter useless" -msgstr "Filter useless" +msgstr "" msgid "" "Find all currently attached filesystems and swap and replace configuration " @@ -1155,7 +1154,7 @@ msgstr "" "づいてデフォルト設定を置き換えます。" msgid "Find and join network" -msgstr "ネットワークを検索して参加" +msgstr "ネットワークの検索と参加" msgid "Find package" msgstr "パッケージを検索" @@ -1173,13 +1172,13 @@ msgid "Firewall Settings" msgstr "ファイアウォール設定" msgid "Firewall Status" -msgstr "ファイアウォール・ステータス" +msgstr "ファイアウォール ステータス" msgid "Firmware File" msgstr "ファームウェア ファイル" msgid "Firmware Version" -msgstr "ファームウェア・バージョン" +msgstr "ファームウェア バージョン" msgid "Fixed source port for outbound DNS queries" msgstr "DNSクエリを送信する送信元ポートを固定します" @@ -1215,6 +1214,9 @@ msgstr "TKIP を使用" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP 及びCCMP (AES) を使用" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "NAT-Tの強制使用" @@ -1228,13 +1230,13 @@ msgid "Forward Error Correction Seconds (FECS)" msgstr "" msgid "Forward broadcast traffic" -msgstr "ブロードキャスト・トラフィックを転送する" +msgstr "ブロードキャスト トラフィックを転送する" msgid "Forwarding mode" msgstr "転送モード" msgid "Fragmentation Threshold" -msgstr "フラグメンテーション閾値" +msgstr "フラグメンテーションしきい値" msgid "Frame Bursting" msgstr "フレームバースト" @@ -1262,7 +1264,7 @@ msgid "Gateway" msgstr "ゲートウェイ" msgid "Gateway ports" -msgstr "ゲートウェイ・ポート" +msgstr "ゲートウェイ ポート" msgid "General Settings" msgstr "一般設定" @@ -1277,7 +1279,7 @@ msgid "Generate Config" msgstr "コンフィグ生成" msgid "Generate archive" -msgstr "バックアップアーカイブの作成" +msgstr "バックアップ アーカイブの作成" msgid "Generic 802.11%s Wireless Controller" msgstr "802.11%s 無線LANコントローラ" @@ -1307,7 +1309,7 @@ msgid "HE.net password" msgstr "HE.net パスワード" msgid "HE.net username" -msgstr "" +msgstr "HE.net ユーザー名" msgid "HT mode (802.11n)" msgstr "HT モード (802.11n)" @@ -1345,7 +1347,7 @@ msgid "Host" msgstr "ホスト" msgid "Host entries" -msgstr "ホストエントリー" +msgstr "ホスト エントリー" msgid "Host expiry timeout" msgstr "" @@ -1488,20 +1490,21 @@ msgstr "チェックした場合、暗号化は無効になります。" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" -msgstr "固定のデバイスノード名のかわりに、設定したUUIDを使用してマウントします" +msgstr "" +"固定のデバイス ノード名のかわりに、設定されたUUIDを使用してマウントします" msgid "" "If specified, mount the device by the partition label instead of a fixed " "device node" msgstr "" -"固定のデバイスノード名のかわりに、設定したパーティションラベルを使用してマウ" -"ントします。" +"固定のデバイス ノード名のかわりに、設定されたパーティション ラベルを使用して" +"マウントします。" msgid "If unchecked, no default route is configured" -msgstr "チェックされていない場合、デフォルトルートを設定しません" +msgstr "チェックされていない場合、デフォルト ルートを設定しません" msgid "If unchecked, the advertised DNS server addresses are ignored" -msgstr "チェックされていない場合、通知されたDNSサーバーアドレスを無視します" +msgstr "チェックされていない場合、通知されたDNSサーバー アドレスを無視します" msgid "" "If your physical memory is insufficient unused data can be temporarily " @@ -1510,11 +1513,11 @@ msgid "" "slow process as the swap-device cannot be accessed with the high datarates " "of the RAM." msgstr "" -"物理メモリが不足する場合、一時的にデータをより大容量なRAMデバイスにスワップすることが出来ます。ただし、デー" -"タのスワップは非常に遅い処理であるため、スワップするデバイスには高速にRAMにアクセスすることができなくなる恐れ" -"があります。" +"物理メモリが不足する場合、使用されていないデータを一時的にスワップ デバイスに" +"スワップし、RAMの使用可能領域を増" +"やすことができます。ただし、スワップ デバイスはRAMから高速にアクセスすることができないため、データのスワップ" +"は非常に遅い処理であることに注意します。" msgid "Ignore /etc/hosts" msgstr "/etc/hostsを無視" @@ -1523,7 +1526,7 @@ msgid "Ignore interface" msgstr "インターフェースを無視する" msgid "Ignore resolve file" -msgstr "リゾルバファイルを無視する" +msgstr "リゾルバ ファイルを無視する" msgid "Image" msgstr "イメージ" @@ -1600,7 +1603,7 @@ msgid "Internal" msgstr "内部" msgid "Internal Server Error" -msgstr "内部サーバーエラー" +msgstr "内部サーバー エラー" msgid "Invalid" msgstr "入力値が不正です" @@ -1612,7 +1615,8 @@ msgid "Invalid VLAN ID given! Only unique IDs are allowed" msgstr "無効なVLAN IDです! ユニークなIDを入力してください。" msgid "Invalid username and/or password! Please try again." -msgstr "ユーザー名とパスワードが不正です! もう一度入力してください。" +msgstr "" +"ユーザー名かパスワード、もしくは両方が不正です！もう一度入力してください。" msgid "" "It appears that you are trying to flash an image that does not fit into the " @@ -1631,16 +1635,16 @@ msgid "Join Network: Wireless Scan" msgstr "ネットワークに接続する: 無線LANスキャン" msgid "Joining Network: %q" -msgstr "次のネットワークに参加: %q" +msgstr "ネットワークに接続: %q" msgid "Keep settings" msgstr "設定を保持する" msgid "Kernel Log" -msgstr "カーネルログ" +msgstr "カーネル ログ" msgid "Kernel Version" -msgstr "カーネルバージョン" +msgstr "カーネル バージョン" msgid "Key" msgstr "暗号キー" @@ -1797,13 +1801,13 @@ msgid "Local Service Only" msgstr "" msgid "Local Startup" -msgstr "ローカル Startup" +msgstr "ローカル スタートアップ" msgid "Local Time" msgstr "時刻" msgid "Local domain" -msgstr "ローカルドメイン" +msgstr "ローカル ドメイン" msgid "" "Local domain specification. Names matching this domain are never forwarded " @@ -1812,11 +1816,11 @@ msgstr "" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" -"DHCP名とhostsファイルのエントリーに付される、ローカルドメインサフィックスで" +"DHCP名とhostsファイルのエントリーに付される、ローカルドメイン サフィックスで" "す。" msgid "Local server" -msgstr "ローカルサーバー" +msgstr "ローカル サーバー" msgid "" "Localise hostname depending on the requesting subnet if multiple IPs are " @@ -1833,7 +1837,7 @@ msgid "Log output level" msgstr "ログ出力レベル" msgid "Log queries" -msgstr "ログクエリー" +msgstr "ログ クエリ" msgid "Logging" msgstr "ログ" @@ -1855,7 +1859,7 @@ msgid "MAC-Address" msgstr "MAC-アドレス" msgid "MAC-Address Filter" -msgstr "MAC-アドレスフィルタ" +msgstr "MAC-アドレス フィルタ" msgid "MAC-Filter" msgstr "MAC-フィルタ" @@ -1864,7 +1868,7 @@ msgid "MAC-List" msgstr "MAC-リスト" msgid "MAP / LW4over6" -msgstr "" +msgstr "MAP / LW4over6" msgid "MB/s" msgstr "MB/s" @@ -1949,7 +1953,7 @@ msgid "Model" msgstr "モデル" msgid "Modem device" -msgstr "モデムデバイス" +msgstr "モデム デバイス" msgid "Modem init timeout" msgstr "モデム初期化タイムアウト" @@ -2001,7 +2005,7 @@ msgid "Move up" msgstr "上へ" msgid "Multicast address" -msgstr "マルチキャストアドレス" +msgstr "マルチキャスト アドレス" msgid "NAS ID" msgstr "NAS ID" @@ -2012,6 +2016,9 @@ msgstr "NAT-T モード" msgid "NAT64 Prefix" msgstr "NAT64 プレフィクス" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "NDP-プロキシ" @@ -2043,10 +2050,10 @@ msgid "Network" msgstr "ネットワーク" msgid "Network Utilities" -msgstr "ネットワーク・ユーティリティ" +msgstr "ネットワーク ユーティリティ" msgid "Network boot image" -msgstr "ネットワーク・ブート用イメージ" +msgstr "ネットワークブート用イメージ" msgid "Network without interfaces." msgstr "" @@ -2079,7 +2086,7 @@ msgid "No network name specified" msgstr "ネットワーク名が設定されていません" msgid "No package lists available" -msgstr "パッケージリストがありません" +msgstr "パッケージ リストがありません" msgid "No password set!" msgstr "パスワードが設定されていません!" @@ -2155,18 +2162,18 @@ msgid "" "INTERFACE.VLANNR (e.g.: " "eth0.1)." msgstr "" -"このページではネットワークインターフェースの設定を行うことが出来ます。\"ブ" -"リッジインターフェース\"フィールドをチェックし、複数のネットワークインター" -"フェース名をスペースで区切りで入力することで複数のインターフェースをブリッジ" -"することが出来ます。また、INTERFACE.VLANNRという表記によりVLANも使用することが出来ます。" -"(例: eth0.1)" +"このページではネットワーク インターフェースの設定を行うことが出来ます。\"ブ" +"リッジインターフェース\"フィールドにチェックを付け、複数のネットワーク イン" +"ターフェースをリストから選択することで複数のインターフェースをブリッジするこ" +"とが出来ます。また、INTERFACE.VLANNRという表記によりVLANも使用することが出来ます。(例: eth0.1)" msgid "On-State Delay" msgstr "点灯時間" msgid "One of hostname or mac address must be specified!" -msgstr "1つ以上のホスト名またはmacアドレスを設定してください!" +msgstr "1つ以上のホスト名またはMACアドレスを設定してください!" msgid "One or more fields contain invalid values!" msgstr "1つ以上のフィールドに無効な値が設定されています！" @@ -2335,7 +2342,7 @@ msgid "Package libiwinfo required!" msgstr "libiwinfo パッケージをインストールしてください！" msgid "Package lists are older than 24 hours" -msgstr "パッケージリストは24時間以上前のものです" +msgstr "パッケージ リストは24時間以上前のものです" msgid "Package name" msgstr "パッケージ名" @@ -2433,6 +2440,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "委任されたプレフィクス (PD)" @@ -2480,7 +2493,7 @@ msgid "Protocol of the new interface" msgstr "新しいインターフェースのプロトコル" msgid "Protocol support is not installed" -msgstr "プロトコルサポートがインストールされていません" +msgstr "プロトコル サポートがインストールされていません" msgid "Provide NTP server" msgstr "NTPサーバー機能を有効にする" @@ -2513,7 +2526,7 @@ msgid "RFC3947 NAT-T mode" msgstr "RFC3947 NAT-Tモード" msgid "RTS/CTS Threshold" -msgstr "RTS/CTS閾値" +msgstr "RTS/CTSしきい値" msgid "RX" msgstr "RX" @@ -2525,7 +2538,7 @@ msgid "RaLink 802.11%s Wireless Controller" msgstr "RaLink 802.11%s 無線LANコントローラ" msgid "Radius-Accounting-Port" -msgstr "Radiusアカウントサーバー・ポート番号" +msgstr "Radiusアカウントサーバー ポート番号" msgid "Radius-Accounting-Secret" msgstr "Radiusアカウント秘密鍵" @@ -2534,7 +2547,7 @@ msgid "Radius-Accounting-Server" msgstr "Radiusアカウントサーバー" msgid "Radius-Authentication-Port" -msgstr "Radius認証サーバー・ポート番号" +msgstr "Radius認証サーバー ポート番号" msgid "Radius-Authentication-Secret" msgstr "Radius認証秘密鍵" @@ -2593,7 +2606,7 @@ msgid "Realtime Connections" msgstr "リアルタイム・コネクション" msgid "Realtime Graphs" -msgstr "リアルタイム・グラフ" +msgstr "リアルタイム グラフ" msgid "Realtime Load" msgstr "リアルタイム・ロード" @@ -2650,7 +2663,7 @@ msgid "Relay bridge" msgstr "リレーブリッジ" msgid "Remote IPv4 address" -msgstr "リモートIPv4アドレス" +msgstr "リモート IPv4アドレス" msgid "Remote IPv4 address or FQDN" msgstr "リモート IPv4アドレス または FQDN" @@ -2699,7 +2712,7 @@ msgid "" "
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" "'フル' バージョンの wpad/hostapd と、無線LANドライバーによるサポートが必要で" -"す。
（2017年2月現在: ath9k と ath10k、LEDE内では mwlwifi と mt76）" +"す。
（2017年2月現在: ath9k 及び ath10k、LEDE内では mwlwifi 及び mt76）" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " @@ -2758,7 +2771,7 @@ msgid "Router Advertisement-Service" msgstr "ルーター アドバタイズメント-サービス" msgid "Router Password" -msgstr "ルーター・パスワード" +msgstr "ルーター パスワード" msgid "Routes" msgstr "経路情報" @@ -2865,6 +2878,11 @@ msgstr "サービスタイプ" msgid "Services" msgstr "サービス" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "時刻同期設定" @@ -3070,10 +3088,10 @@ msgid "System Log" msgstr "システムログ" msgid "System Properties" -msgstr "システム・プロパティ" +msgstr "システム プロパティ" msgid "System log buffer size" -msgstr "システムログ・バッファサイズ" +msgstr "システムログ バッファサイズ" msgid "TCP:" msgstr "TCP:" @@ -3297,21 +3315,21 @@ msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " "front of 'exit 0') to execute them at the end of the boot process." msgstr "" -"/etc/rc.localを表示しています。あなたの実行したいコマンドを'exit 0'行より上に" -"入力してください。これらのコマンドはブートプロセスの最後に実行されます。" +"/etc/rc.localを表示しています。実行したいコマンドを'exit 0'行より上に入力して" +"ください。これらのコマンドはブートプロセスの最後に実行されます。" msgid "" "This is the local endpoint address assigned by the tunnel broker, it usually " "ends with :2" msgstr "" -"プロバイダからアサインされた、ローカルのエンドポイント・アドレスです。通常、" +"プロバイダからアサインされた、ローカルのエンドポイント アドレスです。通常、" ":2が終端に設定されます。" msgid "" "This is the only DHCP in the local network" msgstr "" -"ローカルネットワーク内のみの DHCPとして使用する" msgid "This is the plain username for logging into the account" @@ -3323,7 +3341,7 @@ msgstr "" msgid "This is the system crontab in which scheduled tasks can be defined." msgstr "" -"スケジュールタスクシステムを使用することで、定期的に特定のタスクの実行を行う" +"スケジュールタスク システムを使用することで、定期的に特定のタスクの実行を行う" "ことが可能です。" msgid "" @@ -3359,7 +3377,7 @@ msgid "" "To restore configuration files, you can upload a previously generated backup " "archive here." msgstr "" -"設定を復元するには、作成しておいたバックアップアーカイブをアップロードしてく" +"設定を復元するには、作成しておいたバックアップ アーカイブをアップロードしてく" "ださい。" msgid "Tone" @@ -3469,13 +3487,13 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェアイ" -"メージをアップロードしてください。\"設定の保持\"を有効にすると、現在の設定を" -"維持してアップデートを行います。ただし、OpenWrt/LEDE互換のファームウェアイ" -"メージがアップロードされた場合のみ、設定は保持されます。" +"システムをアップデートする場合、sysupgrade機能に互換性のあるファームウェア イ" +"メージをここにアップロードしてください。\"設定の保持\"を有効にすると、現在の" +"設定を維持してアップデートを行います（互換性のあるファームウェア イメージが必" +"要）。" msgid "Upload archive..." -msgstr "アーカイブをアップロード" +msgstr "アーカイブをアップロード..." msgid "Uploaded File" msgstr "アップロード完了" @@ -3496,10 +3514,10 @@ msgid "Use ISO/IEC 3166 alpha2 country codes." msgstr "ISO/IEC 3166 alpha2の国コードを使用します。" msgid "Use MTU on tunnel interface" -msgstr "トンネルインターフェースのMTUを設定" +msgstr "トンネル インターフェースのMTUを設定" msgid "Use TTL on tunnel interface" -msgstr "トンネルインターフェースのTTLを設定" +msgstr "トンネル インターフェースのTTLを設定" msgid "Use as external overlay (/overlay)" msgstr "外部オーバーレイとして使用する (/overlay)" @@ -3508,7 +3526,7 @@ msgid "Use as root filesystem (/)" msgstr "ルート ファイルシステムとして使用する (/)" msgid "Use broadcast flag" -msgstr "ブロードキャスト・フラグを使用する" +msgstr "ブロードキャスト フラグを使用する" msgid "Use builtin IPv6-management" msgstr "ビルトインのIPv6-マネジメントを使用する" @@ -3517,10 +3535,10 @@ msgid "Use custom DNS servers" msgstr "DNSサーバーを手動で設定" msgid "Use default gateway" -msgstr "デフォルトゲートウェイを使用する" +msgstr "デフォルト ゲートウェイを使用する" msgid "Use gateway metric" -msgstr "ゲートウェイ・メトリックを使用する" +msgstr "ゲートウェイ メトリックを使用する" msgid "Use routing table" msgstr "" diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index e79d36e84..50b44ff46 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1192,6 +1192,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1969,6 +1972,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2386,6 +2392,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2800,6 +2812,11 @@ msgstr "" msgid "Services" msgstr "서비스" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index ac6a2868d..32e565d70 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1164,6 +1164,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1951,6 +1954,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2365,6 +2371,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2776,6 +2788,11 @@ msgstr "" msgid "Services" msgstr "Perkhidmatan" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index aac8f0b9d..794c5fd3f 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1201,6 +1201,9 @@ msgstr "Bruk TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Bruk TKIP og CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1994,6 +1997,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2411,6 +2417,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2839,6 +2851,11 @@ msgstr "Tjeneste type" msgid "Services" msgstr "Tjenester" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Oppsett tidssynkronisering" diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index 79111542d..2b5cfb561 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1232,6 +1232,9 @@ msgstr "Wymuś TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Wymuś TKIP i CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2039,6 +2042,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2457,6 +2463,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2889,6 +2901,11 @@ msgstr "Typ serwisu" msgid "Services" msgstr "Serwisy" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Ustawienia synchronizacji czasu" diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index a8086fde2..a6a8b788b 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1268,6 +1268,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "Force o uso do NAT-T" @@ -2120,6 +2123,9 @@ msgstr "Modo NAT-T" msgid "NAT64 Prefix" msgstr "Prefixo NAT64" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "Proxy NDP" @@ -2552,6 +2558,12 @@ msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" "Erros CRC PreemptivosCRCP_P" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "Prefixo Delegado" @@ -2994,6 +3006,11 @@ msgstr "Tipo do Serviço" msgid "Services" msgstr "Serviços" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "Configurar a Sincronização do Horário" diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index e9b9b9d15..9ed6a3892 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1218,6 +1218,9 @@ msgstr "Forçar TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forçar TKIP e CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2018,6 +2021,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2433,6 +2439,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2857,6 +2869,11 @@ msgstr "Tipo de Serviço" msgid "Services" msgstr "Serviços" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurar Sincronização Horária" diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 3930eb47c..c1c40d42c 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1171,6 +1171,9 @@ msgstr "Forteaza TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Forteaza TKIP si CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1948,6 +1951,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2357,6 +2363,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2767,6 +2779,11 @@ msgstr "Tip de serviciu" msgid "Services" msgstr "Servicii" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Configurare sincronizare timp" diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 94511db46..4bcaf3ca6 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1220,6 +1220,9 @@ msgstr "Требовать TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "TKIP или CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2024,6 +2027,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2441,6 +2447,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2869,6 +2881,11 @@ msgstr "Тип службы" msgid "Services" msgstr "Сервисы" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Настроить синхронизацию времени" diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 46c3fddda..219cf1a5b 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1151,6 +1151,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1923,6 +1926,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2332,6 +2338,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2740,6 +2752,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 7145846f7..aeb7c280b 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1157,6 +1157,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1929,6 +1932,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2338,6 +2344,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2746,6 +2758,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot index d7ecb8af9..720b955a2 100644 --- a/modules/luci-base/po/templates/base.pot +++ b/modules/luci-base/po/templates/base.pot @@ -1144,6 +1144,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1916,6 +1919,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2325,6 +2331,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2733,6 +2745,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index 9be51e3c3..66080faa5 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1164,6 +1164,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1936,6 +1939,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2345,6 +2351,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2753,6 +2765,11 @@ msgstr "" msgid "Services" msgstr "" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 21db53b2e..e892ffbc9 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1227,6 +1227,9 @@ msgstr "Примусово TKIP" msgid "Force TKIP and CCMP (AES)" msgstr "Примусово TKIP та CCMP (AES)" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -2032,6 +2035,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2452,6 +2458,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2882,6 +2894,11 @@ msgstr "Тип сервісу" msgid "Services" msgstr "Сервіси" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "Настройки синхронізації часу" diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 7ffacf015..f42d8bf64 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1169,6 +1169,9 @@ msgstr "" msgid "Force TKIP and CCMP (AES)" msgstr "" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1953,6 +1956,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2368,6 +2374,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2780,6 +2792,11 @@ msgstr "" msgid "Services" msgstr "Dịch vụ " +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + msgid "Set up Time Synchronization" msgstr "" diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index acfe956ab..b5ade2b06 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-12-21 23:08+0200\n" -"PO-Revision-Date: 2017-01-07 21:46+0800\n" +"PO-Revision-Date: 2017-04-09 15:04+0800\n" "Last-Translator: Hsing-Wang Liao \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.11\n" +"X-Generator: Poedit 2.0\n" "Language-Team: \n" msgid "%s is untagged in multiple VLANs!" @@ -44,43 +44,43 @@ msgid "-- match by label --" msgstr "-- 根据标签匹配 --" msgid "-- match by uuid --" -msgstr "" +msgstr "-- 根据 UUID 匹配 --" msgid "1 Minute Load:" -msgstr "1分钟负载:" +msgstr "1 分钟负载:" msgid "15 Minute Load:" -msgstr "15分钟负载:" +msgstr "15 分钟负载:" msgid "4-character hexadecimal ID" -msgstr "" +msgstr "4 字符的十六进制 ID" msgid "464XLAT (CLAT)" msgstr "464XLAT (CLAT)" msgid "5 Minute Load:" -msgstr "5分钟负载:" +msgstr "5 分钟负载:" msgid "6-octet identifier as a hex string - no colons" -msgstr "" +msgstr "6 个八位字节的标识符 (十六进制字符串) - 无冒号" msgid "802.11r Fast Transition" -msgstr "" +msgstr "802.11r 快速转换" msgid "802.11w Association SA Query maximum timeout" -msgstr "" +msgstr "802.11w 关联 SA 查询最大超时" msgid "802.11w Association SA Query retry timeout" -msgstr "" +msgstr "802.11w 关联 SA 查询重试超时" msgid "802.11w Management Frame Protection" -msgstr "" +msgstr "802.11w 管理帧保护" msgid "802.11w maximum timeout" -msgstr "" +msgstr "802.11w 最大超时" msgid "802.11w retry timeout" -msgstr "" +msgstr "802.11w 重试超时" msgid "BSSID" msgstr "BSSID" @@ -94,7 +94,7 @@ msgstr "DNS 服务器端口" msgid "" "DNS servers will be queried in the " "order of the resolvfile" -msgstr "将会按照指定的顺序查询DNS" +msgstr "将会按照指定的顺序查询 DNS" msgid "ESSID" msgstr "ESSID" @@ -112,20 +112,20 @@ msgid "" "IPv6-Address or Network " "(CIDR)" msgstr "" -"IPv6-地址或超网(CIDR)" +"IPv6-地址或超网 (CIDR)" msgid "IPv6-Gateway" msgstr "IPv6-网关" msgid "IPv6-Suffix (hex)" -msgstr "IPv6-后缀（十六进制）" +msgstr "IPv6-后缀 (十六进制)" msgid "LED Configuration" -msgstr "LED配置" +msgstr "LED 配置" msgid "LED Name" -msgstr "LED名称" +msgstr "LED 名称" msgid "MAC-Address" msgstr "MAC-地址" @@ -133,12 +133,12 @@ msgstr "MAC-地址" msgid "" "Max. DHCP leases" -msgstr "最大DHCP分配数量" +msgstr "最大 DHCP 分配数量" msgid "" "Max. EDNS0 packet size" -msgstr "最大EDNS0数据包大小" +msgstr "最大 EDNS0 数据包大小" msgid "Max. concurrent queries" msgstr "最大并发查询数" @@ -165,33 +165,33 @@ msgid "APN" msgstr "APN" msgid "ARP retry threshold" -msgstr "ARP重试阈值" +msgstr "ARP 重试阈值" msgid "ATM (Asynchronous Transfer Mode)" -msgstr "ATM(异步传输模式)" +msgstr "ATM (异步传输模式)" msgid "ATM Bridges" -msgstr "ATM桥接" +msgstr "ATM 桥接" msgid "ATM Virtual Channel Identifier (VCI)" -msgstr "ATM虚拟通道标识(VCI)" +msgstr "ATM 虚拟通道标识 (VCI)" msgid "ATM Virtual Path Identifier (VPI)" -msgstr "ATM虚拟路径标识(VPI)" +msgstr "ATM 虚拟路径标识 (VPI)" msgid "" "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual " "Linux network interfaces which can be used in conjunction with DHCP or PPP " "to dial into the provider network." msgstr "" -"ATM桥是以AAL5协议封装以太网的虚拟Linux网桥，用于协同DHCP或PPP来拨号连接到网络" -"运营商。" +"ATM 桥是以 AAL5 协议封装以太网的虚拟 Linux 网桥，用于协同 DHCP 或 PPP 来拨号" +"连接到网络运营商。" msgid "ATM device number" -msgstr "ATM设备号码" +msgstr "ATM 设备号码" msgid "ATU-C System Vendor ID" -msgstr "ATU-C系统供应商ID" +msgstr "ATU-C 系统供应商 ID" msgid "AYIYA" msgstr "AYIYA" @@ -200,7 +200,7 @@ msgid "Access Concentrator" msgstr "接入集中器" msgid "Access Point" -msgstr "接入点AP" +msgstr "接入点 AP" msgid "Action" msgstr "动作" @@ -212,37 +212,37 @@ msgid "Activate this network" msgstr "激活此网络" msgid "Active IPv4-Routes" -msgstr "活动的IPv4-链路" +msgstr "活动的 IPv4-链路" msgid "Active IPv6-Routes" -msgstr "活动的IPv6-链路" +msgstr "活动的 IPv6-链路" msgid "Active Connections" msgstr "活动连接" msgid "Active DHCP Leases" -msgstr "已分配的DHCP租约" +msgstr "已分配的 DHCP 租约" msgid "Active DHCPv6 Leases" -msgstr "已分配的DHCPv6租约" +msgstr "已分配的 DHCPv6 租约" msgid "Ad-Hoc" -msgstr "点对点Ad-Hoc" +msgstr "点对点 Ad-Hoc" msgid "Add" msgstr "添加" msgid "Add local domain suffix to names served from hosts files" -msgstr "添加本地域名后缀到HOSTS文件中的域名" +msgstr "添加本地域名后缀到 HOSTS 文件中的域名" msgid "Add new interface..." msgstr "添加新接口..." msgid "Additional Hosts files" -msgstr "额外的HOSTS文件" +msgstr "额外的 HOSTS 文件" msgid "Additional servers file" -msgstr "额外的SERVERS文件" +msgstr "额外的 SERVERS 文件" msgid "Address" msgstr "地址" @@ -257,7 +257,7 @@ msgid "Advanced Settings" msgstr "高级设置" msgid "Aggregate Transmit Power(ACTATP)" -msgstr "总发射功率(ACTATP)" +msgstr "总发射功率 (ACTATP)" msgid "Alert" msgstr "警戒" @@ -265,13 +265,13 @@ msgstr "警戒" msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" -msgstr "从最低可用地址开始顺序分配IP地址" +msgstr "从最低可用地址开始顺序分配 IP 地址" msgid "Allocate IP sequentially" -msgstr "顺序分配IP" +msgstr "顺序分配 IP" msgid "Allow SSH password authentication" -msgstr "允许SSH密码验证" +msgstr "允许 SSH 密码验证" msgid "Allow all except listed" msgstr "仅允许列表外" @@ -283,26 +283,26 @@ msgid "Allow localhost" msgstr "允许本机" msgid "Allow remote hosts to connect to local SSH forwarded ports" -msgstr "允许远程主机连接到本地SSH转发端口" +msgstr "允许远程主机连接到本地 SSH 转发端口" msgid "Allow root logins with password" -msgstr "允许root用户凭密码登录" +msgstr "允许 Root 用户凭密码登录" msgid "Allow the root user to login with password" -msgstr "允许root用户凭密码登录" +msgstr "允许 root 用户凭密码登录" msgid "" "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services" -msgstr "允许127.0.0.0/8回环范围内的上行响应，例如：RBL服务" +msgstr "允许 127.0.0.0/8 回环范围内的上行响应，例如: RBL 服务" msgid "Allowed IPs" -msgstr "允许的IP" +msgstr "允许的 IP" msgid "" "Also see Tunneling Comparison on SIXXS" msgstr "" -"也请查看SIXXS上的隧道对比" msgid "Always announce default router" @@ -357,10 +357,10 @@ msgid "Announce as default router even if no public prefix is available." msgstr "即使没有可用的公共前缀也广播默认路由。" msgid "Announced DNS domains" -msgstr "广播的DNS域名" +msgstr "广播的 DNS 域名" msgid "Announced DNS servers" -msgstr "广播的DNS服务器" +msgstr "广播的 DNS 服务器" msgid "Anonymous Identity" msgstr "匿名身份" @@ -369,7 +369,7 @@ msgid "Anonymous Mount" msgstr "自动挂载未配置的磁盘分区" msgid "Anonymous Swap" -msgstr "自动挂载未配置的Swap分区" +msgstr "自动挂载未配置的 Swap 分区" msgid "Antenna 1" msgstr "天线 1" @@ -391,14 +391,14 @@ msgstr "正在应用更改" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" -msgstr "给每个公共IPv6前缀分配指定长度的固定部分" +msgstr "给每个公共 IPv6 前缀分配指定长度的固定部分" msgid "Assign interfaces..." msgstr "分配接口..." msgid "" "Assign prefix parts using this hexadecimal subprefix ID for this interface." -msgstr "指定此接口使用的十六进制子ID前缀部分" +msgstr "指定此接口使用的十六进制子 ID 前缀部分。" msgid "Associated Stations" msgstr "已连接站点" @@ -416,7 +416,7 @@ msgid "Authentication Type" msgstr "认证类型" msgid "Authoritative" -msgstr "授权的唯一DHCP服务器" +msgstr "唯一授权" msgid "Authorization Required" msgstr "需要授权" @@ -428,22 +428,22 @@ msgid "Automatic" msgstr "自动" msgid "Automatic Homenet (HNCP)" -msgstr "自动家庭网络(HNCP)" +msgstr "自动家庭网络 (HNCP)" 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 "自动挂载磁盘" msgid "Automount Swap" -msgstr "自动挂载Swap" +msgstr "自动挂载 Swap" msgid "Available" msgstr "可用" @@ -497,7 +497,7 @@ msgid "Band" msgstr "频宽" msgid "Behind NAT" -msgstr "在NAT网络内" +msgstr "在 NAT 网络内" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -514,7 +514,7 @@ msgid "Bind only to specific interfaces rather than wildcard address." msgstr "仅绑定到特定接口，而不是全部地址。" msgid "Bind the tunnel to this interface (optional)." -msgstr "将隧道绑定到此接口(可选)。" +msgstr "将隧道绑定到此接口 (可选)。" msgid "Bitrate" msgstr "传输速率" @@ -552,10 +552,10 @@ 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使用率(%)" +msgstr "CPU 使用率 (%)" msgid "Cancel" msgstr "取消" @@ -585,7 +585,7 @@ msgid "Check fileystems before mount" msgstr "在挂载前检查文件系统" msgid "Check this option to delete the existing networks from this radio." -msgstr "" +msgstr "选中此选项以从无线中删除现有网络。" msgid "Checksum" msgstr "校验值" @@ -606,24 +606,26 @@ msgid "Cipher" msgstr "算法" msgid "Cisco UDP encapsulation" -msgstr "Cisco UDP封装" +msgstr "Cisco UDP 封装" msgid "" "Click \"Generate archive\" to download a tar archive of the current " "configuration files. To reset the firmware to its initial state, click " "\"Perform reset\" (only possible with squashfs images)." -msgstr "备份/恢复当前系统配置文件或重置OpenWrt(仅squashfs固件有效)。" +msgstr "" +"点击“生成备份”下载当前配置文件的 tar 存档。要将固件恢复到初始状态，请单击“执" +"行重置” (仅 Squashfs 固件有效)。" msgid "Client" -msgstr "客户端Client" +msgstr "客户端 Client" msgid "Client ID to send when requesting DHCP" -msgstr "请求DHCP时发送的客户ID" +msgstr "请求 DHCP 时发送的客户 ID" msgid "" "Close inactive connection after the given amount of seconds, use 0 to " "persist connection" -msgstr "定时关闭非活动链接(秒)，0为持续连接" +msgstr "定时关闭非活动链接 (秒)，0 为持续连接" msgid "Close list..." msgstr "关闭列表..." @@ -641,7 +643,7 @@ msgid "Configuration" msgstr "配置" msgid "Configuration applied." -msgstr "配置已应用" +msgstr "配置已应用。" msgid "Configuration files will be kept." msgstr "配置文件将被保留。" @@ -659,7 +661,7 @@ msgid "Connection Limit" msgstr "连接数限制" msgid "Connection to server fails when TLS cannot be used" -msgstr "当TLS不可用时连接到服务器失败" +msgstr "当 TLS 不可用时，与服务器连接失败" msgid "Connections" msgstr "链接" @@ -677,7 +679,7 @@ msgid "Cover the following interfaces" msgstr "包括以下接口" msgid "Create / Assign firewall-zone" -msgstr "创建/分配 防火墙区域" +msgstr "创建/分配防火墙区域" msgid "Create Interface" msgstr "创建新接口" @@ -689,19 +691,19 @@ msgid "Critical" msgstr "致命错误" msgid "Cron Log Level" -msgstr "Cron日志级别" +msgstr "Cron 日志级别" msgid "Custom Interface" msgstr "自定义接口" msgid "Custom delegated IPv6-prefix" -msgstr "自定义分配的IPv6前缀" +msgstr "自定义分配的 IPv6 前缀" msgid "" "Custom feed definitions, e.g. private feeds. This file can be preserved in a " "sysupgrade." msgstr "" -"自定义的软件源地址（例如私有的软件源）。此处设定的源地址在系统升级时将被保留" +"自定义的软件源地址 (例如私有的软件源)。此处设定的源地址在系统升级时将被保留" msgid "Custom feeds" msgstr "自定义的软件源" @@ -709,40 +711,40 @@ msgstr "自定义的软件源" msgid "" "Customizes the behaviour of the device LEDs if possible." -msgstr "自定义LED的活动状态。" +msgstr "自定义 LED 的活动状态。" msgid "DHCP Leases" -msgstr "DHCP分配" +msgstr "DHCP 分配" msgid "DHCP Server" -msgstr "DHCP服务器" +msgstr "DHCP 服务器" msgid "DHCP and DNS" msgstr "DHCP/DNS" msgid "DHCP client" -msgstr "DHCP客户端" +msgstr "DHCP 客户端" msgid "DHCP-Options" msgstr "DHCP-选项" msgid "DHCPv6 Leases" -msgstr "DHCPv6分配" +msgstr "DHCPv6 分配" msgid "DHCPv6 client" -msgstr "DHCPv6客户端" +msgstr "DHCPv6 客户端" msgid "DHCPv6-Mode" -msgstr "DHCPv6模式" +msgstr "DHCPv6 模式" msgid "DHCPv6-Service" -msgstr "DHCPv6服务" +msgstr "DHCPv6 服务" msgid "DNS" msgstr "DNS" msgid "DNS forwardings" -msgstr "DNS转发" +msgstr "DNS 转发" msgid "DNS-Label / FQDN" msgstr "DNS-Label / FQDN" @@ -751,25 +753,25 @@ msgid "DNSSEC" msgstr "DNSSEC" msgid "DNSSEC check unsigned" -msgstr "DNSSEC未签名检查" +msgstr "DNSSEC 未签名检查" msgid "DPD Idle Timeout" -msgstr "DPD空闲超时" +msgstr "DPD 空闲超时" msgid "DS-Lite AFTR address" -msgstr "DS-Lite AFTR地址" +msgstr "DS-Lite AFTR 地址" msgid "DSL" msgstr "DSL" msgid "DSL Status" -msgstr "DSL状态" +msgstr "DSL 状态" msgid "DSL line mode" -msgstr "DSL线路模式" +msgstr "DSL 线路模式" msgid "DUID" -msgstr "DUID (DHCP唯一标识符)" +msgstr "DUID" msgid "Data Rate" msgstr "数据速率" @@ -778,7 +780,7 @@ msgid "Debug" msgstr "调试" msgid "Default %d" -msgstr "默认%d" +msgstr "默认 %d" msgid "Default gateway" msgstr "默认网关" @@ -793,15 +795,15 @@ msgid "Default state" msgstr "默认状态" msgid "Define a name for this network." -msgstr "为网络定义名称" +msgstr "为网络定义名称。" msgid "" "Define additional DHCP options, for example " "\"6,192.168.2.1,192.168.2.2\" which advertises different DNS " "servers to clients." msgstr "" -"设置DHCP的附加选项，例如设定\"6,192.168.2.1,192.168.2.2\"表示通" -"告不同的DNS服务器给客户端。" +"设置 DHCP 的附加选项，例如设定 \"6,192.168.2.1,192.168.2.2\" 表" +"示通告不同的 DNS 服务器给客户端。" msgid "Delete" msgstr "删除" @@ -845,10 +847,10 @@ msgstr "禁用" msgid "" "Disable DHCP for " "this interface." -msgstr "禁用本接口的DHCP。" +msgstr "禁用本接口的 DHCP。" msgid "Disable DNS setup" -msgstr "停用DNS设定" +msgstr "停用 DNS 设定" msgid "Disable Encryption" msgstr "禁用加密" @@ -857,10 +859,10 @@ msgid "Disabled" msgstr "禁用" msgid "Disabled (default)" -msgstr "" +msgstr "禁用 (默认)" msgid "Discard upstream RFC1918 responses" -msgstr "丢弃RFC1918上行响应数据" +msgstr "丢弃 RFC1918 上行响应数据" msgid "Displaying only packages containing" msgstr "只显示有内容的软件包" @@ -869,29 +871,32 @@ msgid "Distance Optimization" msgstr "距离优化" msgid "Distance to farthest network member in meters." -msgstr "最远客户端的距离(米)。" +msgstr "最远网络用户的距离 (米)。" msgid "Distribution feeds" msgstr "发行版软件源" msgid "Diversity" -msgstr "分集" +msgstr "差异" msgid "" "Dnsmasq is a combined DHCP-Server and DNS-" "Forwarder for NAT " "firewalls" -msgstr "Dnsmasq为NAT防火墙提供了一个集成的DHCP服务器和DNS转发器" +msgstr "" +"Dnsmasq 为 NAT 防火墙提供了一个集成的 " +"DHCP 服务器和 DNS 转发器" msgid "Do not cache negative replies, e.g. for not existing domains" -msgstr "不缓存无用的回应, 比如：不存在的域。" +msgstr "不缓存无用的回应, 比如: 不存在的域。" msgid "Do not forward requests that cannot be answered by public name servers" msgstr "不转发公共域名服务器无法回应的请求" msgid "Do not forward reverse lookups for local networks" -msgstr "不转发反向查询本地网络的Lookups命令" +msgstr "不转发反向查询本地网络的 Lookups 命令" msgid "Domain required" msgstr "忽略空域名解析" @@ -905,7 +910,7 @@ msgstr "禁止碎片" msgid "" "Don't forward DNS-Requests without " "DNS-Name" -msgstr "不转发没有DNS名称的解析请求" +msgstr "不转发没有 DNS 名称的解析请求" msgid "Download and install package" msgstr "下载并安装软件包" @@ -914,20 +919,20 @@ msgid "Download backup" msgstr "下载备份" msgid "Dropbear Instance" -msgstr "Dropbear设置" +msgstr "Dropbear 实例" msgid "" "Dropbear offers SSH network shell access " "and an integrated SCP server" msgstr "" -"Dropbear提供了集成的SCP服务器和基于SSH的Shell访问" +"Dropbear 提供了集成的 SCP 服务器和基于 SSH 的 Shell 访问" msgid "Dual-Stack Lite (RFC6333)" msgstr "Dual-Stack Lite (RFC6333)" msgid "Dynamic DHCP" -msgstr "动态DHCP" +msgstr "动态 DHCP" msgid "Dynamic tunnel" msgstr "动态隧道" @@ -935,13 +940,14 @@ msgstr "动态隧道" msgid "" "Dynamically allocate DHCP addresses for clients. If disabled, only clients " "having static leases will be served." -msgstr "动态分配DHCP地址。如果禁用，则只能为静态租用表中的客户端提供网络服务。" +msgstr "" +"动态分配 DHCP 地址。如果禁用，则只能为静态租用表中的客户端提供网络服务。" msgid "EA-bits length" -msgstr "EA位长度" +msgstr "EA-bits 长度" msgid "EAP-Method" -msgstr "EAP类型" +msgstr "EAP 类型" msgid "Edit" msgstr "修改" @@ -964,34 +970,34 @@ msgid "Enable" msgstr "启用" msgid "Enable STP" -msgstr "开启STP" +msgstr "开启 STP" msgid "Enable HE.net dynamic endpoint update" -msgstr "启用HE.net动态终端更新" +msgstr "启用 HE.net 动态终端更新" msgid "Enable IPv6 negotiation" -msgstr "启用IPv6协商" +msgstr "启用 IPv6 协商" msgid "Enable IPv6 negotiation on the PPP link" -msgstr "在PPP链路上启用IPv6协商" +msgstr "在 PPP 链路上启用 IPv6 协商" msgid "Enable Jumbo Frame passthrough" msgstr "启用巨型帧透传" msgid "Enable NTP client" -msgstr "启用NTP客户端" +msgstr "启用 NTP 客户端" msgid "Enable Single DES" -msgstr "启用单个DES" +msgstr "启用单个 DES" msgid "Enable TFTP server" -msgstr "启用TFTP服务器" +msgstr "启用 TFTP 服务器" msgid "Enable VLAN functionality" -msgstr "启用VLAN" +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 "启用智能交换学习" @@ -1003,7 +1009,7 @@ msgid "Enable mirroring of outgoing packets" msgstr "启用流出数据包镜像" msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." -msgstr "启用封装数据包的DF(禁止碎片)标志。" +msgstr "启用封装数据包的 DF (禁止碎片) 标志。" msgid "Enable this mount" msgstr "启用挂载点" @@ -1020,7 +1026,7 @@ msgstr "启用" msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" -msgstr "" +msgstr "启用属于同一移动域的接入点之间的快速漫游" msgid "Enables the Spanning Tree Protocol on this bridge" msgstr "在此桥接上启用生成协议树" @@ -1044,7 +1050,7 @@ msgid "Error" msgstr "错误" msgid "Errored seconds (ES)" -msgstr "错误秒数(ES)" +msgstr "错误秒数 (ES)" msgid "Ethernet Adapter" msgstr "以太网适配器" @@ -1056,35 +1062,35 @@ msgid "Exclude interfaces" msgstr "排除接口" msgid "Expand hosts" -msgstr "扩展HOSTS文件中的主机后缀" +msgstr "扩展 HOSTS 文件中的主机后缀" msgid "Expires" msgstr "到期时间" msgid "" "Expiry time of leased addresses, minimum is 2 minutes (2m)." -msgstr "租用地址的到期时间，最短2分钟(2m)。" +msgstr "租用地址的到期时间，最短 2 分钟 (2m)。" msgid "External" -msgstr "远程" +msgstr "外部" msgid "External R0 Key Holder List" -msgstr "" +msgstr "外部 R0KH (R0 Key Holder) 列表" msgid "External R1 Key Holder List" -msgstr "" +msgstr "外部 R1KH (R1 Key Holder) 列表" msgid "External system log server" -msgstr "远程日志服务器" +msgstr "外部日志服务器" msgid "External system log server port" -msgstr "远程日志服务器端口" +msgstr "外部日志服务器端口" msgid "External system log server protocol" -msgstr "远程日志服务器协议" +msgstr "外部日志服务器协议" msgid "Extra SSH command options" -msgstr "额外的SSH命令选项" +msgstr "额外的 SSH 命令选项" msgid "File" msgstr "文件" @@ -1108,8 +1114,8 @@ msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" msgstr "" -"查找所有当前系统上的分区和Swap并使用基于所找到的分区生成的配置文件替换默认配" -"置。" +"查找所有当前系统上的分区和 Swap 并使用基于所找到的分区生成的配置文件替换默认" +"配置" msgid "Find and join network" msgstr "搜索并加入网络" @@ -1124,7 +1130,7 @@ msgid "Firewall" msgstr "防火墙" msgid "Firewall Mark" -msgstr "" +msgstr "防火墙标识" msgid "Firewall Settings" msgstr "防火墙设置" @@ -1139,7 +1145,7 @@ msgid "Firmware Version" msgstr "固件版本" msgid "Fixed source port for outbound DNS queries" -msgstr "指定的DNS查询源端口" +msgstr "指定的 DNS 查询源端口" msgid "Flash Firmware" msgstr "刷新固件" @@ -1157,31 +1163,34 @@ msgid "Flashing..." msgstr "刷写中..." msgid "Force" -msgstr "强制开启DHCP" +msgstr "强制" msgid "Force CCMP (AES)" -msgstr "强制使用CCMP(AES)加密" +msgstr "强制 CCMP (AES)" msgid "Force DHCP on this network even if another server is detected." -msgstr "强制开启DHCP。" +msgstr "即使检测到另一台服务器，也要强制使用此网络上的 DHCP。" msgid "Force TKIP" -msgstr "强制使用TKIP加密" +msgstr "强制 TKIP" msgid "Force TKIP and CCMP (AES)" -msgstr "TKIP和CCMP(AES)混合加密" +msgstr "强制 TKIP 和 CCMP (AES)" + +msgid "Force link" +msgstr "强制链路" msgid "Force use of NAT-T" -msgstr "强制使用NAT-T" +msgstr "强制使用 NAT-T" msgid "Form token mismatch" msgstr "表单令牌不匹配" msgid "Forward DHCP traffic" -msgstr "转发DHCP数据包" +msgstr "转发 DHCP 数据包" msgid "Forward Error Correction Seconds (FECS)" -msgstr "前向纠错秒数(FECS)" +msgstr "前向纠错秒数 (FECS)" msgid "Forward broadcast traffic" msgstr "转发广播数据包" @@ -1205,14 +1214,14 @@ msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." msgstr "" -"有关WireGuard接口和Peer的更多信息：wireguard." -"io" +"有关 WireGuard 接口和 Peer 的更多信息: wireguard.io。" msgid "GHz" msgstr "GHz" msgid "GPRS only" -msgstr "仅GPRS" +msgstr "仅 GPRS" msgid "Gateway" msgstr "网关" @@ -1227,7 +1236,7 @@ msgid "General Setup" msgstr "基本设置" msgid "General options for opkg" -msgstr "Opkg基础配置" +msgstr "OPKG 基础配置" msgid "Generate Config" msgstr "生成配置" @@ -1236,7 +1245,7 @@ msgid "Generate archive" msgstr "生成备份" msgid "Generic 802.11%s Wireless Controller" -msgstr "Generic 802.11%s 无线网卡" +msgstr "通用 802.11%s 无线网卡" msgid "Given password confirmation did not match, password not changed!" msgstr "由于密码验证不匹配，密码没有更改！" @@ -1260,13 +1269,13 @@ msgid "Guest" msgstr "访客" msgid "HE.net password" -msgstr "HE.net密码" +msgstr "HE.net 密码" msgid "HE.net username" -msgstr "HE.net用户名" +msgstr "HE.net 用户名" msgid "HT mode (802.11n)" -msgstr "HT模式(802.11n)" +msgstr "HT 模式 (802.11n)" msgid "Handler" msgstr "处理程序" @@ -1275,7 +1284,7 @@ msgid "Hang Up" msgstr "挂起" msgid "Header Error Code Errors (HEC)" -msgstr "头错误代码错误(HEC)" +msgstr "请求头的错误代码错误 (HEC)" msgid "Heartbeat" msgstr "心跳" @@ -1288,13 +1297,13 @@ msgstr "配置路由器的部分基础信息。" msgid "" "Here you can paste public SSH-Keys (one per line) for SSH public-key " "authentication." -msgstr "SSH公共密钥认证(每行一个密钥)。" +msgstr "请在这里粘贴公共 SSH 密钥用于 SSH 公钥认证 (每行一个)。" msgid "Hermes 802.11b Wireless Controller" msgstr "Hermes 802.11b 无线网卡" msgid "Hide ESSID" -msgstr "隐藏ESSID" +msgstr "隐藏 ESSID" msgid "Host" msgstr "主机" @@ -1306,13 +1315,13 @@ msgid "Host expiry timeout" msgstr "主机到期超时" msgid "Host-IP or Network" -msgstr "主机IP或网络" +msgstr "主机 IP 或网络" msgid "Hostname" msgstr "主机名" msgid "Hostname to send when requesting DHCP" -msgstr "请求DHCP时发送的主机名" +msgstr "请求 DHCP 时发送的主机名" msgid "Hostnames" msgstr "主机名" @@ -1321,49 +1330,49 @@ msgid "Hybrid" msgstr "混合" msgid "IKE DH Group" -msgstr "IKE DH组" +msgstr "IKE DH 组" msgid "IP Addresses" -msgstr "" +msgstr "IP 地址" msgid "IP address" -msgstr "IP地址" +msgstr "IP 地址" msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" -msgstr "IPv4防火墙" +msgstr "IPv4 防火墙" msgid "IPv4 WAN Status" -msgstr "IPv4 WAN状态" +msgstr "IPv4 WAN 状态" msgid "IPv4 address" -msgstr "IPv4地址" +msgstr "IPv4 地址" msgid "IPv4 and IPv6" -msgstr "IPv4和IPv6" +msgstr "IPv4 和 IPv6" msgid "IPv4 assignment length" -msgstr "分配IPv4长度" +msgstr "分配 IPv4 长度" msgid "IPv4 broadcast" -msgstr "IPv4广播" +msgstr "IPv4 广播" msgid "IPv4 gateway" -msgstr "IPv4网关" +msgstr "IPv4 网关" msgid "IPv4 netmask" -msgstr "IPv4子网掩码" +msgstr "IPv4 子网掩码" msgid "IPv4 only" -msgstr "仅IPv4" +msgstr "仅 IPv4" msgid "IPv4 prefix" -msgstr "IPv4地址前缀" +msgstr "IPv4 地址前缀" msgid "IPv4 prefix length" -msgstr "IPv4地址前缀长度" +msgstr "IPv4 地址前缀长度" msgid "IPv4-Address" msgstr "IPv4-地址" @@ -1375,52 +1384,52 @@ msgid "IPv6" msgstr "IPv6" msgid "IPv6 Firewall" -msgstr "IPv6防火墙" +msgstr "IPv6 防火墙" msgid "IPv6 Neighbours" -msgstr "IPv6邻居" +msgstr "IPv6 网上邻居" msgid "IPv6 Settings" -msgstr "IPv6设置" +msgstr "IPv6 设置" msgid "IPv6 ULA-Prefix" -msgstr "IPv6 ULA前缀" +msgstr "IPv6 ULA 前缀" msgid "IPv6 WAN Status" -msgstr "IPv6 WAN状态" +msgstr "IPv6 WAN 状态" msgid "IPv6 address" -msgstr "IPv6地址" +msgstr "IPv6 地址" msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "绑定到本地隧道终点的IPv6地址(可选)" +msgstr "绑定到本地隧道终点的 IPv6 地址 (可选)" msgid "IPv6 assignment hint" -msgstr "IPv6分配提示" +msgstr "IPv6 分配提示" msgid "IPv6 assignment length" -msgstr "IPv6分配长度" +msgstr "IPv6 分配长度" msgid "IPv6 gateway" -msgstr "IPv6网关" +msgstr "IPv6 网关" msgid "IPv6 only" -msgstr "仅IPv6" +msgstr "仅 IPv6" msgid "IPv6 prefix" -msgstr "IPv6地址前缀" +msgstr "IPv6 地址前缀" msgid "IPv6 prefix length" -msgstr "IPv6地址前缀长度" +msgstr "IPv6 地址前缀长度" msgid "IPv6 routed prefix" -msgstr "IPv6路由前缀" +msgstr "IPv6 路由前缀" msgid "IPv6-Address" msgstr "IPv6-地址" msgid "IPv6-PD" -msgstr "" +msgstr "IPv6-PD" msgid "IPv6-in-IPv4 (RFC4213)" msgstr "IPv6-in-IPv4 (RFC4213)" @@ -1435,14 +1444,14 @@ msgid "Identity" msgstr "鉴权" msgid "If checked, 1DES is enaled" -msgstr "选中以启用1DES" +msgstr "选中以启用 1DES" msgid "If checked, encryption is disabled" msgstr "选中以禁用加密" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" -msgstr "用UUID来挂载设备" +msgstr "用 UUID 来挂载设备" msgid "" "If specified, mount the device by the partition label instead of a fixed " @@ -1453,7 +1462,7 @@ msgid "If unchecked, no default route is configured" msgstr "留空则不配置默认路由" msgid "If unchecked, the advertised DNS server addresses are ignored" -msgstr "留空则忽略所通告的DNS服务器地址" +msgstr "留空则忽略所通告的 DNS 服务器地址" msgid "" "If your physical memory is insufficient unused data can be temporarily " @@ -1467,7 +1476,7 @@ msgid "Ignore /etc/hosts" msgstr "忽略 /etc/hosts" msgid "Ignore interface" -msgstr "关闭DHCP" +msgstr "忽略此接口" msgid "Ignore resolve file" msgstr "忽略解析文件" @@ -1489,7 +1498,7 @@ msgid "Inactivity timeout" msgstr "活动超时" msgid "Inbound:" -msgstr "入站：" +msgstr "入站:" msgid "Info" msgstr "信息" @@ -1504,7 +1513,7 @@ msgid "Install" msgstr "安装" msgid "Install iputils-traceroute6 for IPv6 traceroute" -msgstr "安装 iputils-traceroute6 以进行IPv6 traceroute" +msgstr "安装 iputils-traceroute6 以进行 IPv6 路由追踪" msgid "Install package %q" msgstr "安装软件包 %q" @@ -1555,10 +1564,10 @@ 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 "无效的用户名和/或密码！请重试。" @@ -1569,16 +1578,16 @@ msgid "" msgstr "你尝试刷写的固件与本路由器不兼容，请重新验证固件文件。" msgid "JavaScript required!" -msgstr "需要JavaScript！" +msgstr "需要 JavaScript！" msgid "Join Network" msgstr "加入网络" msgid "Join Network: Wireless Scan" -msgstr "加入网络：搜索无线" +msgstr "加入网络: 搜索无线" msgid "Joining Network: %q" -msgstr "加入网络：%q" +msgstr "加入网络: %q" msgid "Keep settings" msgstr "保留配置" @@ -1602,13 +1611,13 @@ msgid "L2TP" msgstr "L2TP" msgid "L2TP Server" -msgstr "L2TP服务器" +msgstr "L2TP 服务器" msgid "LCP echo failure threshold" -msgstr "LCP响应故障阈值" +msgstr "LCP 响应故障阈值" msgid "LCP echo interval" -msgstr "LCP响应间隔" +msgstr "LCP 响应间隔" msgid "LLC" msgstr "LLC" @@ -1626,7 +1635,7 @@ msgid "Latency" msgstr "延迟" msgid "Leaf" -msgstr "叶状" +msgstr "叶节点" msgid "Lease time" msgstr "租期" @@ -1647,10 +1656,10 @@ msgid "Leave empty to autodetect" msgstr "留空则自动探测" msgid "Leave empty to use the current WAN address" -msgstr "留空则使用当前WAN地址" +msgstr "留空则使用当前 WAN 地址" msgid "Legend:" -msgstr "图例：" +msgstr "图例:" msgid "Limit" msgstr "客户数" @@ -1662,7 +1671,7 @@ msgid "Limit listening to these interfaces, and loopback." msgstr "仅监听这些接口和环回接口。" msgid "Line Attenuation (LATN)" -msgstr "线路衰减(LATN)" +msgstr "线路衰减 (LATN)" msgid "Line Mode" msgstr "线路模式" @@ -1679,7 +1688,9 @@ msgstr "活动链接" msgid "" "List of DNS servers to forward " "requests to" -msgstr "将指定的域名DNS解析转发到指定的DNS服务器（按照示例填写）" +msgstr "" +"将指定域名的解析请求转发到指定的 DNS 服务器 " +"(按照示例填写)" msgid "" "List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" @@ -1688,6 +1699,9 @@ msgid "" "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" +"同一移动域中的 R0KH 列表。
格式: MAC 地址,NAS标识符,128位密钥 (十六进制" +"字符串)。
在从初始移动域关联期间使用的 R0KH 中请求 PMK-R1 密钥时，该列表" +"用于将 R0KH-ID (NAS标识符)映射到目标 MAC 地址。" msgid "" "List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " @@ -1696,12 +1710,16 @@ msgid "" "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" +"同一移动域中的 R1KH 列表。
格式: MAC地址,R1KH-ID (包含冒号的6个八位字" +"节),128位密钥 (十六进制字符串)。
当从 R0KH 发送 PMK-R1 键时，此列表用于" +"将 R1KH-ID 映射到目标 MAC 地址。这也是可以请求 PMK-R1 键的 MD 中授权的 R1KH " +"的列表。" msgid "List of SSH key files for auth" -msgstr "用于认证的SSH密钥文件列表" +msgstr "用于认证的 SSH 密钥文件列表" msgid "List of domains to allow RFC1918 responses for" -msgstr "允许RFC1918响应的域名列表" +msgstr "允许 RFC1918 响应的域名列表" msgid "List of hosts that supply bogus NX domain results" msgstr "允许虚假空域名响应的服务器列表" @@ -1713,10 +1731,10 @@ msgid "Listen Port" msgstr "监听端口" msgid "Listen only on the given interface or, if unspecified, on all" -msgstr "监听指定的接口；未指定则监听全部" +msgstr "仅监听指定的接口，未指定则监听全部" msgid "Listening port for inbound DNS queries" -msgstr "入站DNS查询端口" +msgstr "入站 DNS 查询端口" msgid "Load" msgstr "负载" @@ -1728,13 +1746,13 @@ msgid "Loading" msgstr "加载中" msgid "Local IP address to assign" -msgstr "要分配的本地IP地址" +msgstr "要分配的本地 IP 地址" msgid "Local IPv4 address" -msgstr "本地IPv4地址" +msgstr "本地 IPv4 地址" msgid "Local IPv6 address" -msgstr "本地IPv6地址" +msgstr "本地 IPv6 地址" msgid "Local Service Only" msgstr "仅本地服务" @@ -1751,10 +1769,10 @@ msgstr "本地域名" 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文件条目" +msgstr "本地域名后缀将添加到 DHCP 和 HOSTS 文件条目" msgid "Local server" msgstr "本地服务器" @@ -1762,7 +1780,7 @@ msgstr "本地服务器" msgid "" "Localise hostname depending on the requesting subnet if multiple IPs are " "available" -msgstr "如果有多个IP可用，则根据请求来源的子网来本地化主机名" +msgstr "如果有多个 IP 可用，则根据请求来源的子网来本地化主机名" msgid "Localise queries" msgstr "本地化查询" @@ -1774,7 +1792,7 @@ msgid "Log output level" msgstr "日志记录等级" msgid "Log queries" -msgstr "日志查询" +msgstr "记录查询日志" msgid "Logging" msgstr "日志" @@ -1786,7 +1804,7 @@ msgid "Logout" msgstr "退出" msgid "Loss of Signal Seconds (LOSS)" -msgstr "信号丢失秒数(LOSS)" +msgstr "信号丢失秒数 (LOSS)" msgid "Lowest leased address as offset from the network address." msgstr "网络地址的起始分配基址。" @@ -1821,25 +1839,25 @@ msgstr "MTU" msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" -msgstr "请确认你已经复制过整个根文件系统,例如使用以下命令：" +msgstr "请确认你已经复制过整个根文件系统，例如使用以下命令:" msgid "Manual" msgstr "手动" msgid "Max. Attainable Data Rate (ATTNDR)" -msgstr "最大可达数据速率(ATTNDR)" +msgstr "最大可达数据速率 (ATTNDR)" msgid "Maximum allowed number of active DHCP leases" -msgstr "允许的最大DHCP租用数" +msgstr "允许的最大 DHCP 租用数" msgid "Maximum allowed number of concurrent DNS queries" -msgstr "允许的最大并发DNS查询数" +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 "调制解调器就绪的最大等待时间(秒)" +msgstr "调制解调器就绪的最大等待时间 (秒)" msgid "Maximum hold time" msgstr "最大持续时间" @@ -1848,7 +1866,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- 等等)" +"名称的最大长度为 15 个字符，包括自动协议/网桥前缀 (br-, 6in4-, pppoe- 等等)" msgid "Maximum number of leased addresses." msgstr "最大地址分配数量。" @@ -1860,7 +1878,7 @@ msgid "Memory" msgstr "内存" msgid "Memory usage (%)" -msgstr "内存使用率(%)" +msgstr "内存使用率 (%)" msgid "Metric" msgstr "跃点数" @@ -1878,7 +1896,7 @@ msgid "Missing protocol extension for proto %q" msgstr "缺少协议 %q 的协议扩展" msgid "Mobility Domain" -msgstr "" +msgstr "移动域" msgid "Mode" msgstr "模式" @@ -1893,7 +1911,7 @@ msgid "Modem init timeout" msgstr "调制解调器初始化超时" msgid "Monitor" -msgstr "监听Monitor" +msgstr "监听" msgid "Mount Entry" msgstr "挂载项目" @@ -1905,15 +1923,15 @@ msgid "Mount Points" msgstr "挂载点" msgid "Mount Points - Mount Entry" -msgstr "挂载点-存储区" +msgstr "挂载点 - 存储区" msgid "Mount Points - Swap Entry" -msgstr "挂载点-交换区" +msgstr "挂载点 - 交换区" msgid "" "Mount Points define at which point a memory device will be attached to the " "filesystem" -msgstr "配置存储设备挂载到文件系统中的位置和参数。" +msgstr "配置存储设备挂载到文件系统中的位置和参数" msgid "Mount filesystems not specifically configured" msgstr "自动挂载未专门配置挂载点的分区" @@ -1925,7 +1943,7 @@ msgid "Mount point" msgstr "挂载点" msgid "Mount swap not specifically configured" -msgstr "自动挂载未专门配置的Swap分区" +msgstr "自动挂载未专门配置的 Swap 分区" msgid "Mounted file systems" msgstr "已挂载的文件系统" @@ -1943,22 +1961,25 @@ msgid "NAS ID" msgstr "NAS ID" msgid "NAT-T Mode" -msgstr "NAT-T模式" +msgstr "NAT-T 模式" msgid "NAT64 Prefix" -msgstr "NAT64前缀" +msgstr "NAT64 前缀" + +msgid "NCM" +msgstr "" msgid "NDP-Proxy" msgstr "NDP-代理" msgid "NT Domain" -msgstr "NT域" +msgstr "NT 域" msgid "NTP server candidates" -msgstr "候选NTP服务器" +msgstr "候选 NTP 服务器" msgid "NTP sync time-out" -msgstr "NTP同步超时" +msgstr "NTP 同步超时" msgid "Name" msgstr "名称" @@ -1991,10 +2012,10 @@ msgid "Next »" msgstr "下一步 »" msgid "No DHCP Server configured for this interface" -msgstr "本接口未配置DHCP服务器" +msgstr "本接口未配置 DHCP 服务器" msgid "No NAT-T" -msgstr "无NAT-T" +msgstr "无 NAT-T" msgid "No chains in this table" msgstr "本表中没有链" @@ -2030,16 +2051,16 @@ msgid "Noise" msgstr "噪声" msgid "Noise Margin (SNR)" -msgstr "噪声容限(SNR)" +msgstr "噪声容限 (SNR)" msgid "Noise:" msgstr "噪声:" msgid "Non Pre-emtive CRC errors (CRC_P)" -msgstr "非抢占CRC错误(CRC_P)" +msgstr "非抢占 CRC 错误 (CRC_P)" msgid "Non-wildcard" -msgstr "非通配符" +msgstr "非全部地址" msgid "None" msgstr "无" @@ -2057,10 +2078,10 @@ msgid "Not connected" msgstr "未连接" msgid "Note: Configuration files will be erased." -msgstr "注意：配置文件将被删除。" +msgstr "注意: 配置文件将被删除。" msgid "Note: interface name length" -msgstr "注意：接口名称长度" +msgstr "注意: 接口名称长度" msgid "Notice" msgstr "注意" @@ -2075,10 +2096,10 @@ msgid "OPKG-Configuration" msgstr "OPKG-配置" msgid "Obfuscated Group Password" -msgstr "" +msgstr "混淆组密码" msgid "Obfuscated Password" -msgstr "" +msgstr "混淆密码" msgid "Off-State Delay" msgstr "关闭时间" @@ -2090,7 +2111,10 @@ msgid "" "VLAN notation " "INTERFACE.VLANNR (e.g.: " "eth0.1)." -msgstr "配置网络接口信息。" +msgstr "" +"在此页面，你可以配置网络接口。你可以勾选“桥接接口”，并输入由空格分隔的多个网" +"络接口的名称来桥接多个接口。还可以使用 VLAN 符号 INTERFACE.VLANNR (例如: eth0.1)。" msgid "On-State Delay" msgstr "通电时间" @@ -2111,7 +2135,7 @@ msgid "Open list..." msgstr "打开列表..." msgid "OpenConnect (CISCO AnyConnect)" -msgstr "开放连接(CISCO AnyConnect)" +msgstr "开放连接 (CISCO AnyConnect)" msgid "Operating frequency" msgstr "工作频率" @@ -2123,34 +2147,35 @@ msgid "Option removed" msgstr "移除的选项" msgid "Optional" -msgstr "" +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. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." msgstr "" +"可选，传出加密数据包的 32 位标记。请输入十六进制值，以 0x 开头。" msgid "" "Optional. Base64-encoded preshared key. Adds in an additional layer of " "symmetric-key cryptography for post-quantum resistance." -msgstr "" +msgstr "可选，Base64 编码的预共享密钥。" msgid "Optional. Create routes for Allowed IPs for this peer." -msgstr "可选，为此Peer创建允许IP的路由。" +msgstr "可选，为此 Peer 创建允许 IP 的路由。" msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." -msgstr "" +msgstr "可选，Peer 的主机。" msgid "Optional. Maximum Transmission Unit of tunnel interface." msgstr "可选，隧道接口的最大传输单元。" @@ -2162,52 +2187,52 @@ 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。" +"可选，Keep-Alive 消息之间的秒数，默认为 0 (禁用)。如果此设备位于 NAT 之后，建" +"议使用的值为 25。" msgid "Optional. UDP port used for outgoing and incoming packets." -msgstr "可选，用于传出和传入数据包的UDP端口。" +msgstr "可选，用于传出和传入数据包的 UDP 端口。" msgid "Options" msgstr "选项" msgid "Other:" -msgstr "其余：" +msgstr "其余:" msgid "Out" msgstr "出口" msgid "Outbound:" -msgstr "出站：" +msgstr "出站:" msgid "Output Interface" msgstr "网络出口" msgid "Override MAC address" -msgstr "克隆MAC地址" +msgstr "重设 MAC 地址" msgid "Override MTU" -msgstr "更新MTU" +msgstr "重设 MTU" msgid "Override TOS" -msgstr "更新TOS" +msgstr "重设 TOS" msgid "Override TTL" -msgstr "更新TTL" +msgstr "重设 TTL" msgid "Override default interface name" -msgstr "更新默认接口名称" +msgstr "重设默认接口名称" msgid "Override the gateway in DHCP responses" -msgstr "更新DHCP响应网关" +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 "更新内部路由表" +msgstr "重设内部路由表" msgid "Overview" msgstr "总览" @@ -2216,10 +2241,10 @@ msgid "Owner" msgstr "用户名" msgid "PAP/CHAP password" -msgstr "PAP/CHAP密码" +msgstr "PAP/CHAP 密码" msgid "PAP/CHAP username" -msgstr "PAP/CHAP用户名" +msgstr "PAP/CHAP 用户名" msgid "PID" msgstr "PID" @@ -2228,13 +2253,13 @@ msgid "PIN" msgstr "PIN" msgid "PMK R1 Push" -msgstr "" +msgstr "PMK R1 Push" msgid "PPP" msgstr "PPP" msgid "PPPoA Encapsulation" -msgstr "PPPoA封包" +msgstr "PPPoA 封包" msgid "PPPoATM" msgstr "PPPoATM" @@ -2249,19 +2274,19 @@ msgid "PPtP" msgstr "PPtP" msgid "PSID offset" -msgstr "PSID偏移" +msgstr "PSID 偏移" msgid "PSID-bits length" -msgstr "PSID位长度" +msgstr "PSID-bits 长度" msgid "PTM/EFM (Packet Transfer Mode)" -msgstr "PTM/EFM(分组传输模式)" +msgstr "PTM/EFM (分组传输模式)" msgid "Package libiwinfo required!" msgstr "需要 libiwinfo 软件包！" msgid "Package lists are older than 24 hours" -msgstr "软件包列表已超过24小时未更新" +msgstr "软件包列表已超过 24 小时未更新" msgid "Package name" msgstr "软件包名称" @@ -2288,7 +2313,7 @@ msgid "Password successfully changed!" msgstr "密码修改成功！" msgid "Path to CA-Certificate" -msgstr "CA证书路径" +msgstr "CA 证书路径" msgid "Path to Client-Certificate" msgstr "客户端证书路径" @@ -2312,7 +2337,7 @@ msgid "Peak:" msgstr "峰值:" msgid "Peer IP address to assign" -msgstr "要分配的Peer IP地址" +msgstr "要分配的 Peer IP 地址" msgid "Peers" msgstr "Peers" @@ -2324,10 +2349,10 @@ msgid "Perform reboot" msgstr "执行重启" msgid "Perform reset" -msgstr "执行复位" +msgstr "执行重置" msgid "Persistent Keep Alive" -msgstr "持续Keep-Alive" +msgstr "持续 Keep-Alive" msgid "Phy Rate:" msgstr "物理速率:" @@ -2351,16 +2376,22 @@ msgid "Port" msgstr "端口" msgid "Port status:" -msgstr "端口状态：" +msgstr "端口状态:" msgid "Power Management Mode" msgstr "电源管理模式" msgid "Pre-emtive CRC errors (CRCP_P)" -msgstr "抢占式CRC错误(CRCP_P)" +msgstr "抢占式 CRC 错误 (CRCP_P)" + +msgid "Prefer LTE" +msgstr "首选 LTE" + +msgid "Prefer UMTS" +msgstr "首选 UMTS" msgid "Prefix Delegated" -msgstr "" +msgstr "分发前缀" msgid "Preshared Key" msgstr "预共享密钥" @@ -2368,10 +2399,10 @@ msgstr "预共享密钥" msgid "" "Presume peer to be dead after given amount of LCP echo failures, use 0 to " "ignore failures" -msgstr "在指定数量的LCP响应故障后假定链路已断开，0为忽略故障" +msgstr "在指定数量的 LCP 响应故障后假定链路已断开，0 为忽略故障" msgid "Prevent listening on these interfaces." -msgstr "防止监听这些接口。" +msgstr "不监听这些接口。" msgid "Prevents client-to-client communication" msgstr "禁止客户端间通信" @@ -2413,7 +2444,7 @@ msgid "Provide new network" msgstr "添加新网络" msgid "Pseudo Ad-Hoc (ahdemo)" -msgstr "伪装Ad-Hoc(ahdemo)" +msgstr "伪装 Ad-Hoc (ahdemo)" msgid "Public Key" msgstr "公钥" @@ -2422,22 +2453,22 @@ msgid "Public prefix routed to this device for distribution to clients." msgstr "分配到此设备的公共前缀，用以分发到客户端。" msgid "QMI Cellular" -msgstr "QMI蜂窝" +msgstr "QMI 蜂窝" msgid "Quality" msgstr "质量" msgid "R0 Key Lifetime" -msgstr "" +msgstr "R0 Key Lifetime" msgid "R1 Key Holder" -msgstr "" +msgstr "R1 Key Holder" msgid "RFC3947 NAT-T mode" -msgstr "RFC3947 NAT-T模式" +msgstr "RFC3947 NAT-T 模式" msgid "RTS/CTS Threshold" -msgstr "RTS/CTS阈值" +msgstr "RTS/CTS 阈值" msgid "RX" msgstr "接收" @@ -2446,7 +2477,7 @@ msgid "RX Rate" msgstr "接收速率" msgid "RaLink 802.11%s Wireless Controller" -msgstr "MediaTek/RaLink 802.11%s 无线网卡" +msgstr "RaLink 802.11%s 无线网卡" msgid "Radius-Accounting-Port" msgstr "Radius 计费端口" @@ -2470,8 +2501,8 @@ msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" -"根据/etc/ethers来配置DHCP-服务器" +"根据 /etc/ethers 来配置 DHCP-服务器" msgid "" "Really delete this interface? The deletion cannot be undone!\\nYou might " @@ -2522,7 +2553,7 @@ msgid "Realtime Wireless" msgstr "实时无线" msgid "Reassociation Deadline" -msgstr "" +msgstr "重关联截止时间" msgid "Rebind protection" msgstr "重绑定保护" @@ -2543,7 +2574,7 @@ msgid "Receiver Antenna" msgstr "接收天线" msgid "Recommended. IP addresses of the WireGuard interface." -msgstr "" +msgstr "推荐，Wire Guard 接口的 IP 地址。" msgid "Reconnect this interface" msgstr "重连此接口" @@ -2567,10 +2598,10 @@ msgid "Relay bridge" msgstr "中继桥" msgid "Remote IPv4 address" -msgstr "远程IPv4地址" +msgstr "远程 IPv4 地址" msgid "Remote IPv4 address or FQDN" -msgstr "远程IPv4地址或FQDN" +msgstr "远程 IPv4 地址或 FQDN" msgid "Remove" msgstr "移除" @@ -2585,43 +2616,45 @@ msgid "Replace wireless configuration" msgstr "重置无线配置" msgid "Request IPv6-address" -msgstr "请求IPv6地址" +msgstr "请求 IPv6 地址" msgid "Request IPv6-prefix of length" -msgstr "请求指定长度的IPv6前缀" +msgstr "请求指定长度的 IPv6 前缀" msgid "Require TLS" -msgstr "必须使用TLS" +msgstr "必须使用 TLS" msgid "Required" -msgstr "" +msgstr "必须" 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 "必须，此接口的Base64编码私钥。" +msgstr "必须，此接口的 Base64 编码私钥。" msgid "Required. Base64-encoded public key of peer." -msgstr "" +msgstr "必须，Peer 的 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地址和通过隧" -"道的路由网络。" +"必须，允许该 Peer 在隧道中使用的 IP 地址和前缀，通常是该 Peer 的隧道 IP 地址" +"和通过隧道的路由网络。" msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " "
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" +"需要 wpad/hostapd 的完整版本和 WiFi 驱动程序的支持
(截至 2017 年 2 月: " +"ath9k 和 ath10k，或者 LEDE 的 mwlwifi 和 mt76)" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " "come from unsigned domains" -msgstr "需要上级支持DNSSEC，验证未签名的域响应确实是来自未签名的域。" +msgstr "需要上级支持 DNSSEC，验证未签名的域响应确实是来自未签名的域。" msgid "Reset" msgstr "复位" @@ -2633,7 +2666,7 @@ msgid "Reset to defaults" msgstr "恢复到出厂设置" msgid "Resolv and Hosts Files" -msgstr "HOSTS和解析文件" +msgstr "HOSTS 和解析文件" msgid "Resolve file" msgstr "解析文件" @@ -2657,19 +2690,19 @@ msgid "Root" msgstr "Root" msgid "Root directory for files served via TFTP" -msgstr "TFTP服务器的根目录" +msgstr "TFTP 服务器的根目录" msgid "Root preparation" -msgstr "" +msgstr "根目录准备" msgid "Route Allowed IPs" -msgstr "路由允许的IP" +msgstr "路由允许的 IP" msgid "Route type" msgstr "路由类型" msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "下行接口的路由IPv6前缀" +msgstr "下行接口的路由 IPv6 前缀" msgid "Router Advertisement-Service" msgstr "路由器广告服务" @@ -2697,25 +2730,25 @@ msgstr "SHA256" msgid "" "SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " "use 6in4 instead" -msgstr "SIXXS仅支持TIC，对于使用IP协议41(RFC4213)的静态隧道，使用6in4" +msgstr "SIXXS 仅支持 TIC，对于使用 IP 协议 41 (RFC4213) 的静态隧道，使用 6in4" msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" +msgstr "SIXXS-handle[/Tunnel-ID]" msgid "SNR" msgstr "SNR" msgid "SSH Access" -msgstr "SSH访问" +msgstr "SSH 访问" msgid "SSH server address" -msgstr "SSH服务器地址" +msgstr "SSH 服务器地址" msgid "SSH server port" -msgstr "SSH服务器端口" +msgstr "SSH 服务器端口" msgid "SSH username" -msgstr "SSH用户名" +msgstr "SSH 用户名" msgid "SSH-Keys" msgstr "SSH-密钥" @@ -2750,7 +2783,7 @@ msgstr "详参 \"mount\" 联机帮助" msgid "" "Send LCP echo requests at the given interval in seconds, only effective in " "conjunction with failure threshold" -msgstr "定时发送LCP响应(秒)，仅在结合了故障阈值时有效" +msgstr "定时发送 LCP 响应 (秒)，仅在结合了故障阈值时有效" msgid "Separate Clients" msgstr "隔离客户端" @@ -2764,7 +2797,7 @@ msgstr "服务器密码" msgid "" "Server password, enter the specific password of the tunnel when the username " "contains the tunnel ID" -msgstr "服务器密码,如果用户名包含隧道ID则在此填写独立的密码" +msgstr "服务器密码,如果用户名包含隧道 ID 则在此填写独立的密码" msgid "Server username" msgstr "服务器用户名" @@ -2778,17 +2811,24 @@ msgstr "服务类型" msgid "Services" msgstr "服务" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" +"无论链路载荷如何都设置接口属性 (如果设置，载荷侦听事件不调用 Hotplug 处理程" +"序)。" + msgid "Set up Time Synchronization" msgstr "设置时间同步" msgid "Setup DHCP Server" -msgstr "配置DHCP服务器" +msgstr "配置 DHCP 服务器" msgid "Severely Errored Seconds (SES)" -msgstr "严重误码秒(SES)" +msgstr "严重误码秒 (SES)" msgid "Short GI" -msgstr "" +msgstr "Short GI" msgid "Show current backup file list" msgstr "显示当前文件备份列表" @@ -2803,7 +2843,7 @@ msgid "Signal" msgstr "信号" msgid "Signal Attenuation (SATN)" -msgstr "信号衰减(SATN)" +msgstr "信号衰减 (SATN)" msgid "Signal:" msgstr "信号:" @@ -2812,7 +2852,7 @@ msgid "Size" msgstr "大小" msgid "Size (.ipk)" -msgstr "大小(.ipk)" +msgstr "大小 (.ipk)" msgid "Skip" msgstr "跳过" @@ -2830,7 +2870,7 @@ msgid "Software" msgstr "软件包" msgid "Software VLAN" -msgstr "" +msgstr "软件 VLAN" msgid "Some fields are invalid, cannot save values!" msgstr "一些项目的值无效，无法保存！" @@ -2846,8 +2886,8 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"抱歉，您的设备暂不支持Sysupgrade升级，需手动更新固件。请参考Wiki中关于此设备" -"的固件更新说明。" +"抱歉，您的设备暂不支持 Sysupgrade 升级，需手动更新固件。请参考 Wiki 中关于此" +"设备的固件更新说明。" msgid "Sort" msgstr "排序" @@ -2865,30 +2905,30 @@ msgid "Specifies the directory the device is attached to" msgstr "指定设备的挂载目录" msgid "Specifies the listening port of this Dropbear instance" -msgstr "指定Dropbear的监听端口" +msgstr "指定 Dropbear 的监听端口" msgid "" "Specifies the maximum amount of failed ARP requests until hosts are presumed " "to be dead" -msgstr "指定假设主机已丢失的最大失败ARP请求数" +msgstr "指定假设主机已丢失的最大失败 ARP 请求数" msgid "" "Specifies the maximum amount of seconds after which hosts are presumed to be " "dead" -msgstr "指定假设主机已丢失的最大时间(秒)" +msgstr "指定假设主机已丢失的最大时间 (秒)" msgid "Specify a TOS (Type of Service)." -msgstr "指定TOS(服务类型)。" +msgstr "指定 TOS (服务类型)。" msgid "" "Specify a TTL (Time to Live) for the encapsulating packet other than the " "default (64)." -msgstr "为封装数据包设置TTL(生存时间)，缺省值：64" +msgstr "为封装数据包设置 TTL (生存时间)，缺省值: 64" msgid "" "Specify an MTU (Maximum Transmission Unit) other than the default (1280 " "bytes)." -msgstr "设置MTU(最大传输单位)，缺省值：1280 bytes" +msgstr "设置 MTU (最大传输单位)，缺省值: 1280 bytes" msgid "Specify the secret encryption key here." msgstr "在此指定密钥。" @@ -2904,10 +2944,10 @@ msgid "Startup" msgstr "启动项" msgid "Static IPv4 Routes" -msgstr "静态IPv4路由" +msgstr "静态 IPv4 路由" msgid "Static IPv6 Routes" -msgstr "静态IPv6路由" +msgstr "静态 IPv6 路由" msgid "Static Leases" msgstr "静态地址分配" @@ -2923,8 +2963,8 @@ msgid "" "to DHCP clients. They are also required for non-dynamic interface " "configurations where only hosts with a corresponding lease are served." msgstr "" -"静态租约用于给DHCP客户端分配固定的IP地址和主机标识。只有指定的主机才能连接，" -"并且接口须为非动态配置。" +"静态租约用于给 DHCP 客户端分配固定的 IP 地址和主机标识。只有指定的主机才能连" +"接，并且接口须为非动态配置。" msgid "Status" msgstr "状态" @@ -2961,13 +3001,13 @@ msgstr "交换机 %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." -msgstr "交换机 %q 具有未知的拓扑结构 - VLAN设置可能不正确。" +msgstr "交换机 %q 具有未知的拓扑结构 - VLAN 设置可能不正确。" msgid "Switch VLAN" -msgstr "VLAN交换机" +msgstr "交换机 VLAN" msgid "Switch protocol" -msgstr "切换协议" +msgstr "交换机协议" msgid "Sync with browser" msgstr "同步浏览器时间" @@ -3014,7 +3054,6 @@ msgstr "目标网络" msgid "Terminate" msgstr "关闭" -#, fuzzy msgid "" "The Device Configuration section covers physical settings of the " "radio hardware such as channel, transmit power or antenna selection which " @@ -3022,56 +3061,58 @@ msgid "" "multi-SSID capable). Per network settings like encryption or operation mode " "are grouped in the Interface Configuration." msgstr "" -"设备配置区域可配置无线的硬件参数，比如信道、发射功率或发射天线(如果" -"此无线模块硬件支持多SSID，则全部SSID共用此设备配置)。接口配置区域则" +"设备配置区域可配置无线的硬件参数，比如信道、发射功率或发射天线 (如果" +"此无线模块硬件支持多 SSID，则全部SSID共用此设备配置)。接口配置区域则" "可配置此网络的工作模式和加密等。" msgid "" "The libiwinfo-lua package is not installed. You must install this " "component for working wireless configuration!" -msgstr "软件包libiwinfo-lua未安装。必需安装此组件以配置无线！" +msgstr "软件包 libiwinfo-lua 未安装。必需安装此组件以配置无线！" msgid "" "The HE.net endpoint update configuration changed, you must now use the plain " "username instead of the user ID!" -msgstr "HE.net客户端更新设置已经被改变,您现在必须使用用户名代替用户ID/" +msgstr "HE.net 客户端更新设置已经被改变，您现在必须使用用户名代替用户 ID！" msgid "" "The IPv4 address or the fully-qualified domain name of the remote tunnel end." -msgstr "远程隧道端的IPv4地址或完整域名。" +msgstr "远程隧道端的 IPv4 地址或完整域名。" msgid "" "The IPv6 prefix assigned to the provider, usually ends with ::" -msgstr "运营商特定的IPv6前缀，通常以::为结尾" +msgstr "运营商特定的 IPv6 前缀，通常以 :: 为结尾" msgid "" "The allowed characters are: A-Z, a-z, 0-9 and _" msgstr "" -"合法字符：A-Z, a-z, 0-9 和 _A-Z, a-z, 0-9 和 _" msgid "The configuration file could not be loaded due to the following error:" -msgstr "由于以下错误，配置文件无法被加载：" +msgstr "由于以下错误，配置文件无法被加载:" msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" -msgstr "存储器或分区的设备节点，(例如：/dev/sda1)" +msgstr "存储器或分区的设备节点，(例如: /dev/sda1)" msgid "" "The filesystem that was used to format the memory (e.g. ext3)" msgstr "" -"用于格式化存储器的文件系统，(例如：ext3)" msgid "" "The flash image was uploaded. Below is the checksum and file size listed, " "compare them with the original file to ensure data integrity.
Click " "\"Proceed\" below to start the flash procedure." -msgstr "固件已上传，请注意核对文件大小和校验值！
刷新过程切勿断电！" +msgstr "" +"固件已上传，请注意核对文件大小和校验值！
点击下面的“继续”开始刷写，刷新" +"过程中切勿断电！" msgid "The following changes have been committed" msgstr "以下更改已提交" @@ -3088,18 +3129,18 @@ msgstr "给定的网络名重复" 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 " "addresses." -msgstr "bit格式的IPv4前缀长度, 其余的用在IPv6地址." +msgstr "IPv4 前缀长度 (bit)，其余的用在 IPv6 地址。" msgid "The length of the IPv6 prefix in bits" -msgstr "bit格式的IPv6前缀长度" +msgstr "IPv6 前缀长度 (bit)" msgid "The local IPv4 address over which the tunnel is created (optional)." -msgstr "所创建隧道的本地IPv4地址(可选)。" +msgstr "所创建隧道的本地 IPv4 地址 (可选)。" msgid "" "The network ports on this device can be combined to several VLAN，并支持电脑间的直" -"接通讯。VLAN也常用于分割不同网段。默认通常" -"是一条上行端口连接ISP，其余端口为本地子网。" +"本设备可以划分为多个 VLAN，并支持电脑间的直" +"接通讯。VLAN 也常用于分割不同网段。默认通常" +"是一条上行端口连接 ISP，其余端口为本地子网。" msgid "The selected protocol needs a device assigned" msgstr "所选的协议需要分配设备" @@ -3131,12 +3172,12 @@ msgid "" "settings." msgstr "" "正在刷新系统...
切勿关闭电源! DO NOT POWER OFF THE DEVICE!
等待数分" -"钟后即可尝试重新连接到路由。您可能需要更改计算机的IP地址以重新连接。" +"钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。" msgid "" "The tunnel end-point is behind NAT, defaults to disabled and only applies to " "AYIYA" -msgstr "隧道端点在NAT之后，默认为禁用，仅适用于AYIYA" +msgstr "隧道端点在 NAT 之后，默认为禁用，仅适用于 AYIYA" msgid "" "The uploaded image file does not contain a supported format. Make sure that " @@ -3163,26 +3204,26 @@ msgstr "尚未分配设备，请在“物理设置”选项卡中选择网络设 msgid "" "There is no password set on this router. Please configure a root password to " "protect the web interface and enable SSH." -msgstr "尚未设置密码。请为root用户设置密码以保护主机并开启SSH。" +msgstr "尚未设置密码。请为 Root 用户设置密码以保护主机并开启 SSH。" msgid "This IPv4 address of the relay" -msgstr "中继的IPv4地址" +msgstr "中继的 IPv4 地址" msgid "" "This file may contain lines like 'server=/domain/1.2.3.4' or " "'server=1.2.3.4' fordomain-specific or full upstream DNS servers." msgstr "" -"此文件可能包含类似'server=/domain/1.2.3.4'或'server=1.2.3.4'的行，来解析特定" -"域名或指定上游DNS服务器。" +"此文件包含类似于 'server=/domain/1.2.3.4' 或 'server=1.2.3.4' 的行，用于解析" +"特定域名或指定上游 DNS 服务器。" msgid "" "This is a list of shell glob patterns for matching files and directories to " "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." msgstr "" -"系统升级时要保存的配置文件和目录的清单。目录/etc/config/内修改过的文件以及部" -"分其他配置会被自动保存。" +"系统升级时要保存的配置文件和目录的清单。目录 /etc/config/ 内修改过的文件以及" +"部分其他配置会被自动保存。" msgid "" "This is either the \"Update Key\" configured for the tunnel or the account " @@ -3192,17 +3233,17 @@ msgstr "如果更新密钥没有设置的话,隧道的“更新密钥”或者 msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " "front of 'exit 0') to execute them at the end of the boot process." -msgstr "启动脚本插入到'exit 0'之前即可随系统启动运行。" +msgstr "启动脚本插入到 'exit 0' 之前即可随系统启动运行。" msgid "" "This is the local endpoint address assigned by the tunnel broker, it usually " "ends with :2" -msgstr "隧道代理分配的本地终端地址，通常以:2结尾" +msgstr "隧道代理分配的本地终端地址，通常以 :2 结尾" msgid "" "This is the only DHCP in the local network" -msgstr "这是内网中唯一的DHCP服务器" +msgstr "这是内网中唯一的 DHCP 服务器" msgid "This is the plain username for logging into the account" msgstr "登录账户时填写的用户名" @@ -3212,11 +3253,11 @@ msgid "" 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" -msgstr "这通常是隧道代理所管理的最近的PoP的地址" +msgstr "这通常是隧道代理所管理的最近的 PoP 的地址" msgid "" "This list gives an overview over currently running system processes and " @@ -3247,13 +3288,13 @@ msgid "" msgstr "上传备份存档以恢复配置。" msgid "Tone" -msgstr "" +msgstr "Tone" msgid "Total Available" msgstr "可用数" msgid "Traceroute" -msgstr "Traceroute" +msgstr "路由追踪" msgid "Traffic" msgstr "流量" @@ -3280,7 +3321,7 @@ msgid "Trigger Mode" msgstr "触发模式" msgid "Tunnel ID" -msgstr "隧道ID" +msgstr "隧道 ID" msgid "Tunnel Interface" msgstr "隧道接口" @@ -3307,16 +3348,16 @@ msgid "UDP:" msgstr "UDP:" msgid "UMTS only" -msgstr "仅UMTS(WCDMA)" +msgstr "仅 UMTS (WCDMA)" msgid "UMTS/GPRS/EV-DO" msgstr "UMTS/GPRS/EV-DO" msgid "USB Device" -msgstr "USB设备" +msgstr "USB 设备" msgid "USB Ports" -msgstr "" +msgstr "USB 接口" msgid "UUID" msgstr "UUID" @@ -3325,7 +3366,7 @@ msgid "Unable to dispatch" msgstr "无法调度" msgid "Unavailable Seconds (UAS)" -msgstr "不可用秒数(UAS)" +msgstr "不可用秒数 (UAS)" msgid "Unknown" msgstr "未知" @@ -3352,7 +3393,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 "上传备份..." @@ -3364,37 +3405,37 @@ msgid "Uptime" msgstr "运行时间" msgid "Use /etc/ethers" -msgstr "使用/etc/ethers配置" +msgstr "使用 /etc/ethers 配置" msgid "Use DHCP gateway" -msgstr "使用DHCP网关" +msgstr "使用 DHCP 网关" msgid "Use DNS servers advertised by peer" msgstr "使用端局通告的DNS服务器" msgid "Use ISO/IEC 3166 alpha2 country codes." -msgstr "参考ISO/IEC 3166 alpha2国家代码。" +msgstr "参考 ISO/IEC 3166 alpha2 国家代码。" msgid "Use MTU on tunnel interface" -msgstr "隧道接口的MTU" +msgstr "隧道接口的 MTU" msgid "Use TTL on tunnel interface" -msgstr "隧道接口的TTL" +msgstr "隧道接口的 TTL" msgid "Use as external overlay (/overlay)" -msgstr "作为外部Overlay使用(/overlay)" +msgstr "作为外部 Overlay 使用 (/overlay)" msgid "Use as root filesystem (/)" -msgstr "作为跟文件系统使用(/)" +msgstr "作为根文件系统使用 (/)" msgid "Use broadcast flag" msgstr "使用广播标签" msgid "Use builtin IPv6-management" -msgstr "使用内置的IPv6管理" +msgstr "使用内置的 IPv6 管理" msgid "Use custom DNS servers" -msgstr "使用自定义的DNS服务器" +msgstr "使用自定义的 DNS 服务器" msgid "Use default gateway" msgstr "使用默认网关" @@ -3425,12 +3466,14 @@ msgid "" "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not " "needed with normal WPA(2)-PSK." msgstr "" +"用于两种不同的用途: RADIUS NAS ID 和 802.11r R0KH-ID。普通 WPA(2)-PSK 不需" +"要。" msgid "User certificate (PEM encoded)" -msgstr "客户证书(PEM加密的)" +msgstr "客户证书 (PEM加密的)" msgid "User key (PEM encoded)" -msgstr "客户Key(PEM加密的)" +msgstr "客户 Key (PEM加密的)" msgid "Username" msgstr "用户名" @@ -3442,40 +3485,40 @@ msgid "VDSL" 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 "VPN本地地址" +msgstr "VPN 本地地址" msgid "VPN Local port" -msgstr "VPN本地端口" +msgstr "VPN 本地端口" msgid "VPN Server" -msgstr "VPN服务器" +msgstr "VPN 服务器" msgid "VPN Server port" -msgstr "VPN服务器端口" +msgstr "VPN 服务器端口" msgid "VPN Server's certificate SHA1 hash" -msgstr "VPN服务器证书的SHA1哈希值" +msgstr "VPN 服务器证书的 SHA1 哈希值" msgid "VPNC (CISCO 3000 (and others) VPN)" -msgstr "VPNC (CISCO 3000 和其他VPN)" +msgstr "VPNC (CISCO 3000 和其他 VPN)" msgid "Vendor" -msgstr "" +msgstr "Vendor" msgid "Vendor Class to send when requesting DHCP" -msgstr "请求DHCP时发送的Vendor Class" +msgstr "请求 DHCP 时发送的 Vendor Class" msgid "Verbose" msgstr "详细" msgid "Verbose logging by aiccu daemon" -msgstr "aiccu守护程序详细日志" +msgstr "Aiccu 守护程序详细日志" msgid "Verify" msgstr "验证" @@ -3487,30 +3530,30 @@ msgid "WDS" msgstr "WDS" msgid "WEP Open System" -msgstr "WEP开放认证" +msgstr "WEP 开放认证" msgid "WEP Shared Key" -msgstr "WEP共享密钥" +msgstr "WEP 共享密钥" msgid "WEP passphrase" -msgstr "WEP密钥" +msgstr "WEP 密钥" msgid "WMM Mode" -msgstr "WMM多媒体加速" +msgstr "WMM 多媒体加速" msgid "WPA passphrase" -msgstr "WPA密钥" +msgstr "WPA 密钥" msgid "" "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " "and ad-hoc mode) to be installed." msgstr "" -"WPA加密需要安装wpa_supplicant(客户端模式)或安装hostapd(接入点AP、点对点ad-hoc" -"模式)。" +"WPA 加密需要安装 wpa_supplicant (客户端模式) 或安装 hostapd (接入点 AP、点对" +"点 Ad-Hoc 模式)。" 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 "正在应用更改..." @@ -3525,10 +3568,10 @@ 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 "是否通过隧道创建IPv6缺省路由" +msgstr "是否通过隧道创建 IPv6 缺省路由" msgid "Whether to route only packets from delegated prefixes" msgstr "是否仅路由来自分发前缀的数据包" @@ -3537,7 +3580,7 @@ msgid "Width" msgstr "频宽" msgid "WireGuard VPN" -msgstr "" +msgstr "WireGuard VPN" msgid "Wireless" msgstr "无线" @@ -3573,7 +3616,7 @@ msgid "Wireless shut down" msgstr "无线已关闭" msgid "Write received DNS requests to syslog" -msgstr "将收到的DNS请求写入系统日志" +msgstr "将收到的 DNS 请求写入系统日志" msgid "Write system log to file" msgstr "将系统日志写入文件" @@ -3583,20 +3626,20 @@ msgid "" "after a device reboot.
Warning: If you disable essential init " "scripts like \"network\", your device might become inaccessible!" msgstr "" -"启用或禁用已安装的启动脚本。更改在设备重启后生效。
警告：如果禁" -"用了必要的启动脚本，比如\"network\"，可能会导致设备无法访问！" +"启用或禁用已安装的启动脚本。更改在设备重启后生效。
警告: 如果禁" +"用了必要的启动脚本，比如 \"network\"，可能会导致设备无法访问！" msgid "" "You must enable JavaScript in your browser or LuCI will not work properly." -msgstr "LUCI的正常运行需要开启浏览器的JavaScript支持。" +msgstr "LUCI 的正常运行需要开启浏览器的 JavaScript 支持。" msgid "" "Your Internet Explorer is too old to display this page correctly. Please " "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 "任意" @@ -3637,7 +3680,7 @@ msgstr "过期时间" msgid "" "file where given DHCP-leases will be stored" -msgstr "存放DHCP租约的文件" +msgstr "存放 DHCP 租约的文件" msgid "forward" msgstr "转发" @@ -3673,19 +3716,19 @@ msgid "kbit/s" msgstr "kbit/s" msgid "local DNS file" -msgstr "本地DNS解析文件" +msgstr "本地 DNS 解析文件" msgid "minimum 1280, maximum 1480" -msgstr "最小值1280，最大值1480" +msgstr "最小值 1280，最大值 1480" msgid "minutes" -msgstr "" +msgstr "分钟" msgid "navigation Navigation" msgstr "导航" msgid "no" -msgstr "" +msgstr "否" msgid "no link" msgstr "未连接" @@ -3736,7 +3779,7 @@ msgid "tagged" msgstr "关联" msgid "time units (TUs / 1.024 ms) [1000-65535]" -msgstr "" +msgstr "时间单位 (TUs / 1.024ms) [1000-65535]" msgid "unknown" msgstr "未知" @@ -3748,7 +3791,7 @@ msgid "unspecified" msgstr "未指定" msgid "unspecified -or- create:" -msgstr "未指定或创建：" +msgstr "未指定或创建:" msgid "untagged" msgstr "不关联" diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 4cb84163c..3d1934e55 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1182,6 +1182,9 @@ msgstr "強制TKIP加密" msgid "Force TKIP and CCMP (AES)" msgstr "強制TKIP+CCMP (AES)加密" +msgid "Force link" +msgstr "" + msgid "Force use of NAT-T" msgstr "" @@ -1960,6 +1963,9 @@ msgstr "" msgid "NAT64 Prefix" msgstr "" +msgid "NCM" +msgstr "" + msgid "NDP-Proxy" msgstr "" @@ -2373,6 +2379,12 @@ msgstr "" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" +msgid "Prefer LTE" +msgstr "" + +msgid "Prefer UMTS" +msgstr "" + msgid "Prefix Delegated" msgstr "" @@ -2792,6 +2804,11 @@ msgstr "服務型態" msgid "Services" msgstr "各服務" +msgid "" +"Set interface properties regardless of the link carrier (If set, carrier " +"sense events do not invoke hotplug handlers)." +msgstr "" + #, fuzzy msgid "Set up Time Synchronization" msgstr "安裝校時同步" diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua index 10636a491..f418ecb40 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -68,9 +68,10 @@ se = s:taboption("advanced", Flag, "sequential_ip", translate("Allocate IP addresses sequentially, starting from the lowest available address")) se.optional = true -s:taboption("advanced", Flag, "boguspriv", +bp = s:taboption("advanced", Flag, "boguspriv", translate("Filter private"), translate("Do not forward reverse lookups for local networks")) +bp.default = bp.enabled s:taboption("advanced", Flag, "filterwin2k", translate("Filter useless"), diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 16a104494..031852228 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -220,6 +220,12 @@ auto.default = (net:proto() == "none") and auto.disabled or auto.enabled delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management")) delegate.default = delegate.enabled +force_link = s:taboption("advanced", Flag, "force_link", + translate("Force link"), + translate("Set interface properties regardless of the link carrier (If set, carrier sense events do not invoke hotplug handlers).")) + +force_link.default = (net:proto() == "static") and force_link.enabled or force_link.disabled + if not net:is_virtual() then br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)")) diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index 206f9ef82..d29a89427 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -37,10 +37,8 @@ local wan = ntm:get_wannet() local wan6 = ntm:get_wan6net() - local conn_count = tonumber(( - luci.sys.exec("wc -l /proc/net/nf_conntrack") or - luci.sys.exec("wc -l /proc/net/ip_conntrack") or - ""):match("%d+")) or 0 + local conn_count = tonumber( + fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count")) or 0 local conn_max = tonumber(( luci.sys.exec("sysctl net.nf_conntrack_max") or diff --git a/protocols/luci-proto-vpnc/Makefile b/protocols/luci-proto-vpnc/Makefile index 9c77e67a5..0800e279f 100644 --- a/protocols/luci-proto-vpnc/Makefile +++ b/protocols/luci-proto-vpnc/Makefile @@ -10,9 +10,6 @@ LUCI_TITLE:=Support for VPNC VPN LUCI_DEPENDS:=+vpnc LUCI_PKGARCH:=all -PKG_NAME:=luci-proto-vpnc -PKG_RELEASE=1 -PKG_VERSION:=1.0.0 PKG_MAINTAINER:=Daniel Dickinson PKG_LICENSE:=Apache-2.0 @@ -20,4 +17,4 @@ LUA_TARGET:=source include ../../luci.mk -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file +# call BuildPackage - OpenWrt buildroot signature