Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 12:40:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-20 12:40:42 +0300
commitee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch)
treef8479f94a28f66654c6a4f6fb99bad6b4e86a40e /config/locales
parent62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff)
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/doorkeeper.en.yml12
-rw-r--r--config/locales/en.yml2
2 files changed, 8 insertions, 6 deletions
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 81e4f73e6b2..0b3b5af48a1 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -98,17 +98,17 @@ en:
Grants read-only access to the user's primary email address using OpenID Connect.
project_access_token_scope_desc:
api:
- Grants complete read/write access to the scoped project API.
+ Grants complete read and write access to the scoped project API, including the Package Registry.
read_api:
- Grants read access to the scoped project API.
+ Grants read access to the scoped project API, including the Package Registry.
read_repository:
- Allows read-only access (pull) to the repository.
+ Grants read access (pull) to the repository.
write_repository:
- Allows read-write access (pull, push) to the repository.
+ Grants read and write access (pull and push) to the repository.
read_registry:
- Allows read-access (pull) to container registry images if the project is private and authorization is required.
+ Grants read access (pull) to the Container Registry images if a project is private and authorization is required.
write_registry:
- Allows write-access (push) to container registry.
+ Grants write access (push) to the Container Registry.
flash:
applications:
create:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56df8f93113..3c33cdac3f1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
hello: "Hello world"
activerecord:
attributes:
+ incident_management/timeline_event:
+ note: 'Timeline text'
issue_link:
source: Source issue
target: Target issue