zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge e43277ec65 into 1959365c2f

This commit is contained in:
gunchleoc 2024-05-10 20:06:51 +00:00 committed by GitHub
parent 1959365c2f e43277ec65
commit d2e9b265e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/community_timeline/index.jsx
View File

@ -21,7 +21,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 }) => {
@ -147,7 +147,7 @@ class CommunityTimeline extends PureComponent {
scrollKey={`community_timeline-${columnId}`}
timelineId={`community${onlyMedia ? ':media' : ''}`}
onLoadMore={this.handleLoadMore}
emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />}
emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='This server looks empty. Write something publicly to get the ball rolling!' />}
bindToDocument={!multiColumn}
/>

4
app/javascript/mastodon/features/compose/index.jsx
View File

@ -37,8 +37,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' },

2
app/javascript/mastodon/features/firehose/index.jsx
View File

@ -150,7 +150,7 @@ const Firehose = ({ feedType, multiColumn }) => {
const emptyMessage = feedType === 'community' ? (
<FormattedMessage
id='empty_column.community'
defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!'
defaultMessage='This server looks empty. Write something publicly to get the ball rolling!'
/>
) : (
<FormattedMessage

4
app/javascript/mastodon/features/getting_started/index.jsx
View File

@ -35,9 +35,9 @@ import TrendsContainer from './containers/trends_container';
const messages = defineMessages({
home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Other servers' },
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'This server' },
explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },

4
app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
View File

@ -124,11 +124,11 @@ class KeyboardShortcuts extends ImmutablePureComponent {
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>l</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.local' defaultMessage='to open local timeline' /></td>
<td><FormattedMessage id='keyboard_shortcuts.local' defaultMessage='to open this server’s timeline' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>t</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.federated' defaultMessage='to open federated timeline' /></td>
<td><FormattedMessage id='keyboard_shortcuts.federated' defaultMessage='to open other servers’ timeline' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>d</kbd></td>

2
app/javascript/mastodon/features/public_timeline/index.jsx
View File

@ -21,7 +21,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 }) => {

14
app/javascript/mastodon/locales/en.json
View File

@ -118,7 +118,7 @@
"column.about": "About",
"column.blocks": "Blocked users",
"column.bookmarks": "Bookmarks",
"column.community": "Local timeline",
"column.community": "This server",
"column.direct": "Private mentions",
"column.directory": "Browse profiles",
"column.domain_blocks": "Blocked domains",
@ -130,7 +130,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",
@ -253,7 +253,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!",
@ -383,12 +383,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",
@ -445,7 +445,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",
@ -463,7 +463,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.",

2
config/locales/en.yml
View File

@ -1018,7 +1018,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