From 81a1ef16e72319304ac1b65a667cc6d813934f88 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sat, 24 Dec 2016 23:24:19 +0800
Subject: [PATCH] add file name and http header option in new task page

---
 src/langs/zh_CN.txt                   |  4 +++-
 src/scripts/config/aria2Options.js    | 13 +++++++++++++
 src/scripts/config/defaultLanguage.js |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/langs/zh_CN.txt b/src/langs/zh_CN.txt
index 2452046..ba9ac17 100644
--- a/src/langs/zh_CN.txt
+++ b/src/langs/zh_CN.txt
@@ -285,6 +285,8 @@ netrc-path.description=
 no-netrc.name=禁用 netrc
 no-netrc.description=
 no-proxy.name=不使用代理服务器列表
+out.name=文件名
+out.description=下载文件的文件名. 其总是相对于 --dir 选项中设置的路径. 当使用 --force-sequential 参数是, 此选项无效.
 no-proxy.description=设置不使用代理服务器的主机名, 域名, 包含或不包含子网掩码的网络地址, 多个使用逗号分隔.
 proxy-method.name=代理服务器请求方法
 proxy-method.description=设置用来请求代理服务器的方法. 方法可设置为 GET 或 TUNNEL. HTTPS 下载将忽略此选项并总是使用 TUNNEL.
@@ -397,7 +399,7 @@ bt-save-metadata.description=保存种子文件为 ".torrent" 文件. 此选项
 bt-seed-unverified.name=不检查已经下载的文件
 bt-seed-unverified.description=不检查之前下载文件中每个分片的哈希值.
 bt-stop-timeout.name=无速度时自动停止时间
-bt-stop-timeout.description=当 BT 任务F下载速度持续为 0, 达到本选项设置的时间后停止下载. 如果设置为 0, 此功能将禁用.
+bt-stop-timeout.description=当 BT 任务F下载速度持续为 0, 达到此选项设置的时间后停止下载. 如果设置为 0, 此功能将禁用.
 bt-tracker.name=BT 服务器地址
 bt-tracker.description=逗号分隔的 BT 服务器地址. 如果服务器地址在 --bt-exclude-tracker 选项中, 其将不会生效.
 bt-tracker-connect-timeout.name=BT 服务器连接超时时间
diff --git a/src/scripts/config/aria2Options.js b/src/scripts/config/aria2Options.js
index 94dfd31..63ce42f 100644
--- a/src/scripts/config/aria2Options.js
+++ b/src/scripts/config/aria2Options.js
@@ -108,6 +108,9 @@
             split: ',',
             showCount: true
         },
+        'out': {
+            type: 'string'
+        },
         'proxy-method': {
             type: 'option',
             options: ['get', 'tunnel'],
@@ -820,6 +823,11 @@
                 key: 'dir',
                 newOnly: true
             },
+            {
+                key: 'out',
+                httpOnly: true,
+                newOnly: true
+            },
             {
                 key: 'allow-overwrite',
                 newOnly: true
@@ -871,6 +879,11 @@
                 httpOnly: true,
                 activeReadonly: true
             },
+            {
+                key: 'header',
+                httpOnly: true,
+                newOnly: true
+            },
             {
                 key: 'bt-max-peers',
                 btOnly: true
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index 7ed9f2d..946c652 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -305,6 +305,8 @@
                 'no-netrc.description': '',
                 'no-proxy.name': 'No Proxy List',
                 'no-proxy.description': 'Specify a comma separated list of host names, domains and network addresses with or without a subnet mask where no proxy should be used.',
+                'out.name': 'File Name',
+                'out.description': 'The file name of the downloaded file. It is always relative to the directory given in --dir option. When the --force-sequential option is used, this option is ignored.',
                 'proxy-method.name': 'Proxy Method',
                 'proxy-method.description': 'Set the method to use in proxy request. METHOD is either GET or TUNNEL. HTTPS downloads always use TUNNEL regardless of this option.',
                 'remote-time.name': 'Remote File Timestamp',