From 3a863a594783c87519eda60b7b8b78f2b916597f Mon Sep 17 00:00:00 2001 From: GunChleoc Date: Fri, 25 Aug 2023 09:32:58 +0100 Subject: [PATCH] Replace 'local timeline' by 'this server' and 'federated timeline' by 'other servers' --- .../mastodon/features/community_timeline/index.jsx | 4 ++-- app/javascript/mastodon/features/compose/index.jsx | 4 ++-- .../mastodon/features/firehose/index.jsx | 2 +- .../mastodon/features/getting_started/index.jsx | 4 ++-- .../mastodon/features/keyboard_shortcuts/index.jsx | 4 ++-- .../mastodon/features/public_timeline/index.jsx | 2 +- app/javascript/mastodon/locales/en.json | 14 +++++++------- config/locales/en.yml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/javascript/mastodon/features/community_timeline/index.jsx b/app/javascript/mastodon/features/community_timeline/index.jsx index 5652ea53279..88eb1ed720c 100644 --- a/app/javascript/mastodon/features/community_timeline/index.jsx +++ b/app/javascript/mastodon/features/community_timeline/index.jsx @@ -22,7 +22,7 @@ import StatusListContainer from '../ui/containers/status_list_container'; import ColumnSettingsContainer from './containers/column_settings_container'; const messages = defineMessages({ - title: { id: 'column.community', defaultMessage: 'Local timeline' }, + title: { id: 'column.community', defaultMessage: 'This server' }, }); const mapStateToProps = (state, { columnId }) => { @@ -144,7 +144,7 @@ class CommunityTimeline extends PureComponent { scrollKey={`community_timeline-${columnId}`} timelineId={`community${onlyMedia ? ':media' : ''}`} onLoadMore={this.handleLoadMore} - emptyMessage={} + emptyMessage={} bindToDocument={!multiColumn} /> diff --git a/app/javascript/mastodon/features/compose/index.jsx b/app/javascript/mastodon/features/compose/index.jsx index 660f08615be..caeab12dd9f 100644 --- a/app/javascript/mastodon/features/compose/index.jsx +++ b/app/javascript/mastodon/features/compose/index.jsx @@ -32,8 +32,8 @@ const messages = defineMessages({ start: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' }, notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' }, - public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' }, - community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' }, + public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Other servers' }, + community: { id: 'navigation_bar.community_timeline', defaultMessage: 'This server' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' }, compose: { id: 'navigation_bar.compose', defaultMessage: 'Compose new post' }, diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx index ff80aac2200..701896404c5 100644 --- a/app/javascript/mastodon/features/firehose/index.jsx +++ b/app/javascript/mastodon/features/firehose/index.jsx @@ -142,7 +142,7 @@ const Firehose = ({ feedType, multiColumn }) => { const emptyMessage = feedType === 'community' ? ( ) : ( g+l - + g+t - + g+d diff --git a/app/javascript/mastodon/features/public_timeline/index.jsx b/app/javascript/mastodon/features/public_timeline/index.jsx index aa5a02645d7..23cf4c1990d 100644 --- a/app/javascript/mastodon/features/public_timeline/index.jsx +++ b/app/javascript/mastodon/features/public_timeline/index.jsx @@ -22,7 +22,7 @@ import StatusListContainer from '../ui/containers/status_list_container'; import ColumnSettingsContainer from './containers/column_settings_container'; const messages = defineMessages({ - title: { id: 'column.public', defaultMessage: 'Federated timeline' }, + title: { id: 'column.public', defaultMessage: 'Other servers' }, }); const mapStateToProps = (state, { columnId }) => { diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 44827532423..16366e92f3c 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -139,7 +139,7 @@ "column.about": "About", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", - "column.community": "Local timeline", + "column.community": "This server", "column.create_list": "Create list", "column.direct": "Private mentions", "column.directory": "Browse profiles", @@ -154,7 +154,7 @@ "column.mutes": "Muted users", "column.notifications": "Notifications", "column.pins": "Pinned posts", - "column.public": "Federated timeline", + "column.public": "Other servers", "column_back_button.label": "Back", "column_header.hide_settings": "Hide settings", "column_header.moveLeft_settings": "Move column to the left", @@ -288,7 +288,7 @@ "empty_column.account_unavailable": "Profile unavailable", "empty_column.blocks": "You haven't blocked any users yet.", "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.", - "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", + "empty_column.community": "This server looks empty. Write something publicly to get the ball rolling!", "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.", "empty_column.domain_blocks": "There are no blocked domains yet.", "empty_column.explore_statuses": "Nothing is trending right now. Check back later!", @@ -436,12 +436,12 @@ "keyboard_shortcuts.enter": "Open post", "keyboard_shortcuts.favourite": "Favorite post", "keyboard_shortcuts.favourites": "Open favorites list", - "keyboard_shortcuts.federated": "Open federated timeline", + "keyboard_shortcuts.federated": "Open other servers’ timeline", "keyboard_shortcuts.heading": "Keyboard shortcuts", "keyboard_shortcuts.home": "Open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", "keyboard_shortcuts.legend": "Display this legend", - "keyboard_shortcuts.local": "Open local timeline", + "keyboard_shortcuts.local": "Open this server’s timeline", "keyboard_shortcuts.mention": "Mention author", "keyboard_shortcuts.muted": "Open muted users list", "keyboard_shortcuts.my_profile": "Open your profile", @@ -513,7 +513,7 @@ "navigation_bar.advanced_interface": "Open in advanced web interface", "navigation_bar.blocks": "Blocked users", "navigation_bar.bookmarks": "Bookmarks", - "navigation_bar.community_timeline": "Local timeline", + "navigation_bar.community_timeline": "This server", "navigation_bar.compose": "Compose new post", "navigation_bar.direct": "Private mentions", "navigation_bar.discover": "Discover", @@ -532,7 +532,7 @@ "navigation_bar.personal": "Personal", "navigation_bar.pins": "Pinned posts", "navigation_bar.preferences": "Preferences", - "navigation_bar.public_timeline": "Federated timeline", + "navigation_bar.public_timeline": "Other servers", "navigation_bar.search": "Search", "navigation_bar.security": "Security", "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.", diff --git a/config/locales/en.yml b/config/locales/en.yml index ab76b462ee5..2ba17cc2125 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1104,7 +1104,7 @@ en: remove: Unlink alias appearance: advanced_web_interface: Advanced web interface - advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' + advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, other servers, any number of lists and hashtags.' animations_and_accessibility: Animations and accessibility confirmation_dialogs: Confirmation dialogs discovery: Discovery