diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:46:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:46:36 -0400 |
commit | e7d7a99fbc78c7dbf763279aa4262580cabd8e1f (patch) | |
tree | 6f1fce572c176a73aeacffa948c51ca3bf797596 /config/locales/en.yml | |
parent | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (diff) | |
parent | 8d27de32b31f1093ab7c6eb177dfb9b866a1203e (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 |