diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 20:55:16 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 21:44:57 +0200 |
commit | 694c073d1f94a54a0ccf19299e06f1de849c6edb (patch) | |
tree | 77e9855f70000396b8a6b793ac8a8dbb61c82783 /config/locales/en.yml | |
parent | ebf2c3195615bb524f6908e84f99887c8775cbc3 (diff) | |
parent | 9b978872cc1a86c7d82afda4060c909dc7ca2536 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 486592b29..5ad5767c9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -371,32 +371,28 @@ en: updated_msg: Emoji successfully updated! upload: Upload dashboard: - authorized_fetch_mode: Secure mode - backlog: backlogged jobs - config: Configuration - feature_deletions: Account deletions - feature_invites: Invite links - feature_profile_directory: Profile directory - feature_registrations: Registrations - feature_relay: Federation relay - feature_timeline_preview: Timeline preview - features: Features - hidden_service: Federation with hidden services - open_reports: open reports - pending_tags: hashtags waiting for review - pending_users: users waiting for review - recent_users: Recent users - search: Full-text search - single_user_mode: Single user mode + active_users: active users + interactions: interactions + media_storage: Media storage + new_users: new users + opened_reports: reports opened + pending_reports_html: + one: "<strong>1</strong> pending reports" + other: "<strong>%{count}</strong> pending reports" + pending_tags_html: + one: "<strong>1</strong> pending hashtags" + other: "<strong>%{count}</strong> pending hashtags" + pending_users_html: + one: "<strong>1</strong> pending users" + other: "<strong>%{count}</strong> pending users" + resolved_reports: reports resolved software: Software + sources: Sign-up sources space: Space usage title: Dashboard - total_users: users in total - trends: Trends - week_interactions: interactions this week - week_users_active: active this week - week_users_new: users this week - whitelist_mode: Limited federation mode + top_languages: Top active languages + top_servers: Top active servers + website: Website domain_allows: add_new: Allow federation with domain created_msg: Domain has been successfully allowed for federation |