diff options
author | ThibG <thib@sitedethib.com> | 2019-03-06 12:20:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 12:20:17 +0100 |
commit | fefacb7b7a21fc4aa40cb18ac797ecb5c44627f6 (patch) | |
tree | 7c4dbacf4603fd834da1bf8645b894634da06d4f /config/locales/en.yml | |
parent | e80fabfd84c1e2d157ca1cd536f68f3c75f011c1 (diff) | |
parent | 94a0149ff3e455792050e790d397d1d4d2c2d851 (diff) |
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 05f6243df..b77387890 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -745,9 +745,9 @@ en: duration_too_long: is too far into the future duration_too_short: is too soon expired: The poll has already ended - over_character_limit: cannot be longer than %{MAX} characters each + over_character_limit: cannot be longer than %{max} characters each too_few_options: must have more than one item - too_many_options: can't contain more than %{MAX} items + too_many_options: can't contain more than %{max} items preferences: languages: Languages other: Other |