From 8dabab45090443d9130612770d8ea83e3dc33998 Mon Sep 17 00:00:00 2001
From: ElonH <elonhhuang@gmail.com>
Date: Wed, 25 Mar 2020 16:44:22 +0800
Subject: [PATCH] luci-app-rclone: more robust

---
 .../luasrc/controller/rclone.lua              |  5 +-
 .../ctcgfw/luci-app-rclone/po/zh-cn/rclone.po | 98 ++++++++++++++-----
 2 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua b/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua
index f296545224..5b1028066c 100644
--- a/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua
+++ b/package/ctcgfw/luci-app-rclone/luasrc/controller/rclone.lua
@@ -1,8 +1,7 @@
 module("luci.controller.rclone", package.seeall)
 
 function index()
-	if not nixio.fs.access("/etc/config/rclone") then
-		return
-	end
+	if not nixio.fs.access("/etc/config/rclone") then return end
+	entry({"admin", "nas"}, firstchild(), _("NAS") , 45).dependent = false
 	entry({"admin", "nas", "rclone"}, cbi("rclone"), _("Rclone"), 100 ).dependent = false
 end
diff --git a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po
index 0d673325cc..1caa031ec5 100644
--- a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po
+++ b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po
@@ -11,101 +11,151 @@ msgstr ""
 "PO-Revision-Date: \n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:41
+#: luasrc/model/cbi/rclone.lua:115
+msgid "FAQ"
+msgstr "常见问题"
+
+#: luasrc/model/cbi/rclone.lua:131
+msgid "Hosts must be comma separated, and can contain domains or parts."
+msgstr "用逗号分隔地址,且地址必须包含(部分)域名"
+
+#: luasrc/model/cbi/rclone.lua:41
 msgid "Installed Web Interface"
 msgstr "已安装Web界面"
 
-#: luci-app-rclone/luasrc/controller/rclone.lua:7
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:37
+#: luasrc/controller/rclone.lua:5
+msgid "NAS"
+msgstr "存储"
+
+#: luasrc/model/cbi/rclone.lua:37 luasrc/controller/rclone.lua:6
 msgid "Rclone"
 msgstr "Rclone"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:38
+#: luasrc/model/cbi/rclone.lua:38
 msgid ""
 "Rclone (\"rsync for cloud storage\") is a command line program to sync root/"
 "usr/bin and directories to and from different cloud storage providers."
 msgstr ""
 "Rclone是一款的命令行工具，支持在不同对象存储、网盘间同步、上传、下载数据。"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:43
+#: luasrc/model/cbi/rclone.lua:124
+msgid ""
+"The content of the variable is protocol://server:port. The protocol value is "
+"commonly either http or socks5."
+msgstr ""
+"内容格式为: protocol://server:port\n"
+"protocol 通常为 http 或者 socks5"
+
+#: luasrc/model/cbi/rclone.lua:130
+msgid "This allows you to disable the proxy for specific hosts."
+msgstr "这允许不代理特定的地址."
+
+#: luasrc/model/cbi/rclone.lua:43
 msgid "Webui React"
 msgstr "Webui React"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:61
+#: luasrc/model/cbi/rclone.lua:61
 msgid "all address"
 msgstr "全部地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:54
+#: luasrc/model/cbi/rclone.lua:54
 msgid "configure"
 msgstr "配置"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77
+#: luasrc/model/cbi/rclone.lua:126
+msgid "disable proxy"
+msgstr ""
+
+#: luasrc/model/cbi/rclone.lua:77
 msgid "download"
 msgstr "下载"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:76
+#: luasrc/model/cbi/rclone.lua:76
 msgid "download configuration"
 msgstr "下载配置文件"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:47
+#: luasrc/model/cbi/rclone.lua:117
+msgid "enable proxy"
+msgstr "启用代理"
+
+#: luasrc/model/cbi/rclone.lua:47
 msgid "global"
 msgstr "全局"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:58
+#: luasrc/model/cbi/rclone.lua:58
 msgid "listen address"
 msgstr "监听地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:65
+#: luasrc/model/cbi/rclone.lua:65
 msgid "listen port"
 msgstr "监听端口"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:60
+#: luasrc/model/cbi/rclone.lua:60
 msgid "local network address"
 msgstr "局域网地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:59
+#: luasrc/model/cbi/rclone.lua:59
 msgid "localhost address"
 msgstr "本机地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:111
+#: luasrc/model/cbi/rclone.lua:133
 msgid "log"
 msgstr "日志"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:105
+#: luasrc/model/cbi/rclone.lua:105
 msgid "password"
 msgstr "密码"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:115
+#: luasrc/model/cbi/rclone.lua:137
 msgid "path"
 msgstr "路径"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:28
+#: luasrc/model/cbi/rclone.lua:111
+msgid "proxy"
+msgstr "代理"
+
+#: luasrc/model/cbi/rclone.lua:120
+msgid "proxy address"
+msgstr "代理地址"
+
+#: luasrc/model/cbi/rclone.lua:28
 msgid "rclone address"
 msgstr "rclone 地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:71
+#: luasrc/model/cbi/rclone.lua:71
 msgid "rclone configuration file path"
 msgstr "rclone 配置文件地址"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:30
+#: luasrc/model/cbi/rclone.lua:30
 msgid "rclone not run"
 msgstr "rclone未运行"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:27
+#: luasrc/model/cbi/rclone.lua:27
 msgid "rclone running"
 msgstr "rclone 运行中"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:39
+#: luasrc/model/cbi/rclone.lua:39
 msgid "rclone state"
 msgstr "rclone 状态"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:51
+#: luasrc/model/cbi/rclone.lua:51
 msgid "run Rclone as daemon"
 msgstr "启动 rclone 后台服务"
 
-#: luci-app-rclone/luasrc/model/cbi/rclone.lua:100
+#: luasrc/model/cbi/rclone.lua:100
 msgid "username"
 msgstr "用户名"
 
+#~ msgid "How to proxy rclone"
+#~ msgstr "如何代理rclone"
+
+#~ msgid "disable proxy for specific hosts"
+#~ msgstr "针对特定主机禁用代理"
+
+#~ msgid ""
+#~ "rclone will follow the standard environment variables for proxies, "
+#~ "similar to cURL and other programs."
+#~ msgstr "rclone 会使用代理的标准环境变量，类似于 cURL 及其他程序。"
+
 #~ msgid "run Rclone in daeman"
 #~ msgstr "启动 rclone 后台服务"