diff --git a/locales/index.d.ts b/locales/index.d.ts index 48c3daf05..ae89f883f 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -128,8 +128,8 @@ export interface Locale { "pinnedEmojisForReactionSettingDescription": string; "pinnedEmojisSettingDescription": string; "emojiPickerDisplay": string; - "copyFromPinnedEmojisForReaction": string; - "copyFromPinnedEmojis": string; + "overwriteFromPinnedEmojisForReaction": string; + "overwriteFromPinnedEmojis": string; "reactionSettingDescription2": string; "rememberNoteVisibility": string; "attachCancel": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index daa6a3203..922ce4fe3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -125,8 +125,8 @@ emojiPicker: "絵文字ピッカー" pinnedEmojisForReactionSettingDescription: "リアクション時にピン留め表示する絵文字を設定できます" pinnedEmojisSettingDescription: "絵文字入力時にピン留め表示する絵文字を設定できます" emojiPickerDisplay: "ピッカーの表示" -copyFromPinnedEmojisForReaction: "リアクション設定からコピーする" -copyFromPinnedEmojis: "絵文字設定からコピーする" +overwriteFromPinnedEmojisForReaction: "リアクション設定から上書きする" +overwriteFromPinnedEmojis: "全般設定から上書きする" reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、+を押して追加します。" rememberNoteVisibility: "公開範囲を記憶する" attachCancel: "添付取り消し" diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue index 7e7bf9bd1..61f333212 100644 --- a/packages/frontend/src/pages/settings/emoji-picker.vue +++ b/packages/frontend/src/pages/settings/emoji-picker.vue @@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -80,7 +80,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -164,7 +164,7 @@ function previewEmoji(ev: MouseEvent) { emojiPicker.show(getHTMLElement(ev)); } -async function copyFromPinnedEmojis() { +async function overwriteFromPinnedEmojis() { const { canceled } = await os.confirm({ type: 'warning', text: i18n.ts.overwriteContentConfirm, @@ -177,7 +177,7 @@ async function copyFromPinnedEmojis() { pinnedEmojisForReaction.value = [...pinnedEmojis.value]; } -async function copyFromPinnedEmojisForReaction() { +async function overwriteFromPinnedEmojisForReaction() { const { canceled } = await os.confirm({ type: 'warning', text: i18n.ts.overwriteContentConfirm,