diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
| commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
| tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /config/locales/en.yml | |
| parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
| parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) | |
Merge branch 'master' into add-infinimatix.net-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 |