From a1c87db46fcb8de6800245358c1a104cc24e2d09 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Wed, 21 Aug 2024 18:39:51 +0500
Subject: [PATCH 1/2] i18n(en): fix administrator access naming consistency

---
 options/locale/locale_en-US.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1764d0ad9e..88b4ee1ab1 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2884,7 +2884,7 @@ teams.delete_team_desc = Deleting a team revokes repository access from its memb
 teams.delete_team_success = The team has been deleted.
 teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone team repositories.
 teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to team repositories.
-teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to and add collaborators to team repositories.
+teams.admin_permission_desc = This team grants <strong>Administrator</strong> access: members can read from, push to and add collaborators to team repositories.
 teams.create_repo_permission_desc = Additionally, this team grants <strong>Create repository</strong> permission: members can create new repositories in organization.
 teams.repositories = Team repositories
 teams.remove_all_repos_title = Remove all team repositories
@@ -2901,7 +2901,7 @@ teams.all_repositories = All repositories
 teams.all_repositories_helper = Team has access to all repositories. Selecting this will <strong>add all existing</strong> repositories to the team.
 teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
 teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
-teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
+teams.all_repositories_admin_permission_desc = This team grants <strong>Administrator</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
 teams.invite.title = You have been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
 teams.invite.by = Invited by %s
 teams.invite.description = Please click the button below to join the team.

From b65a1312b3c0e3481a6f0c15cc8864c3673ce7c9 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@noreply.codeberg.org>
Date: Wed, 21 Aug 2024 18:41:07 +0500
Subject: [PATCH 2/2] i18n(en): remove unused strings related to team
 permissions

Added in https://codeberg.org/forgejo/forgejo/commit/72aa5a20ecf8aa3f7c110fd51c37994d950e0ba8.
Dropped in https://codeberg.org/forgejo/forgejo/commit/cb41f5cae16c5c11cad717c0d19333c2aa4e3b55.
---
 options/locale/locale_en-US.ini | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 88b4ee1ab1..34b134d870 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2899,9 +2899,6 @@ teams.specific_repositories = Specific repositories
 teams.specific_repositories_helper = Members will only have access to repositories explicitly added to the team. Selecting this <strong>will not</strong> automatically remove repositories already added with <i>All repositories</i>.
 teams.all_repositories = All repositories
 teams.all_repositories_helper = Team has access to all repositories. Selecting this will <strong>add all existing</strong> repositories to the team.
-teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
-teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
-teams.all_repositories_admin_permission_desc = This team grants <strong>Administrator</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
 teams.invite.title = You have been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
 teams.invite.by = Invited by %s
 teams.invite.description = Please click the button below to join the team.