diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
| commit | 45709d6987db87b38e5a16c18ea3b2d9e55fba98 (patch) | |
| tree | 854dcee1c7c85f518f46616f1a2b6af87df77c5b /config | |
| parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
| parent | 51182843d49d04621c3d3069f44f365fd9f415e5 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/locales/doorkeeper.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 16 |
3 files changed, 10 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb index 58e59fd51..c1bc18a30 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,6 +70,7 @@ module Mastodon :hy, :id, :io, + :is, :it, :ja, :ka, 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 9b467f84e..8386c8cf1 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -163,14 +163,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 |