完善翻译

shenzt68 · Dec 9, 2020 · b968c7c · b968c7c
1 parent 410cb2b
commit b968c7c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/v2ray_util/global_setting/update_timer.py b/v2ray_util/global_setting/update_timer.py
@@ -35,7 +35,7 @@ def planUpdate():
     else:
         local_time = 3
     os.system('echo "SHELL=/bin/bash" >> crontab.txt && echo "$(crontab -l)" >> crontab.txt')
-    os.system('echo "0 {} * * * bash <(curl -L -s https://multi.netlify.app/go.sh) | tee -a /root/{}Update.log && v2ray-util restart" >> crontab.txt'.format(local_time, run_type))
+    os.system('echo "0 {} * * * bash <(curl -L -s https://multi.netlify.app/go.sh) {}| tee -a /root/{}Update.log && v2ray-util restart" >> crontab.txt'.format(local_time,"-x" if run_type == "xray" else "",run_type))
     os.system("crontab crontab.txt && rm -f crontab.txt")
     restartCron()
     print(ColorStr.green(_("success open schedule update task!")))

diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.mo
diff --git a/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po b/v2ray_util/locale_i18n/zh_CH/LC_MESSAGES/lang.po
@@ -227,15 +227,27 @@ msgstr "是否存在"
 msgid "clean v2ray log success!"
 msgstr "清理v2ray日志成功!"
 
+msgid "clean xray log success!"
+msgstr "清理xray日志成功!"
+
 msgid "ipv6 network not support update v2ray online, please manual donwload v2ray to update!"
 msgstr "ipv6 网络不支持v2ray的在线更新, 请手动下载v2ray来更新!"
 
+msgid "ipv6 network not support update xray online, please manual donwload xray to update!"
+msgstr "ipv6 网络不支持xray的在线更新, 请手动下载xray来更新!"
+
 msgid "download v2ray-linux-xx.zip and run 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l v2ray-linux-xx.zip' to update"
 msgstr "下载v2ray-linux-xx.zip包然后运行 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l v2ray-linux-xx.zip' 来更新"
 
+msgid "download Xray-linux-xx.zip and run 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l Xray-linux-xx.zip -x' to update"
+msgstr "下载Xray-linux-xx.zip包然后运行 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l Xray-linux-xx.zip -x' 来更新"
+
 msgid "check v2ray no install, auto install v2ray.."
 msgstr "检测到本机没安装v2ray, 正在自动安装.."
 
+msgid "check xray no install, auto install xray.."
+msgstr "检测到本机没安装xray, 正在自动安装.."
+
 ### v2ray.py end ###
 
 ### writer.py start ###
@@ -507,10 +519,10 @@ msgid "local group is socks, please input user and password to create user"
 msgstr "当前组为socks组, 请输入用户密码创建新的socks用户"
 
 msgid "Mtproto protocol only support one user!!"
-msgstr "当前选择的组为MTProto协议, V2ray只支持该协议同组的第一个用户生效, 所以没必要新增用户!"
+msgstr "当前选择的组为MTProto协议, 该协议只支持同组的第一个用户生效, 所以没必要新增用户!"
 
 msgid "Shadowsocks protocol only support one user, u can add new port to multiple SS!"
-msgstr "当前选择的组为Shadowsocks协议, V2ray只支持ss协议一个用户一个端口, 想多用户请新增端口!"
+msgstr "当前选择的组为Shadowsocks协议, ss协议只支持一个用户一个端口, 想多用户请新增端口!"
 
 msgid "del group info: "
 msgstr "你要删除的Group组所有节点信息: "

diff --git a/v2ray_util/util_core/v2ray.py b/v2ray_util/util_core/v2ray.py
@@ -86,7 +86,10 @@ def info():
     def update(version=None):
         if is_ipv6(get_ip()):
             print(ColorStr.yellow(_("ipv6 network not support update {soft} online, please manual donwload {soft} to update!".format(soft=run_type))))
-            print(ColorStr.fuchsia(_("download {soft}-linux-xx.zip and run 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l {soft}-linux-xx.zip' to update".format(soft=run_type))))
+            if run_type == "xray":
+                print(ColorStr.fuchsia(_("download Xray-linux-xx.zip and run 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l Xray-linux-xx.zip -x' to update")))
+            else:
+                print(ColorStr.fuchsia(_("download v2ray-linux-xx.zip and run 'bash <(curl -L -s https://multi.netlify.app/go.sh) -l v2ray-linux-xx.zip' to update")))
             sys.exit(0)
         if os.path.exists("/.dockerenv"):
             V2ray.stop()