diff options
author | mayaeh <mayaeh@marimo-net.org> | 2019-10-01 08:20:22 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-01 01:20:22 +0200 |
commit | b258583d2becfb1d1b434a2368fac627069bed0b (patch) | |
tree | e926c7262c5ef61494f3a0bf41cf3933ecdfd70d /app/javascript/mastodon/locales/defaultMessages.json | |
parent | f7c146a9e11389e208fe61ab8e6f5e3d3b43ddfb (diff) |
Fix hashtag link to directory in AdminUI (#12005)
* Fixed not to generate link if no user used hashtag in directory * Added missing translation for AdminUI custom emojis * run yarn manage:translations en
Diffstat (limited to 'app/javascript/mastodon/locales/defaultMessages.json')
-rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 104 |
1 files changed, 32 insertions, 72 deletions
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index e2caf18d3..79ead58ec 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -239,16 +239,20 @@ "id": "poll.voted" }, { + "defaultMessage": "{count, plural, one {# person} other {# people}}", + "id": "poll.total_people" + }, + { + "defaultMessage": "{count, plural, one {# vote} other {# votes}}", + "id": "poll.total_votes" + }, + { "defaultMessage": "Vote", "id": "poll.vote" }, { "defaultMessage": "Refresh", "id": "poll.refresh" - }, - { - "defaultMessage": "{count, plural, one {# vote} other {# votes}}", - "id": "poll.total_votes" } ], "path": "app/javascript/mastodon/components/poll.json" @@ -499,24 +503,12 @@ "id": "confirmations.redraft.message" }, { - "defaultMessage": "Block", - "id": "confirmations.block.confirm" - }, - { "defaultMessage": "Reply", "id": "confirmations.reply.confirm" }, { "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "id": "confirmations.reply.message" - }, - { - "defaultMessage": "Block & Report", - "id": "confirmations.block.block_and_report" - }, - { - "defaultMessage": "Are you sure you want to block {name}?", - "id": "confirmations.block.message" } ], "path": "app/javascript/mastodon/containers/status_container.json" @@ -554,26 +546,14 @@ "id": "confirmations.unfollow.confirm" }, { - "defaultMessage": "Block", - "id": "confirmations.block.confirm" - }, - { "defaultMessage": "Hide entire domain", "id": "confirmations.domain_block.confirm" }, { - "defaultMessage": "Block & Report", - "id": "confirmations.block.block_and_report" - }, - { "defaultMessage": "Are you sure you want to unfollow {name}?", "id": "confirmations.unfollow.message" }, { - "defaultMessage": "Are you sure you want to block {name}?", - "id": "confirmations.block.message" - }, - { "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.", "id": "confirmations.domain_block.message" } @@ -1137,15 +1117,6 @@ { "descriptors": [ { - "defaultMessage": "Uploading...", - "id": "upload_progress.label" - } - ], - "path": "app/javascript/mastodon/features/compose/components/upload_progress.json" - }, - { - "descriptors": [ - { "defaultMessage": "Delete", "id": "upload_form.undo" }, @@ -1636,6 +1607,10 @@ { "descriptors": [ { + "defaultMessage": "Basic", + "id": "home.column_settings.basic" + }, + { "defaultMessage": "Show boosts", "id": "home.column_settings.show_reblogs" }, @@ -2017,14 +1992,6 @@ "id": "notifications.column_settings.push" }, { - "defaultMessage": "Basic", - "id": "home.column_settings.basic" - }, - { - "defaultMessage": "Update in real-time", - "id": "home.column_settings.update_live" - }, - { "defaultMessage": "Quick filter bar", "id": "notifications.column_settings.filter_bar.category" }, @@ -2083,10 +2050,6 @@ { "descriptors": [ { - "defaultMessage": "and {count, plural, one {# other} other {# others}}", - "id": "notification.and_n_others" - }, - { "defaultMessage": "{name} followed you", "id": "notification.follow" }, @@ -2274,24 +2237,12 @@ "id": "confirmations.redraft.message" }, { - "defaultMessage": "Block", - "id": "confirmations.block.confirm" - }, - { "defaultMessage": "Reply", "id": "confirmations.reply.confirm" }, { "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "id": "confirmations.reply.message" - }, - { - "defaultMessage": "Block & Report", - "id": "confirmations.block.block_and_report" - }, - { - "defaultMessage": "Are you sure you want to block {name}?", - "id": "confirmations.block.message" } ], "path": "app/javascript/mastodon/features/status/containers/detailed_status_container.json" @@ -2315,10 +2266,6 @@ "id": "confirmations.redraft.message" }, { - "defaultMessage": "Block", - "id": "confirmations.block.confirm" - }, - { "defaultMessage": "Show more for all", "id": "status.show_more_all" }, @@ -2337,21 +2284,30 @@ { "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?", "id": "confirmations.reply.message" + } + ], + "path": "app/javascript/mastodon/features/status/index.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Are you sure you want to block {name}?", + "id": "confirmations.block.message" }, { - "defaultMessage": "Block & Report", - "id": "confirmations.block.block_and_report" + "defaultMessage": "Cancel", + "id": "confirmation_modal.cancel" }, { - "defaultMessage": "Toot", - "id": "column.status" + "defaultMessage": "Block & Report", + "id": "confirmations.block.block_and_report" }, { - "defaultMessage": "Are you sure you want to block {name}?", - "id": "confirmations.block.message" + "defaultMessage": "Block", + "id": "confirmations.block.confirm" } ], - "path": "app/javascript/mastodon/features/status/index.json" + "path": "app/javascript/mastodon/features/ui/components/block_modal.json" }, { "descriptors": [ @@ -2570,6 +2526,10 @@ "id": "confirmations.mute.message" }, { + "defaultMessage": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts follow you.", + "id": "confirmations.mute.explanation" + }, + { "defaultMessage": "Hide notifications from this user?", "id": "mute_modal.hide_notifications" }, |