diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
index 10759528e5..24617e648d 100644
--- a/options/locale/locale_bg-BG.ini
+++ b/options/locale/locale_bg-BG.ini
@@ -261,6 +261,7 @@ register_success=Успешна регистрация
+
[modal]
yes=Да
no=Не
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 654a9480f0..6da1cac65d 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -412,6 +412,7 @@ repo.transfer.body=Chcete-li ji přijmout nebo odmítnout, navštivte %s nebo ji
repo.collaborator.added.subject=%s vás přidal do %s
repo.collaborator.added.text=Byl jste přidán jako spolupracovník repozitáře:
+
[modal]
yes=Ano
no=Ne
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 86c442716d..789774e322 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -407,6 +407,7 @@ repo.transfer.body=Um es anzunehmen oder abzulehnen, öffne %s, oder ignoriere e
repo.collaborator.added.subject=%s hat dich zu %s hinzugefügt
repo.collaborator.added.text=Du wurdest als Mitarbeiter für folgendes Repository hinzugefügt:
+
[modal]
yes=Ja
no=Abbrechen
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index abf504dda0..62ef37d4b1 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -409,6 +409,7 @@ repo.transfer.body=Για να το αποδεχτείτε ή να το απορ
repo.collaborator.added.subject=%s σας πρόσθεσε στο %s
repo.collaborator.added.text=Έχετε προστεθεί ως συνεργάτης του αποθετηρίου:
+
[modal]
yes=Ναι
no=Όχι
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 7588d53f1f..31264ea9bd 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -411,6 +411,7 @@ repo.transfer.body=Para aceptarlo o rechazarlo, visita %s o simplemente ignórel
repo.collaborator.added.subject=%s le añadió en %s
repo.collaborator.added.text=Has sido añadido como colaborador del repositorio:
+
[modal]
yes=Sí
no=No
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 9e012ff557..e86480d0bc 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -379,6 +379,7 @@ repo.transfer.body=برای تایید یا رد آن %s را ببینید یا
repo.collaborator.added.subject=%s شما را به پروژه %s اضافه کرد
repo.collaborator.added.text=شما به عنوان مشارکتکننده در این مخزن اضافه شدید:
+
[modal]
yes=بله
no=خیر
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index faac82b0cf..7f13d1b807 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -358,6 +358,7 @@ release.download.targz=Lähdekoodi (TAR.GZ)
repo.transfer.to_you=sinä
+
[modal]
yes=Kyllä
no=Ei
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index 600f43049f..eaedeaf9c3 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -412,6 +412,7 @@ repo.transfer.body=Pour l'accepter ou le rejeter, visitez %s ou ignorez-le.
repo.collaborator.added.subject=%s vous a ajouté à %s
repo.collaborator.added.text=Vous avez été ajouté en tant que collaborateur du dépôt :
+
[modal]
yes=Oui
no=Non
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index d3d31f30ef..c5bd8c5af2 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -291,6 +291,7 @@ register_success=Sikeres regisztráció
+
[modal]
yes=Igen
no=Nem
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index 53d6006c96..8e537abf71 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -282,6 +282,7 @@ register_success=Pendaftaran berhasil
+
[modal]
yes=Ya
no=Tidak
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index c6b747826a..2e33940b99 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -339,6 +339,7 @@ repo.transfer.body=Til að samþykkja eða hafna því skaltu fara á %s eða hu
repo.collaborator.added.subject=%s bætti þér við í %s
repo.collaborator.added.text=Þér hefur verið bætt við sem aðila hugbúnaðarsafns:
+
[modal]
yes=Já
no=Nei
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index f002c534d7..2a159dda6f 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -407,6 +407,7 @@ repo.transfer.body=Per accettare o respingerla visita %s o semplicemente ignorar
repo.collaborator.added.subject=%s ti ha aggiunto a %s
repo.collaborator.added.text=Sei stato aggiunto come collaboratore del repository:
+
[modal]
yes=Sì
no=No
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index 3b39236545..a4c6349eee 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -412,6 +412,7 @@ repo.transfer.body=承認または拒否するには %s を開きます。 も
repo.collaborator.added.subject=%s が %s にあなたを追加しました
repo.collaborator.added.text=あなたは次のリポジトリの共同作業者に追加されました:
+
[modal]
yes=はい
no=いいえ
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index f4f682cb7a..db2cee952b 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -273,6 +273,7 @@ register_success=등록 완료
+
[modal]
yes=예
no=아니오
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index e06ff0a7ff..d6fd4fee75 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -407,6 +407,7 @@ repo.transfer.body=Ja vēlaties to noraidīt vai apstiprināt, tad apmeklējiet
repo.collaborator.added.subject=%s pievienoja Jūs repozitorijam %s
repo.collaborator.added.text=Jūs tikāt pievienots kā līdzstrādnieks repozitorijam:
+
[modal]
yes=Jā
no=Nē
diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini
index 078b013ee1..90731f6f70 100644
--- a/options/locale/locale_ml-IN.ini
+++ b/options/locale/locale_ml-IN.ini
@@ -261,6 +261,7 @@ register_success=രജിസ്ട്രേഷൻ വിജയകരം
+
[modal]
yes=അതെ
no=ഇല്ല
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index e3f10451f4..0320efbf22 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -407,6 +407,7 @@ repo.transfer.body=Om het te accepteren of afwijzen, bezoek %s of negeer het gew
repo.collaborator.added.subject=%s heeft jou toegevoegd aan %s
repo.collaborator.added.text=U bent toegevoegd als een medewerker van de repository:
+
[modal]
yes=Ja
no=Nee
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index e5e5f31861..005b9bdb20 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -392,6 +392,7 @@ repo.transfer.body=Aby zaakceptować lub odrzucić go, odwiedź %s lub po prostu
repo.collaborator.added.subject=%s dodał Cię do %s
repo.collaborator.added.text=Zostałeś dodany jako współtwórca repozytorium:
+
[modal]
yes=Tak
no=Nie
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index 04b9a43519..86e375c6ba 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -409,6 +409,7 @@ repo.transfer.body=Para o aceitar ou rejeitar visite %s, ou simplesmente o ignor
repo.collaborator.added.subject=%s adicionou você a %s
repo.collaborator.added.text=Você foi adicionado como um colaborador do repositório:
+
[modal]
yes=Sim
no=Não
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index 6f99e4d6e8..14f6a33ca2 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -412,6 +412,11 @@ repo.transfer.body=Para o aceitar ou rejeitar visite %s, ou ignore-o, simplesmen
repo.collaborator.added.subject=%s adicionou você a %s
repo.collaborator.added.text=Foi adicionado(a) como colaborador(a) do repositório:
+team_invite.subject=%[1]s fez-lhe um convite para se juntar à organização %[2]s
+team_invite.text_1=%[1]s fez-lhe um convite para se juntar à equipa %[2]s na organização %[3]s.
+team_invite.text_2=Clique na ligação seguinte para se juntar à equipa:
+team_invite.text_3=Nota: Este convite é dirigido a %[1]s. Se não estava à espera deste convite, pode ignorar este email.
+
[modal]
yes=Sim
no=Não
@@ -487,6 +492,7 @@ user_not_exist=O utilizador não existe.
team_not_exist=A equipa não existe.
last_org_owner=Não pode remover o último utilizador da equipa 'proprietários'. Tem que haver pelo menos um proprietário numa organização.
cannot_add_org_to_team=Uma organização não pode ser adicionada como membro de uma equipa.
+duplicate_invite_to_team=O(A) utilizador(a) já tinha sido convidado(a) para ser membro da equipa.
invalid_ssh_key=Não é possível validar a sua chave SSH: %s
invalid_gpg_key=Não é possível validar a sua chave GPG: %s
@@ -2402,6 +2408,8 @@ teams.members=Membros da equipa
teams.update_settings=Modificar configurações
teams.delete_team=Eliminar equipa
teams.add_team_member=Adicionar membro da equipa
+teams.invite_team_member=Convidar para %s
+teams.invite_team_member.list=Convites pendentes
teams.delete_team_title=Eliminar equipa
teams.delete_team_desc=Eliminar uma equipa revoga o acesso dos seus membros ao repositório. Quer continuar?
teams.delete_team_success=A equipa foi eliminada.
@@ -2426,6 +2434,9 @@ teams.all_repositories_helper=A equipa tem acesso a todos os repositórios. Esco
teams.all_repositories_read_permission_desc=Esta equipa atribui o acesso de leitura a todos os repositórios: os seus membros podem ver e clonar os repositórios.
teams.all_repositories_write_permission_desc=Esta equipa atribui o acesso de escrita a todos os repositórios: os seus membros podem ler de, e enviar para os repositórios.
teams.all_repositories_admin_permission_desc=Esta equipa atribui o acesso de administração a todos os repositórios: os seus membros podem ler de, enviar para, e adicionar colaboradores aos repositórios.
+teams.invite.title=Foi-lhe feito um convite para se juntar à equipa %s na organização%s.
+teams.invite.by=Convidado(a) por %s
+teams.invite.description=Clique no botão abaixo para se juntar à equipa.
[admin]
dashboard=Painel de controlo
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index fab3dfc6d9..f83ccb73ed 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -403,6 +403,7 @@ repo.transfer.body=Для того чтобы принять или отклон
repo.collaborator.added.subject=%s добавил вас в %s
repo.collaborator.added.text=Вы были добавлены в качестве соавтора репозитория:
+
[modal]
yes=Да
no=Нет
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index 4ddf97356c..6652c43f22 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -365,6 +365,7 @@ repo.transfer.body=එය පිළිගැනීමට හෝ ප්රති
repo.collaborator.added.subject=%s ඔබව %s ට එකතු කළා
repo.collaborator.added.text=ඔබ ගබඩාවේ සහයෝගිතාකරුවෙකු ලෙස එකතු කර ඇත:
+
[modal]
yes=ඔව්
no=නැහැ
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
index 597b91cb1f..1e0f9dc006 100644
--- a/options/locale/locale_sk-SK.ini
+++ b/options/locale/locale_sk-SK.ini
@@ -409,6 +409,7 @@ repo.transfer.body=Ak to chcete prijať alebo odmietnuť, navštívte %s alebo t
repo.collaborator.added.subject=%s vás pridal do %s
repo.collaborator.added.text=Boli ste pridaný ako spolupracovník repozitára:
+
[modal]
yes=Áno
no=Nie
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index 08733692b5..12d6693bde 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -304,6 +304,7 @@ register_success=Registreringen lyckades
+
[modal]
yes=Ja
no=Nej
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index ea48962856..d6eb62acaa 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -412,6 +412,7 @@ repo.transfer.body=Kabul veya reddetmek için %s ziyaret edin veya görmezden ge
repo.collaborator.added.subject=%s sizi %s ekledi
repo.collaborator.added.text=Bu depo için katkıcı olarak eklendiniz:
+
[modal]
yes=Evet
no=Hayır
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index a98f35dd7f..e88e9cf14b 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -382,6 +382,7 @@ repo.transfer.body=Щоб прийняти або відхилити перей
repo.collaborator.added.subject=%s додав вас до %s
repo.collaborator.added.text=Ви були додані в якості співавтора репозиторію:
+
[modal]
yes=Так
no=Ні
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 674ec9d266..3e009b5d2b 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -412,6 +412,11 @@ repo.transfer.body=访问 %s 以接受或拒绝转移,亦可忽略此邮件。
repo.collaborator.added.subject=%s 把你添加到了 %s
repo.collaborator.added.text=您已被添加为代码库的协作者:
+team_invite.subject=%[1]s 邀请您加入组织 %[2]s
+team_invite.text_1=%[1]s 邀请您加入组织 %[3]s 中的团队 %[2]s。
+team_invite.text_2=请点击下面的链接加入团队:
+team_invite.text_3=注意:这是发送给 %[1]s 的邀请。如果您未曾收到过此类邀请,请忽略这封电子邮件。
+
[modal]
yes=确认操作
no=取消操作
@@ -487,6 +492,7 @@ user_not_exist=该用户不存在
team_not_exist=团队不存在
last_org_owner=您不能从 "所有者" 团队中删除最后一个用户。组织中必须至少有一个所有者。
cannot_add_org_to_team=组织不能被加入到团队中。
+duplicate_invite_to_team=此用户已被邀请为团队成员。
invalid_ssh_key=无法验证您的 SSH 密钥: %s
invalid_gpg_key=无法验证您的 GPG 密钥: %s
@@ -861,8 +867,8 @@ readme_helper_desc=这是您可以为您的项目撰写完整描述的地方。
auto_init=初始化仓库(添加. gitignore、许可证和自述文件)
trust_model_helper=选择签名验证的“信任模型”。可能的选项是:
trust_model_helper_collaborator=协作者:信任协作者的签名
-trust_model_helper_committer=提交者:信任匹配提交者的签名
-trust_model_helper_collaborator_committer=协作者+提交者:信任与提交者匹配的协作者的签名
+trust_model_helper_committer=提交者:信任与提交者相符的签名
+trust_model_helper_collaborator_committer=协作者+提交者:信任协作者同时是提交者的签名
trust_model_helper_default=默认:使用此安装的默认信任模型
create_repo=创建仓库
default_branch=默认分支
@@ -1882,13 +1888,13 @@ settings.trust_model.default=默认信任模型
settings.trust_model.default.desc=为此安装使用默认仓库信任模型。
settings.trust_model.collaborator=协作者
settings.trust_model.collaborator.long=协作者:信任协作者的签名
-settings.trust_model.collaborator.desc=此仓库中协作者的有效签名将被标记为“可信” - 不管他们是否是提交者。否则,如果签名匹配了提交者,有效的签名将被标记为“不可信”。
+settings.trust_model.collaborator.desc=此仓库中协作者的有效签名将被标记为「可信」(无论它们是否是提交者),签名只符合提交者时将标记为「不可信」,都不匹配时标记为「不匹配」。
settings.trust_model.committer=提交者
-settings.trust_model.committer.long=提交者: 信任与提交者匹配的签名 (匹配GitHub 并强制Gitea签名的提交者将Gitea作为提交者)
-settings.trust_model.committer.desc=有效的签名只有与提交者匹配时才会被标记为“可信”,否则会被标记为“不匹配”。这会强制Gitea成为已签名提交的提交者,而实际提交者在提交中被标记为Co-authored-by: 和Co-committed-by: trailer。默认的Gitea密钥必须与数据库中的一位用户相匹配。
+settings.trust_model.committer.long=提交者: 信任与提交者相符的签名 (此特性类似 GitHub,这会强制采用 Gitea 作为提交者和签名者)
+settings.trust_model.committer.desc=提交者的有效签名将被标记为「可信」,否则将被标记为「不匹配」。这会强制 Gitea 成为签名者和提交者,实际的提交者将被标记于提交消息结尾处的「Co-Authored-By:」和「Co-Committed-By:」。默认的 Gitea 签名密钥必须匹配数据库中的一个用户密钥。
settings.trust_model.collaboratorcommitter=协作者+提交者
settings.trust_model.collaboratorcommitter.long=协作者+提交者:信任协作者同时是提交者的签名
-settings.trust_model.collaboratorcommitter.desc=如果匹配为提交者,此仓库中协作者的有效签名将被标记为“可信”。否则,如果签名匹配了提交者或者未匹配,有效的签名将被标记为“不可信”。这将强制 Gitea 在签名提交上将实际提交者加上 Co-Authored-By: 和 Co-Committed-By: 。默认的Gitea密钥必须匹配Gitea用户。
+settings.trust_model.collaboratorcommitter.desc=此仓库中协作者的有效签名在他同时是提交者时将被标记为「可信」,签名只匹配了提交者时将标记为「不可信」,都不匹配时标记为「不匹配」。这会强制 Gitea 成为签名者和提交者,实际的提交者将被标记于提交消息结尾处的「Co-Authored-By:」和「Co-Committed-By:」。默认的 Gitea 签名密钥必须匹配数据库中的一个用户密钥。
settings.wiki_delete=删除百科数据
settings.wiki_delete_desc=删除仓库百科数据是永久性的,无法撤消。
settings.wiki_delete_notices_1=- 这将永久删除和禁用 %s 的百科。
@@ -2402,6 +2408,8 @@ teams.members=团队成员
teams.update_settings=更新团队设置
teams.delete_team=删除团队
teams.add_team_member=添加团队成员
+teams.invite_team_member=邀请加入 %s
+teams.invite_team_member.list=待处理的邀请
teams.delete_team_title=删除团队
teams.delete_team_desc=删除一个团队将删除团队成员的访问权限,继续?
teams.delete_team_success=该团队已被删除。
@@ -2426,6 +2434,9 @@ teams.all_repositories_helper=团队可以访问所有仓库。选择此选项
teams.all_repositories_read_permission_desc=此团队授予读取所有仓库的访问权限: 成员可以查看和克隆仓库。
teams.all_repositories_write_permission_desc=此团队授予修改所有仓库的访问权限: 成员可以查看和推送至仓库。
teams.all_repositories_admin_permission_desc=该团队拥有 管理 所有仓库的权限:团队成员可以读取、克隆、推送以及添加其它仓库协作者。
+teams.invite.title=您已被邀请加入组织 %s 中的团队 %s。
+teams.invite.by=邀请人 %s
+teams.invite.description=请点击下面的按钮加入团队。
[admin]
dashboard=管理面板
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index ba828365d5..cb241d5ef4 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -124,6 +124,7 @@ register_success=註冊成功
+
[modal]
yes=確認操作
no=取消操作
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 0d6e6f617d..5827d0b207 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -410,6 +410,7 @@ repo.transfer.body=請造訪 %s 以接受或拒絕轉移,您也可以忽略它
repo.collaborator.added.subject=%s 把您加入到 %s
repo.collaborator.added.text=您已被新增為儲存庫的協作者:
+
[modal]
yes=是
no=否