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 21:59:21 -0400
committerGitHub <noreply@github.com>2017-04-07 21:59:21 -0400
commit4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch)
tree4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /config/locales/en.yml
parent96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff)
parentd438eab67301e767bdd040c6f9bd831c92214656 (diff)
Merge branch 'master' into patch-1
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