Merge branch 'main' into config

Author: hiifong

Makefile

@@ -26,9 +26,9 @@ COMMA := ,
 XGO_VERSION := go-1.24.x
 
 AIR_PACKAGE ?= github.com/air-verse/air@v1
-EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.1.2
+EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.2.1
 GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].5
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].7
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]

options/locale/locale_pt-PT.ini

@@ -113,6 +113,7 @@ copy_type_unsupported=Este tipo de ficheiro não pode ser copiado
 write=Escrever
 preview=Pré-visualizar
 loading=Carregando…
+files=Ficheiros
 
 error=Erro
 error404=A página que pretende aceder <strong>não existe</strong> ou <strong>não tem autorização</strong> para a ver.

options/locale/locale_zh-CN.ini

@@ -96,8 +96,8 @@ edit=编辑
 view=查看
 test=测试
 
-enabled=启用
-disabled=禁用
+enabled=已启用
+disabled=已禁用
 locked=已锁定
 
 copy=复制
@@ -148,7 +148,7 @@ name=名称
 value=值
 readme=自述文档
 
-filter=过滤
+filter=筛选
 filter.clear=清除筛选器
 filter.is_archived=已归档
 filter.not_archived=非存档
@@ -159,7 +159,7 @@ filter.not_mirror=非镜像
 filter.is_template=模板
 filter.not_template=非模板
 filter.public=公开
-filter.private=私有库
+filter.private=私有
 
 no_results_found=未找到结果
 internal_error_skipped=发生内部错误，但已被跳过： %s
@@ -245,6 +245,7 @@ license_desc=所有的代码都开源在 <a target="_blank" rel="noopener norefe
 
 [install]
 install=安装页面
+installing_desc=正在安装，请稍候...
 title=初始配置
 docker_helper=如果您正在使用 Docker 容器运行 Gitea，请务必先仔细阅读 <a target="_blank" rel="noopener noreferrer" href="%s">官方文档</a> 后再对本页面进行填写。
 require_db_desc=Gitea 需要使用 MySQL、PostgreSQL、MSSQL、SQLite3 或 TiDB (MySQL协议) 等数据库
@@ -2870,7 +2871,7 @@ authentication=认证源
 emails=用户邮件
 config=应用配置
 config_summary=摘要
-config_settings=组织设置
+config_settings=设置
 notices=系统提示
 monitor=监控面板
 first_page=首页
@@ -3349,6 +3350,7 @@ monitor.previous=上次执行时间
 monitor.execute_times=执行次数
 monitor.process=运行中进程
 monitor.stacktrace=调用栈踪迹
+monitor.performance_logs=性能日志
 monitor.processes_count=%d 个进程
 monitor.download_diagnosis_report=下载诊断报告
 monitor.desc=进程描述
@@ -3529,12 +3531,12 @@ alpine.registry.info=从下面的列表中选择 $branch 和 $repository。
 alpine.install=要安装包，请运行以下命令：
 alpine.repository=仓库信息
 alpine.repository.branches=分支
-alpine.repository.repositories=仓库管理
+alpine.repository.repositories=仓库
 alpine.repository.architectures=架构
 arch.registry=添加具有相关仓库和架构的服务器到 <code>/etc/pacman.conf</code> 中：
 arch.install=使用 pacman 同步软件包：
 arch.repository=仓库信息
-arch.repository.repositories=仓库管理
+arch.repository.repositories=仓库
 arch.repository.architectures=架构
 cargo.registry=在 Cargo 配置文件中设置此注册中心(例如：<code>~/.cargo/config.toml</code>)：
 cargo.install=要使用 Cargo 安装软件包，请运行以下命令：
@@ -3552,6 +3554,7 @@ conda.install=要使用 Conda 安装软件包，请运行以下命令：
 container.details.type=镜像类型
 container.details.platform=平台
 container.pull=从命令行拉取镜像：
+container.images=镜像
 container.multi_arch=OS / Arch
 container.layers=镜像层
 container.labels=标签

templates/package/content/container.tmpl

@@ -82,7 +82,7 @@
 				<tbody>
 					{{range $key, $value := .PackageDescriptor.Metadata.Labels}}
 						<tr>
-							<td class="top aligned">{{$key}}</td>
+							<td class="tw-align-top">{{$key}}</td>
 							<td class="tw-break-anywhere">{{$value}}</td>
 						</tr>
 					{{end}}

templates/repo/issue/labels/label_list.tmpl

@@ -63,13 +63,11 @@
 
 		{{if and (not .PageIsOrgSettingsLabels) (.OrgLabels)}}
 			<li class="item">
-				<div class="ui grid middle aligned">
-					<div class="ten wide column">
-						{{ctx.Locale.Tr "repo.org_labels_desc"}}
-						{{if .IsOrganizationOwner}}
-							<a href="{{.OrganizationLink}}/settings/labels">({{ctx.Locale.Tr "repo.org_labels_desc_manage"}})</a>:
-						{{end}}
-					</div>
+				<div>{{/* parent is flex, so use block here to keep sentence spaces */}}
+					{{ctx.Locale.Tr "repo.org_labels_desc"}}
+					{{if .IsOrganizationOwner}}
+						<a href="{{.OrganizationLink}}/settings/labels">({{ctx.Locale.Tr "repo.org_labels_desc_manage"}})</a>:
+					{{end}}
 				</div>
 			</li>
 

templates/repo/issue/sidebar/reference_link.tmpl

@@ -1,8 +1,6 @@
 <div class="divider"></div>
-<div class="ui equal width compact grid">
-	{{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
-	<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
-		<span class="text column truncate">{{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span>
-		<button class="ui two wide button column tw-p-2" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
-	</div>
+{{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
+<div class="flex-text-block" data-tooltip-content="{{$issueReferenceLink}}">
+	<span class="tw-flex-1 gt-ellipsis">{{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span>
+	<button class="ui compact tiny icon button" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
 </div>

templates/repo/view_file_tree.tmpl

@@ -1,5 +1,5 @@
-<div class="flex-text-block tw-mb-2">
-	<button class="ui compact tiny icon button"
+<div class="flex-text-block repo-button-row">
+	<button class="ui compact basic icon button"
 		data-global-click="onRepoViewFileTreeToggle" data-toggle-action="hide"
 		data-tooltip-content="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
 		{{svg "octicon-sidebar-expand"}}

templates/user/auth/captcha.tmpl

@@ -10,12 +10,12 @@
 	<div class="inline field tw-text-center required">
 		<div id="captcha" data-captcha-type="g-recaptcha" class="g-recaptcha-style" data-sitekey="{{.RecaptchaSitekey}}"></div>
 	</div>
-	<script src='{{URLJoin .RecaptchaURL "api.js"}}'></script>
+	<script defer src='{{URLJoin .RecaptchaURL "api.js"}}'></script>
 {{else if eq .CaptchaType "hcaptcha"}}
 	<div class="inline field tw-text-center required">
 		<div id="captcha" data-captcha-type="h-captcha" class="h-captcha-style" data-sitekey="{{.HcaptchaSitekey}}"></div>
 	</div>
-	<script src='https://hcaptcha.com/1/api.js'></script>
+	<script defer src='https://hcaptcha.com/1/api.js'></script>
 {{else if eq .CaptchaType "mcaptcha"}}
 	<div class="inline field tw-text-center">
 		<div class="m-captcha-style" id="mcaptcha__widget-container"></div>
@@ -25,5 +25,5 @@
 	<div class="inline field tw-text-center">
 		<div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div>
 	</div>
-	<script src='https://challenges.cloudflare.com/turnstile/v0/api.js'></script>
+	<script defer src='https://challenges.cloudflare.com/turnstile/v0/api.js'></script>
 {{end}}{{end}}

templates/user/settings/repos.tmpl

@@ -81,7 +81,7 @@
 				{{end}}
 			{{else}}
 				{{if .Repos}}
-					<div class="ui middle aligned divided list">
+					<div class="ui list">
 						{{range .Repos}}
 							<div class="item">
 								<div class="content flex-text-block">

web_src/css/markup/content.css

@@ -285,7 +285,6 @@
 .markup table {
   display: block;
   width: 100%;
-  width: max-content;
   max-width: 100%;
   overflow: auto;
 }