diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:21:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:21:21 -0400 |
| commit | fef478781d1033ba045806945f84cbab1bdb0007 (patch) | |
| tree | cf99ed9130e2226f13e52f87dc7bbe8a9b464ee2 /config/locales/en.yml | |
| parent | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (diff) | |
| parent | c1a553d2c274941f38cc299699dfae1f60559e67 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 742219df9..aa3a732f9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -163,3 +163,7 @@ en: invalid_otp_token: Invalid two-factor code will_paginate: page_gap: "…" + media_attachments: + validations: + too_many: Cannot attach more than 4 files + images_and_video: Cannot attach a video to a status that already contains images |