diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-19 20:25:54 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-19 20:25:54 +0100 |
| commit | 4aa5ebe59142eedbb1aa9dad88c608dda9ad8d6c (patch) | |
| tree | fffa7f74235f1a4be559bb26cf1373758f37727c /app/assets/javascripts/components/locales/en.jsx | |
| parent | 9e99b8c068b11ec2d0f3b5d560cae0166c247342 (diff) | |
Split public timeline into "public timeline" which is local, and
"whole known network" which is what public timeline used to be Only domain blocks with suspend severity will block PuSH subscriptions Silenced accounts should not appear in conversations unless followed
Diffstat (limited to 'app/assets/javascripts/components/locales/en.jsx')
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 95962fd73..cf01a59b8 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -28,8 +28,8 @@ const en = { "getting_started.about_developer": "The developer of this project can be followed as Gargron@mastodon.social", "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on github at {github}.", "column.home": "Home", - "column.mentions": "Mentions", - "column.public": "Public", + "column.community": "Public", + "column.public": "Whole Known Network", "column.notifications": "Notifications", "tabs_bar.compose": "Compose", "tabs_bar.home": "Home", @@ -45,7 +45,8 @@ const en = { "compose_form.unlisted": "Do not display in public timeline", "navigation_bar.edit_profile": "Edit profile", "navigation_bar.preferences": "Preferences", - "navigation_bar.public_timeline": "Public timeline", + "navigation_bar.community_timeline": "Public timeline", + "navigation_bar.public_timeline": "Whole Known Network", "navigation_bar.logout": "Logout", "reply_indicator.cancel": "Cancel", "search.placeholder": "Search", |