Fix: #697 英語翻訳の改善 (#709)

* Fix: #697 英語翻訳の改善

* Fix translations

app/javascript/mastodon/components/searchability_icon.tsx

@@ -19,7 +19,7 @@ const messages = defineMessages({
   public_short: { id: 'searchability.public.short', defaultMessage: 'Public' },
   public_unlisted_short: {
     id: 'searchability.public_unlisted.short',
-    defaultMessage: 'Public unlisted',
+    defaultMessage: 'Local public',
   },
   private_short: {
     id: 'searchability.unlisted.short',

app/javascript/mastodon/components/visibility_icon.tsx

@@ -19,7 +19,7 @@ const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_unlisted_short: {
     id: 'privacy.public_unlisted.short',
-    defaultMessage: 'Public unlisted',
+    defaultMessage: 'Local public',
   },
   login_short: {
     id: 'privacy.login.short',

app/javascript/mastodon/features/about/index.jsx

@@ -34,7 +34,7 @@ const messages = defineMessages({
   silencedExplanation: { id: 'about.domain_blocks.silenced.explanation', defaultMessage: 'You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.' },
   suspended: { id: 'about.domain_blocks.suspended.title', defaultMessage: 'Suspended' },
   suspendedExplanation: { id: 'about.domain_blocks.suspended.explanation', defaultMessage: 'No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.' },
-  publicUnlistedVisibility: { id: 'privacy.public_unlisted.short', defaultMessage: 'Public unlisted' },
+  publicUnlistedVisibility: { id: 'privacy.public_unlisted.short', defaultMessage: 'Local public' },
   publicVisibility: { id: 'about.public_visibility', defaultMessage: 'Public visibility' },
   emojiReaction: { id: 'status.emoji_reaction', defaultMessage: 'Emoji reaction' },
   enabled: { id: 'about.enabled', defaultMessage: 'Enabled' },

app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx

@@ -27,7 +27,7 @@ const messages = defineMessages({
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
   unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
-  public_unlisted_short: { id: 'privacy.public_unlisted.short', defaultMessage: 'Public unlisted' },
+  public_unlisted_short: { id: 'privacy.public_unlisted.short', defaultMessage: 'Local public' },
   public_unlisted_long: { id: 'privacy.public_unlisted.long', defaultMessage: 'Visible for all without GTL' },
   login_short: { id: 'privacy.login.short', defaultMessage: 'Login only' },
   login_long: { id: 'privacy.login.long', defaultMessage: 'Login user only' },

app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx

@@ -20,7 +20,7 @@ import { enableLocalPrivacy } from 'mastodon/initial_state';
 const messages = defineMessages({
   public_short: { id: 'searchability.public.short', defaultMessage: 'Public' },
   public_long: { id: 'searchability.public.long', defaultMessage: 'Anyone can find' },
-  public_unlisted_short: { id: 'searchability.public_unlisted.short', defaultMessage: 'Public unlisted' },
+  public_unlisted_short: { id: 'searchability.public_unlisted.short', defaultMessage: 'Local public' },
   public_unlisted_long: { id: 'searchability.public_unlisted.long', defaultMessage: 'Local users and followers can find' },
   private_short: { id: 'searchability.unlisted.short', defaultMessage: 'Followers' },
   private_long: { id: 'searchability.unlisted.long', defaultMessage: 'Your followers can find' },

app/javascript/mastodon/locales/en.json

@@ -46,6 +46,7 @@
   "account.follow_back": "Follow back",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
+  "account.followers.hidden_from_me": "This information is hidden by your setting.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
@@ -593,14 +594,22 @@
   "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
   "notification.relationships_severance_event.learn_more": "Learn more",
   "notification.relationships_severance_event.user_domain_block": "You have blocked {target}, removing {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
-  "notification_requests.accept": "Accept",
-  "notification_requests.dismiss": "Dismiss",
-  "notification_requests.notifications_from": "Notifications from {name}",
-  "notification_requests.title": "Filtered notifications",
   "notification.status": "{name} just posted",
   "notification.status_reference": "{name} quoted your post",
   "notification.update": "{name} edited a post",
   "notification.warning": "You have been warned and did something. Check your mailbox",
+  "notification.warning.delete_statuses": "You have been warned and one or more statuses have been deleted. Check your mailbox.",
+  "notification.warning.disable": "You have been warned and disabled account. Check your mailbox.",
+  "notification.warning.force_cw": "You have been warned and one or more statuses have been added warning messages. Check your mailbox.",
+  "notification.warning.mark_statuses_as_sensitive": "You have been warned and some statuses have been marked as sensitive. Check your mailbox.",
+  "notification.warning.none": "You have been warned. Check your mailbox.",
+  "notification.warning.sensitive": "You have been warned and your account has been marked as sensitive. Check your mailbox.",
+  "notification.warning.silence": "You have been warned and your account has been silenced. Check your mailbox.",
+  "notification.warning.suspend": "You have been warned and your account has been suspended. Check your mailbox.",
+  "notification_requests.accept": "Accept",
+  "notification_requests.dismiss": "Dismiss",
+  "notification_requests.notifications_from": "Notifications from {name}",
+  "notification_requests.title": "Filtered notifications",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.admin.report": "New reports:",
@@ -719,7 +728,7 @@
   "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
   "privacy.public_unlisted.long": "Visible for all without GTL",
-  "privacy.public_unlisted.short": "Public unlisted",
+  "privacy.public_unlisted.short": "Local public",
   "privacy.reply.long": "Reply to limited post",
   "privacy.reply.short": "Reply",
   "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
@@ -858,6 +867,7 @@
   "status.embed": "Embed",
   "status.emoji_reaction": "Emoji reaction",
   "status.emoji_reaction.pick": "Pick emoji reaction",
+  "status.emoji_reactions": "{count, plural, one {emoji} other {emojis}}",
   "status.expiration.12_hours": "Remove 12 hours later",
   "status.expiration.1_day": "Remove 1 day later",
   "status.expiration.1_hour": "Remove 1 hour later",
@@ -866,7 +876,6 @@
   "status.expiration.5_minutes": "Remove 5 minutes later",
   "status.expiration.7_days": "Remove 7 days later",
   "status.expiration.add": "Set status expired time",
-  "status.emoji_reactions": "{count, plural, one {emoji} other {emojis}}",
   "status.favourite": "Favorite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.featured_tags.add": "Add your featured tag",

app/views/admin/settings/registrations/show.html.haml

@@ -50,13 +50,17 @@
   .fields-group
     = f.input :registrations_limit_per_day, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }, label: I18n.t('simple_form.labels.form_admin_settings.registrations_limit_per_day', count: @current_users_count_today)
 
-  .fields-group
+  .fields-row
-    = f.input :registrations_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
-    = f.input :registrations_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+      = f.input :registrations_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
 
-  .fields-group
+  .fields-row
-    = f.input :registrations_secondary_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
-    = f.input :registrations_secondary_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+      = f.input :registrations_secondary_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :registrations_secondary_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }, hint: I18n.t('simple_form.labels.form_admin_settings.registrations_secondary_end_hour_hint')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit

config/locales/en.yml

@@ -421,8 +421,8 @@ en:
         undo_relationships: This will undo any follow relationship between accounts of these servers and yours.
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
-      detect_invalid_subscription: 不正な購読を行うサーバーとしてマークする
+      detect_invalid_subscription: Mark as a server with unauthorized subscriptions
-      detect_invalid_subscription_hint: Misskey、Calckeyなどは購読機能で未フォローユーザーの未収載投稿を拾います。これをマークしたサーバーは、ユーザーが任意で配送を拒否できます。停止とは無関係です
+      detect_invalid_subscription_hint: Misskey, Calckey, and others pick up unfollowed posts from unfollowed users with the subscribe feature. Servers that mark these can refuse delivery at the user's discretion. This has nothing to do with suspension.
       domain: Domain
       edit: Edit domain block
       existing_domain_block: You have already imposed stricter limits on %{name}.
@@ -466,8 +466,8 @@ en:
       reject_reply_exclude_followers_hint: Reject replies exclude followers in the future
       reject_reports: Reject reports
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
-      reject_send_sensitive: センシティブな投稿を配送しない
+      reject_send_sensitive: Do not deliver sensitive postings
-      reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
+      reject_send_sensitive_hint: Fetches from the other server may not be prevented. It has nothing to do with outages.
       reject_straight_follow: Reject straight follow
       reject_straight_follow_hint: The server accounts must be authenticated when follow our accounts
       undo: Undo domain block
@@ -520,21 +520,21 @@ en:
       accept: Accept
       add_new: Add and make a new application
       delete: Delete
-      description_html: <strong>フレンドサーバー</strong>とは、お互いのローカル公開・ローカル検索許可の投稿をそのまま交換するシステムです。
+      description_html: <strong>Friend server</strong> is a system for exchanging posts with each other's local public and local search permissions as they are.
       disabled: Disabled
       domain: Domain
       edit:
         allow_all_posts: Receive all posts
-        allow_all_posts_hint: 通常は自分のサーバーの誰もフォローしていないアカウントの投稿は例外を除き受け入れがブロックされます。そのブロックを解除します。スパムが発生した場合など、いつでもブロックを再開できます。
+        allow_all_posts_hint: Normally, posts from accounts that are not following anyone on your server will be blocked from acceptance, with one exception. You can unblock that block. You can reactivate the block at any time, e.g., if spam occurs.
         available: Available
         delivery_local: Deliver without changing public unlisted visibility and searchability
-        delivery_local_hint: Public unlisted posts will be added the friend's global timeline
+        delivery_local_hint: Local public posts will be added the friend's global timeline
-        description: フレンドサーバーは、登録と同時に相手方のサーバーへ申請されます。
+        description: A friend server is applied to the other server at the same time as registration.
         domain: Domain
         inbox_url: Friend server inbox URL
         inbox_url_hint: Default value is https://domain/inbox if you input empty (For example, https://example.com/inbox)
         pseudo_relay: Send all public or searchable posts
-        pseudo_relay_hint: お互いに有効で、かつ相手側で「このサーバーからの投稿を無条件で受け入れる」が有効になっている必要があります
+        pseudo_relay_hint: Must be valid for both parties and "Accept submissions from this server unconditionally" must be enabled on the other side
         unlocked: Approve automatically receiving new request
       edit_friend: Edit
       enabled: Enabled
@@ -544,7 +544,7 @@ en:
       reject: Reject
       save_and_enable: Save and enable
       setup: Add and make a new application
-      signatures_not_enabled: セキュアモードまたは連合制限モードが有効の場合、フレンドサーバーの動作を確認していないため正常に動作しない可能性があります
+      signatures_not_enabled: If Secure Mode or Federation Restricted Mode is enabled, the friend server may not work properly because it has not been checked
       status: Status
       title: Friend server
       unfollow: Cancel request
@@ -746,29 +746,29 @@ en:
       title: NG Rule History %{title}
     ng_words:
       block_unfollow_account_mention: Reject all mentions/quotes from all accounts that do not have followers on your server
-      block_unfollow_account_mention_hint: この設定は削除予定です。設定削除後は、常にチェックをつけていない場合と同じ挙動になります。NGルールで代替してください。
+      block_unfollow_account_mention_hint: This setting will be removed. After the setting is removed, the behavior will always be the same as if it were unchecked; please use NG rules instead.
       deprecated: Will remove settings
       deprecated_hint: These settings will be removed in the next LTS or kmyblue version 14.0, whichever comes first. Please refer to the description of each setting and replace them with the new settings if possible.
       edit:
         add_domain: Add domain
       hide_local_users_for_anonymous: Hide timeline local user posts from anonymous
-      hide_local_users_for_anonymous_hint: この設定は削除予定です。設定削除後は、常にチェックをつけていない場合と同じ挙動になります。サーバー設定の「見つける」にある「公開タイムラインへの未認証のアクセスを許可する」で、完全ではありませんが代替可能です。
+      hide_local_users_for_anonymous_hint: This setting will be removed. After the setting is removed, the behavior will always be the same as if it were unchecked. It can be replaced, though not completely, by "Allow unauthorized access to public timelines" in the "Find" section of the server settings.
       hold_remote_new_accounts: Hold new remote accounts
       keywords: Reject keywords
-      preamble: This setting is useful for solving problems related to spam that are difficult to address with domain blocking. You can reject posts that meet certain criteria, such as the inclusion of specific keywords. Please consider your settings carefully and check your history regularly to ensure that problem-free submissions are not deleted.
+      preamble: This setting is useful for solving problems related to spam that are difficult to address with domain blocking. You can reject posts that meet certain criteria, such as the inclusion of specific keywords. Please consider your settings carefully and check your history regularly to ensure that problem-free posts are not deleted.
-      post_hash_tags_max: Hash tags max for posts
+      post_hash_tags_max: Hash tags limit of a post
-      post_mentions_max: Mentions max for posts
+      post_mentions_max: Mentions limit of a post
-      post_stranger_mentions_max: 投稿に設定可能なメンションの最大数 (If the mentions include at least one person who is not a follower of yours)
+      post_stranger_mentions_max: Mentions limit of a post
       phrases:
-        regexp_html: <strong>正規</strong> 表現 にチェックの入っている項目は、正規表現を用いての比較となります。
+        regexp_html: <strong>Reg</strong> - If the <strong>Reg</strong> checkbox is checked, the comparison is performed using regular expressions.
-        regexp_short: 正規
+        regexp_short: Reg
-        stranger_html: <strong>無関</strong> 係のフォロワーからのメンション にチェックの入っている項目は、フォロー関係にないアカウントからのメンション、返信、引用などのみに適用されます。
+        stranger_html: <strong>UE</strong> - Items checked under <strong>Uem</strong> apply only to mentions, replies, quotes, etc. from accounts with which you have no follow relationship.
-        stranger_short: 無関
+        stranger_short: Uem
       remote_approval_list: List of remote accounts awaiting approval
       remote_approval_hint: Newly recognized accounts with unspecified domains will be placed in Suspended status. You can review that list and approve them if necessary. If this setting is not enabled, all remote accounts will be approved immediately.
       settings: Settings
-      stranger_mention_from_local_ng: フォローしていないアカウントへのメンションのNGワードを、ローカルユーザーによる投稿にも適用する
+      stranger_mention_from_local_ng: NG words for Mention to accounts you do not follow are also applied to posts by local users.
-      stranger_mention_from_local_ng_hint: この設定は削除予定です。設定削除後は、常にチェックをつけている場合と同じ挙動になります。この動作を希望しない場合は、NGルールで代替してください。
+      stranger_mention_from_local_ng_hint: This setting will be removed. After the setting is removed, the behavior will be the same as if it is always checked. If you do not wish this behavior, please use NG rules instead.
       test_error: Testing is returned any errors
       title: NG words and against spams
       white_list: White list
@@ -971,13 +971,13 @@ en:
       auto_warning_text_hint: If not specified, the default warning text is used.
       hint: This keywords is applied to public posts only..
       phrases:
-        remote_html: <strong>Rem</strong> ote にチェックの入っている項目は、リモートからの投稿にも適用されます。
+        remote_html: <strong>Rem</strong> ote checked applies to remote posts as well.
         remote_short: Rem
-        regexp_html: <strong>Reg</strong> Exp にチェックの入っている項目は、正規表現を用いての比較となります。
+        regexp_html: <strong>Reg</strong> Exp checked items are compared using regular expressions.
         regexp_short: Reg
-        spoiler_html: <strong>War</strong> ning にチェックの入っている項目は、コンテンツ警告文にも適用されます。
+        spoiler_html: <strong>War</strong> ning checked will also be applied to the content warning statement.
         spoiler_short: War
-      title: Sensitive words and moderation options
+      title: Sensitive words
     settings:
       about:
         manage_rules: Manage server rules
@@ -1048,10 +1048,10 @@ en:
       version: Version
     special_domains:
       stop_fetch_activity_domains:
-        preamble: WebとActivityでドメインの異なるサーバーでは、WebにアクセスしてもActivityが取得できない場合があります。引用において、投稿本文内でそのようなURLが指定された場合のフェッチを抑止します。多くの場合、この設定を利用する機会はほとんどありません。
+        preamble: On servers with different domains for Web and Activity, you may not be able to retrieve Activity even if you access Web. In citations, this setting suppresses fetching when such a URL is specified in the body of a post. In most cases, this setting is rarely used.
         title: Domains do not fetch for quotes
       stop_link_preview_domains:
-        preamble: 多くのアクセスがあったIPアドレスからの接続を一時的に制限するサイトがある場合、自分のサーバーが不利に扱われる場合があります。そのようなサイトにアクセスしてリンクプレビューを生成する処理を抑制します。多くの場合、この設定を利用する機会はほとんどありません。
+        preamble: If a site temporarily restricts connections from IP addresses that have received many hits, your server may be treated unfavorably. This setting suppresses the process of accessing such sites and generating link previews. In most cases, this setting is rarely used.
         title: Domains do not fetch for link previews
       title: Special domains
     special_instances:
@@ -1304,27 +1304,9 @@ en:
         tags: 登録できるタグ数の上限に達しています
       too_short_keyword: Too short keyword! must 2 and more letters
     edit:
-      accounts_hint: \@askyq or @askyq@example.com
-      accounts_raw: Account list
       available: Available
-      description: アンテナは、サーバーが認識した全ての公開・ローカル公開投稿のうち、検索許可が「公開」または明示的に設定されていないもの(検索許可システムに対応していないサーバーからの投稿)、かつ購読を拒否していないすべてのアカウントからの投稿が対象です。検出された投稿は、指定したリストに追加されます。
+      description: Antenna is for all public and local public posts recognized by the server, from all accounts that have not refused to subscribe. Detected posts will be added to the specified list.
-      domains_hint: ドメインとは、アカウントIDやサイトのURLのうち「kmy.blue」「example.com」に該当する部分です。自身のサーバーを指定することはできません
-      domains_raw: Domain list
-      exclude_accounts_raw: Excluding account list
-      exclude_domains_raw: Excluding domain list
-      exclude_keywords_raw: Excluding keyword list
-      exclude_tags_raw: Excluding hashtag list
-      hint: 下のリストに、絞り込み条件・除外条件を入力します。条件は複数指定することができます。1行につき1つずつ入力してください。空行、コメント、重複を含めることはできません。
-      ignore_reblog: Ignore BTs
-      insert_feeds: Insert home/list timeline (Destination list setting is NOT available if this checkbox is NOT set)
-      keywords_hint: キーワードは1つあたり最低2文字です。キーワードによる絞り込みを指定した場合、検索許可に対応しているサーバーからの投稿は、検索許可が「公開」以外のものは掲載されなくなります
-      keywords_raw: Keyword list
-      list: Destination list
-      stl: Enable stl (Social timeline) mode
-      stl_hint: All of under settings will be ignored, but rejecting subscription settings are ignored
-      tags_raw: Hashtag list
       title: Edit antenna
-      with_media_only: With media only
     errors:
       deprecated_api_multiple_keywords: These parameters cannot be changed from this application because they apply to more than one filter keyword. Use a more recent application or the web interface.
       empty_contexts: No contexts! You must set any context filters
@@ -1903,10 +1885,10 @@ en:
     title: Privacy and reach
   privacy_extra:
     hint_html: These settings are kmyblue original. You will receive additional privacy benefits by doing this setting.
-    post_processing_hint_html: 投稿された情報に対して、システムが追加で行うことができる操作を制御します。これらには、第三者のサイトへあなたの投稿に関する情報の送信を伴う設定も含まれます。
+    post_processing_hint_html: Controls additional operations that the system may perform on the information you post. These include settings that involve sending information about your submission to third party sites.
-    post_processing: 投稿の処理
+    post_processing: Processing posts
-    stop_deliver: 配送停止
+    stop_deliver: Stop delivery
-    stop_deliver_hint_html: Mastodonの投稿を、他のソフトウェアでは自由に検索することができます。Mastodon内で行ったプライバシーの設定は無視され、あなたの投稿が意図しない人に見つかるおそれがあります。ここでは、他のサーバーやソフトウェアであなたの投稿が見つからないようにする設定が可能です。ただしリスクは伴います。
+    stop_deliver_hint_html: Mastodon posts can be freely searched by other software; privacy settings made within Mastodon will be ignored and your posts may be found by unintended people. Here, you can set up your posts so that they will not be found by other servers or software. However, there is a risk involved.
     title: Privacy extra settings
     will_remove_settings: This function will be removed
     will_remove_settings_hint_html: This function will be removed kb14.0 or next LTS.
@@ -2103,14 +2085,18 @@ en:
     visibilities:
       direct: Direct
       limited: Limited
-      login: Login only
+      login: Login-only
       login_long: Only logined users
       private: Followers-only
       private_long: Only show to followers
       public: Public
       public_long: Everyone can see
+      public_unlisted: Local-public
+      public_unlisted_long: Everyone can see, but not listed on public timelines of other servers
       unlisted: Unlisted
       unlisted_long: Everyone can see, but not listed on public timelines
+      unset: Default
+      unset_long: Following Mastodon default behavior
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below
@@ -2131,6 +2117,8 @@ en:
     keep_polls_hint: Doesn't delete any of your polls
     keep_self_bookmark: Keep posts you bookmarked
     keep_self_bookmark_hint: Doesn't delete your own posts if you have bookmarked them
+    keep_self_emoji: Keep posts you reacted with emoji
+    keep_self_emoji_hint: Doesn't delete your own posts if you have reacted them with emoji
     keep_self_fav: Keep posts you favorited
     keep_self_fav_hint: Doesn't delete your own posts if you have favorited them
     min_age:

config/locales/ja.yml

@@ -462,7 +462,7 @@ ja:
       reject_reports: 通報を拒否
       reject_reports_hint: このドメインからの通報をすべて無視します。停止とは無関係です
       reject_send_sensitive: センシティブな投稿を配送しない
-      reject_send_sensitive_hint: 相手サーバーからのフェッチは防げません。停止とは無関係です
+      reject_send_sensitive_hint: 相手サーバーからのフェッチは防げない可能性があります。停止とは無関係です
       reject_straight_follow: フォローを強制的に審査制にする
       reject_straight_follow_hint: 相手からのフォローは当サーバーのアカウントの承認が必須になります
       undo: ドメインブロックを戻す
@@ -1297,27 +1297,9 @@ ja:
       over_stl_limit: 所持できるSTLモード付きアンテナ数 (ホーム/リストそれぞれにつき%{limit}) を超えています
       too_short_keyword: キーワードが短すぎます
     edit:
-      accounts_hint: ローカルアカウントの場合は「@info」、リモートアカウントの場合は「@info@example.com」の形式で指定します。サーバーが認識していないアカウントは保存時に自動的に削除されます。
-      accounts_raw: 絞り込むアカウント
       available: 有効
       description: アンテナは、サーバーが認識した全ての公開・ローカル公開投稿のうち、購読を拒否していないすべてのアカウントからの投稿が対象です。検出された投稿は、指定したリストに追加されます。
-      domains_hint: ドメインとは、アカウントIDやサイトのURLのうち「kmy.blue」「example.com」に該当する部分です
-      domains_raw: 絞り込むドメイン
-      exclude_accounts_raw: 除外するアカウント
-      exclude_domains_raw: 除外するドメイン
-      exclude_keywords_raw: 除外するキーワード
-      exclude_tags_raw: 除外するハッシュタグ
-      hint: 下のリストに、絞り込み条件・除外条件を入力します。条件は複数指定することができます。1行につき1つずつ入力してください。空行、コメント、重複を含めることはできません。絞り込み条件（除外条件ではない）は最低1つ設定しなければいけません。
-      ignore_reblog: ブーストを含めない
-      insert_feeds: 投稿をホーム・リストに流す（投稿配置先リストの設定を有効にするには、この設定を有効にする必要があります）
-      keywords_hint: キーワードは1つあたり最低2文字です。キーワードによる絞り込みを指定した場合、検索許可に対応しているサーバーからの投稿は、検索許可が「公開」以外のものは掲載されなくなります
-      keywords_raw: 絞り込むキーワード
-      list: 投稿配置先リスト
-      stl: STL(ソーシャルタイムライン)モードを有効にする
-      stl_hint: STLモードが有効になったアンテナは、全てのフォロワーとローカルタイムラインの発言を流します。STLが有効になっていると、これより下の設定が例外なく全て何もかも無視されます。その代わり購読拒否設定は無視されます。
-      tags_raw: 絞り込むハッシュタグ
       title: アンテナを編集
-      with_media_only: メディアのみ
     index:
       accounts:
         other: "%{count}件のアカウント"

config/locales/simple_form.en.yml

@@ -60,18 +60,21 @@ en:
         setting_allow_quote: Subdued quotes are allowed regardless of this setting; you can quote freely from any source except kmyblue!
         setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon
         setting_bookmark_category_needed: When removing from all category, unbookmarked automatically
-        setting_default_searchability: kmyblue・Fedibirdでは検索許可設定に基づき検索されます。Misskeyでは当設定に関係なく、全ての公開・ローカル公開・未収載投稿が検索されます。Mastodon・Firefishでは検索許可の代わりにプロフィール設定の「公開投稿を他のサーバーで自由に検索できるようにする」設定が適用されます
+        setting_default_searchability:  On kmyblue and Fedibird, the search is based on the search permission setting; on Misskey, all public, local public, and non-public posts are searched regardless of this setting; on Mastodon and Firefish, instead of search permission, the "Make public posts freely searchable on other servers" setting in the profile settings is applied. In Mastodon and Firefish, the "Make public posts freely searchable on other servers" setting in the profile settings is applied instead of the search permission.
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         setting_display_media_default: Hide media marked as sensitive
+        setting_display_media_expand: Misskey and others can submit more than 4. The additions will be displayed up to 16. kmyblue will not allow uploading from kmyblue.
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
         setting_dtl_force_subscribable: Your post can be detected local user's antenna to subscribe deep timeline
         setting_dtl_force_searchability: "With using #%{tag} tag, your post settings will be changed forcibly"
         setting_dtl_force_visibility: "With using #%{tag} tag, your post settings will be changed forcibly"
-        setting_dtl_menu: Show DTL menu on web
         setting_emoji_reaction_policy: Even with this setting, users on other servers are free to put their emoji reaction on the post and share it within the same server. If you simply want to remove the emoji reaction from your own screen, you can disable it from the appearance settings
         setting_enable_emoji_reaction: If turn off, other users still can react your posts
+        setting_reject_send_limited_to_suspects: This applies to "Mutual Only" posts. Circle posts will be delivered without exception. Some Misskey servers have independently supported limited posting, but this is a setting for those who are concerned about it, as mutual-only posting exposes some of the users you are mutual with to Misskey users!
+        setting_reject_unlisted_subscription: Misskey and its forks can **subscribe and search** for "non-following" posts from accounts they do not follow. This differs from kmyblue's behavior. It delivers posts in the specified public range to such servers as "followers only". Please understand, however, that due to its structure, it is difficult to handle perfectly and will occasionally be delivered as non-subscribed.
         setting_reverse_search_quote: Double-quotes will result in a search with a wider range of notation, which is the opposite of Mastodon's default behavior.
+        setting_stop_emoji_reaction_streaming: Helps to save communication capacity.
         setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details
         setting_use_pending_items: Hide timeline updates behind a click instead of automatically scrolling the feed
         subscription_policy: Your post is not picked by antenna
@@ -99,7 +102,7 @@ en:
         custom_css: You can apply custom styles on the web version of Mastodon.
         enable_local_timeline: While enabling this feature will allow for interaction between like-minded users, it may also strengthen the internal atmosphere; since Mastodon is supposed to have a local timeline, we recommend annotating it in the server introduction if it is to be disabled.
         enable_public_unlisted_visibility: If true, your community maybe closed-minded. If turn it false, strongly recommend that you disclose that you have disabled this setting!
-        enable_public_visibility: If disabled, public submissions will be forcibly replaced with "Public unlisted" or "Unlisted" submissions.
+        enable_public_visibility: If disabled, public posts will be forcibly replaced with "Local public" or "Unlisted" posts.
         mascot: Overrides the illustration in the advanced web interface.
         media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
@@ -262,6 +265,7 @@ en:
         setting_dtl_force_subscribable: Ignore your subscribability setting when using the DTL tag
         setting_dtl_force_searchability: Post searchability
         setting_dtl_force_visibility: Post visibility
+        setting_dtl_menu: Show DTL menu on web
         setting_emoji_reaction_streaming_notify_impl2: Enable emoji reaction notification compat with Nyastodon, Catstodon, glitch-soc
         setting_enable_emoji_reaction: Use emoji reaction function
         setting_enable_login_privacy: Enable login visibility
@@ -297,7 +301,7 @@ en:
         setting_show_statuses_count: Show statuses count
         setting_simple_timeline_menu: Reduce post menu on timeline
         setting_slip_local_emoji_reaction: Allow bypassing emoji reaction from local users
-        setting_stay_privacy: Not change privacy after post
+        setting_stay_privacy: Keep visibility after post
         setting_stop_emoji_reaction_streaming: Disable emoji reaction streamings
         setting_system_font_ui: Use system's default font
         setting_theme: Site theme
@@ -321,7 +325,7 @@ en:
         unchange: Unchange
       dtl_force_visibility:
         public: Public
-        public_unlisted: Public unlisted
+        public_unlisted: Local public
         unchange: Unchange
         unlisted: Unlisted
       email_domain_block:
@@ -365,7 +369,8 @@ en:
         registrations_mode: Who can sign-up
         registrations_end_hour: Registration-without-approval end hour (UTC 0-24)
         registrations_start_hour: Registration-without-approval start hour (UTC 0-24)
-        registrations_secondary_end_hour: Secondary registration end hour (UTC 0-24) If input 0, secondary hour is disabled.
+        registrations_secondary_end_hour: Secondary registration end hour (UTC 0-24)
+        registrations_secondary_end_hour_hint: If input 0, secondary hour is disabled.
         registrations_secondary_start_hour: Secondary registration start hour (UTC 0-24)
         require_invite_text: Require a reason to join
         show_domain_blocks: Show domain blocks
@@ -410,7 +415,7 @@ en:
         follow_request: Someone requested to follow you
         mention: Someone mentioned you
         pending_account: New account needs review
-        pending_friend_server: New friend server needs review
+        pending_friend_server: New friend server requires review
         reblog: Someone boosted your post
         report: New report is submitted
         software_updates:

config/locales/simple_form.ja.yml

@@ -377,7 +377,8 @@ ja:
         registrations_mode: 新規登録が可能な人
         registrations_end_hour: 登録に承認を必要としない時間帯の終了時刻 A (UTC 0〜24)
         registrations_start_hour: 登録に承認を必要としない時間帯の開始時刻 A (UTC 0〜24)
-        registrations_secondary_end_hour: 登録に承認を必要としない時間帯の終了時刻 B (UTC 0〜24) ここで0を指定した場合、時間Bの設定は無効化されます
+        registrations_secondary_end_hour: 登録に承認を必要としない時間帯の終了時刻 B (UTC 0〜24)
+        registrations_secondary_end_hour_hint: ここで0を指定した場合、時間Bの設定は無効化されます
         registrations_secondary_start_hour: 登録に承認を必要としない時間帯の開始時刻 B (UTC 0〜24)
         require_invite_text: 申請事由の入力を必須にする
         show_domain_blocks: ドメインブロックを表示