Merge branch 'main' into load-missing-diffs

Author: zeripath

CHANGELOG.md

@@ -4,6 +4,29 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.15.4](https://github.com/go-gitea/gitea/releases/tag/v1.15.4) - 2021-10-08
+* BUGFIXES
+  * Raw file API: don't try to interpret 40char filenames as commit SHA (#17185) (#17272)
+  * Don't allow merged PRs to be reopened (#17192) (#17271)
+  * Fix incorrect repository count on organization tab of dashboard (#17256) (#17266)
+  * Fix unwanted team review request deletion (#17257) (#17264)
+  * Fix broken Activities link in team dashboard (#17255) (#17258)
+  * API pull's head/base have correct permission(#17214) (#17245)
+  * Fix stange behavior of DownloadPullDiffOrPatch in incorect index (#17223) (#17227)
+  * Upgrade xorm to v1.2.5 (#17177) (#17188)
+  * Fix missing repo link in issue/pull assigned emails (#17183) (#17184)
+  * Fix bug of get context user (#17169) (#17172)
+  * Nicely handle missing user in collaborations (#17049) (#17166)
+  * Add Horizontal scrollbar to inner menu on Chrome (#17086) (#17164)
+  * Fix wrong i18n keys (#17150) (#17153)
+  * Fix Archive Creation: correct transaction ending (#17151)
+  * Prevent panic in Org mode HighlightCodeBlock (#17140) (#17141)
+  * Create doctor command to fix repo_units broken by dumps from 1.14.3-1.14.6 (#17136) (#17137)
+* ENHANCEMENT
+  * Check user instead of organization when creating a repo from a template via API (#16346) (#17195)
+* TRANSLATION
+  * v1.15 fix Sprintf format 'verbs' in locale files (#17187)
+
 ## [1.15.3](https://github.com/go-gitea/gitea/releases/tag/v1.15.3) - 2021-09-19
 
 * ENHANCEMENTS

docs/config.yaml

@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.15.3
+  version: 1.15.4
   minGoVersion: 1.16
   goVersion: 1.17
   minNodeVersion: 12.17

options/locale/locale_zh-CN.ini

@@ -96,6 +96,7 @@ error=错误
 error404=您正尝试访问的页面 <strong>不存在</strong> 或 <strong>您尚未被授权</strong> 查看该页面。
 
 never=从不
+color=颜色
 
 [error]
 occurred=发生错误
@@ -345,6 +346,8 @@ reset_password.text=请点击以下链接，恢复你在 <b>%s</b> 的账户：
 
 register_success=注册成功
 
+issue_assigned.pull=@%[1]s 已将仓库 %[3]s 中的合并请求 %[2]s 指派给您
+issue_assigned.issue=@%[1]s 已将仓库 %[3]s 中的工单 %[2]s 指派给您
 
 issue.x_mentioned_you=<b>@%s</b> 提到了您：
 issue.action.force_push=<b>%[1]s</b> 强制从 %[3]s 推送 <b>%[2]s</b> 至 [4]s。
@@ -967,6 +970,7 @@ file_view_rendered=渲染模式
 file_view_raw=查看原始文件
 file_permalink=永久链接
 file_too_large=文件过大，无法显示。
+file_copy_permalink=复制永久链接
 video_not_supported_in_browser=您的浏览器不支持使用 HTML5 'video' 标签。
 audio_not_supported_in_browser=您的浏览器不支持使用 HTML5 'video' 标签。
 stored_lfs=存储到Git LFS
@@ -1194,6 +1198,11 @@ issues.action_milestone_no_select=无里程碑
 issues.action_assignee=指派人筛选
 issues.action_assignee_no_select=未指派
 issues.opened_by=由 <a href="%[2]s">%[3]s</a> 于 %[1]s创建
+pulls.merged_by=由 <a href="%[2]s">%[3]</a> 于 %[1]s 合并
+pulls.merged_by_fake=由 %[2]s 于 %[1]s 合并
+issues.closed_by=由 <a href="%[2]s">%[3]s</a> 于 %[1]s 关闭
+issues.opened_by_fake=由 %[2]s 于 %[1]s 打开
+issues.closed_by_fake=由 %[2]s 于 %[1]s 关闭
 issues.previous=上一页
 issues.next=下一页
 issues.open_title=开启中
@@ -1378,6 +1387,8 @@ pulls.compare_changes=创建合并请求
 pulls.compare_changes_desc=选择合并的目标分支和源分支。
 pulls.compare_base=合并到
 pulls.compare_compare=拉取从
+pulls.switch_comparison_type=切换比较类型
+pulls.switch_head_and_base=切换 head 和 base
 pulls.filter_branch=过滤分支
 pulls.no_results=未找到结果
 pulls.nothing_to_compare=分支内容相同，无需创建合并请求。
@@ -2412,6 +2423,7 @@ auths.attribute_name=名字属性
 auths.attribute_surname=姓氏属性
 auths.attribute_mail=电子邮箱属性
 auths.attribute_ssh_public_key=SSH公钥属性
+auths.attribute_avatar=头像属性
 auths.attributes_in_bind=从 Bind DN 中拉取属性信息
 auths.allow_deactivate_all=允许在搜索结果为空时停用所有用户
 auths.use_paged_search=使用分页搜索