From e95dfe82b6f60bf1393d3ab6b04ef4d28e6b23a3 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Wed, 30 Aug 2023 17:07:48 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A8=AD=E5=AE=9A=E3=81=A7=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=8C=E5=8F=AF=E8=83=BD=E3=81=AA=E3=82=AA=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AF=E3=83=80=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=A7=E6=A1=88=E5=86=85=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + locales/en-US.yml | 2 ++ locales/index.d.ts | 2 ++ locales/ja-JP.yml | 2 ++ locales/ko-KR.yml | 2 ++ packages/frontend/src/components/MkDialog.vue | 7 +++++++ packages/frontend/src/components/MkNote.vue | 1 + packages/frontend/src/components/MkNoteDetailed.vue | 1 + packages/frontend/src/components/MkSubNoteContent.vue | 1 + packages/frontend/src/components/MkUserSetupDialog.vue | 1 + packages/frontend/src/os.ts | 1 + 11 files changed, 21 insertions(+) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 1e42245aea..9eaf08244a 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -35,6 +35,7 @@ - 이용 약관을 서버 메뉴에서 볼 수 있도록 - 계정 초기 설정과 타임라인 튜토리얼을 다시 진행할 수 있도록 - 유저 메뉴에서 '리모트 유저 정보 갱신'을 진행할 수 있도록 +- 설정에서 변경 가능한 옵션은 다이얼로그에서 안내하도록 주석 추가 ### Client - about-misskey 페이지에서 클라이언트 버전을 누르면 변경 사항을 볼 수 있음 diff --git a/locales/en-US.yml b/locales/en-US.yml index 25a0d8f0dc..ba577d5943 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -12,6 +12,7 @@ showSubNoteFooterButtonDescription: "Enabling this setting will show an action b alreadyFollowed: "You've been followed!" enableMarkByDate: "Show note times as dates" renoteConfirm: "Do you want to renote?" +renoteConfirmDescription: "You can change this setting in \"Settings - CherryPick\"." inviteRevoke: "Revoke All Invitation Codes" inviteRevokeConfirm: "Are you sure that you want to revoke all invitation codes?" enableAbsoluteTime: "Enable Absolute Time" @@ -1239,6 +1240,7 @@ _initialAccountSetting: haveFun: "Enjoy {name}!" ifYouNeedLearnMore: "If you'd like to learn more about how to use {name} (CherryPick), please visit {link}." skipAreYouSure: "Really skip profile setup?" + skipAreYouSureDescription: "If you interrupt initialization now, you can resume it at [More! - Help - Replay initial setting]." laterAreYouSure: "Really do profile setup later?" _serverRules: description: "A set of rules to be displayed before registration. Setting a summary of the Terms of Service is recommended." diff --git a/locales/index.d.ts b/locales/index.d.ts index 8158a0716b..abf231a34b 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -15,6 +15,7 @@ export interface Locale { "alreadyFollowed": string; "enableMarkByDate": string; "renoteConfirm": string; + "renoteConfirmDescription": string; "inviteRevoke": string; "inviteRevokeConfirm": string; "enableAbsoluteTime": string; @@ -1250,6 +1251,7 @@ export interface Locale { "haveFun": string; "ifYouNeedLearnMore": string; "skipAreYouSure": string; + "skipAreYouSureDescription": string; "laterAreYouSure": string; }; "_serverRules": { diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index f24057848d..647cefddb7 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -12,6 +12,7 @@ showSubNoteFooterButtonDescription: "この設定を有効にすると、返信 alreadyFollowed: "フォローしました！" enableMarkByDate: "ノート時刻を日付で表示" renoteConfirm: "Renoteしますか？" +renoteConfirmDescription: "この設定は「設定 - CherryPick」で変更できます。" inviteRevoke: "全ての招待コードを失効する" inviteRevokeConfirm: "本当に全ての招待コードを失効させますか？" enableAbsoluteTime: "絶対時刻表記を使用する" @@ -1248,6 +1249,7 @@ _initialAccountSetting: haveFun: "{name}をお楽しみください！" ifYouNeedLearnMore: "{name}(CherryPick)の使い方などを詳しく知るには{link}をご覧ください。" skipAreYouSure: "初期設定をスキップしますか？" + skipAreYouSureDescription: "今すぐ初期設定を中断しても、[もっと！ - ヘルプ - 初期設定のリプレイ]から再開することができます。" laterAreYouSure: "初期設定をあとでやり直しますか？" _serverRules: diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 4220487cb2..5143501eaa 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -12,6 +12,7 @@ showSubNoteFooterButtonDescription: "이 설정을 활성화하면 답글이 달 alreadyFollowed: "팔로우 했어요!" enableMarkByDate: "노트 시간을 일자로 표시" renoteConfirm: "리노트 할까요?" +renoteConfirmDescription: "이 설정은 [설정 - CherryPick]에서 변경할 수 있어요." inviteRevoke: "모든 초대 코드 제거" inviteRevokeConfirm: "정말로 모든 초대 코드를 제거할까요?" enableAbsoluteTime: "절대 시간 표기 사용" @@ -1240,6 +1241,7 @@ _initialAccountSetting: haveFun: "{name}와 함께 즐거운 시간 보내세요!" ifYouNeedLearnMore: "{name}(CherryPick)의 사용 방법에 대해 자세히 알아보려면 {link}를 참고해 주세요." skipAreYouSure: "초기 설정을 중단하시겠어요?" + skipAreYouSureDescription: "지금 초기 설정을 중단해도 [더 보기! - 도움말 - 초기 설정 다시 보기]에서 다시 진행할 수 있어요." laterAreYouSure: "초기 설정을 나중에 진행할까요?" _serverRules: description: "회원 가입 이전에 간단하게 표시할 서버 규칙이에요. 이용 약관의 요약으로 구성하는 것을 추천해요." diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 09af66ad47..1a5210f566 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -27,6 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+