luci-app-aria2: Refactor, new views and more options

This commit contains:

* Refactor package code.
* Add options for RPC, HTTP/HTTPS and BT.
* Improve descriptions for some options.
* New views for config files and log files.
* Also updated translation for simplified Chinese.

Signed-off-by: Xingwang Liao <kuoruan@gmail.com>

17 files changed, 5929 insertions, 1417 deletions

diff --git a/applications/luci-app-aria2/Makefile b/applications/luci-app-aria2/Makefile
index 8035ea3a50..541672f4d2 100644
--- a/applications/luci-app-aria2/Makefile
+++ b/applications/luci-app-aria2/Makefile
@@ -1,39 +1,18 @@
 #
-# Copyright (C) 2016 Openwrt.org
+# Copyright (C) 2017-2019 Xingwang Liao <kuoruan@gmail.com>
 #
-# This is free software, licensed under the Apache License, Version 2.0 .
+# This is free software, licensed under the MIT License.
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=luci-app-aria2
-
-# Version == major.minor.patch
-# increase "minor" on new functionality and "patch" on patches/optimization
-PKG_VERSION:=1.0.1
-
-# Release == build
-# increase on changes of translation files
-PKG_RELEASE:=4
-
-PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
-
-# LuCI specific settings
 LUCI_TITLE:=LuCI Support for Aria2
-LUCI_DEPENDS:=+luci-lib-ipkg +aria2
+LUCI_DEPENDS:=+aria2 +luci-lib-ipkg
 LUCI_PKGARCH:=all
 
-define Package/$(PKG_NAME)/config
-# shown in make menuconfig <Help>
-help
-		$(LUCI_TITLE)
-		.
-		Version: $(PKG_VERSION)-$(PKG_RELEASE)
-		$(PKG_MAINTAINER)
-endef
+PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
+PKG_LICENSE:=MIT
 
 include ../../luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
-
diff --git a/applications/luci-app-aria2/luasrc/controller/aria2.lua b/applications/luci-app-aria2/luasrc/controller/aria2.lua
index 56172ec1dd..4891727a08 100644
--- a/applications/luci-app-aria2/luasrc/controller/aria2.lua
+++ b/applications/luci-app-aria2/luasrc/controller/aria2.lua
@@ -1,15 +1,11 @@
---[[
-LuCI - Lua Configuration Interface - aria2 support
+-- Copyright 2016-2019 Xingwang Liao <kuoruan@gmail.com>
+-- Licensed to the public under the MIT License.
 
-Copyright 2014-2015 nanpuyue <nanpuyue@gmail.com>
-Modified by kuoruan <kuoruan@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-]]--
+local fs   = require "nixio.fs"
+local sys  = require "luci.sys"
+local http = require "luci.http"
+local util = require "luci.util"
+local uci  = require "luci.model.uci".cursor()
 
 module("luci.controller.aria2", package.seeall)
 
@@ -18,26 +14,48 @@ function index()
 		return
 	end
 
-	local page = entry({"admin", "services", "aria2"}, cbi("aria2"), _("Aria2 Settings"))
-	page.dependent = true
+	entry({"admin", "services", "aria2"},
+		firstchild(), _("Aria2")).dependent = false
 
-	entry({"admin", "services", "aria2", "status"}, call("status")).leaf = true
+	entry({"admin", "services", "aria2", "config"},
+		cbi("aria2/config"), _("Configuration"), 1)
 
-end
+	entry({"admin", "services", "aria2", "file"},
+		form("aria2/files"), _("Files"), 2)
+
+	entry({"admin", "services", "aria2", "log"},
+		firstchild(), _("Log"), 3)
 
-function status()
-	local sys  = require "luci.sys"
-	local ipkg = require "luci.model.ipkg"
-	local http = require "luci.http"
-	local uci  = require "luci.model.uci".cursor()
+	entry({"admin", "services", "aria2", "log", "view"},
+		template("aria2/log_template"))
+
+	entry({"admin", "services", "aria2", "log", "read"},
+		call("action_log_read"))
+
+	entry({"admin", "services", "aria2", "status"},
+		call("action_status"))
+
+end
 
+function action_status()
 	local status = {
-		running = (sys.call("pidof aria2c > /dev/null") == 0),
-		yaaw = ipkg.installed("yaaw"),
-		webui = ipkg.installed("webui-aria2"),
-		ariang = (ipkg.installed("ariang") or ipkg.installed("ariang-nginx"))
+		running = (sys.call("pidof aria2c >/dev/null") == 0)
 	}
 
 	http.prepare_content("application/json")
 	http.write_json(status)
 end
+
+function action_log_read()
+	local data = { log = "", syslog = "" }
+
+	local log_file = uci:get("aria2", "main", "log") or "/var/log/aria2.log"
+	if fs.access(log_file) then
+		data.log = util.trim(sys.exec("tail -n 50 %s | sed 'x;1!H;$!d;x'" % log_file))
+	end
+
+	data.syslog = util.trim(sys.exec("logread | grep aria2 | tail -n 50 | sed 'x;1!H;$!d;x'"))
+
+	http.prepare_content("application/json")
+	http.write_json(data)
+end
diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua
deleted file mode 100644
index d36610b49a..0000000000
--- a/applications/luci-app-aria2/luasrc/model/cbi/aria2.lua
+++ /dev/null
@@ -1,211 +0,0 @@
---[[
-LuCI - Lua Configuration Interface - Aria2 support
-
-Copyright 2014-2016 nanpuyue <nanpuyue@gmail.com>
-Modified by maz-1 <ohmygod19993@gmail.com>
-Modified by kuoruan <kuoruan@gmail.com>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-]]--
-
-local sys  = require "luci.sys"
-local util = require "luci.util"
-local uci = require "luci.model.uci".cursor()
-
-local cfgbtn = "<input type=\"button\" value=\"" .. translate("Generate Randomly") .. "\" onclick=\"randomSecret(32);\" />"
-local sessionbtn = "<input class=\"cbi-button mar-10\" type=\"button\" value=\"" .. translate("View Json-RPC URL") .. "\" onclick=\"showRPCURL();\" />"
-local aria2rpctxt = "<input class=\"mar-10\" id=\"aria2rpcpath\" onmouseover=\"obj=document.getElementById(this.id);obj.focus();obj.select()\" />"
-local use_websocket = "<input id=\"use_websocket\" type=\"checkbox\" /><label for=\"use_websocket\">" .. translate("Use WebSocket") .. "</label>"
-
-function ipkg_ver(pkg)
-	local version = nil
-	local control = io.open("/usr/lib/opkg/info/%s.control" % pkg, "r")
-	if control then
-		local ln
-		repeat
-			ln = control:read("*l")
-			if ln and ln:match("^Version: ") then
-				version = ln:gsub("^Version: ", ""):gsub("-%d", "")
-				break
-			end
-		until not ln
-		control:close()
-	end
-	return version
-end
-
-function ipkg_ver_lined(pkg)
-	return ipkg_ver(pkg):gsub("%.", "-")
-end
-
-m = Map("aria2", translate("Aria2"), translate("Aria2 is a multi-protocol &amp; multi-source download utility, here you can configure the settings."))
-
-m:section(SimpleSection).template  = "aria2/overview_status"
-
-s = m:section(TypedSection, "aria2", translate("Aria2 Settings"))
-s.addremove = false
-s.anonymous = true
-
-s:tab("general", translate("General Settings"))
-s:tab("file", translate("Files and Locations"))
-s:tab("task", translate("Task Settings"))
-s:tab("bittorrent", translate("BitTorrent Settings"))
-
-o = s:taboption("general", Flag, "enabled", translate("Enabled"))
-o.rmempty = false
-
-user = s:taboption("general", ListValue, "user", translate("Run daemon as user"))
-local p_user
-for _, p_user in util.vspairs(util.split(sys.exec("cat /etc/passwd | cut -f 1 -d :"))) do
-	user:value(p_user)
-end
-
-o = s:taboption("general", Value, "rpc_listen_port", translate("RPC port"))
-o.datatype = "port"
-o.placeholder = "6800"
-
-rpc_auth_method = s:taboption("general", ListValue, "rpc_auth_method", translate("RPC authentication method"))
-rpc_auth_method:value("none", translate("No Authentication"))
-rpc_auth_method:value("user_pass", translate("Username & Password"))
-rpc_auth_method:value("token", translate("Token"))
-
-o = s:taboption("general", Value, "rpc_user", translate("RPC username"))
-o:depends("rpc_auth_method", "user_pass")
-o.rmempty = false
-
-o = s:taboption("general", Value, "rpc_passwd", translate("RPC password"))
-o:depends("rpc_auth_method", "user_pass")
-o.password  =  true
-o.rmempty = true
-
-o = s:taboption("general", Value, "rpc_secret", translate("RPC Token"), "<br/>" .. cfgbtn)
-o:depends("rpc_auth_method", "token")
-o.rmempty = true
-
-o = s:taboption("file", Value, "config_dir", translate("Config file directory"))
-o.placeholder = "/var/etc/aria2"
-
-o = s:taboption("file", Flag, "enable_logging", translate("Enable log"), translate("The default log file is /var/log/aria2.log"))
-o.enabled = "true"
-o.disabled = "false"
- 
-o = s:taboption("file", ListValue, "log_level", translate("Log level"))
-o:depends("enable_logging", "true")
-o:value("debug", translate("Debug"))
-o:value("info", translate("Info"))
-o:value("notice", translate("Notice"))
-o:value("warn", translate("Warn"))
-o:value("error", translate("Error"))
-
-o = s:taboption("file", Value, "dir", translate("Default download directory"))
-o.rmempty = false
-
-o = s:taboption("file", Value, "disk_cache", translate("Disk cache"), translate("in bytes, You can append K or M."))
-o.rmempty = true
-
-o = s:taboption("file", ListValue, "file_allocation", translate("Preallocation"), translate("\"Falloc\" is not available in all cases."))
-o:value("none", translate("Off"))
-o:value("prealloc", translate("Prealloc"))
-o:value("trunc", translate("Trunc"))
-o:value("falloc", translate("Falloc"))
-
-overall_speed_limit = s:taboption("task", Flag, "overall_speed_limit", translate("Overall speed limit enabled"))
-overall_speed_limit.rmempty = true
-
-o = s:taboption("task", Value, "max_overall_download_limit", translate("Overall download limit"), translate("in bytes/sec, You can append K or M."))
-o:depends("overall_speed_limit", "1")
-
-o = s:taboption("task", Value, "max_overall_upload_limit", translate("Overall upload limit"), translate("in bytes/sec, You can append K or M."))
-o:depends("overall_speed_limit", "1")
-
-task_speed_limit = s:taboption("task", Flag, "task_speed_limit", translate("Per task speed limit enabled"))
-task_speed_limit.rmempty = true
-
-o = s:taboption("task", Value, "max_download_limit", translate("Per task download limit"), translate("in bytes/sec, You can append K or M."))
-o:depends("task_speed_limit", "1")
-
-o = s:taboption("task", Value, "max_upload_limit", translate("Per task upload limit"), translate("in bytes/sec, You can append K or M."))
-o:depends("task_speed_limit", "1")
-
-o = s:taboption("task", Value, "max_concurrent_downloads", translate("Max concurrent downloads"))
-o.placeholder = "5"
-
-o = s:taboption("task", Value, "max_connection_per_server", translate("Max connection per server"), "1-16")
-o.datatype = "range(1, 16)"
-o.placeholder = "1"
-
-o = s:taboption("task", Value, "min_split_size", translate("Min split size"), "1M-1024M")
-o.placeholder = "20M"
-
-o = s:taboption("task", Value, "split", translate("Max number of split"))
-o.placeholder = "5"
-
-o = s:taboption("task", Value, "save_session_interval", translate("Autosave session interval"), translate("Sec"))
-o.default = "30"
-
-o = s:taboption("task", Value, "user_agent", translate("User agent value"))
-o.placeholder = "aria2/" .. ipkg_ver("aria2")
-
-o = s:taboption("bittorrent", Flag, "enable_dht", translate("<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"))
-o.enabled = "true"
-o.disabled = "false"
-
-o = s:taboption("bittorrent", Flag, "bt_enable_lpd", translate("<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"))
-o.enabled = "true"
-o.disabled = "false"
-
-o = s:taboption("bittorrent", Flag, "follow_torrent", translate("Follow torrent"))
-o.enabled = "true"
-o.disabled = "false"
-
-o = s:taboption("bittorrent", Value, "listen_port", translate("BitTorrent listen port"))
-o.placeholder = "6881-6999"
-
-o = s:taboption("bittorrent", Value, "bt_max_peers", translate("Max number of peers per torrent"))
-o.placeholder = "55"
-
-bt_tracker_enable = s:taboption("bittorrent", Flag, "bt_tracker_enable", translate("Additional Bt tracker enabled"))
-bt_tracker = s:taboption("bittorrent", DynamicList, "bt_tracker", translate("List of additional Bt tracker"))
-bt_tracker:depends("bt_tracker_enable", "1")
-bt_tracker.rmempty = true
-
-function bt_tracker.cfgvalue(self, section)
-	local rv = {}
-	local val = Value.cfgvalue(self, section)
-	if type(val) == "table" then
-		val = table.concat(val, ",")
-	elseif not val then
-		val = ""
-	end
-	for v in val:gmatch("[^,%s]+") do
-		rv[#rv+1] = v
-	end
-	return rv
-end
-
-function bt_tracker.write(self, section, value)
-	local rv = {}
-	for v in util.imatch(value) do
-		rv[#rv+1] = v
-	end
-	Value.write(self, section, table.concat(rv, ","))
-end
-
-o = s:taboption("bittorrent", Value, "peer_id_prefix", translate("Prefix of peer ID"))
-o.placeholder = "A2-" .. ipkg_ver_lined("aria2") .. "-"
-
-s = m:section(TypedSection, "aria2", translate("Extra Settings"))
-s.addremove = false
-s.anonymous = true
-
-o = s:option(DynamicList, "extra_settings", translate("List of extra settings"))
-o.placeholder = "option=value"
-o.rmempty = true
-
-m:section(SimpleSection, nil, sessionbtn .. use_websocket .. aria2rpctxt)
-
-return m
diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
new file mode 100644
index 0000000000..17fdc566ce
--- /dev/null
+++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua
@@ -0,0 +1,491 @@
+-- Copyright 2017-2019 Xingwang Liao <kuoruan@gmail.com>
+-- Licensed to the public under the MIT License.
+
+local sys  = require "luci.sys"
+local util = require "luci.util"
+
+local m, s, o
+
+local function aria2_info()
+	if sys.call("command -v aria2c >/dev/null") ~= 0 then
+		return nil
+	end
+
+	local info = {}
+	local line
+	for line in util.execi("aria2c -v 2>/dev/null | grep -E '^(aria2 version|Enabled Features)'") do
+		if line:match("^aria2 version") then
+			local _, _, v = line:find("([%d%.]+)$")
+			info.version = v
+		elseif line:match("^Enabled Features") then
+			info.gzip = line:find("GZip") ~= nil
+			info.https = line:find("HTTPS") ~= nil
+			info.bt = line:find("BitTorrent") ~= nil
+			info.sftp = line:find("SFTP") ~= nil
+			info.adns = line:find("Async DNS") ~= nil
+			info.cookie = line:find("Firefox3 Cookie") ~= nil
+		end
+	end
+
+	return info
+end
+
+local aria2 = aria2_info()
+
+m = Map("aria2", "%s - %s" % { translate("Aria2"), translate("Settings") },
+"<p>%s</p><p>%s</p>" % {
+	translate("Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform download utility."),
+	translatef("For more information, please visit: %s",
+		"<a href=\"https://aria2.github.io\" target=\"_blank\">https://aria2.github.io</a>")
+})
+
+if not aria2 then
+	m:section(SimpleSection, nil, "<span style=\"color: red;\">%s</span>" %
+		translate("Error: Can't find aria2c in PATH, please reinstall aria2."))
+	m.reset = false
+	m.submit = false
+	return m
+end
+
+m:append(Template("aria2/settings_header"))
+
+s = m:section(NamedSection, "main", "aria2")
+s.addremove = false
+s.anonymous = true
+
+s:tab("basic", translate("Basic Options"))
+
+o = s:taboption("basic", Flag, "enabled", translate("Enabled"))
+o.rmempty = false
+
+o = s:taboption("basic", ListValue, "user", translate("Run daemon as user"),
+	translate("Leave blank to use default user."))
+o:value("")
+local user
+for user in util.execi("cat /etc/passwd | cut -d':' -f1") do
+	o:value(user)
+end
+
+o = s:taboption("basic", Value, "dir", translate("Download directory"),
+	translate("The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"))
+o.rmempty = false
+
+o = s:taboption("basic", Value, "config_dir", translate("Config file directory"),
+	translate("The directory to store the config file, session file and DHT file."))
+o.placeholder = "/var/etc/aria2"
+
+o = s:taboption("basic", Flag, "enable_logging", translate("Enable logging"))
+o.rmempty = false
+
+o = s:taboption("basic", Value, "log", translate("Log file"),
+	translate("The file name of the log file."))
+o:depends("enable_logging", "1")
+o.placeholder = "/var/log/aria2.log"
+
+o = s:taboption("basic", ListValue, "log_level", translate("Log level"))
+o:depends("enable_logging", "1")
+o:value("debug", translate("Debug"))
+o:value("info", translate("Info"))
+o:value("notice", translate("Notice"))
+o:value("warn", translate("Warn"))
+o:value("error", translate("Error"))
+o.default = "warn"
+
+o = s:taboption("basic", Value, "max_concurrent_downloads", translate("Max concurrent downloads"))
+o.placeholder = "5"
+
+s:tab("rpc", translate("RPC Options"))
+
+o = s:taboption("rpc", Flag, "pause", translate("Pause"), translate("Pause download after added."))
+o.enabled = "true"
+o.disabled = "false"
+o.default = "false"
+
+o = s:taboption("rpc", Flag, "pause_metadata", translate("Pause metadata"),
+	translate("Pause downloads created as a result of metadata download."))
+o.enabled = "true"
+o.disabled = "false"
+o.default = "false"
+
+o = s:taboption("rpc", Value, "rpc_listen_port", translate("RPC port"))
+o.datatype = "range(1024,65535)"
+o.placeholder = "6800"
+
+o = s:taboption("rpc", ListValue, "rpc_auth_method", translate("RPC authentication method"))
+o:value("none", translate("No Authentication"))
+o:value("user_pass", translate("Username & Password"))
+o:value("token", translate("Token"))
+
+o = s:taboption("rpc", Value, "rpc_user", translate("RPC username"))
+o:depends("rpc_auth_method", "user_pass")
+
+o = s:taboption("rpc", Value, "rpc_passwd", translate("RPC password"))
+o:depends("rpc_auth_method", "user_pass")
+o.password  =  true
+
+o = s:taboption("rpc", Value, "rpc_secret", translate("RPC token"))
+o:depends("rpc_auth_method", "token")
+o.template = "aria2/value_with_btn"
+o.btntext = translate("Generate Randomly")
+o.btnclick = "randomToken();"
+
+if aria2.https then
+	o = s:taboption("rpc", Flag, "rpc_secure", translate("RPC secure"),
+		translate("RPC transport will be encrypted by SSL/TLS. The RPC clients must use https"
+		.. " scheme to access the server. For WebSocket client, use wss scheme."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.rmempty = false
+
+	o = s:taboption("rpc", Value, "rpc_certificate", translate("RPC certificate"),
+		translate("Use the certificate in FILE for RPC server. The certificate must be either"
+		.. " in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the"
+		.. " certificate, a key and optionally a chain of additional certificates. Only PKCS12"
+		.. " files with a blank import password can be opened!<br/>When using PEM, you have to"
+		.. " specify the \"RPC private key\" as well."))
+	o:depends("rpc_secure", "true")
+	o.datatype = "file"
+
+	o = s:taboption("rpc", Value, "rpc_private_key", translate("RPC private key"),
+		translate("Use the private key in FILE for RPC server. The private key must be"
+		.. " decrypted and in PEM format."))
+	o:depends("rpc_secure", "true")
+	o.datatype = "file"
+end
+
+o = s:taboption("rpc", Flag, "_use_ws", translate("Use WebSocket"))
+
+o = s:taboption("rpc", Value, "_rpc_url", translate("Json-RPC URL"))
+o.template = "aria2/value_with_btn"
+o.onmouseover = "this.focus();this.select();"
+o.btntext = translate("Show URL")
+o.btnclick = "showRPCURL();"
+
+s:tab("http", translate("HTTP/FTP/SFTP Options"))
+
+o = s:taboption("http", Flag, "enable_proxy", translate("Enable proxy"))
+o.rmempty = false
+
+o = s:taboption("http", Value, "all_proxy", translate("All proxy"),
+	translate("Use a proxy server for all protocols."))
+o:depends("enable_proxy", "1")
+o.placeholder = "[http://][USER:PASSWORD@]HOST[:PORT]"
+
+o = s:taboption("http", Value, "all_proxy_user", translate("Proxy user"))
+o:depends("enable_proxy", "1")
+
+o = s:taboption("http", Value, "all_proxy_passwd", translate("Proxy password"))
+o:depends("enable_proxy", "1")
+o.password = true
+
+if aria2.https then
+	o = s:taboption("http", Flag, "check_certificate", translate("Check certificate"),
+		translate("Verify the peer using certificates specified in \"CA certificate\" option."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "true"
+	o.rmempty = false
+
+	o = s:taboption("http", Value, "ca_certificate", translate("CA certificate"),
+		translate("Use the certificate authorities in FILE to verify the peers. The certificate"
+		.. " file must be in PEM format and can contain multiple CA certificates."))
+	o:depends("check_certificate", "true")
+	o.datatype = "file"
+
+	o = s:taboption("http", Value, "certificate", translate("Certificate"),
+		translate("Use the client certificate in FILE. The certificate must be either in PKCS12"
+		.. " (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the certificate, a"
+		.. " key and optionally a chain of additional certificates. Only PKCS12 files with a"
+		.. " blank import password can be opened!<br/>When using PEM, you have to specify the"
+		.. " \"Private key\" as well."))
+	o.datatype = "file"
+
+	o = s:taboption("http", Value, "private_key", translate("Private key"),
+		translate("Use the private key in FILE. The private key must be decrypted and in PEM"
+		.. " format. The behavior when encrypted one is given is undefined."))
+	o.datatype = "file"
+end
+
+if aria2.gzip then
+	o = s:taboption("http", Flag, "http_accept_gzip", translate("HTTP accept gzip"),
+		translate("Send <code>Accept: deflate, gzip</code> request header and inflate response"
+		.. " if remote server responds with <code>Content-Encoding: gzip</code> or"
+		.. " <code>Content-Encoding: deflate</code>."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "false"
+end
+
+o = s:taboption("http", Flag, "http_no_cache", translate("HTTP no cache"),
+	translate("Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code>"
+	.. " header to avoid cached content. If disabled, these headers are not sent and you"
+	.. " can add Cache-Control header with a directive you like using \"Header\" option."))
+o.enabled = "true"
+o.disabled = "false"
+o.default = "false"
+
+o = s:taboption("http", DynamicList, "header", translate("Header"),
+	translate("Append HEADERs to HTTP request header."))
+
+o = s:taboption("http", Value, "connect_timeout", translate("Connect timeout"),
+	translate("Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy server." ..
+	" After the connection is established, this option makes no effect and \"Timeout\" option is used instead."))
+o.datatype = "uinteger"
+o.placeholder = "60"
+
+o = s:taboption("http", Value, "timeout", translate("Timeout"))
+o.datatype = "uinteger"
+o.placeholder = "60"
+
+o = s:taboption("http", Value, "lowest_speed_limit", translate("Lowest speed limit"),
+	"%s %s" % {
+		translate("Close connection if download speed is lower than or equal to this value(bytes per sec). " ..
+	"0 means has no lowest speed limit."),
+		translate("You can append K or M.")
+	})
+o.placeholder = "0"
+
+o = s:taboption("http", Value, "max_connection_per_server", translate("Max connection per server"),
+	translate("The maximum number of connections to one server for each download."))
+o.datatype = "uinteger"
+o.placeholder = "1"
+
+o = s:taboption("http", Value, "split", translate("Max number of split"),
+	translate("Download a file using N connections."))
+o.datatype = "uinteger"
+o.placeholder = "5"
+
+o = s:taboption("http", Value, "min_split_size", translate("Min split size"),
+	translate("Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."))
+o.placeholder = "20M"
+
+o = s:taboption("http", Value, "max_tries", translate("Max tries"))
+o.datatype = "uinteger"
+o.placeholder = "5"
+
+o = s:taboption("http", Value, "retry_wait", translate("Retry wait"),
+	translate("Set the seconds to wait between retries."))
+o.datatype = "uinteger"
+o.placeholder = "0"
+
+o = s:taboption("http", Value, "user_agent", translate("User agent"),
+	translate("Set user agent for HTTP(S) downloads."))
+o.placeholder = "aria2/%s" % { aria2.version and aria2.version or "$VERSION" }
+
+if aria2.bt then
+	s:tab("bt", translate("BitTorrent Options"))
+
+	o = s:taboption("bt", Flag, "enable_dht", translate("IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"),
+		"%s %s" % {
+			translate("Enable IPv4 DHT functionality. It also enables UDP tracker support."),
+			translate("This option will be ignored if a private flag is set in a torrent.")
+		})
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "true"
+	o.rmempty = false
+
+	o = s:taboption("bt", Flag, "enable_dht6", translate("IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"),
+		"%s %s" % {
+			translate("Enable IPv6 DHT functionality."),
+			translate("This option will be ignored if a private flag is set in a torrent.")
+		})
+	o.enabled = "true"
+	o.disabled = "false"
+
+	o = s:taboption("bt", Flag, "bt_enable_lpd", translate("<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"),
+		"%s %s" % {
+			translate("Enable Local Peer Discovery."),
+			translate("This option will be ignored if a private flag is set in a torrent.")
+		})
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "false"
+
+	o = s:taboption("bt", Flag, "enable_peer_exchange", translate("Enable peer exchange"),
+		"%s %s" % {
+			translate("Enable Peer Exchange extension."),
+			translate("This option will be ignored if a private flag is set in a torrent.")
+		})
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "true"
+	o.rmempty = false
+
+	o = s:taboption("bt", Flag, "bt_save_metadata", translate("Sava metadata"),
+		translate("Save meta data as \".torrent\" file. This option has effect only when BitTorrent"
+		.. " Magnet URI is used. The file name is hex encoded info hash with suffix \".torrent\"."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "false"
+
+	o = s:taboption("bt", Flag, "bt_remove_unselected_file", translate("Remove unselected file"),
+		translate("Removes the unselected files when download is completed in BitTorrent. Please"
+		.. " use this option with care because it will actually remove files from your disk."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "false"
+
+	o = s:taboption("bt", Flag, "bt_seed_unverified", translate("Seed unverified"),
+		translate("Seed previously downloaded files without verifying piece hashes."))
+	o.enabled = "true"
+	o.disabled = "false"
+	o.default = "false"
+
+	o = s:taboption("bt", Value, "listen_port", translate("BitTorrent listen port"),
+		translate("Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\","
+		.. " \"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are open"
+		.. " for incoming TCP traffic."))
+	o.placeholder = "6881-6999"
+
+	o = s:taboption("bt", Value, "dht_listen_port", translate("DHT Listen port"),
+		translate("Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure that the "
+		.. "specified ports are open for incoming UDP traffic."))
+	o:depends("enable_dht", "true")
+	o:depends("enable_dht6", "true")
+	o.placeholder = "6881-6999"
+
+	o = s:taboption("bt", ListValue, "follow_torrent", translate("Follow torrent"))
+	o:value("true", translate("True"))
+	o:value("false", translate("False"))
+	o:value("mem", translate("Keep in memory"))
+
+	o = s:taboption("bt", Value, "max_overall_upload_limit", translate("Max overall upload limit"),
+		"%s %s" % {
+			translate("Set max overall upload speed in bytes/sec. 0 means unrestricted."),
+			translate("You can append K or M.")
+		})
+	o.placeholder = "0"
+
+	o = s:taboption("bt", Value, "max_upload_limit", translate("Max upload limit"),
+		"%s %s" % {
+			translate("Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."),
+			translate("You can append K or M.")
+		})
+	o.placeholder = "0"
+
+	o = s:taboption("bt", Value, "bt_max_open_files", translate("Max open files"),
+		translate("Specify maximum number of files to open in multi-file BitTorrent download globally."))
+	o.datatype = "uinteger"
+	o.placeholder = "100"
+
+	o = s:taboption("bt", Value, "bt_max_peers", translate("Max peers"),
+		translate("Specify the maximum number of peers per torrent, 0 means unlimited."))
+	o.datatype = "uinteger"
+	o.placeholder = "55"
+
+	o = s:taboption("bt", Value, "bt_request_peer_speed_limit", translate("Request peer speed limit"),
+		"%s %s" % {
+			translate("If the whole download speed of every torrent is lower than SPEED, aria2"
+			.. " temporarily increases the number of peers to try for more download speed."
+			.. " Configuring this option with your preferred download speed can increase your"
+			.. " download speed in some cases."),
+			translate("You can append K or M.")
+		})
+	o.placeholder = "50K"
+
+	o = s:taboption("bt", Value, "bt_stop_timeout", translate("Stop timeout"),
+		translate("Stop BitTorrent download if download speed is 0 in consecutive N seconds. If 0 is"
+		.. " given, this feature is disabled."))
+	o.datatype = "uinteger"
+	o.placeholder = "0"
+
+	o = s:taboption("bt", Value, "peer_id_prefix", translate("Prefix of peer ID"),
+		translate("Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length."
+		.. " If more than 20 bytes are specified, only first 20 bytes are used. If less than 20"
+		.. " bytes are specified, random byte data are added to make its length 20 bytes."))
+	o.placeholder = "A2-%s-" % {
+		aria2.version and string.gsub(aria2.version, "%.", "-") or "$MAJOR-$MINOR-$PATCH"
+	}
+
+	o = s:taboption("bt", Value, "seed_ratio", translate("Seed ratio"),
+		translate("Specify share ratio. Seed completed torrents until share ratio reaches RATIO."
+		.. " You are strongly encouraged to specify equals or more than 1.0 here. Specify 0.0 if"
+		.. " you intend to do seeding regardless of share ratio."))
+	o.datatype = "ufloat"
+	o.placeholder = "1.0"
+
+	o = s:taboption("bt", Value, "seed_time", translate("Seed time"),
+		translate("Specify seeding time in minutes. If \"Seed ratio\" option is"
+		.. " specified along with this option, seeding ends when at least one of the conditions"
+		.. " is satisfied. Specifying 0 disables seeding after download completed."))
+	o.datatype = "ufloat"
+
+	o = s:taboption("bt", DynamicList, "bt_tracker", translate("Additional BT tracker"),
+		translate("List of additional BitTorrent tracker's announce URI."))
+	o.placeholder = "http://tracker.example.com/announce"
+end
+
+s:tab("advance", translate("Advanced Options"))
+
+o = s:taboption("advance", Flag, "disable_ipv6", translate("IPv6 disabled"),
+	translate("Disable IPv6. This is useful if you have to use broken DNS and want to avoid terribly"
+	.. " slow AAAA record lookup."))
+o.enabled = "true"
+o.disabled = "false"
+o.default = "false"
+
+o = s:taboption("advance", Value, "auto_save_interval", translate("Auto save interval"),
+	translate("Save a control file(*.aria2) every N seconds. If 0 is given, a control file is not"
+	.. " saved during download."))
+o.datatype = "range(0, 600)"
+o.placeholder = "60"
+
+o = s:taboption("advance", Value, "save_session_interval", translate("Save session interval"),
+	translate("Save error/unfinished downloads to session file every N seconds. If 0 is given, file"
+	.. " will be saved only when aria2 exits."))
+o.datatype = "uinteger"
+o.placeholder = "0"
+
+o = s:taboption("advance", Value, "disk_cache", translate("Disk cache"),
+	"%s %s" % {
+		translate("Enable disk cache (in bytes), set 0 to disabled."),
+		translate("You can append K or M.")
+	})
+o.placeholder = "16M"
+
+o = s:taboption("advance", ListValue, "file_allocation", translate("File allocation"),
+	translate("Specify file allocation method. If you are using newer file systems such as ext4"
+	.. " (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc\" is your best choice."
+	.. " It allocates large(few GiB) files almost instantly, but it may not be available if your system"
+	.. " doesn't have posix_fallocate(3) function. Don't use \"falloc\" with legacy file systems such as"
+	.. " ext3 and FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 entirely"
+	.. " until allocation finishes."))
+o:value("none", translate("None"))
+o:value("prealloc", translate("prealloc"))
+o:value("trunc", translate("trunc"))
+o:value("falloc", translate("falloc"))
+o.default = "prealloc"
+
+o = s:taboption("advance", Flag, "force_save", translate("Force save"),
+	translate("Save download to session file even if the download is completed or removed."
+	.. " This option also saves control file in that situations. This may be useful to save"
+	.. " BitTorrent seeding which is recognized as completed state."))
+o.enabled = "true"
+o.disabled = "false"
+o.default = "false"
+
+o = s:taboption("advance", Value, "max_overall_download_limit", translate("Max overall download limit"),
+	"%s %s" % {
+		translate("Set max overall download speed in bytes/sec. 0 means unrestricted."),
+		translate("You can append K or M.")
+	})
+o.placeholder = "0"
+
+o = s:taboption("advance", Value, "max_download_limit", translate("Max download limit"),
+	"%s %s" % {
+		translate("Set max download speed per each download in bytes/sec. 0 means unrestricted."),
+		translate("You can append K or M.")
+	})
+o.placeholder = "0"
+
+s = m:section(NamedSection, "main", "aria2", translate("Extra Settings"),
+	translate("Settings in this section will be added to config file."))
+s.addremove = false
+s.anonymous = true
+
+o = s:option(DynamicList, "extra_setting", translate("Settings list"),
+	translate("List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/.netrc</code>."))
+o.placeholder = "option=value"
+
+return m
diff --git a/applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua b/applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua
new file mode 100644
index 0000000000..954a4ec5ef
--- /dev/null
+++ b/applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua
@@ -0,0 +1,39 @@
+-- Copyright 2017-2019 Xingwang Liao <kuoruan@gmail.com>
+-- Licensed to the public under the MIT License.
+
+local m, s, o
+
+local fs   = require "nixio.fs"
+local util = require "luci.util"
+local uci  = require "luci.model.uci".cursor()
+
+local config_dir = uci:get("aria2", "main", "config_dir") or "/var/etc/aria2"
+local config_file = "%s/aria2.conf.main" % config_dir
+local session_file = "%s/aria2.session.main" % config_dir
+
+m = SimpleForm("aria2", "%s - %s" % { translate("Aria2"), translate("Files") },
+	translate("Here shows the files used by aria2."))
+m.reset = false
+m.submit = false
+
+s = m:section(SimpleSection, nil, translatef("Content of config file: <code>%s</code>", config_file))
+
+o = s:option(TextValue, "_config")
+o.rows = 20
+o.readonly = true
+o.cfgvalue = function()
+	local v = fs.readfile(config_file) or translate("File does not exist.")
+	return util.trim(v) ~= "" and v or translate("Empty file.")
+end
+
+s = m:section(SimpleSection, nil, translatef("Content of session file: <code>%s</code>", session_file))
+
+o = s:option(TextValue, "_session")
+o.rows = 20
+o.readonly = true
+o.cfgvalue = function()
+	local v = fs.readfile(session_file) or translate("File does not exist.")
+	return util.trim(v) ~= "" and v or translate("Empty file.")
+end
+
+return m
diff --git a/applications/luci-app-aria2/luasrc/view/aria2/log_template.htm b/applications/luci-app-aria2/luasrc/view/aria2/log_template.htm
new file mode 100644
index 0000000000..ed91168dbc
--- /dev/null
+++ b/applications/luci-app-aria2/luasrc/view/aria2/log_template.htm
@@ -0,0 +1,55 @@
+<%#
+ Copyright 2017-2019 Xingwang Liao <kuoruan@gmail.com>
+ Licensed to the public under the MIT License.
+-%>
+
+<% css = [[
+
+	#log_text {
+		padding: 10px;
+		text-align: left;
+	}
+	#log_text pre {
+		word-break: break-all;
+		margin: 0;
+	}
+	.description {
+		background-color: #33ccff;
+	}
+
+]]
+-%>
+
+<%+header%>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+	XHR.poll(10, '<%=url("admin/services/aria2/log/read")%>', null,
+		function(x, data) {
+			var logElm = document.getElementById('log_text');
+			if (logElm) {
+				logElm.innerHTML = data
+					? String.format(
+						'<pre>%s%s%s%s</pre>',
+						'<span class="description"><%:Last 50 lines of log file:%></span><br/><br/>',
+						data.log || '<%:No log data.%>',
+						'<br/><br/><span class="description"><%:Last 50 lines of syslog:%></span><br/><br/>',
+						data.syslog || '<%:No log data.%>'
+					)
+					: '<strong><%:Failed to load log data.%></strong>';
+			}
+		}
+	);
+//]]></script>
+<div class="cbi-map">
+	<h2 name="content"><%:Aria2%> - <%:Log Data%></h2>
+	<fieldset class="cbi-section">
+		<div id="log_text">
+			<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+			<%:Collecting data...%>
+		</div>
+		<div style="text-align:right"><small><%:Refresh every 10 seconds.%></small></div>
+	</fieldset>
+</div>
+
+<%+footer%>
diff --git a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm b/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
deleted file mode 100644
index 9d9ffeeac6..0000000000
--- a/applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm
+++ /dev/null
@@ -1,84 +0,0 @@
-<script type="text/javascript">//<![CDATA[
-XHR.poll(-1, '<%=luci.dispatcher.build_url("admin/services/aria2/status")%>', null,
-	function(x, data) {
-		var tb = document.getElementById('aria2_status');
-		if (data && tb) {
-			if (data.running) {
-				var links = '<em><%:The Aria2 service is running.%></em>';
-				if (data.yaaw) {
-					links += '<input class="cbi-button mar-10" type="button" value="<%:Open YAAW%>" onclick="openWebUI(\'yaaw\');" />';
-				}
-				if (data.webui) {
-					links += '<input class="cbi-button mar-10" type="button" value="<%:Open WebUI-Aria2%>" onclick="openWebUI(\'webui-aria2\');" />';
-				}
-				if (data.ariang) {
-					links += '<input class="cbi-button mar-10" type="button" value="<%:Open AriaNg%>" onclick="openWebUI(\'ariang\');" />';
-				}
-				tb.innerHTML = links;
-			} else {
-				tb.innerHTML = '<em><%:The Aria2 service is not running.%></em>';
-			}
-		}
-	}
-);
-
-function randomString(len) {
-	len = len || 32;
-	var $chars = 'abcdefghijklmnopqrstuvwxyz1234567890';
-	var maxPos = $chars.length;
-	var pwd = '';
-	for (var i = 0; i < len; i++) {
-		pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
-	}
-	return pwd;
-};
-
-function randomSecret() {
-	var Token = document.getElementById("cbid.aria2.main.rpc_secret");
-	Token.value = randomString(32);
-};
-
-function showRPCURL() {
-	var websocket = document.getElementById("use_websocket");
-	var protocol = (websocket.checked) ? "ws" : "http";
-	var newTextNode = document.getElementById("aria2rpcpath");
-	var auth_method = document.getElementById("cbid.aria2.main.rpc_auth_method");
-	var auth_port = document.getElementById("cbid.aria2.main.rpc_listen_port");
-	var auth_port_value;
-	if (window.location.protocol == "https:") {                                  
-		protocol += "s";                                                     
-	}
-	if (auth_port.value == "") {
-		auth_port_value = "6800";
-	} else {
-		auth_port_value = auth_port.value;
-	}
-	if (auth_method.value == "token") {
-		var auth_token = document.getElementById("cbid.aria2.main.rpc_secret");
-		newTextNode.value = protocol + "://token:" + auth_token.value + "@" + document.domain + ":" + auth_port_value + "/jsonrpc";
-	} else if (auth_method.value == "user_pass") {
-		var auth_user = document.getElementById("cbid.aria2.main.rpc_user");
-		var auth_passwd = document.getElementById("cbid.aria2.main.rpc_passwd");
-		newTextNode.value = protocol + "://" + auth_user.value + ":" + auth_passwd.value + "@" + document.domain + ":" + auth_port_value + "/jsonrpc";
-	} else {
-		newTextNode.value = protocol + "://" + document.domain + ":" + auth_port_value + "/jsonrpc";
-	}
-};
-
-function openWebUI(path) {
-	var curWwwPath = window.document.location.href;
-	var pathName = window.document.location.pathname;
-	var pos = curWwwPath.indexOf(pathName);
-	var localhostPath = curWwwPath.substring(0, pos);
-	var url = localhostPath + "/" + path;
-	window.open(url);
-};
-//]]>
-</script>
-<style>.mar-10 {margin-left: 10px; margin-right: 10px;}</style>
-<fieldset class="cbi-section">
-	<legend><%:Aria2 Status%></legend>
-	<p id="aria2_status">
-		<em><%:Collecting data...%></em>
-	</p>
-</fieldset>
diff --git a/applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm b/applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm
new file mode 100644
index 0000000000..b71690fb69
--- /dev/null
+++ b/applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm
@@ -0,0 +1,116 @@
+<%#
+ Copyright 2017-2019 Xingwang Liao <kuoruan@gmail.com>
+ Licensed to the public under the MIT License.
+-%>
+
+<%
+	local ipkg = require "luci.model.ipkg"
+	local has_ui = false
+
+	local uilist = {
+		supported = {
+			["ariang"] = "AriaNg",
+			["webui-aria2"] = "WebUI-Aria2",
+			["yaaw"] = "YAAW"
+		},
+		installed = {}
+	}
+
+	for k in pairs(uilist.supported) do
+		if ipkg.installed(k) then
+			uilist.installed[#uilist.installed + 1] = k
+			has_ui = true
+		end
+	end
+%>
+
+<fieldset class="cbi-section">
+	<p id="aria2_status">
+		<em><%:Collecting data...%></em>
+	</p>
+	<% if has_ui then %>
+	<p>
+		<%:Installed web interface: %>
+		<%- for _, v in pairs(uilist.installed) do %>
+		<input type="button" class="cbi-button" style="margin: 0 5px;" value="<%=uilist.supported[v]%>" onclick="openWebInterface('<%=v%>');" />
+		<%- end %>
+	<p>
+	<% end %>
+</fieldset>
+
+<script type="text/javascript">//<![CDATA[
+XHR.poll(5, '<%=url("admin/services/aria2/status")%>', null,
+	function(x, data) {
+		var tb = document.getElementById('aria2_status');
+		if (data && tb) {
+			tb.innerHTML = data.running
+				? '<%:The Aria2 service is running.%>'
+				: '<%:The Aria2 service is not running.%>';
+		}
+	}
+);
+
+function randomString(len) {
+	var randomStr = '';
+	var restLen = len;
+	while ((restLen = len - randomStr.length) > 0) {
+		randomStr += Math.random().toString(36).substring(2, 2 + restLen);
+	}
+	return randomStr;
+}
+
+function randomToken() {
+	var len = 32;
+	var inputLength = prompt('<%:Please input token length:%>', len);
+	if (inputLength === null || inputLength === '') {
+		return;
+	} else if (/^\d+$/.test(inputLength)) {
+		len = parseInt(inputLength);
+	}
+
+	var secretInput = document.getElementById('cbid.aria2.main.rpc_secret');
+	if (secretInput) {
+		secretInput.value = randomString(len);
+	}
+};
+
+function showRPCURL() {
+	var portElm = document.getElementById('cbid.aria2.main.rpc_listen_port');
+	var authMethodElm = document.getElementById('cbid.aria2.main.rpc_auth_method');
+	var useWSElm = document.getElementById('cbid.aria2.main._use_ws');
+	var secureElm = document.getElementById('cbid.aria2.main.rpc_secure');
+
+	var port = (portElm && /^\d+$/.test(portElm.value)) ? parseInt(portElm.value) : 6800;
+	var authMethod = (authMethodElm && authMethodElm.value) ? authMethodElm.value : "none";
+	var useWS = (useWSElm && useWSElm.checked) ? true : false;
+	var secure = (secureElm && secureElm.checked) ? true : false;
+
+	var protocol = useWS
+		? (secure ? 'wss' : 'ws')
+		: (secure ? 'https' : 'http');
+	var url = protocol + "://";
+
+	if (authMethod == 'token') {
+		var authToken = document.getElementById('cbid.aria2.main.rpc_secret').value;
+		url += 'token:' + authToken + '@';
+	} else if (authMethod == 'user_pass') {
+		var authUser = document.getElementById('cbid.aria2.main.rpc_user').value;
+		var authPasswd = document.getElementById('cbid.aria2.main.rpc_passwd').value;
+		url += authUser + ':' + authPasswd + '@';
+	}
+	url += window.location.hostname + ':' + port + '/jsonrpc';
+	var rpcUrlElm = document.getElementById('cbid.aria2.main._rpc_url');
+
+	if (rpcUrlElm) {
+		rpcUrlElm.value = url;
+	} else {
+		alert(url)
+	}
+};
+
+function openWebInterface(path) {
+	var host = window.location.host;
+	var protocol = window.location.protocol;
+	window.open(protocol + '//' + host + '/' + path);
+};
+//]]></script>
diff --git a/applications/luci-app-aria2/luasrc/view/aria2/value_with_btn.htm b/applications/luci-app-aria2/luasrc/view/aria2/value_with_btn.htm
new file mode 100644
index 0000000000..487e107b6d
--- /dev/null
+++ b/applications/luci-app-aria2/luasrc/view/aria2/value_with_btn.htm
@@ -0,0 +1,22 @@
+<%#
+ Copyright 2017-2019 Xingwang Liao <kuoruan@gmail.com>
+ Licensed to the public under the MIT License.
+-%>
+
+<%+cbi/valueheader%>
+		<input data-update="change" type="text" class="cbi-input-text"<%=
+			attr("id", cbid) ..
+			attr("name", cbid) ..
+			attr("value", self:cfgvalue(section) or self.default) ..
+			ifattr(self.size, "size") ..
+			ifattr(self.placeholder, "placeholder") ..
+			ifattr(self.maxlength, "maxlength") ..
+			ifattr(self.datatype, "data-type", self.datatype) ..
+			ifattr(self.onmouseover, "onmouseover")
+		%> />
+		<%- if self.btntext then -%>
+			<div class="cbi-button cbi-button-neutral" title="<%=self.btntext%>" aria-label="<%=self.btntext%>"<%=
+				ifattr(self.btnclick, "onclick", self.btnclick)
+			%>><span style="font-weight: normal;"><%=self.btntext%></span></div>
+		<% end %>
+<%+cbi/valuefooter%>
diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index e765d97a0e..61bd523d14 100644
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -12,287 +12,905 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: es\n"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
-msgstr "\"Falloc\" no está disponible en todos los casos."
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr "Habilitar <abbr title=\"Tabla de hash distribuida\">DHT</abbr>"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
 msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr ""
 "Habilitar <abbr title=\"Descubrimiento de compañeros locales\">LPD</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
-msgstr "Habilitar Bt tracker adicional"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Estado de Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
+msgstr "Aria2"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
 msgstr ""
-"Aria2 es una utilidad de descarga multi-fuente &amp; multiprotocolo. Aquí "
-"puede configurarlo."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "Intervalo de sesión de autoguardado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "Configuraciones de BitTorrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "BitTorrent escucha puerto"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "Recolectando datos..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "Directorio de archivos de configuración"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "Depurar"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "Directorio de descarga predeterminado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "Caché de disco"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
-msgstr "Habilitar registro"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "Error"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "Configuraciones extra"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "Falloc"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "Archivos y ubicaciones"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "Seguir torrent"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "Configuraciones generales"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "Generar aleatoriamente"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "Información"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "Lista de Bt Tracker adicional"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "Lista de configuraciones extra"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "Máximo de descargas concurrentes"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "Máxima conexiones por servidor"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "Número máximo de pares por torrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "Número máximo de división"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "Tamaño mínimo de división"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "Sin autenticacion"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "Aviso"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "Apagado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
-msgstr "Abrir AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "Abrir WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "Abrir YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "Tamaño mínimo de división"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr "Límite global de descargas"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "Sin autenticacion"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
-msgstr "Habilitar límite de velocidad total"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
-msgstr "Límite global de carga"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "Aviso"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
-msgstr "Límite de descarga por tarea"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
-msgstr "Habilitar límite de velocidad por tarea"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
-msgstr "Límite de carga por tarea"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "Preasignar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "Preasignación"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Prefijo de ID de par"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
-msgstr "RPC Token"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr "Método de autenticación RPC"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr "Contraseña RPC"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr "Puerto RPC"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr "Nombre de usuario RPC"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "Ejecutar demonio como usuario"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "Seg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "Configuración de tareas"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr "El servicio Aria2 no se está ejecutando."
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr "El servicio Aria2 se está ejecutando."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
-msgstr "El archivo de registro predeterminado es /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "Token"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
-msgstr "Truncar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "Utilizar websocket"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "Valor de agente de usuario"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "Nombre de usuario y contraseña"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "Ver la URL de Json-RPC"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "Advertir"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
-msgstr "en bytes, puedes añadir K o M."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
+
+#~ msgid "\"Falloc\" is not available in all cases."
+#~ msgstr "\"Falloc\" no está disponible en todos los casos."
+
+#~ msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#~ msgstr "Habilitar <abbr title=\"Tabla de hash distribuida\">DHT</abbr>"
+
+#~ msgid "Additional Bt tracker enabled"
+#~ msgstr "Habilitar Bt tracker adicional"
+
+#~ msgid "Aria2 Settings"
+#~ msgstr "Aria2"
+
+#~ msgid "Aria2 Status"
+#~ msgstr "Estado de Aria2"
+
+#~ msgid ""
+#~ "Aria2 is a multi-protocol &amp; multi-source download utility, here you "
+#~ "can configure the settings."
+#~ msgstr ""
+#~ "Aria2 es una utilidad de descarga multi-fuente &amp; multiprotocolo. Aquí "
+#~ "puede configurarlo."
+
+#~ msgid "Autosave session interval"
+#~ msgstr "Intervalo de sesión de autoguardado"
+
+#~ msgid "BitTorrent Settings"
+#~ msgstr "Configuraciones de BitTorrent"
+
+#~ msgid "Default download directory"
+#~ msgstr "Directorio de descarga predeterminado"
+
+#~ msgid "Enable log"
+#~ msgstr "Habilitar registro"
+
+#~ msgid "Falloc"
+#~ msgstr "Falloc"
+
+#~ msgid "Files and Locations"
+#~ msgstr "Archivos y ubicaciones"
+
+#~ msgid "General Settings"
+#~ msgstr "Configuraciones generales"
+
+#~ msgid "List of additional Bt tracker"
+#~ msgstr "Lista de Bt Tracker adicional"
+
+#~ msgid "List of extra settings"
+#~ msgstr "Lista de configuraciones extra"
+
+#~ msgid "Max number of peers per torrent"
+#~ msgstr "Número máximo de pares por torrent"
+
+#~ msgid "Off"
+#~ msgstr "Apagado"
+
+#~ msgid "Open AriaNg"
+#~ msgstr "Abrir AriaNg"
+
+#~ msgid "Open WebUI-Aria2"
+#~ msgstr "Abrir WebUI-Aria2"
+
+#~ msgid "Open YAAW"
+#~ msgstr "Abrir YAAW"
+
+#~ msgid "Overall download limit"
+#~ msgstr "Límite global de descargas"
+
+#~ msgid "Overall speed limit enabled"
+#~ msgstr "Habilitar límite de velocidad total"
+
+#~ msgid "Overall upload limit"
+#~ msgstr "Límite global de carga"
+
+#~ msgid "Per task download limit"
+#~ msgstr "Límite de descarga por tarea"
+
+#~ msgid "Per task speed limit enabled"
+#~ msgstr "Habilitar límite de velocidad por tarea"
+
+#~ msgid "Per task upload limit"
+#~ msgstr "Límite de carga por tarea"
+
+#~ msgid "Prealloc"
+#~ msgstr "Preasignar"
+
+#~ msgid "Preallocation"
+#~ msgstr "Preasignación"
+
+#~ msgid "RPC Token"
+#~ msgstr "RPC Token"
+
+#~ msgid "Sec"
+#~ msgstr "Seg"
+
+#~ msgid "Task Settings"
+#~ msgstr "Configuración de tareas"
+
+#~ msgid "The default log file is /var/log/aria2.log"
+#~ msgstr "El archivo de registro predeterminado es /var/log/aria2.log"
+
+#~ msgid "Trunc"
+#~ msgstr "Truncar"
+
+#~ msgid "User agent value"
+#~ msgstr "Valor de agente de usuario"
+
+#~ msgid "View Json-RPC URL"
+#~ msgstr "Ver la URL de Json-RPC"
+
+#~ msgid "in bytes, You can append K or M."
+#~ msgstr "en bytes, puedes añadir K o M."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "en bytes/seg, puedes añadir K o M."
+#~ msgid "in bytes/sec, You can append K or M."
+#~ msgstr "en bytes/seg, puedes añadir K o M."
diff --git a/applications/luci-app-aria2/po/pt-br/aria2.po b/applications/luci-app-aria2/po/pt-br/aria2.po
index 1c33b5138a..d34f50b37d 100644
--- a/applications/luci-app-aria2/po/pt-br/aria2.po
+++ b/applications/luci-app-aria2/po/pt-br/aria2.po
@@ -12,303 +12,915 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Language: pt_BR\n"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
-msgstr "\"Falloc\" não está disponível em todas as classes."
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
-"<abbr title=\"Distributed Hash Table/Tabla de disperção distribuída\">DHT</"
-"abbr> habilitado"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
 msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr ""
 "<abbr title=\"Local Peer Discovery/Descoberta de Parceiros Locais\">LPD</"
 "abbr> habilitado"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
-msgstr "Rastreadores BitTorrent adicionais habilitado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Configurações do Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Estado do Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
+msgstr "Aria2"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
 msgstr ""
-"Aria2 é um utilitário de transferência multi-protocolo de múltiplas fontes, "
-"aqui você pode configurá-lo."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "Intervalo para autossalvamento da sessão"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "Configurações do BitTorrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "Porta de escuta do BitTorrent"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "Coletando dados..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "Diretório dos arquivos de configuração"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "Depuração"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "Diretório padrão de arquivos baixados"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "Cache em Disco"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
-msgstr "Habilitar registros"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "Erro"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "Configurações Adicionais"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "Falloc"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "Arquivos e Locais"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "Seguir torrent"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "Configurações Gerais"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "Gerar aleatoriamente"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "Informações"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "Lista de rastreadores BitTorrent adicionais"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "Lista de configurações adicionais"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "Nível do registro"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "Número máximo de transferencias simultâneas"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "Numero máximo de conexões por servidor"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "Numero máximo de parceiros por torrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "Numero máximo de divisões"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "Tamanho mínimo da divisão"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "Sem Autenticação"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "Aviso"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "Desligado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "Abrir WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "Abrir YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "Tamanho mínimo da divisão"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr "Limite global para baixar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "Sem Autenticação"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
-msgstr "Limite da taxa de transferência global habilitado"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
-msgstr "Limite global para subir"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "Aviso"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
-msgstr "Limite por tarefa para baixar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
-msgstr "Limite da taxa de transferência por tarefa habilitado"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
-msgstr "Limite por tarefa para subir"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "Pré-alocação"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "Pré-alocação"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Prefixo da identificação do paceiro"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
 msgstr ""
-"Chave eletrônica do <abbr title=\"Remote Procedure Call/Chamada de "
-"Procedimento Remoto\">RPC</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr ""
 "Método de autenticação do <abbr title=\"Remote Procedure Call/Chamada de "
 "Procedimento Remoto\">RPC</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr ""
 "Senha do <abbr title=\"Remote Procedure Call/Chamada de Procedimento Remoto"
 "\">RPC</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr ""
 "Porta do <abbr title=\"Remote Procedure Call/Chamada de Procedimento Remoto"
 "\">RPC</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr ""
 "Nome do usuario do <abbr title=\"Remote Procedure Call/Chamada de "
 "Procedimento Remoto\">RPC</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "Executar serviço como usuário"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "Segurança"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "Configurações das tarefas"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr "O serviço Aria2 está parado."
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr "O serviço Aria2 está em execução."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "Chave eletrônica"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
-msgstr "Truncar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "Use WebSockets"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "Valor da identificação do agente do usuário"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "Usuário & Senha"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "Visualizar URL do JSON-RPC"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "Atenção"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
-msgstr "em bytes. Você pode sufixar com K (quilo) ou M (mega)."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
+
+#~ msgid "\"Falloc\" is not available in all cases."
+#~ msgstr "\"Falloc\" não está disponível em todas as classes."
+
+#~ msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#~ msgstr ""
+#~ "<abbr title=\"Distributed Hash Table/Tabla de disperção distribuída"
+#~ "\">DHT</abbr> habilitado"
+
+#~ msgid "Additional Bt tracker enabled"
+#~ msgstr "Rastreadores BitTorrent adicionais habilitado"
+
+#~ msgid "Aria2 Settings"
+#~ msgstr "Configurações do Aria2"
+
+#~ msgid "Aria2 Status"
+#~ msgstr "Estado do Aria2"
+
+#~ msgid ""
+#~ "Aria2 is a multi-protocol &amp; multi-source download utility, here you "
+#~ "can configure the settings."
+#~ msgstr ""
+#~ "Aria2 é um utilitário de transferência multi-protocolo de múltiplas "
+#~ "fontes, aqui você pode configurá-lo."
+
+#~ msgid "Autosave session interval"
+#~ msgstr "Intervalo para autossalvamento da sessão"
+
+#~ msgid "BitTorrent Settings"
+#~ msgstr "Configurações do BitTorrent"
+
+#~ msgid "Default download directory"
+#~ msgstr "Diretório padrão de arquivos baixados"
+
+#~ msgid "Enable log"
+#~ msgstr "Habilitar registros"
+
+#~ msgid "Falloc"
+#~ msgstr "Falloc"
+
+#~ msgid "Files and Locations"
+#~ msgstr "Arquivos e Locais"
+
+#~ msgid "General Settings"
+#~ msgstr "Configurações Gerais"
+
+#~ msgid "List of additional Bt tracker"
+#~ msgstr "Lista de rastreadores BitTorrent adicionais"
+
+#~ msgid "List of extra settings"
+#~ msgstr "Lista de configurações adicionais"
+
+#~ msgid "Max number of peers per torrent"
+#~ msgstr "Numero máximo de parceiros por torrent"
+
+#~ msgid "Off"
+#~ msgstr "Desligado"
+
+#~ msgid "Open WebUI-Aria2"
+#~ msgstr "Abrir WebUI-Aria2"
+
+#~ msgid "Open YAAW"
+#~ msgstr "Abrir YAAW"
+
+#~ msgid "Overall download limit"
+#~ msgstr "Limite global para baixar"
+
+#~ msgid "Overall speed limit enabled"
+#~ msgstr "Limite da taxa de transferência global habilitado"
+
+#~ msgid "Overall upload limit"
+#~ msgstr "Limite global para subir"
+
+#~ msgid "Per task download limit"
+#~ msgstr "Limite por tarefa para baixar"
+
+#~ msgid "Per task speed limit enabled"
+#~ msgstr "Limite da taxa de transferência por tarefa habilitado"
+
+#~ msgid "Per task upload limit"
+#~ msgstr "Limite por tarefa para subir"
+
+#~ msgid "Prealloc"
+#~ msgstr "Pré-alocação"
+
+#~ msgid "Preallocation"
+#~ msgstr "Pré-alocação"
+
+#~ msgid "RPC Token"
+#~ msgstr ""
+#~ "Chave eletrônica do <abbr title=\"Remote Procedure Call/Chamada de "
+#~ "Procedimento Remoto\">RPC</abbr>"
+
+#~ msgid "Sec"
+#~ msgstr "Segurança"
+
+#~ msgid "Task Settings"
+#~ msgstr "Configurações das tarefas"
+
+#~ msgid "Trunc"
+#~ msgstr "Truncar"
+
+#~ msgid "User agent value"
+#~ msgstr "Valor da identificação do agente do usuário"
+
+#~ msgid "View Json-RPC URL"
+#~ msgstr "Visualizar URL do JSON-RPC"
+
+#~ msgid "in bytes, You can append K or M."
+#~ msgstr "em bytes. Você pode sufixar com K (quilo) ou M (mega)."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "em bytes por segundo. Você pode sufixar com K (quilo) ou M (mega)."
+#~ msgid "in bytes/sec, You can append K or M."
+#~ msgstr "em bytes por segundo. Você pode sufixar com K (quilo) ou M (mega)."
 
 #~ msgid "Log file is in the config file dir."
 #~ msgstr ""
diff --git a/applications/luci-app-aria2/po/ru/aria2.po b/applications/luci-app-aria2/po/ru/aria2.po
index e75114303f..45bc2a67e6 100644
--- a/applications/luci-app-aria2/po/ru/aria2.po
+++ b/applications/luci-app-aria2/po/ru/aria2.po
@@ -15,290 +15,903 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
-msgstr "'Falloc' возможен не всегда."
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr "<abbr title=\"Распределенная Hash таблица\">DHT</abbr> включена"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
 msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr "<abbr title=\"Обнаружение локальных пиров\">LPD</abbr> включено"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
-msgstr "Дополнительный<br />Bt tracker включен"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Настройка Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Состояние Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
+msgstr "Aria2"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
 msgstr ""
-"Aria2 - это мульти-протокольная и мульти-платформенная утилита загрузки, "
-"здесь вы сможете ее настроить."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "Интервал сессии автосохранения"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "Настройки BitTorrent-а"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "Порты BitTorrent-а"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "Сбор данных..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "Папка расположения<br />сonfig файла"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "Отладка"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "Папка для загрузки<br />файлов по умолчанию"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "Дисковый кэш"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
-msgstr "Включить ведение системного журнала"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "Включено"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "Ошибка"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "Falloc"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "Файлы и папки"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "Запустить<br />торрент-файл"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "Основные настройки"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "Генерировать случайно"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "Информация"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "Список дополнительных BT tracker-ов"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "Список дополнительных настроек"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "Записывать в журнал"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "Максимальное количество одновременных загрузок"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "Максимальное количество<br />подключений на сервер"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "Максимальное число<br />пиров на торрент-файл"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "Максимальное<br />число разделений"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "Минимальный размер разделений"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "Без проверки подлинности"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "Заметка"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "Выключено"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "Открыть WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "Минимальный размер разделений"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "Открыть YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "Без проверки подлинности"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr "Общее ограничение<br />скорости загрузки"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
-msgstr "Общее ограничение скорости<br /> для утилиты включено"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
-msgstr "Общее ограничение<br />скорости раздачи"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "Заметка"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
-msgstr "Ограничить скорость загрузки"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
-msgstr "Ограничить скорость для одной задачи включено"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
-msgstr "Ограничить скорость раздачи"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "Предварительно"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "Предварительное<br />распределение<br />места под файл"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Префикс ID пира"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
-msgstr "Токен для доступа к удаленному управлению (RPC)"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr "Метод аутентификации для доступа к удаленному управлению (RPC)"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr "Пароль для доступа к удаленному управлению (RPC)"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr "Порт для доступа к удаленному управлению (RPC)"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr "Логин для доступа к удаленному управлению (RPC)"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "Запуск демона<br />от имени пользователя"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "Секунды"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "Настройки задач"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr "Aria2 сервис не запущен."
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr "Aria2 сервис запущен."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "Токен"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
-msgstr "Сокращать"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "Использовать WebSockets"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "Агент пользователя"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "Имя и пароль"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "Показать URL Json-RPC"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "Внимание"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
 msgstr ""
-"Дисковый кэш в байтах. Вы можете добавить суффикс K (кило) или М (мега)."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "в байтах/секундах. Вы можете добавить суффикс K (кило) или М (мега)."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
+
+#~ msgid "\"Falloc\" is not available in all cases."
+#~ msgstr "'Falloc' возможен не всегда."
+
+#~ msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#~ msgstr "<abbr title=\"Распределенная Hash таблица\">DHT</abbr> включена"
+
+#~ msgid "Additional Bt tracker enabled"
+#~ msgstr "Дополнительный<br />Bt tracker включен"
+
+#~ msgid "Aria2 Settings"
+#~ msgstr "Настройка Aria2"
+
+#~ msgid "Aria2 Status"
+#~ msgstr "Состояние Aria2"
+
+#~ msgid ""
+#~ "Aria2 is a multi-protocol &amp; multi-source download utility, here you "
+#~ "can configure the settings."
+#~ msgstr ""
+#~ "Aria2 - это мульти-протокольная и мульти-платформенная утилита загрузки, "
+#~ "здесь вы сможете ее настроить."
+
+#~ msgid "Autosave session interval"
+#~ msgstr "Интервал сессии автосохранения"
+
+#~ msgid "BitTorrent Settings"
+#~ msgstr "Настройки BitTorrent-а"
+
+#~ msgid "Default download directory"
+#~ msgstr "Папка для загрузки<br />файлов по умолчанию"
+
+#~ msgid "Enable log"
+#~ msgstr "Включить ведение системного журнала"
+
+#~ msgid "Falloc"
+#~ msgstr "Falloc"
+
+#~ msgid "Files and Locations"
+#~ msgstr "Файлы и папки"
+
+#~ msgid "General Settings"
+#~ msgstr "Основные настройки"
+
+#~ msgid "List of additional Bt tracker"
+#~ msgstr "Список дополнительных BT tracker-ов"
+
+#~ msgid "List of extra settings"
+#~ msgstr "Список дополнительных настроек"
+
+#~ msgid "Max number of peers per torrent"
+#~ msgstr "Максимальное число<br />пиров на торрент-файл"
+
+#~ msgid "Off"
+#~ msgstr "Выключено"
+
+#~ msgid "Open WebUI-Aria2"
+#~ msgstr "Открыть WebUI-Aria2"
+
+#~ msgid "Open YAAW"
+#~ msgstr "Открыть YAAW"
+
+#~ msgid "Overall download limit"
+#~ msgstr "Общее ограничение<br />скорости загрузки"
+
+#~ msgid "Overall speed limit enabled"
+#~ msgstr "Общее ограничение скорости<br /> для утилиты включено"
+
+#~ msgid "Overall upload limit"
+#~ msgstr "Общее ограничение<br />скорости раздачи"
+
+#~ msgid "Per task download limit"
+#~ msgstr "Ограничить скорость загрузки"
+
+#~ msgid "Per task speed limit enabled"
+#~ msgstr "Ограничить скорость для одной задачи включено"
+
+#~ msgid "Per task upload limit"
+#~ msgstr "Ограничить скорость раздачи"
+
+#~ msgid "Prealloc"
+#~ msgstr "Предварительно"
+
+#~ msgid "Preallocation"
+#~ msgstr "Предварительное<br />распределение<br />места под файл"
+
+#~ msgid "RPC Token"
+#~ msgstr "Токен для доступа к удаленному управлению (RPC)"
+
+#~ msgid "Sec"
+#~ msgstr "Секунды"
+
+#~ msgid "Task Settings"
+#~ msgstr "Настройки задач"
+
+#~ msgid "Trunc"
+#~ msgstr "Сокращать"
+
+#~ msgid "User agent value"
+#~ msgstr "Агент пользователя"
+
+#~ msgid "View Json-RPC URL"
+#~ msgstr "Показать URL Json-RPC"
+
+#~ msgid "in bytes, You can append K or M."
+#~ msgstr ""
+#~ "Дисковый кэш в байтах. Вы можете добавить суффикс K (кило) или М (мега)."
+
+#~ msgid "in bytes/sec, You can append K or M."
+#~ msgstr ""
+#~ "в байтах/секундах. Вы можете добавить суффикс K (кило) или М (мега)."
 
 #~ msgid "Log file is in the config file dir."
 #~ msgstr "Файл системного журнала находится в папке с config файлом."
diff --git a/applications/luci-app-aria2/po/sv/aria2.po b/applications/luci-app-aria2/po/sv/aria2.po
index ba8a588407..36a295a763 100644
--- a/applications/luci-app-aria2/po/sv/aria2.po
+++ b/applications/luci-app-aria2/po/sv/aria2.po
@@ -1,287 +1,861 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
+msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
-msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
 msgid "Aria2"
 msgstr "Aria2"
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Inställningar för Aria2"
-
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Status för Aria2"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "Autospara sessionintervall"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "Inställningar för BitTorrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "Lyssningsport för BitTorrent"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "Samlar in data..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "Ställ in fil-mapp"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "Avlusa"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "Standard nerladdningsmapp"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "Disk-cache"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
-msgstr "Aktivera logg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "Fel"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "Extra inställningar"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "Falloc"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "Filer och Platser"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "Följ torrenten"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "Generella inställningar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "Generera slumpmässigt"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "Info"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "Lista över extra Bt-tracker"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "Lista över extra inställningar"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "Maximalt sammanhängande nerladdningar"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "Max antalet anslutningar per server"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "Maximalt antalet jämlikar per torrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "Högst antal split"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "Minsta split-storlek"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "Ingen autentisering"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "Avisering"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "Av"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "Öppna WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "Öppna YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "Minsta split-storlek"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr ""
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "Ingen autentisering"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "Avisering"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "Prealloc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "Förallokering"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Peer-ID prefix"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr "RPC-lösenord"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr "RPC-port"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr "RPC-användarnamn"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "Kör daemonen som användare"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "Sek"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "Inställningar för uppgifter"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr "Aria2-tjänsten körs inte."
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr "Aria2-tjänsten körs."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "Tecken"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "Använd WebSocket"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "Använd agent-värde"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "Användarnamn & Lösenord"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "Visa Json-RPC URL"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "Varna"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
-msgstr "i bytes, Du kan bifoga K eller M."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
+
+#~ msgid "Aria2 Settings"
+#~ msgstr "Inställningar för Aria2"
+
+#~ msgid "Aria2 Status"
+#~ msgstr "Status för Aria2"
+
+#~ msgid "Autosave session interval"
+#~ msgstr "Autospara sessionintervall"
+
+#~ msgid "BitTorrent Settings"
+#~ msgstr "Inställningar för BitTorrent"
+
+#~ msgid "Default download directory"
+#~ msgstr "Standard nerladdningsmapp"
+
+#~ msgid "Enable log"
+#~ msgstr "Aktivera logg"
+
+#~ msgid "Falloc"
+#~ msgstr "Falloc"
+
+#~ msgid "Files and Locations"
+#~ msgstr "Filer och Platser"
+
+#~ msgid "General Settings"
+#~ msgstr "Generella inställningar"
+
+#~ msgid "List of additional Bt tracker"
+#~ msgstr "Lista över extra Bt-tracker"
+
+#~ msgid "List of extra settings"
+#~ msgstr "Lista över extra inställningar"
+
+#~ msgid "Max number of peers per torrent"
+#~ msgstr "Maximalt antalet jämlikar per torrent"
+
+#~ msgid "Off"
+#~ msgstr "Av"
+
+#~ msgid "Open WebUI-Aria2"
+#~ msgstr "Öppna WebUI-Aria2"
+
+#~ msgid "Open YAAW"
+#~ msgstr "Öppna YAAW"
+
+#~ msgid "Prealloc"
+#~ msgstr "Prealloc"
+
+#~ msgid "Preallocation"
+#~ msgstr "Förallokering"
+
+#~ msgid "Sec"
+#~ msgstr "Sek"
+
+#~ msgid "Task Settings"
+#~ msgstr "Inställningar för uppgifter"
+
+#~ msgid "User agent value"
+#~ msgstr "Använd agent-värde"
+
+#~ msgid "View Json-RPC URL"
+#~ msgstr "Visa Json-RPC URL"
+
+#~ msgid "in bytes, You can append K or M."
+#~ msgstr "i bytes, Du kan bifoga K eller M."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "i bytes/sek, Du kan bifoga K eller M."
+#~ msgid "in bytes/sec, You can append K or M."
+#~ msgstr "i bytes/sek, Du kan bifoga K eller M."
 
 #~ msgid "Log file is in the config file dir."
 #~ msgstr "Logg-filen är i konfigurationsfilens mapp."
diff --git a/applications/luci-app-aria2/po/templates/aria2.pot b/applications/luci-app-aria2/po/templates/aria2.pot
index 6bf1528d19..43a68baac8 100644
--- a/applications/luci-app-aria2/po/templates/aria2.pot
+++ b/applications/luci-app-aria2/po/templates/aria2.pot
@@ -1,284 +1,789 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
+msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
-msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
+msgid ""
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
 msgstr ""
diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po
index 0abebcf8f7..62c65a1b6c 100644
--- a/applications/luci-app-aria2/po/zh-cn/aria2.po
+++ b/applications/luci-app-aria2/po/zh-cn/aria2.po
@@ -1,301 +1,837 @@
-#
-# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
-# Zheng Qian <sotux82@gmail.com>, 2018.
-#
 msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2018-12-15 21:32+0800\n"
-"X-Generator: Gtranslator 2.91.7\n"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
-msgstr "\"Falloc\" 并不是在所有情况下都可用"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr "启用<abbr title=\"分布式哈希表\">DHT</abbr>"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
 msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
-msgstr "启用<abbr title=\"本地节点发现\">LPD</abbr>"
+msgstr "启用 <abbr title=\"Local Peer Discovery\">LPD</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
-msgstr "额外添加的 Bt tracker"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
+msgstr "额外的 BT Tracker"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
+msgstr "高级选项"
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Aria2 配置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
+msgstr "全局代理"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr "追加的 HTTP 请求头。"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Aria2 状态"
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
+msgstr "Aria2"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
-msgstr "Aria2 是一个支持多协议多线程的下载器, 您可以在这里对其进行配置。"
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
+msgstr "Aria2 是一个轻量、多线程，跨平台的下载工具。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
+msgstr "自动保存间隔"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "定时保存会话间隔"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr "基本选项"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "BitTorrent 设置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr "BT 选项"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "BitTorrent 监听端口"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr "CA 证书"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr "证书"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr "检查证书"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+"如果速度小于或等于这个速度（byte/s），关闭下载下载连接。0 表示不限制下载速"
+"度。"
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "正在收集数据..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "配置文件目录"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr "配置"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr "连接超时时间"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr "配置文件的内容：<code>%s</code>"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr "Session 文件的内容：<code>%s</code>"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr "DHT 监听端口"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "调试"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "默认下载目录"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
+"禁用 IPv6。如果你的 DNS 有问题并希望避免 AAAA 查询过慢，可以启用此选项。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "磁盘缓存"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr "当数据小于 2*SIZE 时不分割。可能的值：1M-1024M。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr "使用 N 线程下载文件。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr "下载文件夹"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr "文件为空。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr "启用 IPv4 DHT 功能。会同时启用 UDP Tracker 支持。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr "启用 IPv6 DHT 功能。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr "启用本地 Peer 查找。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr "启用 Peer 交换扩展。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr "启用硬盘缓存（byte），0 表示禁用。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
 msgstr "启用日志"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr "启用 Peer 交换"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr "启用代理"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "启用"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "错误"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr "错误：未在 PATH 中找到 aria2c，请重新安装 Aria2。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "附加选项"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "快速 alloc（Falloc）"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr "获取日志数据失败。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr "否"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr "文件分配"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "文件和目录"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr "文件不存在。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr "文件"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "自动添加下载的种子"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "常规设置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr "获取更多信息，请访问：%s"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr "强制保存"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "随机生成"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr "HTTP 使用 Gzip"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr "HTTP 无缓存"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr "HTTP/FTP/SFTP 选项"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr "请求头"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr "这里展示了 Aria2 使用的文件。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr "启用 IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr>"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr "启用 IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr>"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr "禁用 IPv6"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+"如果某个 BT 任务的下载速度小于配置的速度，Aria2 会临时提高 Peer 的数量来尝试"
+"获得更大的下载速度。在某些情况下，配置此选项能提高你的下载速度。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "信息"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "附加 Bt tracker 列表"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr "已安装的 WEB 界面："
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr "Json-RPC URL"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "附加选项列表"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr "保存在内存中"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr "日志文件的最新 50 行："
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr "系统日志的最新 50 行："
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr "留空以使用默认用户。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr "额外的 BT Tracker 通告链接。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
+"额外设置的列表。格式：option=value，例如：<code>netrc-path=/tmp/.netrc</"
+"code>。"
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr "正在加载"
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr "日志"
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr "日志数据"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr "日志文件"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "日志记录等级"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr "最低限速"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "最大同时下载任务数"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "单服务器最大连接数"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "单个种子最大连接数"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr "最大下载限速"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "单文件最大线程数"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "最小文件分片大小"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr "最大打开文件数"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "无认证"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr "最大全局下载限速"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "注意"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr "最大全局上传限速"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "关闭"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr "最大 Peer 数量"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
-msgstr "打开 AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
+msgstr "最大重试次数"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "打开 WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
+msgstr "最大上传限速"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "打开 YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "最小文件分片大小"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr "全局下载限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "无认证"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
-msgstr "启用全局限速"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
+msgstr "无日志数据。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
-msgstr "全局上传限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
+msgstr "无"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
-msgstr "单任务下载限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "注意"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
+msgstr "暂停"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
-msgstr "启用单任务限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
+msgstr "在下载任务添加后暂停。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
-msgstr "单任务上传限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
+msgstr "暂停下载内容为元数据的下载（磁力链接和 Matalink）。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "预分配"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr "暂停元数据"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "磁盘预分配"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr "请输入密钥长度："
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Peer ID 前缀"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
-msgstr "RPC 令牌"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr "私钥"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr "代理密码"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr "代理用户名"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr "RPC 选项"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr "RPC 认证方式"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr "RPC 证书"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr "RPC 密码"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr "RPC 端口"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr "RPC 私钥"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr "RPC 加密"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr "RPC 令牌"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+"用 SSL/TLS 加密 RPC 连接。RPC 客户端必须使用 HTTPS 协议来连接服务端，对于 "
+"WebSocket 客户端，则使用 WSS 协议。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr "RPC 用户名"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr "每 10 秒刷新。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr "删除未选择的文件"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr "BT 下载完成时删除未选择的文件。文件将从磁盘中被完全删除，请谨慎使用。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr "单个 Peer 限速"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr "重试等待"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "以此用户权限运行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "秒"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr "保存元数据"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+"每 N 秒保存下载“控制文件”（*.aria2）。设置 0 表示在下载过程中不保存控制文件。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+"即使下载已完成或已删除，也将其保存到会话文件。开启此选项也会同时保存“控制文"
+"件”。此选项可能有助于保持被识别为已完成状态的 BT 做种。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+"每 N 秒将失败的/未完成的下载保存到 Session 文件。设置 0 则仅在 Aria2 退出时保"
+"存。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+"将元数据保存到 \".torrent\" 文件。此选项仅在下载连接为 BT 磁力链接时生效。文"
+"件名为 Hash 值，后缀为 \".torrent\"。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr "Session 保存间隔"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr "继续之前的BT任务时, 无需再次校验分片 Hash。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr "做种比率"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr "做种时间"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr "不校验种子"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+"发送 <code>Accept: deflate, gzip</code> 请求头，当服务器响应头包含 "
+"<code>Content-Encoding: gzip</code> 或者 <code>Content-Encoding: deflate</"
+"code> 时解压响应数据。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+"发送 <code>Cache-Control: no-cache</code> 和 <code>Pragma: no-cache</code> 请"
+"求头来防止缓存内容，禁用则不发送。你也可用使用“请求头”选项来设置 Cache-"
+"Control 请求头。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+"为 BT 下载设置 TCP 端口。支持的格式：\"6881,6885\"，\"6881-6999\" 和 "
+"\"6881-6889,6999\"。请确保正确放行了这些端口的 TCP 入站通信。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+"为 DHT（IPv4，IPv6）和 UDP tracker 设置 UDP 监听端口。请确保正确放行了这些端"
+"口的 UDP 入站通信。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr "设置每个任务的最大下载速度（byte/s），0 表示不限制。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr "设置全局最大下载速度（byte/s），0 表示不限制。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr "设置全局最大上传速度，0 表示不限制。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr "设置每个任务的最大上传速度（byte/s），0 表示不限制。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+"设置 HTTP、FTP 和代理服务器的连接超时时间。当连接建立后，该选项失去作用，"
+"而“超时时间”选项会被使用。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr "设置重试的时间间隔。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr "为 HTTP(S) 下载设置 UA。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr "设置"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "任务设置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr "这个区域中的配置信息将被添加到配置文件中。"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr "设置列表"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr "显示 URL"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+"指定文件分配方式。如果你使用的文件系统较新，例如：ext4（支持扩展分区），"
+"btrfs，xfs 或者 NTFS（仅限 MinGW 版本），强烈推荐 \"falloc\"，这种方式几乎能"
+"立即分配比较大的文件（GB），但是它要求你的系统支持 posix_fallocate(3) 函数。"
+"不要在 ext3 或者 FAT32 这些旧文件系统中使用 \"falloc\"，因为它花费的时间和 "
+"\"prealloc\" 几乎一样多，而且在文件分配过程中会阻塞整个 Aria2 进程。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr "设置 BT 全局最大同时下载的文件数量。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+"指定做种时间（分钟）。如果同时指定了“做种比率”选项，那么将在任一条件满足时停"
+"止做种。设置 0 表示下载完成后停止做种。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+"指定做种比率。BT 下载完成之后持续做种，直到比率达到指定值。强烈建议将此选项设"
+"置为大于或等于 1.0。设置为 0.0 来无限做种。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr "设置每个 BT 任务的最大 Peer 数量，0 表示不限制。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
+"配置 Peer ID 前缀。Peer ID 的长度为 20 字节。如果配置超过了 20 字节，将仅使用"
+"前面的 20 字节。如果配置少于 20 字节，将添加额外的随机字符来让长度达到 20 字"
+"节。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+"当 BT 任务在 N 秒的持续时间内的下载速度一直为 0，则停止下载。0 表示禁用。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr "停止超时时间"
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
-msgstr "Aria2 未运行"
+msgstr "Aria2 服务未运行"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
-msgstr "Aria2 正在运行"
+msgstr "Aria2 服务正在运行"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr "用于放置配置文件，Session 文件和 DHT 文件的目录。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
+msgstr "用于放置下载文件的目录。例如：<code>/mnt/sda1</code>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
-msgstr "默认的 log 文件是 /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr "日志文件名。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr "单一服务器最大连接数量。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr "如果种子文件具有“私有”属性，该选项将会被忽略。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr "超时"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "令牌"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
-msgstr "Trunc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
+msgstr "是"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "使用 WebSocket"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "用户代理（UA）"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr "为所有协议设置代理服务器。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+"使用文件中的证书来验证对端。证书文件必须为 PEM 格式并且可以包含多个证书。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+"使用文件中的证书作为 RPC 服务器。证书必须为 PKCS12 (.p12, .pfx) 或者 PEM 格"
+"式。<br/>PKCS12 文件必须包含证书，一个密钥和可选的附加证书链。只有导入密码为"
+"空白的 PKCS12 文件才能被打开。<br/>使用 PEM 时，你必须同时指定“RPC 私钥”。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+"使用文件中的客户端证书。证书必须为 PKCS12 (.p12, .pfx) 或者 PEM 格式。<br/"
+">PKCS12 文件必须包含证书，一个密钥和可选的附加证书链。只有导入密码为空白的 "
+"PKCS12 文件才能被打开。<br/>使用 PEM 时，你必须同时指定“RPC 私钥”。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr "使用文件中的私钥作为 RPC 服务器。私钥必须解密并且为 PEM 格式。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr "使用文件中的私钥。私钥必须解密并且为 PEM 格式，不支持加密的私钥。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr "User Agent"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "用户名与密码"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "查看 Json-RPC URL"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr "使用“CA 证书”里配置的证书来验证对端。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "警告"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
-msgstr "单位 B, 您可以在数字后跟上 K 或 M。"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "单位 B/s, 您可以在数字后跟上 K 或 M。"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr "你可以追加 K 或者 M。"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
 
-#~ msgid "Log file is in the config file dir."
-#~ msgstr "日志文件在配置文件目录下"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
 
-#~ msgid "General settings"
-#~ msgstr "基本设置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po
index c911e0fc32..493b7a9eb6 100644
--- a/applications/luci-app-aria2/po/zh-tw/aria2.po
+++ b/applications/luci-app-aria2/po/zh-tw/aria2.po
@@ -11,287 +11,902 @@ msgstr ""
 "PO-Revision-Date: 2018-10-01 10:05+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "\"Falloc\" is not available in all cases."
-msgstr "\"Falloc\" 並不是在所有情況下都可用"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:153
-msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr "啟用<abbr title=\"分散式雜湊表\">DHT</abbr>"
-
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:157
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:296
 msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
 msgstr "啟用<abbr title=\"本地節點發現\">LPD</abbr>"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:171
-msgid "Additional Bt tracker enabled"
-msgstr "額外新增的 Bt tracker"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
+msgid "Additional BT tracker"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
-msgid "Aria2"
-msgstr "Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
+msgid "Advanced Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:49
-msgid "Aria2 Settings"
-msgstr "Aria2 配置"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
+msgid "All proxy"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:80
-msgid "Aria2 Status"
-msgstr "Aria2 狀態"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
+msgid "Append HEADERs to HTTP request header."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:45
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Aria2"
+msgstr "Aria2"
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:37
 msgid ""
-"Aria2 is a multi-protocol &amp; multi-source download utility, here you can "
-"configure the settings."
-msgstr "Aria2 是一個支援多協議多執行緒的下載器, 您可以在這裡對其進行配置。"
+"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
+"download utility."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Autosave session interval"
-msgstr "定時儲存會話間隔"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
+msgid "Auto save interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
+msgid "Basic Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:56
-msgid "BitTorrent Settings"
-msgstr "BitTorrent 設定"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
+msgid "BitTorrent Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:165
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
 msgid "BitTorrent listen port"
 msgstr "BitTorrent 監聽埠"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:82
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
+msgid "CA certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
+msgid "Certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
+msgid "Check certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
+msgid ""
+"Close connection if download speed is lower than or equal to this "
+"value(bytes per sec). 0 means has no lowest speed limit."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
 msgid "Collecting data..."
 msgstr "正在收集資料..."
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:89
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:73
 msgid "Config file directory"
 msgstr "配置檔案目錄"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:98
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
+msgid "Configuration"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
+msgid "Connect timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
+msgid "Content of config file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
+msgid "Content of session file: <code>%s</code>"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
+msgid "DHT Listen port"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
 msgid "Debug"
 msgstr "除錯"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:104
-msgid "Default download directory"
-msgstr "預設下載目錄"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:422
+msgid ""
+"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
+"terribly slow AAAA record lookup."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
 msgid "Disk cache"
 msgstr "磁碟快取"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "Enable log"
-msgstr "啟用日誌"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
+msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
+msgid "Download a file using N connections."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:58
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
+msgid "Download directory"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
+msgid "Empty file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
+msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
+msgid "Enable IPv6 DHT functionality."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
+msgid "Enable Local Peer Discovery."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
+msgid "Enable Peer Exchange extension."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
+msgid "Enable disk cache (in bytes), set 0 to disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
+msgid "Enable logging"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
+msgid "Enable peer exchange"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
+msgid "Enable proxy"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
 msgid "Enabled"
 msgstr "啟用"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:102
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:91
 msgid "Error"
 msgstr "錯誤"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:201
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
+msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
 msgid "Extra Settings"
 msgstr "附加選項"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:114
-msgid "Falloc"
-msgstr "快速 alloc（Falloc）"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
+msgid "Failed to load log data."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
+msgid "False"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
+msgid "File allocation"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:54
-msgid "Files and Locations"
-msgstr "檔案和目錄"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
+msgid "File does not exist."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:161
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
+msgid "Files"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
 msgid "Follow torrent"
 msgstr "自動新增下載的種子"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:53
-msgid "General Settings"
-msgstr "常規設定"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
+msgid "For more information, please visit: %s"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
+msgid "Force save"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
 msgid "Generate Randomly"
 msgstr "隨機生成"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:99
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
+msgid "HTTP accept gzip"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
+msgid "HTTP no cache"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
+msgid "HTTP/FTP/SFTP Options"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
+msgid "Header"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
+msgid "Here shows the files used by aria2."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
+msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
+msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
+msgid "IPv6 disabled"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
+msgid ""
+"If the whole download speed of every torrent is lower than SPEED, aria2 "
+"temporarily increases the number of peers to try for more download speed. "
+"Configuring this option with your preferred download speed can increase your "
+"download speed in some cases."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
 msgid "Info"
 msgstr "資訊"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:172
-msgid "List of additional Bt tracker"
-msgstr "附加 Bt tracker 列表"
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
+msgid "Installed web interface:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
+msgid "Json-RPC URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
+msgid "Keep in memory"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:205
-msgid "List of extra settings"
-msgstr "附加選項列表"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
+msgid "Last 50 lines of log file:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
+msgid "Last 50 lines of syslog:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
+msgid "Leave blank to use default user."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:96
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
+msgid "List of additional BitTorrent tracker's announce URI."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
+msgid ""
+"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
+"netrc</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
+msgid "Loading"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
+msgid "Log"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
+msgid "Log Data"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
+msgid "Log file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
 msgid "Log level"
 msgstr "日誌記錄等級"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:134
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
+msgid "Lowest speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
 msgid "Max concurrent downloads"
 msgstr "最大同時下載任務數"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:137
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:248
 msgid "Max connection per server"
 msgstr "單伺服器最大連線數"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:168
-msgid "Max number of peers per torrent"
-msgstr "單個種子最大連線數"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
+msgid "Max download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:144
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
 msgid "Max number of split"
 msgstr "單檔案最大執行緒數"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:141
-msgid "Min split size"
-msgstr "最小檔案分片大小"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
+msgid "Max open files"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:72
-msgid "No Authentication"
-msgstr "無認證"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
+msgid "Max overall download limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:100
-msgid "Notice"
-msgstr "注意"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
+msgid "Max overall upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:111
-msgid "Off"
-msgstr "關閉"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
+msgid "Max peers"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:15
-msgid "Open AriaNg"
-msgstr "開啟 AriaNg"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
+msgid "Max tries"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:12
-msgid "Open WebUI-Aria2"
-msgstr "開啟 WebUI-Aria2"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
+msgid "Max upload limit"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:9
-msgid "Open YAAW"
-msgstr "開啟 YAAW"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
+msgid "Min split size"
+msgstr "最小檔案分片大小"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-msgid "Overall download limit"
-msgstr "全域性下載限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:115
+msgid "No Authentication"
+msgstr "無認證"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:116
-msgid "Overall speed limit enabled"
-msgstr "啟用全侷限速"
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
+msgid "No log data."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-msgid "Overall upload limit"
-msgstr "全域性上傳限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
+msgid "None"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-msgid "Per task download limit"
-msgstr "單任務下載限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
+msgid "Notice"
+msgstr "注意"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:125
-msgid "Per task speed limit enabled"
-msgstr "啟用單任務限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "Per task upload limit"
-msgstr "單任務上傳限速"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
+msgid "Pause download after added."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:112
-msgid "Prealloc"
-msgstr "預分配"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
+msgid "Pause downloads created as a result of metadata download."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:110
-msgid "Preallocation"
-msgstr "磁碟預分配"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
+msgid "Pause metadata"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:198
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
+msgid "Please input token length:"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
 msgid "Prefix of peer ID"
 msgstr "Peer ID 字首"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:85
-msgid "RPC Token"
-msgstr "RPC 令牌"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
+msgid "Private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
+msgid "Proxy password"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
+msgid "Proxy user"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
+msgid "RPC Options"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:71
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
 msgid "RPC authentication method"
 msgstr "RPC 認證方式"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:80
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
+msgid "RPC certificate"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
 msgid "RPC password"
 msgstr "RPC 密碼"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:67
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:110
 msgid "RPC port"
 msgstr "RPC 埠"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:76
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
+msgid "RPC private key"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
+msgid "RPC secure"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
+msgid "RPC token"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
+msgid ""
+"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
+"scheme to access the server. For WebSocket client, use wss scheme."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
 msgid "RPC username"
 msgstr "RPC 使用者名稱"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:61
+#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
+msgid "Refresh every 10 seconds."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
+msgid "Remove unselected file"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
+msgid ""
+"Removes the unselected files when download is completed in BitTorrent. "
+"Please use this option with care because it will actually remove files from "
+"your disk."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
+msgid "Request peer speed limit"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
+msgid "Retry wait"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
 msgid "Run daemon as user"
 msgstr "以此使用者許可權執行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:147
-msgid "Sec"
-msgstr "秒"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
+msgid "Sava metadata"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
+msgid ""
+"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
+"is not saved during download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
+msgid ""
+"Save download to session file even if the download is completed or removed. "
+"This option also saves control file in that situations. This may be useful "
+"to save BitTorrent seeding which is recognized as completed state."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
+msgid ""
+"Save error/unfinished downloads to session file every N seconds. If 0 is "
+"given, file will be saved only when aria2 exits."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
+msgid ""
+"Save meta data as \".torrent\" file. This option has effect only when "
+"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
+"suffix \".torrent\"."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
+msgid "Save session interval"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
+msgid "Seed previously downloaded files without verifying piece hashes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
+msgid "Seed ratio"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
+msgid "Seed time"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
+msgid "Seed unverified"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
+msgid ""
+"Send <code>Accept: deflate, gzip</code> request header and inflate response "
+"if remote server responds with <code>Content-Encoding: gzip</code> or "
+"<code>Content-Encoding: deflate</code>."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
+msgid ""
+"Send <code>Cache-Control: no-cache</code> and <code>Pragma: no-cache</code> "
+"header to avoid cached content. If disabled, these headers are not sent and "
+"you can add Cache-Control header with a directive you like using \"Header\" "
+"option."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
+msgid ""
+"Set TCP port number for BitTorrent downloads. Accept format: \"6881,6885\", "
+"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
+"open for incoming TCP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
+msgid ""
+"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
+"that the specified ports are open for incoming UDP traffic."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
+msgid ""
+"Set max download speed per each download in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
+msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
+msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
+msgid ""
+"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
+msgid ""
+"Set the connect timeout in seconds to establish connection to HTTP/FTP/proxy "
+"server. After the connection is established, this option makes no effect and "
+"\"Timeout\" option is used instead."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
+msgid "Set the seconds to wait between retries."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
+msgid "Set user agent for HTTP(S) downloads."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
+msgid "Settings"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
+msgid "Settings in this section will be added to config file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
+msgid "Settings list"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
+msgid "Show URL"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
+msgid ""
+"Specify file allocation method. If you are using newer file systems such as "
+"ext4 (with extents support), btrfs, xfs or NTFS(MinGW build only), \"falloc"
+"\" is your best choice. It allocates large(few GiB) files almost instantly, "
+"but it may not be available if your system doesn't have posix_fallocate(3) "
+"function. Don't use \"falloc\" with legacy file systems such as ext3 and "
+"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
+"entirely until allocation finishes."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
+msgid ""
+"Specify maximum number of files to open in multi-file BitTorrent download "
+"globally."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
+msgid ""
+"Specify seeding time in minutes. If \"Seed ratio\" option is specified along "
+"with this option, seeding ends when at least one of the conditions is "
+"satisfied. Specifying 0 disables seeding after download completed."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
+msgid ""
+"Specify share ratio. Seed completed torrents until share ratio reaches "
+"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
+"Specify 0.0 if you intend to do seeding regardless of share ratio."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
+msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:55
-msgid "Task Settings"
-msgstr "任務設定"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
+msgid ""
+"Specify the prefix of peer ID. The peer ID in BitTorrent is 20 byte length. "
+"If more than 20 bytes are specified, only first 20 bytes are used. If less "
+"than 20 bytes are specified, random byte data are added to make its length "
+"20 bytes."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:19
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
+msgid ""
+"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
+"0 is given, this feature is disabled."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
+msgid "Stop timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
 msgid "The Aria2 service is not running."
 msgstr "Aria2 未執行"
 
-#: applications/luci-app-aria2/luasrc/view/aria2/overview_status.htm:7
+#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:47
 msgid "The Aria2 service is running."
 msgstr "Aria2 正在執行"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:92
-msgid "The default log file is /var/log/aria2.log"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
+msgid "The directory to store the config file, session file and DHT file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
+msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
 msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:74
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
+msgid "The file name of the log file."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
+msgid "The maximum number of connections to one server for each download."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:299
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
+msgid "This option will be ignored if a private flag is set in a torrent."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
 msgid "Token"
 msgstr "令牌"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:113
-msgid "Trunc"
-msgstr "Trunc"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
+msgid "True"
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:22
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
 msgid "Use WebSocket"
 msgstr "使用 WebSocket"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:150
-msgid "User agent value"
-msgstr "使用者代理（UA）"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
+msgid "Use a proxy server for all protocols."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:73
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
+msgid ""
+"Use the certificate authorities in FILE to verify the peers. The certificate "
+"file must be in PEM format and can contain multiple CA certificates."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
+msgid ""
+"Use the certificate in FILE for RPC server. The certificate must be either "
+"in PKCS12 (.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"RPC private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
+msgid ""
+"Use the client certificate in FILE. The certificate must be either in PKCS12 "
+"(.p12, .pfx) or in PEM format.<br/>PKCS12 files must contain the "
+"certificate, a key and optionally a chain of additional certificates. Only "
+"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
+"you have to specify the \"Private key\" as well."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
+msgid ""
+"Use the private key in FILE for RPC server. The private key must be "
+"decrypted and in PEM format."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
+msgid ""
+"Use the private key in FILE. The private key must be decrypted and in PEM "
+"format. The behavior when encrypted one is given is undefined."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
+msgid "User agent"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
 msgid "Username & Password"
 msgstr "使用者名稱與密碼"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:20
-msgid "View Json-RPC URL"
-msgstr "檢視 Json-RPC URL"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:183
+msgid ""
+"Verify the peer using certificates specified in \"CA certificate\" option."
+msgstr ""
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:101
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
 msgid "Warn"
 msgstr "警告"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:107
-msgid "in bytes, You can append K or M."
-msgstr "單位 B, 您可以在數字後跟上 K 或 M。"
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:244
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:356
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:363
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:383
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:443
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
+msgid "You can append K or M."
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
+msgid "falloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
+msgid "prealloc"
+msgstr ""
+
+#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
+msgid "trunc"
+msgstr ""
+
+#~ msgid "\"Falloc\" is not available in all cases."
+#~ msgstr "\"Falloc\" 並不是在所有情況下都可用"
+
+#~ msgid "<abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
+#~ msgstr "啟用<abbr title=\"分散式雜湊表\">DHT</abbr>"
+
+#~ msgid "Additional Bt tracker enabled"
+#~ msgstr "額外新增的 Bt tracker"
+
+#~ msgid "Aria2 Settings"
+#~ msgstr "Aria2 配置"
+
+#~ msgid "Aria2 Status"
+#~ msgstr "Aria2 狀態"
+
+#~ msgid ""
+#~ "Aria2 is a multi-protocol &amp; multi-source download utility, here you "
+#~ "can configure the settings."
+#~ msgstr "Aria2 是一個支援多協議多執行緒的下載器, 您可以在這裡對其進行配置。"
+
+#~ msgid "Autosave session interval"
+#~ msgstr "定時儲存會話間隔"
+
+#~ msgid "BitTorrent Settings"
+#~ msgstr "BitTorrent 設定"
+
+#~ msgid "Default download directory"
+#~ msgstr "預設下載目錄"
+
+#~ msgid "Enable log"
+#~ msgstr "啟用日誌"
+
+#~ msgid "Falloc"
+#~ msgstr "快速 alloc（Falloc）"
+
+#~ msgid "Files and Locations"
+#~ msgstr "檔案和目錄"
+
+#~ msgid "General Settings"
+#~ msgstr "常規設定"
+
+#~ msgid "List of additional Bt tracker"
+#~ msgstr "附加 Bt tracker 列表"
+
+#~ msgid "List of extra settings"
+#~ msgstr "附加選項列表"
+
+#~ msgid "Max number of peers per torrent"
+#~ msgstr "單個種子最大連線數"
+
+#~ msgid "Off"
+#~ msgstr "關閉"
+
+#~ msgid "Open AriaNg"
+#~ msgstr "開啟 AriaNg"
+
+#~ msgid "Open WebUI-Aria2"
+#~ msgstr "開啟 WebUI-Aria2"
+
+#~ msgid "Open YAAW"
+#~ msgstr "開啟 YAAW"
+
+#~ msgid "Overall download limit"
+#~ msgstr "全域性下載限速"
+
+#~ msgid "Overall speed limit enabled"
+#~ msgstr "啟用全侷限速"
+
+#~ msgid "Overall upload limit"
+#~ msgstr "全域性上傳限速"
+
+#~ msgid "Per task download limit"
+#~ msgstr "單任務下載限速"
+
+#~ msgid "Per task speed limit enabled"
+#~ msgstr "啟用單任務限速"
+
+#~ msgid "Per task upload limit"
+#~ msgstr "單任務上傳限速"
+
+#~ msgid "Prealloc"
+#~ msgstr "預分配"
+
+#~ msgid "Preallocation"
+#~ msgstr "磁碟預分配"
+
+#~ msgid "RPC Token"
+#~ msgstr "RPC 令牌"
+
+#~ msgid "Sec"
+#~ msgstr "秒"
+
+#~ msgid "Task Settings"
+#~ msgstr "任務設定"
+
+#~ msgid "Trunc"
+#~ msgstr "Trunc"
+
+#~ msgid "User agent value"
+#~ msgstr "使用者代理（UA）"
+
+#~ msgid "View Json-RPC URL"
+#~ msgstr "檢視 Json-RPC URL"
+
+#~ msgid "in bytes, You can append K or M."
+#~ msgstr "單位 B, 您可以在數字後跟上 K 或 M。"
 
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:119
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:122
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:128
-#: applications/luci-app-aria2/luasrc/model/cbi/aria2.lua:131
-msgid "in bytes/sec, You can append K or M."
-msgstr "單位 B/s, 您可以在數字後跟上 K 或 M。"
+#~ msgid "in bytes/sec, You can append K or M."
+#~ msgstr "單位 B/s, 您可以在數字後跟上 K 或 M。"
 
 #~ msgid "Log file is in the config file dir."
 #~ msgstr "日誌檔案在配置檔案目錄下"
diff --git a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
index 3a9ba5b29a..fc6190d5ac 100755
--- a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
+++ b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
@@ -7,5 +7,19 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
+if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then
+	uci -q batch <<-EOF >/dev/null
+		add aria2 aria2
+		rename aria2.@aria2[-1]="main"
+		set aria2.main.enabled=0
+		set aria2.main.dir="/var/run/aria2"
+		set aria2.main.config_dir="/var/etc/aria2"
+		add_list aria2.main.header=""
+		add_list aria2.main.bt_tracker=""
+		add_list aria2.main.extra_setting=""
+		commit aria2
+	EOF
+fi
+
 rm -f /tmp/luci-indexcache
 exit 0