diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:02:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:02:26 -0400 |
commit | 9f43e3b428c0adea4af75fc4e340799954e42221 (patch) | |
tree | ab2b6bb407ca6310d63b84af6f64ab4dca90a2dc /config/locales/en.yml | |
parent | 8989569dd42aabd9c768927f0975401af89bceb3 (diff) | |
parent | 4a40b40324aa50ec0c42d574f78bb45835dfe295 (diff) |
Merge branch 'master' into patch-4
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 |