diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
| commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
| tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /config | |
| parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
| download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/carrierwave.en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/carrierwave.en.yml b/config/locales/carrierwave.en.yml index 12619226460..864ec8fd73f 100644 --- a/config/locales/carrierwave.en.yml +++ b/config/locales/carrierwave.en.yml @@ -6,8 +6,8 @@ en: 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" + content_type_whitelist_error: "file format is not supported. Please try one of the following supported formats: %{allowed_types}" + content_type_blacklist_error: "You are not allowed to upload %{content_type} files, prohibited types: %{allowed_types}" 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}" |