diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
| commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
| tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /config/locales/en.yml | |
| parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
| parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (diff) | |
Merge branch 'master' into patch-1
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 |