Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

2 files changed, 12 insertions, 0 deletions

diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 63bbab67039..b571801c006 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -76,6 +76,7 @@ en:
       profile: Allows read-only access to the user's personal information using OpenID Connect
       email: Allows read-only access to the user's primary email address using OpenID Connect
       admin_mode: Admin Mode is a functionality designed to limit the access level of administrator's personal access tokens.
+      create_runner: Grants create access to the runners
     scope_desc:
       api:
         Grants complete read/write access to the API, including all groups and projects, the container registry, and the package registry.
@@ -105,6 +106,8 @@ en:
         Grants read-only access to the user's primary email address using OpenID Connect.
       admin_mode:
         Grants permission to perform API actions as an administrator, when Admin Mode is enabled.
+      create_runner:
+        Grants create access to the runners.
     project_access_token_scope_desc:
       api:
         Grants complete read and write access to the scoped project API, including the Package Registry.
@@ -118,6 +121,8 @@ en:
         Grants read access (pull) to the Container Registry images if a project is private and authorization is required.
       write_registry:
         Grants write access (push) to the Container Registry.
+      create_runner:
+        Grants create access to the runners.
     flash:
       applications:
         create:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1de1c20259d..9f00439294c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -25,6 +25,8 @@ en:
       member:
         user: "The member's email address"
         invite_email: "The member's email address"
+      personal_access_token:
+        expires_at: "Expiration date"
       project/error_tracking_setting:
         token: "Auth Token"
         project: "Project"
@@ -37,6 +39,11 @@ en:
         grafana_enabled: "Grafana integration enabled"
       service_desk_setting:
         project_key: "Project name suffix"
+      system_access/microsoft_application:
+        tenant_xid: "Tenant ID"
+        client_xid: "Client ID"
+        login_endpoint: "Login API endpoint"
+        graph_endpoint: "Graph API endpoint"
       user/user_detail:
         job_title: 'Job title'
         bio: 'Bio'