From 709ca0496d750b66d78b61d78c5e5050be220e3f Mon Sep 17 00:00:00 2001
From: mayaeh <mayaeh@marimo-net.org>
Date: Fri, 17 Jan 2020 18:53:53 +0900
Subject: [PATCH] Undo translations restored to its previous state (#12876)
---
config/locales/doorkeeper.en.yml | 1 +
config/locales/simple_form.en.yml | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index 4e9c83a8f..2be2ef036 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -38,6 +38,7 @@ en:
application: Application
callback_url: Callback URL
delete: Delete
+ empty: You have no applications.
name: Name
new: New application
scopes: Scopes
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 65951b73b..66f518c1b 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -150,14 +150,14 @@ en:
text: Why do you want to join?
notification_emails:
digest: Send digest e-mails
- favourite: Send e-mail when someone favourites your status
- follow: Send e-mail when someone follows you
- follow_request: Send e-mail when someone requests to follow you
- mention: Send e-mail when someone mentions you
- pending_account: Send e-mail when a new account needs review
- reblog: Send e-mail when someone boosts your status
- report: Send e-mail when a new report is submitted
- trending_tag: Send e-mail when an unreviewed hashtag is trending
+ favourite: Someone favourited your status
+ follow: Someone followed you
+ follow_request: Someone requested to follow you
+ mention: Someone mentioned you
+ pending_account: New account needs review
+ reblog: Someone boosted your status
+ report: New report is submitted
+ trending_tag: An unreviewed hashtag is trending
tag:
listable: Allow this hashtag to appear in searches and on the profile directory
name: Hashtag