Merge branch 'main' of https://github.com/Grasscutters/GrassClipper i…

…nto main

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)
@@ -77,13 +78,21 @@ 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:
+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:
 
 ```json
 "PublicPort": YOUR_PORT
 ```
 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.
@@ -101,7 +110,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

languages/zh-tw.json

@@ -39,4 +39,28 @@
 
   "gameFolderDialog": "選擇Genshin Impact game資料夾",
   "grasscutterFileDialog": "選擇Grasscutter.jar檔案"
-}
+
+  "loggingInTo": "登錄至：",
+  "registeringFor": "註冊至：",
+  "authUsername": "用戶名: ",
+  "authPassword": "密碼: ",
+  "authConfirmPassword": "再次確認密碼: ",
+  "authLoginBtn": "登錄",
+  "authRegisterBtn": "註冊",
+  "authLoginTitle": "登錄",
+  "authRegisterTitle": "註冊",
+  "launchWithoutAuth": "在未認證的情況下啟動",
+
+  "alertInvalid": "用戶名或密碼不正確。",
+  "alertNoPass": "未設定密碼，請先更改密碼",
+  "alertUnknown": "未知錯誤，請聯系伺服器管理員",
+  "alertAuthNoLogin": "未啟用認證，無需登錄！",
+  "alertLoginSuccess": "登錄成功！Token 已複製至剪貼簿。將 Token 複製到用戶名處即可登錄。",
+
+  "alertUserTaken": "用戶名已被占用",
+  "alertPassMismatch": "兩組密碼不一致",
+  "alertAuthNoRegister": "未啟用認證，無需註冊！",
+  "alertRegisterSuccess": "註冊成功！"
+
+  "updateNotifText": "有新的GrassClipper更新可用！ 最新版本: "
+}

resources/style/index.css

@@ -175,7 +175,7 @@ a {
 #settingsPanel {
   width: 35%;
   height: 80%;
-  overflow: hidden;
+  overflow: auto;
 }
 
 #fullSettingsTitle {