Merge branch 'main' into user-avatar-link-abs

Author: wxiaoguang

docs/content/doc/usage/reverse-proxies.en-us.md

@@ -292,3 +292,50 @@ If you wish to run Gitea with IIS. You will need to setup IIS with URL Rewrite a
     </system.webServer>
 </configuration>
 ```
+
+## HAProxy
+
+If you want HAProxy to serve your Gitea instance, you can add the following to your HAProxy configuration
+
+add an acl in the frontend section to redirect calls to gitea.example.com to the correct backend
+```
+frontend http-in
+    ...
+    acl acl_gitea hdr(host) -i gitea.example.com
+    use_backend gitea if acl_gitea
+    ...
+```
+
+add the previously defined backend section
+```
+backend gitea
+    server localhost:3000 check
+```
+
+If you redirect the http content to https, the configuration work the same way, just remember that the connexion between HAProxy and Gitea will be done via http so you do not have to enable https in Gitea's configuration.
+
+## HAProxy with a sub-path
+
+In case you already have a site, and you want Gitea to share the domain name, you can setup HAProxy to serve Gitea under a sub-path by adding the following to you HAProxy configuration:
+
+```
+frontend http-in
+    ...
+    acl acl_gitea path_beg /gitea
+    use_backend gitea if acl_gitea
+    ...
+```
+
+With that configuration http://example.com/gitea/ will redirect to your Gitea instance.
+
+then for the backend section
+```
+backend gitea
+    http-request replace-path /gitea\/?(.*) \/\1
+    server localhost:3000 check
+```
+
+The added http-request will automatically add a trailing slash if needed and internally remove /gitea from the path to allow it to work correctly with Gitea by setting properly http://example.com/gitea as the root.
+
+Then you **MUST** set something like `[server] ROOT_URL = http://example.com/gitea/` correctly in your configuration.
+

options/locale/locale_zh-TW.ini

@@ -520,7 +520,7 @@ change_username=您的帳號已更改。
 change_username_prompt=注意：修改帳號也會更改您的帳戶的 URL。
 change_username_redirect_prompt=舊的帳號被領用前，會重新導向您的新帳號。
 continue=繼續操作
-cancel=取消操作
+cancel=取消
 language=語言
 ui=佈景主題
 privacy=隱私
@@ -926,6 +926,9 @@ star_guest_user=登入以為此儲存庫加上星號。
 copy_link=複製連結
 copy_link_success=已複製連結
 copy_link_error=請按下 ⌘-C 或 Ctrl-C 複製
+copy_branch=複製
+copy_branch_success=已複製分支名稱
+copy_branch_error=按下 ⌘C 或 Ctrl-C 以複製
 copied=複製成功
 unwatch=取消關注
 watch=關注
@@ -980,6 +983,7 @@ commit_graph=提交線圖
 commit_graph.select=選擇分支
 commit_graph.hide_pr_refs=隱藏合併請求
 commit_graph.monochrome=單色
+commit_graph.color=彩色
 blame=Blame
 normal_view=標準檢視
 line=行
@@ -1096,6 +1100,7 @@ projects.board.set_default=設為預設
 projects.board.set_default_desc=將此看板設定為未分類問題及合併請求的預設看板
 projects.board.delete=刪除看板
 projects.board.deletion_desc=刪除專案看板會將所有相關的問題移動到「未分類」，是否繼續？
+projects.board.color=顏色
 projects.open=開啟
 projects.close=關閉
 
@@ -1799,6 +1804,7 @@ settings.content_type=POST Content Type
 settings.secret=Secret
 settings.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
+settings.slack_color=顏色
 settings.discord_username=使用者名稱
 settings.discord_icon_url=Icon URL
 settings.event_desc=觸發條件：