Skip to content

Commit 6cb2cc1

Browse files
committed
Revert "Change the nouns "toot" and "status" to "post" (mastodon#16080)"
This reverts commit 9cc283f.
1 parent fbcbf78 commit 6cb2cc1

3 files changed

Lines changed: 83 additions & 82 deletions

File tree

app/javascript/mastodon/locales/en.json

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,14 @@
3232
"account.mute": "Mute @{name}",
3333
"account.mute_notifications": "Mute notifications from @{name}",
3434
"account.muted": "Muted",
35-
"account.posts": "Posts",
36-
"account.posts_with_replies": "Posts and replies",
35+
"account.never_active": "Never",
36+
"account.posts": "Toots",
37+
"account.posts_with_replies": "Toots and replies",
3738
"account.report": "Report @{name}",
3839
"account.requested": "Awaiting approval. Click to cancel follow request",
3940
"account.share": "Share @{name}'s profile",
4041
"account.show_reblogs": "Show boosts from @{name}",
41-
"account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
42+
"account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
4243
"account.unblock": "Unblock @{name}",
4344
"account.unblock_domain": "Unblock domain {domain}",
4445
"account.unblock_short": "Unblock",
@@ -79,7 +80,7 @@
7980
"column.lists": "Lists",
8081
"column.mutes": "Muted users",
8182
"column.notifications": "Notifications",
82-
"column.pins": "Pinned posts",
83+
"column.pins": "Pinned toots",
8384
"column.public": "Federated timeline",
8485
"column_back_button.label": "Back",
8586
"column_header.hide_settings": "Hide settings",
@@ -95,8 +96,8 @@
9596
"compose.language.change": "Change language",
9697
"compose.language.search": "Search languages...",
9798
"compose_form.direct_message_warning_learn_more": "Learn more",
98-
"compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
99-
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
99+
"compose_form.encryption_warning": "Toots on Mastodon are not end-to-end encrypted. Do not share any sensitive information over Mastodon.",
100+
"compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
100101
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
101102
"compose_form.lock_disclaimer.lock": "locked",
102103
"compose_form.placeholder": "What's on your mind?",
@@ -112,15 +113,15 @@
112113
"compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
113114
"compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
114115
"compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
115-
"compose_form.spoiler.marked": "Remove content warning",
116-
"compose_form.spoiler.unmarked": "Add content warning",
116+
"compose_form.spoiler.marked": "Text is hidden behind warning",
117+
"compose_form.spoiler.unmarked": "Text is not hidden",
117118
"compose_form.spoiler_placeholder": "Write your warning here",
118119
"confirmation_modal.cancel": "Cancel",
119120
"confirmations.block.block_and_report": "Block & Report",
120121
"confirmations.block.confirm": "Block",
121122
"confirmations.block.message": "Are you sure you want to block {name}?",
122123
"confirmations.delete.confirm": "Delete",
123-
"confirmations.delete.message": "Are you sure you want to delete this post?",
124+
"confirmations.delete.message": "Are you sure you want to delete this toot?",
124125
"confirmations.delete_list.confirm": "Delete",
125126
"confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
126127
"confirmations.discard_edit_media.confirm": "Discard",
@@ -133,7 +134,7 @@
133134
"confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
134135
"confirmations.mute.message": "Are you sure you want to mute {name}?",
135136
"confirmations.redraft.confirm": "Delete & redraft",
136-
"confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
137+
"confirmations.redraft.message": "Are you sure you want to delete this toot and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
137138
"confirmations.reply.confirm": "Reply",
138139
"confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
139140
"confirmations.unfollow.confirm": "Unfollow",
@@ -146,7 +147,7 @@
146147
"directory.local": "From {domain} only",
147148
"directory.new_arrivals": "New arrivals",
148149
"directory.recently_active": "Recently active",
149-
"embed.instructions": "Embed this post on your website by copying the code below.",
150+
"embed.instructions": "Embed this toot on your website by copying the code below.",
150151
"embed.preview": "Here is what it will look like:",
151152
"emoji_button.activity": "Activity",
152153
"emoji_button.clear": "Clear",
@@ -164,22 +165,22 @@
164165
"emoji_button.symbols": "Symbols",
165166
"emoji_button.travel": "Travel & Places",
166167
"empty_column.account_suspended": "Account suspended",
167-
"empty_column.account_timeline": "No posts here!",
168+
"empty_column.account_timeline": "No toots here!",
168169
"empty_column.account_unavailable": "Profile unavailable",
169170
"empty_column.blocks": "You haven't blocked any users yet.",
170-
"empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
171+
"empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
171172
"empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
172173
"empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
173174
"empty_column.domain_blocks": "There are no blocked domains yet.",
174175
"empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
175-
"empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
176-
"empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
176+
"empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
177+
"empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
177178
"empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
178179
"empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
179180
"empty_column.hashtag": "There is nothing in this hashtag yet.",
180-
"empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
181+
"empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
181182
"empty_column.home.suggestions": "See some suggestions",
182-
"empty_column.list": "There is nothing in this list yet. When members of this list publish new posts, they will appear here.",
183+
"empty_column.list": "There is nothing in this list yet. When members of this list post new toots, they will appear here.",
183184
"empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
184185
"empty_column.mutes": "You haven't muted any users yet.",
185186
"empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
@@ -230,13 +231,13 @@
230231
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
231232
"keyboard_shortcuts.back": "Navigate back",
232233
"keyboard_shortcuts.blocked": "Open blocked users list",
233-
"keyboard_shortcuts.boost": "Boost post",
234+
"keyboard_shortcuts.boost": "Boost toot",
234235
"keyboard_shortcuts.column": "Focus column",
235236
"keyboard_shortcuts.compose": "Focus compose textarea",
236237
"keyboard_shortcuts.description": "Description",
237238
"keyboard_shortcuts.direct": "to open direct messages column",
238239
"keyboard_shortcuts.down": "Move down in the list",
239-
"keyboard_shortcuts.enter": "Open post",
240+
"keyboard_shortcuts.enter": "Open toot",
240241
"keyboard_shortcuts.favourite": "Favourite post",
241242
"keyboard_shortcuts.favourites": "Open favourites list",
242243
"keyboard_shortcuts.federated": "Open federated timeline",
@@ -250,16 +251,16 @@
250251
"keyboard_shortcuts.my_profile": "Open your profile",
251252
"keyboard_shortcuts.notifications": "Open notifications column",
252253
"keyboard_shortcuts.open_media": "Open media",
253-
"keyboard_shortcuts.pinned": "Open pinned posts list",
254+
"keyboard_shortcuts.pinned": "Open pinned toots list",
254255
"keyboard_shortcuts.profile": "Open author's profile",
255-
"keyboard_shortcuts.reply": "Reply to post",
256+
"keyboard_shortcuts.reply": "Reply to toot",
256257
"keyboard_shortcuts.requests": "Open follow requests list",
257258
"keyboard_shortcuts.search": "Focus search bar",
258259
"keyboard_shortcuts.spoilers": "Show/hide CW field",
259260
"keyboard_shortcuts.start": "Open “get started” column",
260261
"keyboard_shortcuts.toggle_hidden": "Show/hide text behind CW",
261262
"keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
262-
"keyboard_shortcuts.toot": "Start a new post",
263+
"keyboard_shortcuts.toot": "Start a brand new toot",
263264
"keyboard_shortcuts.unfocus": "Unfocus compose textarea/search",
264265
"keyboard_shortcuts.up": "Move up in the list",
265266
"lightbox.close": "Close",
@@ -294,7 +295,7 @@
294295
"navigation_bar.blocks": "Blocked users",
295296
"navigation_bar.bookmarks": "Bookmarks",
296297
"navigation_bar.community_timeline": "Local timeline",
297-
"navigation_bar.compose": "Compose new post",
298+
"navigation_bar.compose": "Compose new toot",
298299
"navigation_bar.direct": "Direct messages",
299300
"navigation_bar.discover": "Discover",
300301
"navigation_bar.domain_blocks": "Blocked domains",
@@ -310,18 +311,18 @@
310311
"navigation_bar.logout": "Logout",
311312
"navigation_bar.mutes": "Muted users",
312313
"navigation_bar.personal": "Personal",
313-
"navigation_bar.pins": "Pinned posts",
314+
"navigation_bar.pins": "Pinned toots",
314315
"navigation_bar.preferences": "Preferences",
315316
"navigation_bar.public_timeline": "Federated timeline",
316317
"navigation_bar.security": "Security",
317318
"notification.admin.sign_up": "{name} signed up",
318-
"notification.favourite": "{name} favourited your post",
319+
"notification.favourite": "{name} favourited your toot",
319320
"notification.follow": "{name} followed you",
320321
"notification.follow_request": "{name} has requested to follow you",
321322
"notification.mention": "{name} mentioned you",
322323
"notification.own_poll": "Your poll has ended",
323324
"notification.poll": "A poll you have voted in has ended",
324-
"notification.reblog": "{name} boosted your post",
325+
"notification.reblog": "{name} boosted your toot",
325326
"notification.status": "{name} just posted",
326327
"notification.update": "{name} edited a post",
327328
"notifications.clear": "Clear notifications",
@@ -340,7 +341,7 @@
340341
"notifications.column_settings.reblog": "Boosts:",
341342
"notifications.column_settings.show": "Show in column",
342343
"notifications.column_settings.sound": "Play sound",
343-
"notifications.column_settings.status": "New posts:",
344+
"notifications.column_settings.status": "New toot:",
344345
"notifications.column_settings.unread_notifications.category": "Unread notifications",
345346
"notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
346347
"notifications.column_settings.update": "Edits:",
@@ -370,7 +371,7 @@
370371
"poll.votes": "{votes, plural, one {# vote} other {# votes}}",
371372
"poll_button.add_poll": "Add a poll",
372373
"poll_button.remove_poll": "Remove poll",
373-
"privacy.change": "Change post privacy",
374+
"privacy.change": "Adjust toot privacy",
374375
"privacy.direct.long": "Visible for mentioned users only",
375376
"privacy.direct.short": "Mentioned people only",
376377
"privacy.private.long": "Visible for followers only",
@@ -433,25 +434,25 @@
433434
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
434435
"search.placeholder": "Search",
435436
"search_popout.search_format": "Advanced search format",
436-
"search_popout.tips.full_text": "Simple text returns posts you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
437+
"search_popout.tips.full_text": "Simple text returns toots you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
437438
"search_popout.tips.hashtag": "hashtag",
438-
"search_popout.tips.status": "post",
439+
"search_popout.tips.status": "toot",
439440
"search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
440441
"search_popout.tips.user": "user",
441442
"search_results.accounts": "People",
442443
"search_results.all": "All",
443444
"search_results.hashtags": "Hashtags",
444445
"search_results.nothing_found": "Could not find anything for these search terms",
445-
"search_results.statuses": "Posts",
446-
"search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
446+
"search_results.statuses": "Toots",
447+
"search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
447448
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
448449
"status.admin_account": "Open moderation interface for @{name}",
449-
"status.admin_status": "Open this post in the moderation interface",
450+
"status.admin_status": "Open this toot in the moderation interface",
450451
"status.block": "Block @{name}",
451452
"status.bookmark": "Bookmark",
452453
"status.cancel_reblog_private": "Unboost",
453454
"status.cannot_reblog": "This post cannot be boosted",
454-
"status.copy": "Copy link to post",
455+
"status.copy": "Copy link to toot",
455456
"status.delete": "Delete",
456457
"status.detailed_status": "Detailed conversation view",
457458
"status.direct": "Direct message @{name}",
@@ -469,14 +470,14 @@
469470
"status.more": "More",
470471
"status.mute": "Mute @{name}",
471472
"status.mute_conversation": "Mute conversation",
472-
"status.open": "Expand this post",
473+
"status.open": "Expand this toot",
473474
"status.pin": "Pin on profile",
474-
"status.pinned": "Pinned post",
475+
"status.pinned": "Pinned toot",
475476
"status.read_more": "Read more",
476477
"status.reblog": "Boost",
477478
"status.reblog_private": "Boost with original visibility",
478479
"status.reblogged_by": "{name} boosted",
479-
"status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
480+
"status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
480481
"status.redraft": "Delete & re-draft",
481482
"status.remove_bookmark": "Remove bookmark",
482483
"status.reply": "Reply",
@@ -507,7 +508,7 @@
507508
"timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
508509
"timeline_hint.resources.followers": "Followers",
509510
"timeline_hint.resources.follows": "Follows",
510-
"timeline_hint.resources.statuses": "Older posts",
511+
"timeline_hint.resources.statuses": "Older toots",
511512
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
512513
"trends.trending_now": "Trending now",
513514
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",

0 commit comments

Comments
 (0)