diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:39:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:39:59 -0400 |
| commit | c890b86ef6843bb794d895121383e1dec9ce3256 (patch) | |
| tree | 155cba19e20c12450930e3b2735034c08e1ed628 /config/locales/en.yml | |
| parent | eadac4e7f4ed44e868131f8b969a7f3dbc297e92 (diff) | |
| parent | ceba26d5276b18d0de29fc989ef7c343e6a85962 (diff) | |
Merge branch 'master' into patch-2
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 |