From 411bf188bbb9acb48b7bb1a14066f4975e036940 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Wed, 1 Jul 2020 18:34:19 +0900 Subject: [PATCH] follow-up #14149 (#14192) ran `yarn manage:translations en` --- .../mastodon/locales/defaultMessages.json | 70 +++++++++++++++++-- app/javascript/mastodon/locales/en.json | 6 ++ config/locales/simple_form.en.yml | 2 +- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 96c08f4d87..fc624dcc03 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -492,6 +492,22 @@ }, { "descriptors": [ + { + "defaultMessage": "Public", + "id": "privacy.public.short" + }, + { + "defaultMessage": "Unlisted", + "id": "privacy.unlisted.short" + }, + { + "defaultMessage": "Followers-only", + "id": "privacy.private.short" + }, + { + "defaultMessage": "Direct", + "id": "privacy.direct.short" + }, { "defaultMessage": "Filtered", "id": "status.filtered" @@ -647,6 +663,31 @@ ], "path": "app/javascript/mastodon/features/account_timeline/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "No comment provided", + "id": "account_note.placeholder" + }, + { + "defaultMessage": "Cancel", + "id": "account_note.cancel" + }, + { + "defaultMessage": "Save", + "id": "account_note.save" + }, + { + "defaultMessage": "Your note for @{name}", + "id": "account.account_note_header" + }, + { + "defaultMessage": "Edit", + "id": "account_note.edit" + } + ], + "path": "app/javascript/mastodon/features/account/components/account_note.json" + }, { "descriptors": [ { @@ -777,6 +818,10 @@ "defaultMessage": "Open moderation interface for @{name}", "id": "status.admin_account" }, + { + "defaultMessage": "Add note for @{name}", + "id": "account.add_account_note" + }, { "defaultMessage": "Follows you", "id": "account.follows_you" @@ -2465,6 +2510,27 @@ ], "path": "app/javascript/mastodon/features/status/components/card.json" }, + { + "descriptors": [ + { + "defaultMessage": "Public", + "id": "privacy.public.short" + }, + { + "defaultMessage": "Unlisted", + "id": "privacy.unlisted.short" + }, + { + "defaultMessage": "Followers-only", + "id": "privacy.private.short" + }, + { + "defaultMessage": "Direct", + "id": "privacy.direct.short" + } + ], + "path": "app/javascript/mastodon/features/status/components/detailed_status.json" + }, { "descriptors": [ { @@ -2992,10 +3058,6 @@ "defaultMessage": "Exit full screen", "id": "video.exit_fullscreen" }, - { - "defaultMessage": "Download file", - "id": "video.download" - }, { "defaultMessage": "Sensitive content", "id": "status.sensitive_warning" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index e051c59bb0..1212f2b366 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1,4 +1,6 @@ { + "account.account_note_header": "Your note for @{name}", + "account.add_account_note": "Add note for @{name}", "account.add_or_remove_from_list": "Add or Remove from lists", "account.badges.bot": "Bot", "account.badges.group": "Group", @@ -40,6 +42,10 @@ "account.unfollow": "Unfollow", "account.unmute": "Unmute @{name}", "account.unmute_notifications": "Unmute notifications from @{name}", + "account_note.cancel": "Cancel", + "account_note.edit": "Edit", + "account_note.placeholder": "No comment provided", + "account_note.save": "Save", "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.", "alert.rate_limited.title": "Rate limited", "alert.unexpected.message": "An unexpected error occurred.", diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f84b6c884c..0a8a6fd628 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -56,7 +56,7 @@ en: domain: This domain will be able to fetch data from this server and incoming data from it will be processed and stored email_domain_block: domain: This can be the domain name that shows up in the e-mail address, the MX record that domain resolves to, or IP of the server that MX record resolves to. Those will be checked upon user sign-up and the sign-up will be rejected. - with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blacklisted + with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked featured_tag: name: 'You might want to use one of these:' form_challenge: