From 51306d3ef98ce19267dd5302a7ab9bd1de2a58ec Mon Sep 17 00:00:00 2001 From: Kormi Meiko <59416791+KormiMeiko@users.noreply.github.com> Date: Sat, 30 Apr 2022 20:11:02 +0800 Subject: [PATCH 1/8] Update zh-tw.json --- languages/zh-tw.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/languages/zh-tw.json b/languages/zh-tw.json index 266dbeb..e63374a 100644 --- a/languages/zh-tw.json +++ b/languages/zh-tw.json @@ -39,4 +39,26 @@ "gameFolderDialog": "選擇Genshin Impact game資料夾", "grasscutterFileDialog": "選擇Grasscutter.jar檔案" -} \ No newline at end of file + + "loggingInTo": "登錄至：", + "registeringFor": "註冊至：", + "authUsername": "用戶名: ", + "authPassword": "密碼: ", + "authConfirmPassword": "再次確認密碼: ", + "authLoginBtn": "登錄", + "authRegisterBtn": "註冊", + "authLoginTitle": "登錄", + "authRegisterTitle": "註冊", + "launchWithoutAuth": "在未認證的情況下啟動", + + "alertInvalid": "無效的用戶名或密碼", + "alertNoPass": "未設定密碼，請先更改密碼", + "alertUnknown": "未知錯誤，請聯系服務器管理員", + "alertAuthNoLogin": "未啟用認證，無需登錄！", + "alertLoginSuccess": "登錄成功！Token 已復製至剪切板。將 Token 粘貼至用戶名處即可登錄。", + + "alertUserTaken": "用戶名已被占用", + "alertPassMismatch": "密碼與確認密碼不匹配", + "alertAuthNoRegister": "未啟用認證，無需註冊！", + "alertRegisterSuccess": "註冊成功！" +} From 9e921abac01bcdca291631947257a59ca19944cc Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sat, 30 Apr 2022 05:48:44 -0700 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 979c6d1..c04879b 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ The launcher most likely did not close correctly, and was unable to clean your p Thank you to everyone who has provided translations! <3 * ZH - nuoxianCN, Scirese & MrAru -* ZH-TW - Kimi +* ZH-TW - Kimi & KormiMeiko * PT-BR - na.na * VIE - labalityowo * ID - Iqrar99 From d8eba157fd7cc005413d09180346f612426c39ae Mon Sep 17 00:00:00 2001 From: Kimi <34180607+Kimi898246@users.noreply.github.com> Date: Sun, 1 May 2022 01:30:28 +0800 Subject: [PATCH 3/8] Traditional Chinese | Translation Patches Since authentication haven't been implemented in many server yet, I can't verify what can be edited or not, will do one more PR after I can see what I can change. --- languages/zh-tw.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/languages/zh-tw.json b/languages/zh-tw.json index e63374a..d1db5d7 100644 --- a/languages/zh-tw.json +++ b/languages/zh-tw.json @@ -51,14 +51,16 @@ "authRegisterTitle": "註冊", "launchWithoutAuth": "在未認證的情況下啟動", - "alertInvalid": "無效的用戶名或密碼", + "alertInvalid": "用戶名或密碼不正確。", "alertNoPass": "未設定密碼，請先更改密碼", - "alertUnknown": "未知錯誤，請聯系服務器管理員", + "alertUnknown": "未知錯誤，請聯系伺服器管理員", "alertAuthNoLogin": "未啟用認證，無需登錄！", - "alertLoginSuccess": "登錄成功！Token 已復製至剪切板。將 Token 粘貼至用戶名處即可登錄。", + "alertLoginSuccess": "登錄成功！Token 已複製至剪切板。將 Token 貼上至用戶名處即可登錄。", "alertUserTaken": "用戶名已被占用", - "alertPassMismatch": "密碼與確認密碼不匹配", + "alertPassMismatch": "兩組密碼不一致", "alertAuthNoRegister": "未啟用認證，無需註冊！", "alertRegisterSuccess": "註冊成功！" + + "updateNotifText": "有新的GrassClipper更新可用！ 最新版本: " } From 9eb50c68bf33183da32bb69dd7e56cd7d44e94f5 Mon Sep 17 00:00:00 2001 From: Kimi <34180607+Kimi898246@users.noreply.github.com> Date: Sun, 1 May 2022 01:35:03 +0800 Subject: [PATCH 4/8] Update zh-tw.json --- languages/zh-tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/zh-tw.json b/languages/zh-tw.json index d1db5d7..d551fb9 100644 --- a/languages/zh-tw.json +++ b/languages/zh-tw.json @@ -55,7 +55,7 @@ "alertNoPass": "未設定密碼，請先更改密碼", "alertUnknown": "未知錯誤，請聯系伺服器管理員", "alertAuthNoLogin": "未啟用認證，無需登錄！", - "alertLoginSuccess": "登錄成功！Token 已複製至剪切板。將 Token 貼上至用戶名處即可登錄。", + "alertLoginSuccess": "登錄成功！Token 已複製至剪貼簿。將 Token 複製到用戶名處即可登錄。", "alertUserTaken": "用戶名已被占用", "alertPassMismatch": "兩組密碼不一致", From 5520a11266cecd5543644eed8fd490270733eb24 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sat, 30 Apr 2022 23:09:52 -0700 Subject: [PATCH 5/8] scroll through settings --- resources/style/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/style/index.css b/resources/style/index.css index 24e8e7c..ff31870 100644 --- a/resources/style/index.css +++ b/resources/style/index.css @@ -175,7 +175,7 @@ a { #settingsPanel { width: 35%; height: 80%; - overflow: hidden; + overflow: auto; } #fullSettingsTitle { From 90a7d62536fd440a7a5361e3fa4f7106011b9018 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sat, 30 Apr 2022 23:15:57 -0700 Subject: [PATCH 6/8] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c04879b..2b89598 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,9 @@ If all else fails, you can run GrassClipper in `chrome` or `browser` mode. To do ## Error 502 -If you are getting an error 502 when attempting to log in, open your Grasscutter config and add the following to the `DispatchServer` section: +First, if you are running a local server, ensure the local server is running. Otherwise, ensure the server you are connecting to is actually running. + +If you are still getting an error 502 when attempting to log in to your own server, open your Grasscutter config and add the following to the `DispatchServer` section: ```json "PublicPort": YOUR_PORT From 8190219157ca75a50fe5014d94181d23a7c44c2b Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sun, 1 May 2022 17:25:01 -0700 Subject: [PATCH 7/8] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b89598..075efb4 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,9 @@ If all else fails, you can run GrassClipper in `chrome` or `browser` mode. To do ## Error 502 -First, if you are running a local server, ensure the local server is running. Otherwise, ensure the server you are connecting to is actually running. +1. If you are running a local server, ensure the local server is running. Otherwise, ensure the server you are connecting to is actually running. + +2. If you are able, [use the development branch of Grasscutter](https://github.com/Grasscutters/Grasscutter/tree/development). It is known to work better with GrassClipper. If you are still getting an error 502 when attempting to log in to your own server, open your Grasscutter config and add the following to the `DispatchServer` section: From cc1cf9297040cd3491a9a01706edf728632a90b7 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sun, 1 May 2022 17:48:19 -0700 Subject: [PATCH 8/8] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 075efb4..4b87515 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Grasscutter launcher for easily switching between Official and Private servers * [Common Problems](#having-problems) * [White Screen Fix](#white-screen-fix) * [Error 502](#error-502) + * [Error 4206](#error-4206) * [Infinite CMD Windows](#infinite-cmd-windows) * [Broken Discord/Youtube](#my-discord-is-not-letting-me-send-messages-or-load-images-my-youtube-is-acting-strange) * [No internet](#i-have-no-internet-after-closing-everything-restarting-my-pc) @@ -88,6 +89,10 @@ If you are still getting an error 502 when attempting to log in to your own serv ``` where `YOUR_PORT` is the same port you use as the `Port` value already. This will probably be 443. +## Error 4206 + +Ensure you have the correct `keystore.p12` file that comes with your branch (`stable` or `development`). Also ensure the password is set properly in Grasscutters `config.json` (blank for `stable`, "123456" for `development`). + ## Infinite CMD Windows If you are getting infinite CMD windows for any of the scripts (such as the proxy installation, or private server start), ensure you have UAC (user access control) set to any option that requires asking. Ensure your user account can open things as Admin.