summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-mwan3/po/ja/mwan3.po50
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_server.lua127
-rw-r--r--applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po326
-rw-r--r--modules/luci-base/po/ja/base.po9
4 files changed, 444 insertions, 68 deletions
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index 1920d6bb4e..4c9ad6c185 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -7,7 +7,7 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.2\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
@@ -83,8 +83,8 @@ 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 アドレスの個数です。"
+"利用可能な値: 1-100。上記のトラッキング IP の合計個数のうち、Up 状態と判定す"
+"るためにに必要な、レスポンスが返されたトラッキング IP アドレスの個数です。"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:28
msgid "Acceptable values: 1-1000. Defaults to 1 if not set"
@@ -96,11 +96,12 @@ msgstr "利用可能な値: 1-256。空欄の場合のデフォルトは1です
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:177
msgid "All required IP rules for interface %s found"
-msgstr ""
+msgstr "インターフェース %s の全必須 IP ルールが見つかりました"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36
msgid "Also scan this Routing table for connected networks"
msgstr ""
+"接続されたネットワークのために、追加でスキャンするルーティングテーブルです。"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73
msgid "Check IP rules"
@@ -204,7 +205,7 @@ msgstr "ホットプラグ ifup"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24
msgid "How often should rtmon update the interface routing table"
-msgstr ""
+msgstr "rtmon がインターフェース ルーティングテーブルの更新を行う頻度です。"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56
@@ -363,7 +364,7 @@ msgstr ""
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69
msgid "Max TTL"
-msgstr ""
+msgstr "最大 TTL"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85
msgid "Max packet latency [ms]"
@@ -447,11 +448,11 @@ msgstr "MWAN インターフェースが見つかりません"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:159
msgid "No gateway for interface %s found."
-msgstr ""
+msgstr "インターフェース %s にゲートウェイが見つかりません。"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:168
msgid "No tracking Hosts for interface %s defined."
-msgstr ""
+msgstr "インターフェース %s にトラッキングホストが指定されていません。"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:60
msgid "Notification"
@@ -470,7 +471,7 @@ msgstr "オンライン"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:182
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:186
msgid "Only one IP rules for interface %s found"
-msgstr ""
+msgstr "インターフェース %s に IP ルールが一つのみ見つかりました。"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:45
msgid "Ping count"
@@ -478,7 +479,7 @@ msgstr "Ping 回数"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:71
msgid "Ping default gateway"
-msgstr "Ping デフォルト ゲートウェイ"
+msgstr "デフォルト ゲートウェイへのping"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
@@ -503,7 +504,7 @@ msgstr "Ping タイムアウト"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:72
msgid "Ping tracking IP"
-msgstr "Ping トラッキング IP"
+msgstr "トラッキング IP へのping"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:54
msgid "Policies"
@@ -550,19 +551,19 @@ msgstr "障害復旧 インターバル"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40
msgid "Routing table %d"
-msgstr ""
+msgstr "ルーティングテーブル %d"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196
msgid "Routing table %s for interface %s found"
-msgstr ""
+msgstr "ルーティングテーブル %s が見つかりました(インターフェース %s)"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:200
msgid "Routing table %s for interface %s not found"
-msgstr ""
+msgstr "ルーティングテーブル %s が見つかりません(インターフェース %s)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35
msgid "Routing table lookup"
-msgstr ""
+msgstr "ルーティングテーブルの検索"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58
msgid "Rule"
@@ -681,17 +682,17 @@ msgstr ""
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:30
msgid "Tracking hostname or IP address"
-msgstr "追跡ホスト名または IP アドレス"
+msgstr "トラッキング ホスト名または IP アドレス"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
msgid "Tracking method"
-msgstr "追跡方式"
+msgstr "トラッキング方式"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
msgid "Tracking reliability"
-msgstr "追跡の信頼性"
+msgstr "トラッキングの信頼性"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:41
msgid ""
@@ -711,7 +712,7 @@ msgstr "トラブルシューティング"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23
msgid "Update interval"
-msgstr ""
+msgstr "更新間隔"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31
msgid "View the content of /etc/protocols for protocol description"
@@ -735,8 +736,8 @@ msgid ""
"WARNING: Interface %s has a higher reliability requirement than tracking "
"hosts (%d)"
msgstr ""
-"警告: インターフェース %s は追跡ホスト数 (%d) よりも高い追跡信頼性の値が設定"
-"されています"
+"警告: インターフェース %s はトラッキング ホスト数 (%d) よりも高いトラッキング"
+"信頼性の値が設定されています"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:30
msgid "WARNING: Interface %s has no default route in the main routing table"
@@ -810,10 +811,3 @@ msgstr "never"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
msgid "unreachable (reject)"
msgstr "unreachable (reject)"
-
-#~ msgid ""
-#~ "Use the IP address of this interface as source IP address for traffic "
-#~ "initiated by the router itself"
-#~ msgstr ""
-#~ "ルーター自身によって発生するトラフィックのアクセス元 IP アドレスとして、こ"
-#~ "のインターフェースの IP アドレスが使用されます。"
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
index dea7932395..6aaf1d2c22 100644
--- a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
@@ -48,7 +48,7 @@ o.optional = true
o.datatype = "port"
o.placeholder = "3493"
-s = m:section(NamedSection, "upsd", "upsd", translate("Global Settings"))
+s = m:section(NamedSection, "upsd", "upsd", translate("UPS Server Global Settings"))
s.addremove = true
o = s:option(Value, "maxage", translate("Maximum Age of Data"), translate("Period after which data is considered stale"))
@@ -74,6 +74,43 @@ if luci.util.checklib("/usr/sbin/upsd", "libssl.so") then
o.optional = true
end
+s = m:section(NamedSection, "driver_global", "driver_global", translate("Driver Global Settings"))
+s.addremove = true
+
+o = s:option(Value, "chroot", translate("chroot"), translate("Run drivers in a chroot(2) environment"))
+o.optional = true
+
+o = s:option(Value, "driverpath", translate("Driver Path"), translate("Path to drivers (instead of default)"))
+o.optional = true
+o.placeholder = "/lib/lnut"
+
+o = s:option(Value, "maxstartdelay", translate("Maximum Start Delay"), translate("Default for UPSes without this field."))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxretry", translate("Maxium Retries"), translate("Maximum number of times to try starting a driver."))
+o.optional = true
+o.placeholder = 1
+o.datatype = "uinteger"
+
+o = s:option(Value, "retrydelay", translate("Retry Delay"), translate("Time in seconds between driver start retry attempts."))
+o.optional = true
+o.placeholder = 5
+o.datatype = "uinteger"
+
+o = s:option(Value, "pollinterval", translate("Poll Interval"), translate("Maximum time in seconds between refresh of UPS status"))
+o.optional = true
+o.placeholder = 2
+o.datatype = "uinteger"
+
+o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more."))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "user", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver to be read-write for that user."))
+o.optional = true
+o.placeholder = "nut"
+
s = m:section(TypedSection, "driver", translate("Driver Configuration"),
translate("The name of this section will be used as UPS name elsewhere"))
s.addremove = true
@@ -81,15 +118,47 @@ s.anonymous = false
driverlist = nixio.fs.dir("/lib/nut")
+o = s:option(Value, "bus", translate("USB Bus(es) (regex)"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "community", translate("SNMP Community"))
+o.optional = true
+o.placeholder = "private"
+
+o = s:option(Value, "desc", translate("Description (Display)"))
+o.optional = true
+
o = s:option(ListValue, "driver", translate("Driver"))
for driver in driverlist do
o:value(driver)
end
o.optional = false
-o = s:option(Value, "port", translate("Port"))
-o.optional = false
-o.default = "auto"
+o = s:option(Flag, "enable_usb_serial", translate("Set USB serial port permissions"), translate("Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) group read-write as user 'nut'"))
+o.optional = true
+o.default = false
+
+o = s:option(Flag, "ignorelb", translate("Ignore Low Battery"))
+o.optional = true
+o.default = false
+
+o = s:option(Flag, "interruptonly", translate("Interrupt Only"))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "maxstartdelay", translate("Maxium Start Delay"), translate("Time in seconds that upsdrvctl will wait for driver to finish starting"))
+o.optional = true
+o.datatype = "uinteger"
+o.placeholder = 45
o = s:option(Value, "mfr", translate("Manufacturer (Display)"))
o.optional = true
@@ -97,11 +166,13 @@ o.optional = true
o = s:option(Value, "model", translate("Model (Display)"))
o.optional = true
-o = s:option(Value, "serial", translate("Serial Number"))
+o = s:option(Flag, "nolock", translate("No Lock"), translate("Don't lock port when starting driver"))
o.optional = true
+o.default = false
-o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)"))
+o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs"))
o.optional = true
+o.default = false
o = s:option(Value, "offdelay", translate("Off Delay(s)"), translate("Delay for kill power command"))
o.optional = true
@@ -128,42 +199,33 @@ o.optional = true
o.datatype = "integer"
o.placeholder = 30
-o = s:option(Value, "vendor", translate("Vendor (regex)"))
-o.optional = true
+o = s:option(Value, "port", translate("Port"))
+o.optional = false
+o.default = "auto"
o = s:option(Value, "product", translate("Product (regex)"))
o.optional = true
-o = s:option(Value, "bus", translate("USB Bus(es) (regex)"))
-o.optional = true
-o.datatype = "uinteger"
-
-o = s:option(Flag, "interruptonly", translate("Interrupt Only"))
-o.optional = true
-o.default = false
-
-o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe"))
+o = s:option(Value, "productid", translate("USB Product Id"))
o.optional = true
-o.datatype = "integer"
-o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware"))
+o = s:option(Value, "sdorder", translate("Driver Shutdown Order"))
o.optional = true
-o.datatype = "integer"
-o.default = nil
+o.datatype = "uinteger"
-o = s:option(Value, "vendorid", translate("USB Vendor Id"))
+o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)"))
o.optional = true
-o = s:option(Value, "productid", translate("USB Product Id"))
+o = s:option(Value, "serial", translate("Serial Number"))
o.optional = true
-o = s:option(Value, "runas", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver be read-write for that user."))
+o = s:option(Value, "snmp_retries", translate("SNMP retries"))
o.optional = true
-o.placeholder = "nut"
+o.datatype = "uinteger"
-o = s:option(Value, "community", translate("SNMP Community"))
+o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)"))
o.optional = true
-o.placeholder = "private"
+o.datatype = "uinteger"
o = s:option(ListValue, "snmp_version", translate("SNMP version"))
o.optional = true
@@ -173,19 +235,14 @@ o:value("v3", translate("SNMPv3"))
o:value("", "")
o.default = ""
-o = s:option(Value, "snmp_retries", translate("SNMP retries"))
+o = s:option(Value, "vendor", translate("Vendor (regex)"))
o.optional = true
-o.datatype = "uinteger"
-o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)"))
+o = s:option(Value, "vendorid", translate("USB Vendor Id"))
o.optional = true
-o.datatype = "uinteger"
-o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs"))
+o = s:option(Flag, "synchronous", translate("Synchronous Communication"), translate("Driver waits for data to be consumed by upsd before publishing more."))
o.optional = true
o.default = false
-o = s:option(Value, "other", translate("Additional Parameters"))
-o.optional = true
-
return m
diff --git a/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po
new file mode 100644
index 0000000000..d6b84b913b
--- /dev/null
+++ b/applications/luci-app-shadowsocks-libev/po/zh-cn/shadowsocks-libev.po
@@ -0,0 +1,326 @@
+msgid ""
+msgstr ""
+"Last-Translator: Yousong Zhou <yszhou4tech@gmail.com>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:170
+msgid "<hidden>"
+msgstr "<已隐藏>"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:14
+msgid "Add"
+msgstr "添加"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:24
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:32
+msgid "Bind address"
+msgstr "绑定地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:73
+msgid "Bypass ss-redir for packets with dst address in this list"
+msgstr "对于目的地址在列表中的报文,绕过ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:59
+msgid "Bypass ss-redir for packets with src address in this list"
+msgstr "对于源地址在列表中的报文,绕过ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:65
+msgid ""
+"Continue to have dst address checked for packets with src address in this "
+"list"
+msgstr "对于源地址在列表中的报文,继续检查其目的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:47
+msgid "Default action for locally generated TCP packets"
+msgstr "对于设备本身产生的TCP报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:88
+msgid ""
+"Default action for packets whose dst address do not match any of the dst ip "
+"list"
+msgstr "对于目的地址不在列表中的报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:68
+msgid ""
+"Default action for packets whose src address do not match any of the src ip/"
+"net list"
+msgstr "对于源地址不在列表中的报文的默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:11
+msgid ""
+"Definition of remote shadowsocks servers. Disable any of them will also "
+"disable instances referring to it."
+msgstr "在此页面设定访问远端shadowsocks服务器的参数。请注意,禁用远端服务器会同时停止与之关联的shadowsocks-libev组件"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:33
+msgid "Destination Settings"
+msgstr "目的地址设定"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:25
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:35
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:28
+msgid "Disable"
+msgstr "禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:86
+msgid "Disabled"
+msgstr "已禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:87
+msgid "Dst default"
+msgstr "目的未匹配时默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:72
+msgid "Dst ip/net bypass"
+msgstr "绕过"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:79
+msgid "Dst ip/net bypass file"
+msgstr "绕过(文件)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:75
+msgid "Dst ip/net forward"
+msgstr "转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:83
+msgid "Dst ip/net forward file"
+msgstr "转发(文件)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:126
+msgid "Enable SO_REUSEPORT"
+msgstr "启用SO_REUSEPORT"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:124
+msgid "Enable TCP Fast Open"
+msgstr "启用TCP Fast Open"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:125
+msgid "Enable TCP_NODELAY"
+msgstr "启用TCP_NODELAY"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:83
+msgid "Enable/Disable"
+msgstr "启用/禁用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:89
+msgid "Enabled"
+msgstr "已启用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:54
+msgid "Extra arguments"
+msgstr "额外参数"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:80
+msgid ""
+"File containing ip/net for the purposes as with <em>Dst ip/net bypass</em>"
+msgstr "文件列出需要绕过ss-redir转发的地址和网段"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:84
+msgid ""
+"File containing ip/net for the purposes as with <em>Dst ip/net forward</em>"
+msgstr "文件列出需要使用ss-redir转发的地址和网段"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:106
+msgid "Forward recentrst"
+msgstr "转发被连接重置的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:107
+msgid ""
+"Forward those packets whose dst have recently sent to us multiple tcp-rst"
+msgstr "若近期多次收到某地址的连接重置报文,则将其加入到转发列表中"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:76
+msgid "Forward through ss-redir for packets with dst address in this list"
+msgstr "对于目的地址在列表中的报文,通过ss-redir转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:62
+msgid "Forward through ss-redir for packets with src address in this list"
+msgstr "对于源地址在列表中的报文,通过ss-redir转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:23
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:31
+msgid "General Settings"
+msgstr "常规设置"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123
+msgid "IPv6 First"
+msgstr "IPv6优先"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:50
+msgid "Ingress interfaces"
+msgstr "入口网卡"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:197
+msgid "Install package %q"
+msgstr "安装%q"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:97
+msgid "Install package iptables-mod-conntrack-extra"
+msgstr "安装iptables-mod-conntrack-extra"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:11
+msgid ""
+"Instances of shadowsocks-libev components, e.g. ss-local, ss-redir, ss-"
+"tunnel, ss-server, etc. To enable an instance it is required to enable both "
+"the instance itself and the remote server it refers to."
+msgstr "此页面展示本地运行的shadowsocks-libev各组件实例,如ss-local、ss-redir、ss-tunnel、ss-server等。请注意,实际启用一个实例要求实例本身及所关联的远端服务器都是启用状态。"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:99
+msgid "Key (base64 encoding)"
+msgstr "密钥(base64编码)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:13
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:10
+msgid "Local Instances"
+msgstr "本地实例"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:71
+msgid "Local address"
+msgstr "监听地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:75
+msgid "Local port"
+msgstr "监听端口"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:46
+msgid "Local-out default"
+msgstr "本地报文默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:116
+msgid "MTU"
+msgstr ""
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:95
+msgid "Method"
+msgstr "加密方法"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:111
+msgid "Mode of operation"
+msgstr "工作模式"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:76
+#: applications/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm:12
+msgid "Name"
+msgstr "名称"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:10
+msgid ""
+"On this page you can configure how traffics are to be forwarded to ss-redir "
+"instances. If enabled, packets will first have their src ip addresses "
+"checked against <em>Src ip/net bypass</em>, <em>Src ip/net forward</em>, "
+"<em>Src ip/net checkdst</em> and if none matches <em>Src default</em> will "
+"give the default action to be taken. If the prior check results in action "
+"<em>checkdst</em>, packets will continue to have their dst addresses checked."
+msgstr "在此页面,您可以配置指定报文是否通过ss-redir转发。启用后,规则会先将报文的源地址与相应的地址集进行匹配,依次决定是否“绕过(<em>bypass</em>)”、“转发(<em>forward</em>)”,或“继续匹配目的地址(<em>checkdst</em>)”;若未在集合中找到匹配,则执行指定的默认动作。继续匹配目的地址时同理。"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:51
+msgid "Only apply rules on packets from these network interfaces"
+msgstr "仅对来自指定网卡的报文应用规则"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:78
+msgid "Overview"
+msgstr "概览"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:196
+msgid "Package is not installed"
+msgstr "依赖包未安装"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:55
+msgid "Passes additional arguments to iptables. Use with care!"
+msgstr "给iptables的额外参数。请小心使用"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:103
+msgid "Password"
+msgstr "密码"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:123
+msgid "Prefer IPv6 addresses when resolving names"
+msgstr "名字解析时优先取用IPv6地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:21
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:9
+msgid "Redir Rules"
+msgstr "转发规则"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:17
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/servers.lua:10
+msgid "Remote Servers"
+msgstr "远端服务器"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:69
+msgid "Remote server"
+msgstr "服务器"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:120
+msgid "Run as"
+msgstr "运行时用户"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instances.lua:81
+msgid "Running"
+msgstr "运行中"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:89
+msgid "Server"
+msgstr "监听地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:92
+msgid "Server port"
+msgstr "监听端口"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/controller/shadowsocks-libev.lua:9
+msgid "Shadowsocks-libev"
+msgstr ""
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:32
+msgid "Source Settings"
+msgstr "源地址设定"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:67
+msgid "Src default"
+msgstr "源未匹配默认行为"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:58
+msgid "Src ip/net bypass"
+msgstr "绕过"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:64
+msgid "Src ip/net checkdst"
+msgstr "继续匹配目的地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:61
+msgid "Src ip/net forward"
+msgstr "转发"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:33
+msgid "The address ss-server will initiate connection from"
+msgstr "ss-server建立连接时使用的源地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:42
+msgid "The address ss-tunnel will forward traffic to"
+msgstr "ss-tunnel所建立隧道的对端地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:118
+msgid "Timeout (sec)"
+msgstr "超时时间(秒)"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua:41
+msgid "Tunnel address"
+msgstr "隧道对端地址"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua:122
+msgid "Verbose"
+msgstr "记录详细日志"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:39
+msgid "ss-redir for TCP"
+msgstr "用于TCP转发的ss-redir"
+
+#: applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua:42
+msgid "ss-redir for UDP"
+msgstr "用于UDP转发的ss-redir"
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index 8e269a5b17..8fff425530 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2018-12-20 03:00+0900\n"
+"PO-Revision-Date: 2018-12-26 19:48+0900\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Language-Team: \n"
"Language: ja\n"
@@ -1499,7 +1499,7 @@ msgstr "切断の試行が失敗しました"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:17
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:28
msgid "Dismiss"
-msgstr "警告の除去"
+msgstr "閉じる"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:239
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:333
@@ -4996,9 +4996,8 @@ msgstr ""
"未適用の変更を適用後、デバイスは %d 秒以内に完了できなかった可能性がありま"
"す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ"
"でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ"
-"い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う"
-"か、現在動作している設定状況を維持するために未適用の変更を取り消してくださ"
-"い。"
+"い。もしくは、再度適用を試行する前にこの警告を閉じて設定内容の編集を行うか、"
+"現在動作している設定状況を維持するために未適用の変更を取り消してください。"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:87
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:41