diff options
Diffstat (limited to 'config/locales')
-rw-r--r-- | config/locales/carrierwave.en.yml | 14 | ||||
-rw-r--r-- | config/locales/doorkeeper.en.yml | 16 |
2 files changed, 25 insertions, 5 deletions
diff --git a/config/locales/carrierwave.en.yml b/config/locales/carrierwave.en.yml new file mode 100644 index 00000000000..12619226460 --- /dev/null +++ b/config/locales/carrierwave.en.yml @@ -0,0 +1,14 @@ +en: + errors: + messages: + carrierwave_processing_error: failed to be processed + carrierwave_integrity_error: is not of an allowed file type + carrierwave_download_error: could not be downloaded + extension_whitelist_error: "You are not allowed to upload %{extension} files, allowed types: %{allowed_types}" + extension_blacklist_error: "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}" + content_type_whitelist_error: "You are not allowed to upload %{content_type} files" + content_type_blacklist_error: "You are not allowed to upload %{content_type} files" + rmagick_processing_error: "Failed to manipulate with rmagick, maybe it is not an image?" + mini_magick_processing_error: "Failed to manipulate with MiniMagick, maybe it is not an image? Original Error: %{e}" + min_size_error: "File size should be greater than %{min_size}" + max_size_error: "File size should be less than %{max_size}" diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml index 889111282ef..9f451046462 100644 --- a/config/locales/doorkeeper.en.yml +++ b/config/locales/doorkeeper.en.yml @@ -60,17 +60,23 @@ en: scopes: api: Access the authenticated user's API read_user: Read the authenticated user's personal information + read_repository: Allows read-access to the repository + read_registry: Grants permission to read container registry images openid: Authenticate using OpenID Connect - sudo: Perform API actions as any user in the system (if the authenticated user is an admin) + sudo: Perform API actions as any user in the system scope_desc: api: - Full access to GitLab as the user, including read/write on all their groups and projects + Grants complete read/write access to the API, including all groups and projects. read_user: - Read-only access to the user's profile information, like username, public email and full name + Grants read-only access to the authenticated user's profile through the /user API endpoint, which includes username, public email, and full name. Also grants access to read-only API endpoints under /users. + read_repository: + Grants read-only access to repositories on private projects using Git-over-HTTP (not using the API). + read_registry: + Grants read-only access to container registry images on private projects. openid: - The ability to authenticate using GitLab, and read-only access to the user's profile information and group memberships + Grants permission to authenticate with GitLab using OpenID Connect. Also gives read-only access to the user's profile and group memberships. sudo: - Access to the Sudo feature, to perform API actions as any user in the system (only available for admins) + Grants permission to perform API actions as any user in the system, when authenticated as an admin user. flash: applications: create: |