diff --git a/app/javascript/mastodon/features/compose/containers/warning_container.jsx b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
index 4daeeecb99d9ea..bc74d1209be21b 100644
--- a/app/javascript/mastodon/features/compose/containers/warning_container.jsx
+++ b/app/javascript/mastodon/features/compose/containers/warning_container.jsx
@@ -43,7 +43,7 @@ const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning
}
if (mentionWarning) {
- return } />;
+ return } />;
}
if (limitedPostWarning) {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 6cbb18c9b84127..e553549508710b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1,6 +1,7 @@
{
"about.blocks": "Moderated servers",
"about.contact": "Contact:",
+ "about.disabled": "Disabled",
"about.disclaimer": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
"about.domain_blocks.no_reason_available": "Reason not available",
"about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
@@ -10,6 +11,8 @@
"about.domain_blocks.silenced.title": "Limited",
"about.domain_blocks.suspended.explanation": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
"about.domain_blocks.suspended.title": "Suspended",
+ "about.enabled": "Enabled",
+ "about.kmyblue_capability": "This server is using kmyblue, a fork of Mastodon. On this server, kmyblues unique features are configured as follows.",
"about.not_available": "This information has not been made available on this server.",
"about.powered_by": "Decentralized social media powered by {mastodon}",
"about.rules": "Server rules",
@@ -104,6 +107,8 @@
"bundle_modal_error.close": "Close",
"bundle_modal_error.message": "Something went wrong while loading this component.",
"bundle_modal_error.retry": "Try again",
+ "circles.delete": "Delete circle",
+ "circles.edit": "Edit circle",
"closed_registrations.other_server_instructions": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
"closed_registrations_modal.description": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
"closed_registrations_modal.find_another_server": "Find another server",
@@ -151,6 +156,7 @@
"compose_form.lock_disclaimer.lock": "locked",
"compose_form.markdown.marked": "Markdown is available",
"compose_form.markdown.unmarked": "Markdown is NOT available",
+ "compose_form.mention_warning": "When you add a mention to a limited post, the person you are mentioning can also see this post.",
"compose_form.placeholder": "What's on your mind?",
"compose_form.searchability_warning": "Self only searchability is not available other mastodon servers. Others can search your post.",
"compose_form.poll.add_option": "Add a choice",
@@ -236,6 +242,7 @@
"empty_column.account_unavailable": "Profile unavailable",
"empty_column.blocks": "You haven't blocked any users yet.",
"empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+ "empty_column.circle_statuses": "You don't have any circle posts yet. When you post one as circle, it will show up here.",
"empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
"empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
"empty_column.domain_blocks": "There are no blocked domains yet.",
@@ -533,6 +540,7 @@
"privacy.login.short": "Login only",
"privacy.mutual.long": "Mutual followers only",
"privacy.mutual.short": "Mutual",
+ "privacy.personal.short": "Yourself only",
"privacy.private.long": "Visible for followers only",
"privacy.private.short": "Followers only",
"privacy.public.long": "Visible for all",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 8fecf184be5d6a..efe5842199f8f1 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,6 +1,7 @@
{
"about.blocks": "制限中のサーバー",
"about.contact": "連絡先",
+ "about.disabled": "無効",
"about.disclaimer": "Mastodonは自由なオープンソースソフトウェアでMastodon gGmbHの商標です。",
"about.domain_blocks.no_reason_available": "制限理由",
"about.domain_blocks.preamble": "Mastodonでは連合先のどのようなサーバーのユーザーとも交流できます。ただし次のサーバーには例外が設定されています。",
@@ -10,6 +11,8 @@
"about.domain_blocks.silenced.title": "制限",
"about.domain_blocks.suspended.explanation": "これらのサーバーからのデータは処理されず、保存や変換もされません。該当するユーザーとの交流もできません。",
"about.domain_blocks.suspended.title": "停止済み",
+ "about.enabled": "有効",
+ "about.kmyblue_capability": "このサーバーは、kmyblueというMastodonフォークを利用しています。kmyblue独自機能の一部は、サーバー管理者によって有効・無効を切り替えることができます。",
"about.not_available": "この情報はこのサーバーでは利用できません。",
"about.powered_by": "{mastodon}による分散型ソーシャルメディア",
"about.rules": "サーバーのルール",
@@ -154,8 +157,10 @@
"bundle_modal_error.close": "閉じる",
"bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
"bundle_modal_error.retry": "再試行",
- "circles.account.add": "おはぎに追加",
- "circles.account.remove": "おはぎから外す",
+ "circles.account.add": "サークルに追加",
+ "circles.account.remove": "サークルから外す",
+ "circles.delete": "サークルを削除",
+ "circles.edit": "サークルを編集",
"circles.edit.submit": "タイトルを変更",
"circles.new.create": "サークルを作成",
"circles.new.title_placeholder": "新規サークル名",
@@ -213,6 +218,7 @@
"compose_form.lock_disclaimer.lock": "承認制",
"compose_form.markdown.marked": "Markdown有効",
"compose_form.markdown.unmarked": "Markdownは有効になっていません",
+ "compose_form.mention_warning": "限定投稿にメンションを追加すると、そのアカウントはサークルメンバー・相互などに関係なくこの投稿を読むことができます",
"compose_form.placeholder": "今なにしてる？",
"compose_form.searchability_warning": "検索許可「自分のみ」はkmyblue内の検索でのみ有効です。他のサーバーでは「リアクションした人のみ」と同等に扱われます",
"compose_form.poll.add_option": "追加",
@@ -308,6 +314,7 @@
"empty_column.bookmark_categories": "まだ分類がありません。分類を作るとここに表示されます。",
"empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
"empty_column.circles": "まだサークルがありません。サークルを作るとここに表示されます。",
+ "empty_column.circle_statuses": "まだサークル投稿がありません。このサークルでなにか投稿するとここに表示されます。",
"empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
"empty_column.direct": "非公開の返信はまだありません。非公開でやりとりをするとここに表示されます。",
"empty_column.domain_blocks": "ブロックしているドメインはありません。",
@@ -618,6 +625,7 @@
"privacy.login.short": "ログインユーザーのみ",
"privacy.mutual.long": "相互フォローさんのみ閲覧可、限定投稿",
"privacy.mutual.short": "相互のみ",
+ "privacy.personal.short": "自分限定",
"privacy.private.long": "フォロワーのみ閲覧可",
"privacy.private.short": "フォロワーのみ",
"privacy.public.long": "誰でも閲覧可、ﾎｰﾑ＋ﾛｰｶﾙ＋連合TL",
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index fde6e36fcefddb..93f52bc7ec05bc 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -160,7 +160,7 @@ def banned_domains_for_misskey_of_status(status)
return [] if status.public_searchability?
return [] unless (status.public_unlisted_visibility? && status.account.user&.setting_reject_public_unlisted_subscription) || (status.unlisted_visibility? && status.account.user&.setting_reject_unlisted_subscription)
- from_info = InstanceInfo.where(software: %w(misskey calckey)).pluck(:domain)
+ from_info = InstanceInfo.where(software: %w(misskey calckey cherrypick)).pluck(:domain)
from_domain_block = DomainBlock.where(detect_invalid_subscription: true).pluck(:domain)
(from_info + from_domain_block).uniq
end
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e86356948f0d18..0d68960eb4c521 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -5,11 +5,11 @@ module Version
module_function
def kmyblue_major
- 5
+ 6
end
def kmyblue_minor
- 2
+ 0
end
def kmyblue_flag