docs/content/doc/help/faq.en-us.md

@@ -47,7 +47,8 @@ Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}})
 * [How can I enable password reset](#how-can-i-enable-password-reset)
 * [How can a user's password be changed](#how-can-a-user-s-password-be-changed)
 * [Why is my markdown broken](#why-is-my-markdown-broken)
-
+* [Errors during upgrade on MySQL: Error 1118: Row size too large.](#upgrade-errors-with-mysql)
+* [Why are emoji broken on MySQL](#why-are-emoji-broken-on-mysql)
 
 ## Difference between 1.x and 1.x.x downloads
 Version 1.7.x will be used for this example.  
@@ -308,3 +309,30 @@ There is no setting for password resets. It is enabled when a [mail service]({{<
 In Gitea version `1.11` we moved to [goldmark](https://github.com/yuin/goldmark) for markdown rendering, which is [CommonMark](https://commonmark.org/) compliant.  
 If you have markdown that worked as you expected prior to version `1.11` and after upgrading it's not working anymore, please look through the CommonMark spec to see whether the problem is due to a bug or non-compliant syntax.  
 If it is the latter, _usually_ there is a compliant alternative listed in the spec.
+
+## Upgrade errors with MySQL
+
+If you are receiving errors on upgrade of Gitea using MySQL that read:
+
+> `ORM engine initialization failed: migrate: do migrate: Error: 1118: Row size too large...`
+
+Please run `gitea convert` or run `ALTER TABLE table_name ROW_FORMAT=dynamic;` for each table in the database.
+
+The underlying problem is that the space allocated for indices by the default row format
+is too small. Gitea requires that the `ROWFORMAT` for its tables is `DYNAMIC`.
+
+If you are receiving an error line containing `Error 1071: Specified key was too long; max key length is 1000 bytes...`
+then you are attempting to run Gitea on tables which use the ISAM engine. While this may have worked by chance in previous versions of Gitea, it has never been officially supported and
+you must use InnoDB. You should run `ALTER TABLE table_name ENGINE=InnoDB;` for each table in the database.
+
+## Why Are Emoji Broken On MySQL
+
+Unfortunately MySQL's `utf8` charset does not completely allow all possible UTF-8 characters, in particular Emoji.
+They created a new charset and collation called `utf8mb4` that allows for emoji to be stored but tables which use
+the `utf8` charset, and connections which use the `utf8` charset will not use this.
+
+Please run `gitea convert`, or run `ALTER DATABASE database_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;`
+for the database_name and run `ALTER TABLE table_name CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;`
+for each table in the database.
+
+You will also need to change the app.ini database charset to `CHARSET=utf8mb4`.

options/locale/locale_zh-TW.ini

@@ -490,9 +490,12 @@ access_token_deletion=刪除訪問權杖
 
 manage_oauth2_applications=管理 OAuth2 應用程式
 edit_oauth2_application=編輯 OAuth2 應用程式
+remove_oauth2_application=刪除 OAuth2 應用程式
+remove_oauth2_application_success=已刪除應用程式。
 create_oauth2_application=新增 OAuth2 應用程式
 create_oauth2_application_button=建立應用程式
 create_oauth2_application_success=您已成功新增一個 OAuth2 應用程式。
+update_oauth2_application_success=您已成功更新了 OAuth2 應用程式。
 oauth2_application_name=應用程式名稱
 oauth2_type_web=Web (例如 Node.JS, Tomacat, Go)
 oauth2_type_native=原生應用程式 (Mobile, Desktop, Browser)
@@ -504,9 +507,14 @@ oauth2_regenerate_secret=重新產生密鑰
 oauth2_regenerate_secret_hint=遺失您的密鑰？
 oauth2_client_secret_hint=請備份您的祕鑰。祕鑰在您離開這個頁面後將不會再顯示。
 oauth2_application_edit=編輯
+oauth2_application_create_description=OAuth2 應用程式讓您的第三方應用程式可以存取此 Gitea 上的帳戶。
+oauth2_application_remove_description=刪除 OAuth2 應用會拒絕它存取此 Gitea 上已授權的帳戶。繼續嗎？
 
 authorized_oauth2_applications=已授權的 OAuth2 應用程式
-authorized_oauth2_applications_description=您已授權給這些第三方應用程式存取您個人 Gitea 帳戶。請對不再需要的應用程式撤銷授權。
+authorized_oauth2_applications_description=您已授權給這些第三方應用程式存取您個人 Gitea 帳戶。請對不再需要的應用程式撤銷存取權。
+revoke_oauth2_grant=撤銷存取權
+revoke_oauth2_grant_description=撤銷此第三方應用程式的存取權，此應用程式就無法再存取您的資料？您確定嗎？
+revoke_oauth2_grant_success=您已成功撤銷存取權
 
 twofa_is_enrolled=您的帳號已經<strong>啟用</strong>兩步驟驗證。
 twofa_not_enrolled=您的帳號目前尚未啟用兩步驟驗證。
@@ -1448,8 +1456,8 @@ auths.enable_tls=啟用 TLS 加密
 auths.skip_tls_verify=忽略 TLS 驗證
 auths.pam_service_name=PAM 服務名稱
 auths.oauth2_provider=OAuth2 提供者
-auths.oauth2_clientID=用戶端 ID (金鑰)
-auths.oauth2_clientSecret=用戶端金鑰
+auths.oauth2_clientID=客戶端 ID (金鑰)
+auths.oauth2_clientSecret=客戶端密鑰
 auths.openIdConnectAutoDiscoveryURL=OpenID 連接自動探索 URL
 auths.oauth2_use_custom_url=使用自定義 URL 而不是預設 URL
 auths.oauth2_tokenURL=Token URL