From bb5049a0d1d283aab338d1fd72e63189d8ffe0fe Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 15 Jan 2020 01:21:51 +0800 Subject: [PATCH] luci-app-rclone: sync with upstream source --- package/ctcgfw/luci-app-rclone/Makefile | 4 +- .../luasrc/model/cbi/rclone.lua | 43 ++++---- .../ctcgfw/luci-app-rclone/po/en/rclone.po | 98 ++++++++++++++++++ .../luci-app-rclone/po/templates/rclone.pot | 85 ++++++++++++++++ .../ctcgfw/luci-app-rclone/po/zh-cn/rclone.po | 99 +++++++++++++++++++ 5 files changed, 302 insertions(+), 27 deletions(-) create mode 100644 package/ctcgfw/luci-app-rclone/po/en/rclone.po create mode 100644 package/ctcgfw/luci-app-rclone/po/templates/rclone.pot create mode 100644 package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po diff --git a/package/ctcgfw/luci-app-rclone/Makefile b/package/ctcgfw/luci-app-rclone/Makefile index 803185b6ac..a8bcdb131c 100644 --- a/package/ctcgfw/luci-app-rclone/Makefile +++ b/package/ctcgfw/luci-app-rclone/Makefile @@ -13,11 +13,11 @@ LUCI_TITLE:=LuCI support for Rclone LUCI_DEPENDS:=+rclone +rclone-webui-react LUCI_PKGARCH:=all PKG_NAME:=luci-app-rclone -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.0.1 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3.0+ PKG_MAINTAINER:=ElonH include $(TOPDIR)/feeds/luci/luci.mk -# call BuildPackage - OpenWrt buildroot signature \ No newline at end of file +# call BuildPackage - OpenWrt buildroot signature diff --git a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua b/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua index b0ee29ef5c..8dd77e492b 100644 --- a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua +++ b/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua @@ -13,79 +13,72 @@ local state_msg = '' local trport = uci:get('rclone', 'config', 'port') if running then - state_msg = '' .. translate('rclone运行中') .. '' + state_msg = '' .. translate('rclone running') .. '' else - state_msg = '' .. translate('rclone未运行') .. '' + state_msg = '' .. translate('rclone not run') .. '' end m = Map( 'rclone', translate('Rclone'), - translate('Rclone是一款的命令行工具，支持在不同对象存储、网盘间同步、上传、下载数据。') .. + translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') .. '

' .. - translate('rclone运行状态') .. + translate('rclone state') .. ' : ' .. state_msg .. '

' .. - translate('已安装的WEB界面') .. + translate('Installed Web Interface') .. '      

" ) -s = m:section(TypedSection, 'global', translate('全局')) +s = m:section(TypedSection, 'global', translate('global')) s.addremove = false s.anonymous = true -enable = s:option(Flag, 'enabled', translate('启用 Rclone 后台服务')) +enable = s:option(Flag, 'enabled', translate('run Rclone as daemon')) enable.rmempty = false --- user = s:option(ListValue, 'user', translate('以此用户权限运行')) --- local p_user --- for _, p_user in luci.util.vspairs(luci.util.split(luci.sys.exec('cat /etc/passwd | cut -f 1 -d :'))) do --- user:value(p_user) --- end --- TODO: user add rclone - -s = m:section(TypedSection, 'conf', translate('配置')) +s = m:section(TypedSection, 'conf', translate('configure')) s.addremove = false s.anonymous = true -o = s:option(ListValue, 'addr_type', translate('监听地址')) -o:value('local', translate('监听本机地址')) -o:value('lan', translate('监听局域网地址')) -o:value('wan', translate('监听全部地址')) +o = s:option(ListValue, 'addr_type', translate('listen address')) +o:value('local', translate('localhost address')) +o:value('lan', translate('local network address')) +o:value('wan', translate('all address')) o.default = 'lan' o.rmempty = false -o = s:option(Value, 'port', translate('监听端口')) +o = s:option(Value, 'port', translate('listen port')) o.placeholder = 5572 o.default = 5572 o.datatype = 'port' o.rmempty = false -o = s:option(Value, 'config_path', translate('配置文件路径')) +o = s:option(Value, 'config_path', translate('rclone configuration file path')) o.placeholder = '/etc/rclone/rclone.conf' o.default = '/etc/rclone/rclone.conf' o.rmempty = false -o = s:option(Value, 'username', translate('用户名')) +o = s:option(Value, 'username', translate('username')) o.placeholder = 'admin' o.default = 'admin' o.rmempty = false -o = s:option(Value, 'password', translate('密码')) +o = s:option(Value, 'password', translate('password')) o.password = true o.placeholder = 'admin' o.default = 'admin' o.rmempty = false -s = m:section(TypedSection, 'log', translate('日志')) +s = m:section(TypedSection, 'log', translate('log')) s.addremove = false s.anonymous = true -o = s:option(Value, 'path', translate('路径')) +o = s:option(Value, 'path', translate('path')) o.placeholder = '/var/log/rclone/output' o.default = '/var/log/rclone/output' o.rmempty = false diff --git a/package/ctcgfw/luci-app-rclone/po/en/rclone.po b/package/ctcgfw/luci-app-rclone/po/en/rclone.po new file mode 100644 index 0000000000..4d2cee998e --- /dev/null +++ b/package/ctcgfw/luci-app-rclone/po/en/rclone.po @@ -0,0 +1,98 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:31 +msgid "Installed Web Interface" +msgstr "Installed Web Interface" + +#: luci-app-rclone/luasrc/controller/rclone.lua:7 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:24 +msgid "Rclone" +msgstr "Rclone" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:25 +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 (\"rsync for cloud storage\") is a command line program to sync root/" +"usr/bin and directories to and from different cloud storage providers." + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:33 +msgid "Webui React" +msgstr "Webui React" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:51 +msgid "all address" +msgstr "all address" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:44 +msgid "configure" +msgstr "configure" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:37 +msgid "global" +msgstr "global" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:48 +msgid "listen address" +msgstr "listen address" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:55 +msgid "listen port" +msgstr "listen port" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:50 +msgid "local network address" +msgstr "local network address" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:49 +msgid "localhost address" +msgstr "localhost address" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "log" +msgstr "log" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:71 +msgid "password" +msgstr "password" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +msgid "path" +msgstr "path" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:61 +msgid "rclone configuration file path" +msgstr "rclone configuration file path" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:18 +msgid "rclone not run" +msgstr "rclone not run" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:16 +msgid "rclone running" +msgstr "rclone running" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:27 +msgid "rclone state" +msgstr "rclone state" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:41 +msgid "run Rclone as daemon" +msgstr "run Rclone as daemon" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:66 +msgid "username" +msgstr "username" + +#~ msgid "run Rclone in daeman" +#~ msgstr "run Rclone in daeman" diff --git a/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot b/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot new file mode 100644 index 0000000000..2addac0936 --- /dev/null +++ b/package/ctcgfw/luci-app-rclone/po/templates/rclone.pot @@ -0,0 +1,85 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:31 +msgid "Installed Web Interface" +msgstr "" + +#: luci-app-rclone/luasrc/controller/rclone.lua:7 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:24 +msgid "Rclone" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:25 +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 "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:33 +msgid "Webui React" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:51 +msgid "all address" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:44 +msgid "configure" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:37 +msgid "global" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:48 +msgid "listen address" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:55 +msgid "listen port" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:50 +msgid "local network address" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:49 +msgid "localhost address" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "log" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:71 +msgid "password" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +msgid "path" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:61 +msgid "rclone configuration file path" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:18 +msgid "rclone not run" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:16 +msgid "rclone running" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:27 +msgid "rclone state" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:41 +msgid "run Rclone as daemon" +msgstr "" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:66 +msgid "username" +msgstr "" diff --git a/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po new file mode 100644 index 0000000000..ff36be62b7 --- /dev/null +++ b/package/ctcgfw/luci-app-rclone/po/zh-cn/rclone.po @@ -0,0 +1,99 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"Last-Translator: ElonH \n" +"Language-Team: none\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"X-Generator: Poedit 2.0.6\n" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:31 +msgid "Installed Web Interface" +msgstr "已安装Web界面" + +#: luci-app-rclone/luasrc/controller/rclone.lua:7 +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:24 +msgid "Rclone" +msgstr "Rclone" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:25 +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:33 +msgid "Webui React" +msgstr "Webui React" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:51 +msgid "all address" +msgstr "全部地址" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:44 +msgid "configure" +msgstr "配置" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:37 +msgid "global" +msgstr "全局" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:48 +msgid "listen address" +msgstr "监听地址" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:55 +msgid "listen port" +msgstr "监听端口" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:50 +msgid "local network address" +msgstr "局域网地址" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:49 +msgid "localhost address" +msgstr "本机地址" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:77 +msgid "log" +msgstr "日志" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:71 +msgid "password" +msgstr "密码" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:81 +msgid "path" +msgstr "路径" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:61 +msgid "rclone configuration file path" +msgstr "rclone 配置文件地址" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:18 +msgid "rclone not run" +msgstr "rclone未运行" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:16 +msgid "rclone running" +msgstr "rclone 运行中" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:27 +msgid "rclone state" +msgstr "rclone 状态" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:41 +msgid "run Rclone as daemon" +msgstr "启动 rclone 后台服务" + +#: luci-app-rclone/luasrc/model/cbi/rclone.lua:66 +msgid "username" +msgstr "用户名" + +#~ msgid "run Rclone in daeman" +#~ msgstr "启动 rclone 后台服务"