diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:54:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:54:32 -0400 |
commit | 7b7bff04df135aa76329696fbbceee9b80a70645 (patch) | |
tree | a535a961e2af14bdc013274717b8098516cfee64 /config/locales/en.yml | |
parent | a31f5765afb2598937b418cce0b5bacdf71c5ba8 (diff) | |
parent | e6596087977516270c8a805db962eb8b06e99d96 (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 |