Skip to content

Commit

Permalink
Merge branch 'main' into go-gitea#18721-fix-line-highlight
Browse files Browse the repository at this point in the history
  • Loading branch information
wxiaoguang authored Feb 12, 2022
2 parents d894b77 + 91ac65d commit ebb8f20
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 20 deletions.
19 changes: 18 additions & 1 deletion options/locale/locale_pt-PT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ comment_type_group_deadline=Prazo
comment_type_group_dependency=Dependência
comment_type_group_review_request=Pedido de revisão
comment_type_group_pull_request_push=Cometimentos adicionados
comment_type_group_project=Projecto
comment_type_group_issue_ref=Referência da questão
saved_successfully=As suas configurações foram guardadas com sucesso.
privacy=Privacidade
Expand Down Expand Up @@ -1073,6 +1074,10 @@ editor.add_tmpl=Adicionar '<filename>'
editor.add=Adicionar '%s'
editor.update=Modificar '%s'
editor.delete=Eliminar '%s'
editor.patch=Aplicar remendo (patch)
editor.patching=Remendando (patching):
editor.fail_to_apply_patch=Não foi possível aplicar o remendo (patch) '%s'
editor.new_patch=Novo remendo (patch)
editor.commit_message_desc=Adicionar uma descrição alargada opcional…
editor.signoff_desc=Adicionar "Assinado-por" seguido do autor do cometimento no fim da mensagem do registo de cometimentos.
editor.commit_directly_to_this_branch=Cometer imediatamente no ramo <strong class="branch-name">%s</strong>.
Expand Down Expand Up @@ -1108,6 +1113,8 @@ editor.cannot_commit_to_protected_branch=Não é possível cometer para o ramo p
editor.no_commit_to_branch=Não é possível cometer imediatamente para o ramo porque:
editor.user_no_push_to_branch=O utilizador não pode enviar para o ramo
editor.require_signed_commit=O ramo requer um cometimento assinado
editor.cherry_pick=Escolher a dedo %s para:
editor.revert=Reverter %s para:

commits.desc=Navegar pelo histórico de modificações no código fonte.
commits.commits=Cometimentos
Expand All @@ -1132,6 +1139,9 @@ commit.actions=Operações
commit.revert=Reverter
commit.revert-header=Reverter: %s
commit.revert-content=Escolha o ramo para onde vai reverter:
commit.cherry-pick=Escolher a dedo
commit.cherry-pick-header=Escolher a dedo: %s
commit.cherry-pick-content=Escolha o ramo para onde vai escolher a dedo:

ext_issues=Acesso a questões externas
ext_issues.desc=Ligação para um rastreador de questões externo.
Expand Down Expand Up @@ -2226,7 +2236,7 @@ branch.renamed=O ramo %s foi renomeado para %s.
tag.create_tag=Criar etiqueta <strong>%s</strong>
tag.create_tag_operation=Criar etiqueta
tag.confirm_create_tag=Criar etiqueta
tag.create_tag_from=Criar uma etiqueta a partir de '%s'
tag.create_tag_from=Criar uma etiqueta a partir do ramo '%s'

tag.create_success=A etiqueta '%s' foi criada.

Expand Down Expand Up @@ -2371,6 +2381,7 @@ first_page=Primeira
last_page=Última
total=total: %d

dashboard.new_version_hint=O Gitea %s está agora disponível, você está a correr a versão %s. Verifique o <a target="_blank" rel="noreferrer" href="https://blog.gitea.io">blog</a> para mais detalhes.
dashboard.statistic=Resumo
dashboard.operations=Operações de manutenção
dashboard.system_status=Estado do sistema
Expand Down Expand Up @@ -2825,6 +2836,12 @@ monitor.queue.pool.flush.title=Despejar fila
monitor.queue.pool.flush.desc=O despejo irá adicionar um trabalhador que termina assim que a fila esteja vazia ou o prazo acabe.
monitor.queue.pool.flush.submit=Adicionar trabalhador de despejo
monitor.queue.pool.flush.added=Foi adicionado um trabalhador de despejo para %[1]s
monitor.queue.pool.pause.title=Pausar fila
monitor.queue.pool.pause.desc=Pausar uma fila impede que ela processe dados
monitor.queue.pool.pause.submit=Pausar fila
monitor.queue.pool.resume.title=Retomar fila
monitor.queue.pool.resume.desc=Definir esta fila para continuar o trabalho
monitor.queue.pool.resume.submit=Retomar fila

monitor.queue.settings.title=Configurações do agregado
monitor.queue.settings.desc=Os agregados crescem dinamicamente com um impulso em resposta à ocorrência de bloqueios na sua fila de trabalhadores. Essas mudanças não irão influenciar os grupos de trabalhadores correntes.
Expand Down
3 changes: 3 additions & 0 deletions options/locale/locale_uk-UA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ twofa=Двофакторна авторизація
twofa_scratch=Двофакторний одноразовий пароль
passcode=Код доступу

webauthn_reload=Оновити

repository=Репозиторій
organization=Організація
Expand Down Expand Up @@ -92,7 +93,9 @@ error404=Сторінка, до якої ви намагаєтеся зверн
never=Ніколи

[error]
occurred=Сталася помилка
missing_csrf=Некоректний запит: токен CSRF не задано
network_error=Помилка мережі

[startpage]
app_desc=Зручний власний сервіс хостингу репозиторіїв Git
Expand Down
10 changes: 10 additions & 0 deletions options/locale/locale_zh-CN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,10 @@ editor.add_tmpl=添加 '<filename>'
editor.add=添加 '%s'
editor.update=更新 '%s'
editor.delete=删除 '%s'
editor.patch=应用补丁
editor.patching=打补丁:
editor.fail_to_apply_patch=无法应用补丁'%s'
editor.new_patch=新补丁
editor.commit_message_desc=添加一个可选的扩展描述...
editor.signoff_desc=在提交日志消息末尾添加签署人信息。
editor.commit_directly_to_this_branch=直接提交至 <strong class="branch-name">%s</strong> 分支。
Expand Down Expand Up @@ -1130,6 +1134,7 @@ commits.signed_by_untrusted_user_unmatched=由与提交者不匹配的未授信
commits.gpg_key_id=GPG 密钥 ID
commits.ssh_key_fingerprint=SSH 密钥指纹
commit.actions=操作
ext_issues=访问外部工单
ext_issues.desc=链接到外部工单跟踪系统。
Expand Down Expand Up @@ -2216,11 +2221,15 @@ branch.included_desc=此分支是默认分支的一部分
branch.included=已包含
branch.create_new_branch=从下列分支创建分支:
branch.confirm_create_branch=创建分支
branch.create_branch_operation=创建分支
branch.new_branch=创建新分支
branch.new_branch_from=从 %s 创建新分支
branch.renamed=分支 %s 被重命名为 %s。

tag.create_tag=创建标签 <strong>%s</strong>
tag.create_tag_operation=创建标签
tag.confirm_create_tag=创建标签
tag.create_tag_from=从 "%s" 创建新标签

tag.create_success=标签 '%s' 已创建。

Expand Down Expand Up @@ -2365,6 +2374,7 @@ first_page=首页
last_page=末页
total=总计:%d

dashboard.new_version_hint=Gitea %s 现已可用,您正在运行 %s。查看 <a target="_blank" rel="noreferrer" href="https://blog.gitea.io">博客</a> 了解更多详情。
dashboard.statistic=摘要
dashboard.operations=维护操作
dashboard.system_status=系统状态
Expand Down
52 changes: 35 additions & 17 deletions options/locale/locale_zh-TW.ini
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,8 @@ repo.collaborator.added.subject=%s 把您加入到 %s
repo.collaborator.added.text=您已被新增為儲存庫的協作者:

[modal]
yes=確認操作
no=取消操作
yes=
no=
modify=更新

[form]
Expand Down Expand Up @@ -532,7 +532,7 @@ webauthn=安全金鑰

public_profile=公開的個人資料
biography_placeholder=告訴我們一些關於你的事
profile_desc=您的電子信箱將被用於通知提醒和其他操作
profile_desc=您的電子信箱將被用於通知提醒和其他作業
password_username_disabled=非本地使用者不允許更改他們的帳號。詳細資訊請聯絡您的系統管理員。
full_name=全名
website=個人網站
Expand All @@ -546,7 +546,7 @@ update_profile_success=已更新您的個人資料。
change_username=您的帳號已更改。
change_username_prompt=注意:修改帳號也會更改您的帳戶的 URL。
change_username_redirect_prompt=舊的帳號被領用前,會重新導向您的新帳號。
continue=繼續操作
continue=繼續
cancel=取消
language=語言
ui=佈景主題
Expand Down Expand Up @@ -593,7 +593,7 @@ emails=電子信箱
manage_emails=管理電子信箱
manage_themes=選擇預設佈景主題
manage_openid=管理 OpenID 位址
email_desc=您的主要電子信箱將被用於通知提醒和其他操作
email_desc=您的主要電子信箱將被用於通知提醒和其他作業
theme_desc=這將是您在整個網站上的預設佈景主題。
primary=主要
activated=已啟用
Expand Down Expand Up @@ -738,7 +738,7 @@ oauth2_regenerate_secret_hint=遺失您的密鑰?
oauth2_client_secret_hint=請備份您的祕鑰。祕鑰在您離開這個頁面後將不會再顯示。
oauth2_application_edit=編輯
oauth2_application_create_description=OAuth2 應用程式讓您的第三方應用程式可以存取此 Gitea 上的帳戶。
oauth2_application_remove_description=刪除 OAuth2 應用會拒絕它存取此 Gitea 上已授權的帳戶。是否繼續?
oauth2_application_remove_description=刪除 OAuth2 應用程式會拒絕它存取此 Gitea 上已授權的帳戶。是否繼續?

authorized_oauth2_applications=已授權的 OAuth2 應用程式
authorized_oauth2_applications_description=您已授權給這些第三方應用程式存取您個人 Gitea 帳戶。請對不再需要的應用程式撤銷存取權。
Expand Down Expand Up @@ -957,14 +957,14 @@ migrate.migrating=正在從 <b>%s</b> 遷移...
migrate.migrating_failed=從 <b>%s</b> 遷移失敗
migrate.migrating_failed.error=錯誤:%s
migrate.migrating_failed_no_addr=遷移失敗。
migrate.github.description=從 github.com 或其他 GitHub 實例遷移資料
migrate.github.description=從 github.com 或其他 GitHub 執行個體遷移資料
migrate.git.description=從任何 Git 服務遷移儲存庫。
migrate.gitlab.description=從 gitlab.com 或其他 GitLab 實例遷移資料
migrate.gitea.description=從 gitea.com 或其他 Gitea 實例遷移資料
migrate.gogs.description=從 notabug.org 或其他 Gogs 實例遷移資料
migrate.onedev.description=從 code.onedev.io 或其他 OneDev 實例遷移資料
migrate.gitlab.description=從 gitlab.com 或其他 GitLab 執行個體遷移資料
migrate.gitea.description=從 gitea.com 或其他 Gitea 執行個體遷移資料
migrate.gogs.description=從 notabug.org 或其他 Gogs 執行個體遷移資料
migrate.onedev.description=從 code.onedev.io 或其他 OneDev 執行個體遷移資料
migrate.codebase.description=從 codebasehq.com 遷移資料。
migrate.gitbucket.description=從 GitBucket 實例遷移資料
migrate.gitbucket.description=從 GitBucket 執行個體遷移資料
migrate.migrating_git=正在遷移 Git 資料
migrate.migrating_topics=正在遷移主題
migrate.migrating_milestones=正在遷移里程碑
Expand Down Expand Up @@ -993,7 +993,7 @@ clone_this_repo=Clone 此儲存庫
create_new_repo_command=從命令列建立新儲存庫。
push_exist_repo=從命令行推送已經建立的儲存庫
empty_message=此儲存庫未包含任何內容。
broken_message=無法讀取此儲存庫底層的 Git 資料。請聯絡此 Gitea 實例的管理員或刪除此儲存庫
broken_message=無法讀取此儲存庫底層的 Git 資料。請聯絡此 Gitea 執行個體的管理員或刪除此儲存庫

code=程式碼
code.desc=存取原始碼、檔案、提交和分支。
Expand Down Expand Up @@ -1075,6 +1075,10 @@ editor.add_tmpl=新增「<filename>」
editor.add=新增「%s」
editor.update=更新「%s」
editor.delete=刪除「%s」
editor.patch=套用 Patch
editor.patching=正在 Patch:
editor.fail_to_apply_patch=無法套用 Patch「%s」
editor.new_patch=新增 Patch
editor.commit_message_desc=(選填)加入詳細說明...
editor.signoff_desc=在提交訊息底部加入提交者的「Signed-off-by」資訊。
editor.commit_directly_to_this_branch=直接提交到 <strong class="branch-name">%s</strong> 分支。
Expand Down Expand Up @@ -1110,6 +1114,8 @@ editor.cannot_commit_to_protected_branch=無法提交到受保護的分支「%s
editor.no_commit_to_branch=無法直接提交到分支因為:
editor.user_no_push_to_branch=使用者無法推送到分支
editor.require_signed_commit=分支僅接受經簽署的提交
editor.cherry_pick=Cherry-pick %s 到:
editor.revert=還原 %s 到:

commits.desc=瀏覽原始碼修改歷程。
commits.commits=次程式碼提交
Expand All @@ -1121,7 +1127,7 @@ commits.find=搜尋
commits.search_all=所有分支
commits.author=作者
commits.message=備註
commits.date=提交日期
commits.date=日期
commits.older=更舊的提交
commits.newer=更新的提交
commits.signed_by=簽署人
Expand All @@ -1130,6 +1136,13 @@ commits.signed_by_untrusted_user_unmatched=由不受信任且與提交者不相
commits.gpg_key_id=GPG 金鑰 ID
commits.ssh_key_fingerprint=SSH 金鑰指紋

commit.actions=操作
commit.revert=還原
commit.revert-header=還原: %s
commit.revert-content=選擇還原的目標分支:
commit.cherry-pick=Cherry-pick
commit.cherry-pick-header=Cherry-pick: %s
commit.cherry-pick-content=選擇 Cherry-pick 的目標分支:

ext_issues=存取外部問題
ext_issues.desc=連結到外部問題追蹤器。
Expand Down Expand Up @@ -2216,11 +2229,15 @@ branch.included_desc=此分支是預設分支的一部分
branch.included=包含
branch.create_new_branch=從下列分支建立分支:
branch.confirm_create_branch=建立分支
branch.create_branch_operation=建立分支
branch.new_branch=建立新分支
branch.new_branch_from=從「%s」建立新分支
branch.renamed=分支 %s 被重新命名為 %s。

tag.create_tag=建立標籤 <strong>%s</strong>
tag.create_tag_operation=建立標籤
tag.confirm_create_tag=建立標籤
tag.create_tag_from=從「%s」建立新標籤

tag.create_success=已建立標籤「%s」。

Expand Down Expand Up @@ -2365,11 +2382,12 @@ first_page=首頁
last_page=末頁
total=總計:%d

dashboard.new_version_hint=現已推出 Gitea %s,您正在執行 %s。查看<a target="_blank" rel="noreferrer" href="https://blog.gitea.io">部落格</a>以獲得更多資訊。
dashboard.statistic=摘要
dashboard.operations=維護操作
dashboard.operations=維護作業
dashboard.system_status=系統狀態
dashboard.statistic_info=Gitea 資料庫統計:<b>%d</b> 位使用者,<b>%d</b> 個組織,<b>%d</b> 個公鑰,<b>%d</b> 個儲存庫,<b>%d</b> 個儲存庫關注,<b>%d</b> 個星號,<b>%d</b> 次行為,<b>%d</b> 條權限記錄,<b>%d</b> 個問題,<b>%d</b> 則留言,<b>%d</b> 個社群帳戶,<b>%d</b> 個用戶關注,<b>%d</b> 個鏡像,<b>%d</b> 個版本發佈,<b>%d</b> 個認證來源,<b>%d</b> 個 Webhook ,<b>%d</b> 個里程碑,<b>%d</b> 個標籤,<b>%d</b> 個 Hook 任務,<b>%d</b> 個團隊,<b>%d</b> 個更新任務,<b>%d</b> 個附件。
dashboard.operation_name=操作名稱
dashboard.operation_name=作業名稱
dashboard.operation_switch=開關
dashboard.operation_run=執行
dashboard.clean_unbind_oauth=清理未綁定的 OAuth 連結
Expand Down Expand Up @@ -2619,7 +2637,7 @@ auths.tips.oauth2.general=OAuth2 認證
auths.tips.oauth2.general.tip=註冊新的 OAuth2 認證時,callback/redirect 網址應為:<host>/user/oauth2/<Authentication Name>/callback
auths.tip.oauth2_provider=OAuth2 提供者
auths.tip.bitbucket=註冊新的 OAuth 客戶端並加入權限「Account - Read」。網址:https://bitbucket.org/account/user/<your username>/oauth-consumers/new
auths.tip.nextcloud=在您的 Nextcloud 使用「設定 -> 安全性 -> OAuth 2.0 客戶端」註冊新的 OAuth 客戶端
auths.tip.nextcloud=在您的執行個體中,於選單「設定 -> 安全性 -> OAuth 2.0 客戶端」註冊新的 OAuth 客戶端
auths.tip.dropbox=建立一個新的 App。網址:https://www.dropbox.com/developers/apps
auths.tip.facebook=註冊一個新的應用程式並新增產品「Facebook 登入」。網址:https://developers.facebook.com/apps
auths.tip.github=註冊新的 OAuth 應用程式。網址:https://github.com/settings/applications/new
Expand Down
12 changes: 11 additions & 1 deletion services/repository/fork.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,17 @@ func ForkRepository(doer, owner *user_model.User, opts ForkRepoOptions) (_ *repo
log.Error("Failed to update size for repository: %v", err)
}
if err := repo_model.CopyLanguageStat(opts.BaseRepo, repo); err != nil {
log.Error("Copy language stat from oldRepo failed")
log.Error("Copy language stat from oldRepo failed: %v", err)
}

gitRepo, err := git.OpenRepositoryCtx(git.DefaultContext, repo.RepoPath())
if err != nil {
log.Error("Open created git repository failed: %v", err)
} else {
defer gitRepo.Close()
if err := repo_module.SyncReleasesWithTags(repo, gitRepo); err != nil {
log.Error("Sync releases from git tags failed: %v", err)
}
}

notification.NotifyForkRepository(doer, opts.BaseRepo, repo)
Expand Down
2 changes: 1 addition & 1 deletion templates/user/dashboard/feeds.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{{$.i18n.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}}
{{else if eq .GetOpType 24}}
{{ $linkText := .Content | RenderEmoji }}
{{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/release/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}}
{{$.i18n.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}}
{{else if eq .GetOpType 25}}
{{ $index := index .GetIssueInfos 0}}
{{ $reviewer := index .GetIssueInfos 1}}
Expand Down

0 comments on commit ebb8f20

Please sign in to comment.