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
-    = f.input :registrations_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
-    = f.input :registrations_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = 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
-    = f.input :registrations_secondary_start_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
-    = f.input :registrations_secondary_end_hour, kmyblue: true, wrapper: :with_label, input_html: { pattern: '[0-9]+' }
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = 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