Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream
This commit is contained in:
commit
06176deee2
50 files changed
+710
-112
No files matched your search
@@ -956,10 +956,16 @@ en:
|
||||
disabled: Require specific user role
|
||||
public: Everyone
|
||||
landing_page:
|
||||
hints:
|
||||
about_html: A page with the description, contact information, rules and other information regarding this server.
|
||||
local_feed_html: A live feed featuring most recent posts by users on this server.
|
||||
overview_html: A page showcasing the description of your server alongside the most recent local posts by users on this server.
|
||||
trends_html: A page featuring what's popular on this server right now.
|
||||
values:
|
||||
about: About
|
||||
local_feed: Local feed
|
||||
trends: Trends
|
||||
about: About page
|
||||
local_feed: Local live feed
|
||||
overview: Overview
|
||||
trends: Trending
|
||||
registrations:
|
||||
moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
|
||||
preamble: Control who can create an account on your server.
|
||||
|
||||
@@ -34,4 +34,6 @@
|
||||
/search
|
||||
/start/(*any)
|
||||
/statuses/(*any)
|
||||
/overview
|
||||
/overview/about
|
||||
).each { |path| get path, to: 'home#index' }
|
||||
Reference in new issue
Block a user