diff options
author | ThibG <thib@sitedethib.com> | 2020-01-13 16:07:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-13 16:07:40 +0100 |
commit | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (patch) | |
tree | 14bcdbeac5f8d904cad3d13a469869c5baf9db99 /config/locales/en.yml | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 83f8bf48d91605fa63325b4d4acec717031da025 (diff) |
Merge pull request #1263 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 126df69c1..8262a5868 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -340,6 +340,7 @@ en: delete: Delete destroyed_msg: Successfully deleted e-mail domain from blacklist domain: Domain + empty: No e-mail domains currently blacklisted. new: create: Add domain title: New e-mail blacklist entry @@ -935,6 +936,7 @@ en: duration_too_long: is too far into the future duration_too_short: is too soon expired: The poll has already ended + invalid_choice: The chosen vote option does not exist 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 |