diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:11:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:11:24 -0400 |
commit | 451b7431c9d0a8bb34642d5af599bc48701376d2 (patch) | |
tree | 1be076bbade89fa78872d09b8961b5a183230e25 /config/locales/en.yml | |
parent | 8fa8004a2b090a3911cce11473bb926ebd6782a6 (diff) | |
parent | 530725ba3c4fefc6fd3e45cda588daa5af2ea9ec (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 |