diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:15:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:15:55 -0400 |
| commit | 1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (patch) | |
| tree | 852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /config/locales/en.yml | |
| parent | eb98c99924ab810eea8a97040a82308f68c805cc (diff) | |
| parent | 7004c692040d9372c187a13a21f1215f07d3a8ff (diff) | |
Merge branch 'master' into master
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 |