diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:42:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:42:14 -0400 |
commit | c9f15f79913f3b79153fc0750c3eeafd26c26154 (patch) | |
tree | 97f2bc485412e4b4fb85151a785299e5f233f636 /config/locales/en.yml | |
parent | 6a88151edaf34983385134d5930df8469692c207 (diff) | |
parent | 91afe1f8fd8ccc5ed086bb08f72a34eb484d3ba7 (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 |