diff options
author | Valentin Ouvrard <valentin210594@gmail.com> | 2017-04-08 13:39:09 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 13:39:09 +1100 |
commit | 3e4eb9c95fc8d8f3fff1db90215d5050214adc59 (patch) | |
tree | c9f709f2582f8fe97c72b4faa8bc0811bbbb4deb /config/locales/en.yml | |
parent | 93e53a3311c33b218d1cf7ae26b74056dfabc909 (diff) | |
parent | fc7b8307190b8f472b526d99bc10db58153850d5 (diff) |
Merge branch 'master' into master
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 750af0b7a..aa3a732f9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,8 +5,8 @@ en: about_this: About this instance apps: Apps business_email: 'Business e-mail:' - contact: Contact closed_registrations: Registrations are currently closed on this instance. + contact: Contact description_headline: What is %{domain}? domain_count_after: other instances domain_count_before: Connected to @@ -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 |