summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2023-09-04 13:59:21 +0900
committerGitHub <noreply@github.com>2023-09-04 13:59:21 +0900
commite7d30c8eb469f01cea1380556fe82f9884072e33 (patch)
treed017be1e040430a27276e26a01b7bf1a7cc597b8
parentupdate deps (#11764) (diff)
downloadmisskey-e7d30c8eb469f01cea1380556fe82f9884072e33.tar.gz
misskey-e7d30c8eb469f01cea1380556fe82f9884072e33.tar.bz2
misskey-e7d30c8eb469f01cea1380556fe82f9884072e33.zip
(ad) translation for deck column settings (#11778)
-rw-r--r--locales/index.d.ts2
-rw-r--r--locales/ja-JP.yml2
-rw-r--r--packages/frontend/src/ui/deck/column.vue3
3 files changed, 6 insertions, 1 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 1d756a14d8..d281263e3b 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2168,6 +2168,8 @@ export interface Locale {
"introduction2": string;
"widgetsIntroduction": string;
"useSimpleUiForNonRootPages": string;
+ "usedAsMinWidthWhenFlexible": string;
+ "flexible": string;
"_columns": {
"main": string;
"widgets": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3396a3a832..90a00f0c85 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2083,6 +2083,8 @@ _deck:
introduction2: "画面の右にある + を押して、いつでもカラムを追加できます。"
widgetsIntroduction: "カラムのメニューから、「ウィジェットの編集」を選択してウィジェットを追加してください"
useSimpleUiForNonRootPages: "非ルートページは簡易UIで表示"
+ usedAsMinWidthWhenFlexible: "「幅を自動調整」が有効の場合、これが幅の最小値となります"
+ flexible: "幅を自動調整"
_columns:
main: "メイン"
diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue
index d2eef4bea6..d6cc6b3e6d 100644
--- a/packages/frontend/src/ui/deck/column.vue
+++ b/packages/frontend/src/ui/deck/column.vue
@@ -116,11 +116,12 @@ function getMenu() {
width: {
type: 'number',
label: i18n.ts.width,
+ description: i18n.ts._deck.usedAsMinWidthWhenFlexible,
default: props.column.width,
},
flexible: {
type: 'boolean',
- label: i18n.ts.flexible,
+ label: i18n.ts._deck.flexible,
default: props.column.flexible,
},
});