diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-07-23 10:17:08 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-07-23 10:17:08 +0000 |
| commit | 1a3fda63a5f9756cde19bc7e221651b0c33cb5dc (patch) | |
| tree | 7687127acdd21e53236a85a8d0aeeb6aca9b28ae | |
| parent | f4101aeac73368adcab223f14bf3d4d92d718b8b (diff) | |
| parent | afdb618bd3913c38168ec4ca167e9572a39ba86f (diff) | |
| download | gitlab-ce-1a3fda63a5f9756cde19bc7e221651b0c33cb5dc.tar.gz | |
Merge branch 'FixLocaleEN' into 'master'
Remove duplicated mapping key in config/locales/en.yml
See merge request gitlab-org/gitlab-ce!30980
| -rw-r--r-- | changelogs/unreleased/FixLocaleEN.yml | 5 | ||||
| -rw-r--r-- | config/locales/en.yml | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/changelogs/unreleased/FixLocaleEN.yml b/changelogs/unreleased/FixLocaleEN.yml new file mode 100644 index 00000000000..49738a6d127 --- /dev/null +++ b/changelogs/unreleased/FixLocaleEN.yml @@ -0,0 +1,5 @@ +--- +title: Remove duplicated mapping key in config/locales/en.yml +merge_request: 30980 +author: Peter Dave Hello +type: fixed diff --git a/config/locales/en.yml b/config/locales/en.yml index a3dceb2fb62..a60f86e1d80 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,12 +16,6 @@ en: api_url: "Sentry API URL" project/metrics_setting: external_dashboard_url: "External dashboard URL" - errors: - messages: - label_already_exists_at_group_level: "already exists at group level for %{group}. Please choose another one." - wrong_size: "is the wrong size (should be %{file_size})" - size_too_small: "is too small (should be at least %{file_size})" - size_too_big: "is too big (should be at most %{file_size})" views: pagination: previous: "Prev" |