Merge branch 'main' into fix_label_emoji

options/locale/locale_zh-CN.ini

@@ -2568,7 +2568,7 @@ org_name_helper=组织名字应该简单明了。
 create_org=创建组织
 repo_updated=最后更新于
 members=成员
-teams=组织团队
+teams=团队
 code=代码
 lower_members=名成员
 lower_repositories=个仓库

templates/repo/issue/view_content/comments.tmpl

@@ -364,7 +364,7 @@
 				{{end}}
 			</div>
 		{{else if eq .Type 22}}
-			<div class="timeline-item-group">
+			<div class="timeline-item-group" id="{{.HashTag}}">
 				<div class="timeline-item event">
 					{{if .OriginalAuthor}}
 					{{else}}
@@ -403,7 +403,7 @@
 					</span>
 				</div>
 				{{if or .Content .Attachments}}
-				<div class="timeline-item comment" id="{{.HashTag}}">
+				<div class="timeline-item comment">
 					<div class="content comment-container">
 						<div class="ui top attached header comment-header gt-df gt-ac gt-sb">
 							<div class="comment-header-left gt-df gt-ac">