diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192f605168..d75f1f3376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,9 @@ You should also include the user name that made the change.
### Note
13.7.0以前から直接このバージョンにアップデートする場合は全ての通知が削除**されません。**
+### Improvements
+- 紛らわしいため公開範囲の「ローカルのみ」オプションの名称を「連合なし」に変更
+
### Bugfixes
- 全ての通知が削除されてしまうのを修正
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 5ba5f64769..8a04309360 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -949,6 +949,7 @@ copyErrorInfo: "エラー情報をコピー"
joinThisServer: "このサーバーに登録する"
exploreOtherServers: "他のサーバーを探す"
letsLookAtTimeline: "タイムラインを見てみる"
+disableFederationWarn: "連合が無効になっています。無効にしても投稿が非公開にはなりません。ほとんどの場合、このオプションを有効にする必要はありません。"
_achievements:
earnedAt: "獲得日時"
@@ -1677,8 +1678,8 @@ _visibility:
followersDescription: "自分のフォロワーのみに公開"
specified: "ダイレクト"
specifiedDescription: "指定したユーザーのみに公開"
- localOnly: "ローカルのみ"
- localOnlyDescription: "リモートユーザーには非公開"
+ disableFederation: "連合なし"
+ disableFederationDescription: "他インスタンスへの配信を行いません"
_postForm:
replyPlaceholder: "このノートに返信..."
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 6ed3ee51f5..ffc3133a85 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -31,7 +31,7 @@
-
+
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 82e0f3e689..3ec1ce95f4 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -30,7 +30,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue
index 32998e1a70..ffd9a20ef7 100644
--- a/packages/frontend/src/components/MkNoteHeader.vue
+++ b/packages/frontend/src/components/MkNoteHeader.vue
@@ -17,7 +17,7 @@
-
+
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 54512aa4d8..f73eab5b86 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -45,6 +45,7 @@
+ {{ i18n.ts.disableFederationWarn }}
{{ i18n.ts.notSpecifiedMentionWarning }} -
@@ -941,6 +942,10 @@ defineExpose({
background: var(--X4);
}
+.disableFederationWarn {
+ margin: 0 20px 16px 20px;
+}
+
.hasNotSpecifiedMentions {
margin: 0 20px 16px 20px;
}
diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue
index 516b88c13d..703c75c7d0 100644
--- a/packages/frontend/src/components/MkVisibilityPicker.vue
+++ b/packages/frontend/src/components/MkVisibilityPicker.vue
@@ -33,8 +33,8 @@
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 5692ce80cb..c83c48d5ad 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -46,7 +46,7 @@
- {{ i18n.ts._visibility.localOnly }}
+ {{ i18n.ts._visibility.disableFederation }}