diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:34:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:34:45 -0400 |
commit | cf03634e74364af3a703ea09073ab0a58448d460 (patch) | |
tree | d4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /config/locales/en.yml | |
parent | 83530f0eef8f6cf04321b61c917da08ab0f4e323 (diff) | |
parent | 698d74a15fe8db61de057b8876e9967e9e9c7330 (diff) |
Merge branch 'master' into add-elao-com-instance
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 |