about summary refs log tree commit diff
path: root/config/locales/en.yml
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:44:40 -0400
committerGitHub <noreply@github.com>2017-04-07 22:44:40 -0400
commitabab82ec1e086e257650ceed3d03a4d881e0a12e (patch)
treea8b7db83af6b84813c5bd951d38ca0334acb9af7 /config/locales/en.yml
parent07495cc13feb78ae979a8af69a401cce8dcd4e8d (diff)
parentf0797bf8cecd7d8537747bff66fc0363ccc59760 (diff)
Merge branch 'master' into master
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r--config/locales/en.yml4
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: "&hellip;"
+  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