From 9f832989cf597ca0d9b4202687b73a8831a462aa Mon Sep 17 00:00:00 2001
From: Lingxi <2863878907@qq.com>
Date: Sat, 21 Dec 2024 00:36:51 +0800
Subject: [PATCH 1/3] feat: concat and notend sentence setting in sentence
---
packages/origine2/src/locales/en.po | 60 +++++++++++++------
packages/origine2/src/locales/ja.po | 60 +++++++++++++------
packages/origine2/src/locales/zhCn.po | 60 +++++++++++++------
.../GraphicalEditor/SentenceEditor/Say.tsx | 20 ++++++-
4 files changed, 144 insertions(+), 56 deletions(-)
diff --git a/packages/origine2/src/locales/en.po b/packages/origine2/src/locales/en.po
index b735281a5..ba755ccda 100644
--- a/packages/origine2/src/locales/en.po
+++ b/packages/origine2/src/locales/en.po
@@ -201,10 +201,14 @@ msgstr "Rain"
msgid "下雪"
msgstr "Snow"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "Hide the role name"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不继承上一句"
+msgstr ""
+
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
msgstr "Align on both sides"
@@ -213,7 +217,7 @@ msgstr "Align on both sides"
msgid "个字"
msgstr " Words"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "Medium"
@@ -357,7 +361,7 @@ msgstr "Show some texts on Full-screen"
msgid "关于"
msgstr "About"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "Associated figure"
@@ -466,7 +470,7 @@ msgstr "Create new game"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "Delete"
@@ -631,7 +635,7 @@ msgstr "Outer Text"
msgid "外边距"
msgstr "Margin"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "Large"
@@ -683,7 +687,7 @@ msgstr "Experimental fast preview"
msgid "宽度"
msgstr "Width"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "Dialogue"
@@ -713,7 +717,7 @@ msgstr "Export as webpage"
msgid "将当前模板应用到选定的游戏"
msgstr "Apply the current template to selected games"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "Small"
@@ -818,6 +822,10 @@ msgstr "Open mouth"
msgid "当前版本"
msgstr "Current version"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "快速执行"
+msgstr ""
+
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
msgstr "Ignore this version"
@@ -896,7 +904,7 @@ msgstr "Tip: Set the figure/background first, then apply the animation, otherwis
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "Tip: After editing, if you find any invalid CG/BGM in the appreciation gallery, select Clear All Data in the options of the WebGAL game interface to clear them."
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "Tip: Line breaks can be up to three lines"
@@ -986,10 +994,18 @@ msgstr "Sound effect file"
#~ msgstr "File"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "Font size"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完执行下一句"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完等待"
+msgstr ""
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
msgstr "Font color"
@@ -1083,11 +1099,11 @@ msgstr "New template"
msgid "新的游戏"
msgstr "New game"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "Voiceover mode"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "Voiceover mode, no role name"
@@ -1125,7 +1141,7 @@ msgstr "Show figure"
msgid "显示背景"
msgstr "Show background"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "Show role name"
@@ -1278,7 +1294,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "Add or switch the figure at the specified position"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "Add new line"
@@ -1412,7 +1428,7 @@ msgid "立绘"
msgstr "Figure"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1427,7 +1443,7 @@ msgstr "Figure ID (optional)"
msgid "立绘位置"
msgstr "Figure position"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "ID of figure illustration"
@@ -1463,6 +1479,14 @@ msgstr "End game"
msgid "绝对"
msgstr "Absolutely"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "继承上一句"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "继承模式"
+msgstr ""
+
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
msgstr "Edit template"
@@ -1581,7 +1605,7 @@ msgstr "Delete the property {0}?"
msgid "覆盖"
msgstr "Coverage"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "Role name, leave blank to inherit from previous sentence"
@@ -1671,7 +1695,7 @@ msgid "语言"
msgstr "Language"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "Voice"
@@ -1907,7 +1931,7 @@ msgstr "Height"
msgid "高斯模糊:"
msgstr "Gaussian Blur:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "Default"
diff --git a/packages/origine2/src/locales/ja.po b/packages/origine2/src/locales/ja.po
index 061ddb1d3..3116ad54f 100644
--- a/packages/origine2/src/locales/ja.po
+++ b/packages/origine2/src/locales/ja.po
@@ -201,10 +201,14 @@ msgstr "雨"
msgid "下雪"
msgstr "雪"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "キャラクター名は設定不可"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不继承上一句"
+msgstr ""
+
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
msgstr "両端揃え"
@@ -213,7 +217,7 @@ msgstr "両端揃え"
msgid "个字"
msgstr " ワード"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "中央"
@@ -357,7 +361,7 @@ msgstr "全画面画面でテキストを表示する。独白やシーンの導
msgid "关于"
msgstr "About"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "関連する立ち絵"
@@ -466,7 +470,7 @@ msgstr "新しいゲームを作成"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "削除"
@@ -631,7 +635,7 @@ msgstr "外側テキスト"
msgid "外边距"
msgstr "マージン"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "大きい"
@@ -683,7 +687,7 @@ msgstr "実験的な高速プレビュー"
msgid "宽度"
msgstr "幅"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "ダイアログ"
@@ -713,7 +717,7 @@ msgstr "ウェブとしてエクスポート"
msgid "将当前模板应用到选定的游戏"
msgstr "選択したゲームに現在のテンプレートを適用する"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "小さい"
@@ -818,6 +822,10 @@ msgstr "開いた口"
msgid "当前版本"
msgstr "現在のバージョン"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "快速执行"
+msgstr ""
+
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
msgstr "このバージョンを無視する"
@@ -896,7 +904,7 @@ msgstr "ヒント: 最初に立ち絵の描画/背景を設定してから、ア
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "ヒント: 編集後に無効なCG/BGMが見つかった場合は、WebGALゲームインターフェイスのオプションで[すべてのデータを消去]を選択して消去"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "ヒント:改行は三行まで可能"
@@ -986,10 +994,18 @@ msgstr "効果音ファイル"
#~ msgstr "ファイル"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "文字サイズ"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完执行下一句"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完等待"
+msgstr ""
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
msgstr "文字色"
@@ -1083,11 +1099,11 @@ msgstr "新しいテンプレート"
msgid "新的游戏"
msgstr "新しいゲーム"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "ナレーションモード"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "キャラクター名は設定不可"
@@ -1125,7 +1141,7 @@ msgstr "立ち絵を表示"
msgid "显示背景"
msgstr "背景画像を表示"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "キャラクター名を設定"
@@ -1278,7 +1294,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "指定位置の立ち絵を追加または切り替える"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "新しい行を追加"
@@ -1412,7 +1428,7 @@ msgid "立绘"
msgstr "Figure"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1427,7 +1443,7 @@ msgstr "立ち絵ID(オプション)"
msgid "立绘位置"
msgstr "描画位置"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "関連する立ち絵のID"
@@ -1463,6 +1479,14 @@ msgstr "ゲーム終了"
msgid "绝对"
msgstr "絶対"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "继承上一句"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "继承模式"
+msgstr ""
+
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
msgstr "テンプレートを編集"
@@ -1581,7 +1605,7 @@ msgstr "プロパティ{0}を削除しますか?"
msgid "覆盖"
msgstr "カバレッジ"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "キャラクター名を空白のままにすると前の文から継承"
@@ -1671,7 +1695,7 @@ msgid "语言"
msgstr "言語"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "ボイス"
@@ -1907,7 +1931,7 @@ msgstr "高さ"
msgid "高斯模糊:"
msgstr "ぼかし:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "デフォルト"
diff --git a/packages/origine2/src/locales/zhCn.po b/packages/origine2/src/locales/zhCn.po
index 88b657a8b..2ddbfc1d8 100644
--- a/packages/origine2/src/locales/zhCn.po
+++ b/packages/origine2/src/locales/zhCn.po
@@ -217,10 +217,14 @@ msgstr "下雨"
msgid "下雪"
msgstr "下雪"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "不显示角色名"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不继承上一句"
+msgstr "不继承上一句"
+
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
msgstr "两端对齐"
@@ -229,7 +233,7 @@ msgstr "两端对齐"
msgid "个字"
msgstr "个字"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "中"
@@ -377,7 +381,7 @@ msgstr "全屏显示一段文字,用于独白或引出场景"
msgid "关于"
msgstr "关于"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "关联立绘"
@@ -486,7 +490,7 @@ msgstr "创建新游戏"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "删除"
@@ -651,7 +655,7 @@ msgstr "外层文本"
msgid "外边距"
msgstr "外边距"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "大"
@@ -703,7 +707,7 @@ msgstr "实验性快速预览"
msgid "宽度"
msgstr "宽度"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "对话"
@@ -733,7 +737,7 @@ msgstr "导出为网页"
msgid "将当前模板应用到选定的游戏"
msgstr "将当前模板应用到选定的游戏"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "小"
@@ -838,6 +842,10 @@ msgstr "张开嘴"
msgid "当前版本"
msgstr "当前版本"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "快速执行"
+msgstr "快速执行"
+
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
msgstr "忽略此版本"
@@ -916,7 +924,7 @@ msgstr "提示:先设置立绘/背景,再应用动画,否则找不到目
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "提示:换行符最多可达三行"
@@ -1006,10 +1014,18 @@ msgstr "效果音文件"
#~ msgstr "文件"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "文字大小"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完执行下一句"
+msgstr "文字展示完执行下一句"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完等待"
+msgstr "文字展示完等待"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
msgstr "文字颜色"
@@ -1103,11 +1119,11 @@ msgstr "新的模板"
msgid "新的游戏"
msgstr "新的游戏"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "旁白模式"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "旁白模式,无角色名"
@@ -1145,7 +1161,7 @@ msgstr "显示立绘"
msgid "显示背景"
msgstr "显示背景"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "显示角色名"
@@ -1298,7 +1314,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "添加或切换指定位置的立绘"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "添加新行"
@@ -1432,7 +1448,7 @@ msgid "立绘"
msgstr "立绘"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1447,7 +1463,7 @@ msgstr "立绘ID(可选)"
msgid "立绘位置"
msgstr "立绘位置"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "立绘插图的ID"
@@ -1483,6 +1499,14 @@ msgstr "结束游戏"
msgid "绝对"
msgstr "绝对"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "继承上一句"
+msgstr "继承上一句"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "继承模式"
+msgstr "继承模式"
+
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
msgstr "编辑模板"
@@ -1601,7 +1625,7 @@ msgstr "要删除属性{0}吗?"
msgid "覆盖"
msgstr "覆盖"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "角色名,留空以继承上句"
@@ -1691,7 +1715,7 @@ msgid "语言"
msgstr "语言"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "语音"
@@ -1927,7 +1951,7 @@ msgstr "高度"
msgid "高斯模糊:"
msgstr "高斯模糊:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "默认"
diff --git a/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx b/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
index 2090e78d5..d2b8b9661 100644
--- a/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
+++ b/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
@@ -30,6 +30,8 @@ export default function Say(props: ISentenceEditorProps) {
[ "right", t`右侧立绘` ],
[ "id", t`使用立绘ID` ],
]);
+ const isConcat = useValue(!!getArgByKey(props.sentence, 'concat')); // 是否是继承语句
+ const isNotend = useValue(!!getArgByKey(props.sentence, 'notend')); // 是否有 notend 参数
useEffect(() => {
/**
@@ -71,10 +73,12 @@ export default function Say(props: ISentenceEditorProps) {
const pos = figurePosition.value !== "" ? ` -${figurePosition.value}` : "";
const idStr = figureId.value !== "" ? ` -figureId=${figureId.value}` : "";
const commitValue = currentValue.value.map(e=>e.replaceAll('\n','|'));
+ const isConcatStr = isConcat.value ? ' -concat' : '';
+ const isNotendStr = isNotend.value ? ' -notend' : '';
if(figurePosition.value === "id"){
- props.onSubmit(`${isNoSpeaker.value ? "" : currentSpeaker.value}${isNoSpeaker.value || currentSpeaker.value !== "" ? ":" : ""}${commitValue.join("|")}${vocal.value === "" ? "" : " -" + vocal.value} -fontSize=${selectedFontSize}${pos}${idStr};`);
+ props.onSubmit(`${isNoSpeaker.value ? "" : currentSpeaker.value}${isNoSpeaker.value || currentSpeaker.value !== "" ? ":" : ""}${commitValue.join("|")}${vocal.value === "" ? "" : " -" + vocal.value}${isConcatStr}${isNotendStr} -fontSize=${selectedFontSize}${pos}${idStr};`);
} else {
- props.onSubmit(`${isNoSpeaker.value ? "" : currentSpeaker.value}${isNoSpeaker.value || currentSpeaker.value !== "" ? ":" : ""}${commitValue.join("|")}${vocal.value === "" ? "" : " -" + vocal.value} -fontSize=${selectedFontSize}${pos};`);
+ props.onSubmit(`${isNoSpeaker.value ? "" : currentSpeaker.value}${isNoSpeaker.value || currentSpeaker.value !== "" ? ":" : ""}${commitValue.join("|")}${vocal.value === "" ? "" : " -" + vocal.value}${isConcatStr}${isNotendStr} -fontSize=${selectedFontSize}${pos};`);
}
};
@@ -129,6 +133,18 @@ export default function Say(props: ISentenceEditorProps) {
submit();
}} onText={t`不显示角色名`} offText={t`显示角色名`} isChecked={isNoSpeaker.value}/>
+
+ {
+ isConcat.set(newValue);
+ submit();
+ }} onText={t`继承上一句`} offText={t`不继承上一句`} isChecked={isConcat.value}/>
+
+
+ {
+ isNotend.set(newValue);
+ submit();
+ }} onText={t`文字展示完执行下一句`} offText={t`文字展示完等待`} isChecked={isNotend.value}/>
+
<>
{vocal.value !== "" ? `${vocal.value}\u00a0\u00a0` : ""}
From 7ad4be71eb0f85946559f1e1c41e0c9c5810169c Mon Sep 17 00:00:00 2001
From: Lingxi <2863878907@qq.com>
Date: Sun, 22 Dec 2024 14:49:48 +0800
Subject: [PATCH 2/3] i18: update
---
packages/origine2/src/locales/en.po | 98 +++++++++++++++------------
packages/origine2/src/locales/ja.po | 90 ++++++++++++------------
packages/origine2/src/locales/zhCn.po | 98 +++++++++++++++------------
3 files changed, 157 insertions(+), 129 deletions(-)
diff --git a/packages/origine2/src/locales/en.po b/packages/origine2/src/locales/en.po
index 2763312dd..078733ab5 100644
--- a/packages/origine2/src/locales/en.po
+++ b/packages/origine2/src/locales/en.po
@@ -205,7 +205,7 @@ msgstr "Snow"
msgid "不可选项"
msgstr ""
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "Hide the role name"
@@ -221,7 +221,7 @@ msgstr "Align on both sides"
msgid "个字"
msgstr " Words"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "Medium"
@@ -365,7 +365,7 @@ msgstr "Show some texts on Full-screen"
msgid "关于"
msgstr "About"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "Associated figure"
@@ -393,7 +393,7 @@ msgstr "Hide the figure"
msgid "关闭背景"
msgstr "Hide the background"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:31
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:42
msgid "内层文本"
msgstr "Inner Text"
@@ -474,7 +474,7 @@ msgstr "Create new game"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "Delete"
@@ -635,7 +635,7 @@ msgstr "Scenes and branches"
msgid "场景文件"
msgstr "Scene file"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:30
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:41
msgid "外层文本"
msgstr "Outer Text"
@@ -643,7 +643,7 @@ msgstr "Outer Text"
msgid "外边距"
msgstr "Margin"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "Large"
@@ -695,7 +695,7 @@ msgstr "Experimental fast preview"
msgid "宽度"
msgstr "Width"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "Dialogue"
@@ -729,15 +729,15 @@ msgstr "Export as webpage"
msgid "将当前模板应用到选定的游戏"
msgstr "Apply the current template to selected games"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "Small"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:35
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:46
msgid "小头像图像"
msgstr "Mini avatar image"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:45
msgid "小头像容器"
msgstr "Mini avatar container"
@@ -834,6 +834,10 @@ msgstr "Open mouth"
msgid "当前版本"
msgstr "Current version"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "快速执行"
+msgstr ""
+
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
msgstr "Ignore this version"
@@ -912,7 +916,7 @@ msgstr "Tip: Set the figure/background first, then apply the animation, otherwis
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "Tip: After editing, if you find any invalid CG/BGM in the appreciation gallery, select Clear All Data in the options of the WebGAL game interface to clear them."
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "Tip: Line breaks can be up to three lines"
@@ -1002,10 +1006,18 @@ msgstr "Sound effect file"
#~ msgstr "File"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "Font size"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完执行下一句"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完等待"
+msgstr ""
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
msgstr "Font color"
@@ -1018,20 +1030,20 @@ msgstr "Text alignment"
msgid "文本显示"
msgstr "Text display"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
msgid "文本框"
msgstr "Text Box"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:28
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
msgid "文本框(小头像关闭时)"
msgstr "Textbox (when avatar is closed)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
msgid "文本框文本"
msgstr "Text Box Text"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:29
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:40
msgid "文本框背景"
msgstr "Text Box Background"
@@ -1099,11 +1111,11 @@ msgstr "New template"
msgid "新的游戏"
msgstr "New game"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "Voiceover mode"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "Voiceover mode, no role name"
@@ -1141,7 +1153,7 @@ msgstr "Show figure"
msgid "显示背景"
msgstr "Show background"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "Show role name"
@@ -1179,24 +1191,24 @@ msgstr "Execute next sentence after this"
msgid "本句执行后等待"
msgstr "Wait after this sentence"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:55
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:20
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:23
msgid "标题"
msgstr "Title"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:62
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
msgid "标题备用背景"
msgstr "Title Alternate Background"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:60
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:25
msgid "标题按钮"
msgstr "Title Button"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:59
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
msgid "标题按钮列表"
msgstr "Title Button List"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:61
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:26
msgid "标题按钮文字"
msgstr "Title Button Text"
@@ -1294,7 +1306,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "Add or switch the figure at the specified position"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "Add new line"
@@ -1428,7 +1440,7 @@ msgid "立绘"
msgstr "Figure"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1443,7 +1455,7 @@ msgstr "Figure ID (optional)"
msgid "立绘位置"
msgstr "Figure position"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "ID of figure illustration"
@@ -1605,7 +1617,7 @@ msgstr "Delete the property {0}?"
msgid "覆盖"
msgstr "Coverage"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "Role name, leave blank to inherit from previous sentence"
@@ -1613,23 +1625,23 @@ msgstr "Role name, leave blank to inherit from previous sentence"
msgid "角色名,留空以继承上句:对话;"
msgstr "Role name, leave blank to inherit from previous sentence: Dialogue;"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:38
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
msgid "角色名内层文本"
msgstr "Role Name Inner Text"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
msgid "角色名外层文本"
msgstr "Role Name Outer Text"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:36
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
msgid "角色名容器"
msgstr "Role Name Container"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:32
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:43
msgid "角色名文本框"
msgstr "Role Name Text Box"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:33
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
msgid "角色名文本框背景"
msgstr "Role Name Text Box Background"
@@ -1695,7 +1707,7 @@ msgid "语言"
msgstr "Language"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "Voice"
@@ -1800,11 +1812,11 @@ msgid "选择预设目标"
msgstr "Choose Preset Target"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Choose.tsx:59
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:64
msgid "选项"
msgstr "Option"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:67
msgid "选项列表"
msgstr "Selection List"
@@ -1812,15 +1824,15 @@ msgstr "Selection List"
msgid "选项名称"
msgstr "Option Name"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:68
msgid "选项按钮"
msgstr "Selection Button"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:69
msgid "选项按钮(禁用)"
msgstr "Selection Button (disabled)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:70
msgid "选项按钮外层"
msgstr "Selection Button Wrapper"
@@ -1931,7 +1943,7 @@ msgstr "Height"
msgid "高斯模糊:"
msgstr "Gaussian Blur:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "Default"
diff --git a/packages/origine2/src/locales/ja.po b/packages/origine2/src/locales/ja.po
index 030915ece..72c492954 100644
--- a/packages/origine2/src/locales/ja.po
+++ b/packages/origine2/src/locales/ja.po
@@ -201,7 +201,11 @@ msgstr "雨"
msgid "下雪"
msgstr "雪"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
+msgid "不可选项"
+msgstr ""
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "キャラクター名は設定不可"
@@ -217,7 +221,7 @@ msgstr "両端揃え"
msgid "个字"
msgstr " ワード"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "中央"
@@ -361,7 +365,7 @@ msgstr "全画面画面でテキストを表示する。独白やシーンの導
msgid "关于"
msgstr "About"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "関連する立ち絵"
@@ -389,7 +393,7 @@ msgstr "立ち絵を非表示"
msgid "关闭背景"
msgstr "背景画像を非表示"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:31
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:42
msgid "内层文本"
msgstr "内側テキスト"
@@ -470,7 +474,7 @@ msgstr "新しいゲームを作成"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "削除"
@@ -631,7 +635,7 @@ msgstr "シーンとブランチ"
msgid "场景文件"
msgstr "シーンファイル"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:30
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:41
msgid "外层文本"
msgstr "外側テキスト"
@@ -639,7 +643,7 @@ msgstr "外側テキスト"
msgid "外边距"
msgstr "マージン"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "大きい"
@@ -691,7 +695,7 @@ msgstr "実験的な高速プレビュー"
msgid "宽度"
msgstr "幅"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "ダイアログ"
@@ -725,15 +729,15 @@ msgstr "ウェブとしてエクスポート"
msgid "将当前模板应用到选定的游戏"
msgstr "選択したゲームに現在のテンプレートを適用する"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "小さい"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:35
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:46
msgid "小头像图像"
msgstr "アバター画像"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:45
msgid "小头像容器"
msgstr "アバターコンテナ"
@@ -912,7 +916,7 @@ msgstr "ヒント: 最初に立ち絵の描画/背景を設定してから、ア
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "ヒント: 編集後に無効なCG/BGMが見つかった場合は、WebGALゲームインターフェイスのオプションで[すべてのデータを消去]を選択して消去"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "ヒント:改行は三行まで可能"
@@ -1002,7 +1006,7 @@ msgstr "効果音ファイル"
#~ msgstr "ファイル"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "文字サイズ"
@@ -1026,20 +1030,20 @@ msgstr "テキストの配置"
msgid "文本显示"
msgstr "テキストボックス"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
msgid "文本框"
msgstr "テキストボックス"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:28
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
msgid "文本框(小头像关闭时)"
msgstr "テキストボックス(アバターが閉じている場合)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
msgid "文本框文本"
msgstr "テキストボックスのテキスト"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:29
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:40
msgid "文本框背景"
msgstr "テキストボックスの背景"
@@ -1107,11 +1111,11 @@ msgstr "新しいテンプレート"
msgid "新的游戏"
msgstr "新しいゲーム"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "ナレーションモード"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "キャラクター名は設定不可"
@@ -1149,7 +1153,7 @@ msgstr "立ち絵を表示"
msgid "显示背景"
msgstr "背景画像を表示"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "キャラクター名を設定"
@@ -1187,24 +1191,24 @@ msgstr "この文が実行された後、次の文を実行"
msgid "本句执行后等待"
msgstr "この文が実行されるのを待つ"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:55
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:20
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:23
msgid "标题"
msgstr "タイトル"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:62
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
msgid "标题备用背景"
msgstr "タイトル代替背景"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:60
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:25
msgid "标题按钮"
msgstr "タイトルボタン"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:59
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
msgid "标题按钮列表"
msgstr "タイトルボタンリスト"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:61
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:26
msgid "标题按钮文字"
msgstr "タイトルボタンテキスト"
@@ -1302,7 +1306,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "指定位置の立ち絵を追加または切り替える"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "新しい行を追加"
@@ -1436,7 +1440,7 @@ msgid "立绘"
msgstr "Figure"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1451,7 +1455,7 @@ msgstr "立ち絵ID(オプション)"
msgid "立绘位置"
msgstr "描画位置"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "関連する立ち絵のID"
@@ -1613,7 +1617,7 @@ msgstr "プロパティ{0}を削除しますか?"
msgid "覆盖"
msgstr "カバレッジ"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "キャラクター名を空白のままにすると前の文から継承"
@@ -1621,23 +1625,23 @@ msgstr "キャラクター名を空白のままにすると前の文から継承
msgid "角色名,留空以继承上句:对话;"
msgstr "キャラクター名を空白のままにすると前の文から継承;ダイアログ;"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:38
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
msgid "角色名内层文本"
msgstr "キャラクター名内側テキスト"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
msgid "角色名外层文本"
msgstr "キャラクター名外側テキスト"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:36
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
msgid "角色名容器"
msgstr "キャラクター名コンテナ"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:32
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:43
msgid "角色名文本框"
msgstr "キャラクター名テキストボックス"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:33
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
msgid "角色名文本框背景"
msgstr "キャラクター名テキストボックスの背景"
@@ -1703,7 +1707,7 @@ msgid "语言"
msgstr "言語"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "ボイス"
@@ -1808,11 +1812,11 @@ msgid "选择预设目标"
msgstr "事前設定されたターゲットを選択"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Choose.tsx:59
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:64
msgid "选项"
msgstr "選択肢を設定"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:67
msgid "选项列表"
msgstr "選択肢リスト"
@@ -1820,15 +1824,15 @@ msgstr "選択肢リスト"
msgid "选项名称"
msgstr "選択肢を設定"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:68
msgid "选项按钮"
msgstr "選択肢ボタン"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:69
msgid "选项按钮(禁用)"
msgstr "選択肢ボタン(無効状態)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:70
msgid "选项按钮外层"
msgstr "選択肢ボタン外層"
@@ -1939,7 +1943,7 @@ msgstr "高さ"
msgid "高斯模糊:"
msgstr "ぼかし:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "デフォルト"
diff --git a/packages/origine2/src/locales/zhCn.po b/packages/origine2/src/locales/zhCn.po
index afd5a0b9f..e1d0da008 100644
--- a/packages/origine2/src/locales/zhCn.po
+++ b/packages/origine2/src/locales/zhCn.po
@@ -217,7 +217,11 @@ msgstr "下雨"
msgid "下雪"
msgstr "下雪"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
+msgid "不可选项"
+msgstr "不可选项"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "不显示角色名"
@@ -233,7 +237,7 @@ msgstr "两端对齐"
msgid "个字"
msgstr "个字"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:57
msgid "中"
msgstr "中"
@@ -381,7 +385,7 @@ msgstr "全屏显示一段文字,用于独白或引出场景"
msgid "关于"
msgstr "关于"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:143
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:159
msgid "关联立绘"
msgstr "关联立绘"
@@ -409,7 +413,7 @@ msgstr "关闭立绘"
msgid "关闭背景"
msgstr "关闭背景"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:31
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:42
msgid "内层文本"
msgstr "内层文本"
@@ -490,7 +494,7 @@ msgstr "创建新游戏"
#: src/pages/dashboard/GameElement.tsx:154
#: src/pages/dashboard/TemplateElement.tsx:133
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:196
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:114
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:118
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/index.tsx:103
msgid "删除"
msgstr "删除"
@@ -651,7 +655,7 @@ msgstr "场景与分支"
msgid "场景文件"
msgstr "场景文件"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:30
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:41
msgid "外层文本"
msgstr "外层文本"
@@ -659,7 +663,7 @@ msgstr "外层文本"
msgid "外边距"
msgstr "外边距"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:58
msgid "大"
msgstr "大"
@@ -711,7 +715,7 @@ msgstr "实验性快速预览"
msgid "宽度"
msgstr "宽度"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:106
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:110
msgid "对话"
msgstr "对话"
@@ -745,15 +749,15 @@ msgstr "导出为网页"
msgid "将当前模板应用到选定的游戏"
msgstr "将当前模板应用到选定的游戏"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:54
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:56
msgid "小"
msgstr "小"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:35
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:46
msgid "小头像图像"
msgstr "小头像图像"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:45
msgid "小头像容器"
msgstr "小头像容器"
@@ -932,7 +936,7 @@ msgstr "提示:先设置立绘/背景,再应用动画,否则找不到目
msgid "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
msgstr "提示:在编辑结束后,如果发现有失效的鉴赏 CG/BGM ,在 WebGAL 游戏界面的选项中选择清除全部数据以清空。"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:82
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:86
msgid "提示:换行符最多可达三行"
msgstr "提示:换行符最多可达三行"
@@ -1022,10 +1026,18 @@ msgstr "效果音文件"
#~ msgstr "文件"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:230
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:165
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:181
msgid "文字大小"
msgstr "文字大小"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完执行下一句"
+msgstr "文字展示完执行下一句"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
+msgid "文字展示完等待"
+msgstr "文字展示完等待"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
msgstr "文字颜色"
@@ -1038,20 +1050,20 @@ msgstr "文本对齐"
msgid "文本显示"
msgstr "文本显示"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:34
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
msgid "文本框"
msgstr "文本框"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:28
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
msgid "文本框(小头像关闭时)"
msgstr "文本框(小头像关闭时)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:39
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
msgid "文本框文本"
msgstr "文本框文本"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:29
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:40
msgid "文本框背景"
msgstr "文本框背景"
@@ -1119,11 +1131,11 @@ msgstr "新的模板"
msgid "新的游戏"
msgstr "新的游戏"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:126
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
msgid "旁白模式"
msgstr "旁白模式"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "旁白模式,无角色名"
msgstr "旁白模式,无角色名"
@@ -1161,7 +1173,7 @@ msgstr "显示立绘"
msgid "显示背景"
msgstr "显示背景"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:130
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "显示角色名"
msgstr "显示角色名"
@@ -1199,24 +1211,24 @@ msgstr "本句执行后执行下一句"
msgid "本句执行后等待"
msgstr "本句执行后等待"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:55
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:20
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:23
msgid "标题"
msgstr "标题"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:62
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:27
msgid "标题备用背景"
msgstr "标题备用背景"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:60
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:25
msgid "标题按钮"
msgstr "标题按钮"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:59
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:24
msgid "标题按钮列表"
msgstr "标题按钮列表"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:61
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:26
msgid "标题按钮文字"
msgstr "标题按钮文字"
@@ -1314,7 +1326,7 @@ msgid "添加或切换指定位置的立绘"
msgstr "添加或切换指定位置的立绘"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:223
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:124
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:128
msgid "添加新行"
msgstr "添加新行"
@@ -1448,7 +1460,7 @@ msgid "立绘"
msgstr "立绘"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:239
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:161
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:177
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetAnimation.tsx:68
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransform.tsx:95
#: src/pages/editor/GraphicalEditor/SentenceEditor/SetTransition.tsx:73
@@ -1463,7 +1475,7 @@ msgstr "立绘ID(可选)"
msgid "立绘位置"
msgstr "立绘位置"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:153
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:169
msgid "立绘插图的ID"
msgstr "立绘插图的ID"
@@ -1625,7 +1637,7 @@ msgstr "要删除属性{0}吗?"
msgid "覆盖"
msgstr "覆盖"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:91
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:95
msgid "角色名,留空以继承上句"
msgstr "角色名,留空以继承上句"
@@ -1633,23 +1645,23 @@ msgstr "角色名,留空以继承上句"
msgid "角色名,留空以继承上句:对话;"
msgstr "角色名,留空以继承上句:对话;"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:38
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
msgid "角色名内层文本"
msgstr "角色名内层文本"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:37
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
msgid "角色名外层文本"
msgstr "角色名外层文本"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:36
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
msgid "角色名容器"
msgstr "角色名容器"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:32
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:43
msgid "角色名文本框"
msgstr "角色名文本框"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:33
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
msgid "角色名文本框背景"
msgstr "角色名文本框背景"
@@ -1715,7 +1727,7 @@ msgid "语言"
msgstr "语言"
#: src/pages/editor/EditorSidebar/EditorSidebar.tsx:113
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:132
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:148
msgid "语音"
msgstr "语音"
@@ -1820,11 +1832,11 @@ msgid "选择预设目标"
msgstr "选择预设目标"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Choose.tsx:59
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:44
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:64
msgid "选项"
msgstr "选项"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:47
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:67
msgid "选项列表"
msgstr "选项列表"
@@ -1832,15 +1844,15 @@ msgstr "选项列表"
msgid "选项名称"
msgstr "选项名称"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:48
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:68
msgid "选项按钮"
msgstr "选项按钮"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:49
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:69
msgid "选项按钮(禁用)"
msgstr "选项按钮(禁用)"
-#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:50
+#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:70
msgid "选项按钮外层"
msgstr "选项按钮外层"
@@ -1951,7 +1963,7 @@ msgstr "高度"
msgid "高斯模糊:"
msgstr "高斯模糊:"
-#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:53
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:55
msgid "默认"
msgstr "默认"
From 9f326de462094d2791885bb9bcee60bbd2b4bc42 Mon Sep 17 00:00:00 2001
From: Mahiru
Date: Thu, 26 Dec 2024 20:47:23 +0800
Subject: [PATCH 3/3] adjust text and translations
---
packages/origine2/src/locales/en.po | 42 +++++++++++++------
packages/origine2/src/locales/ja.po | 42 +++++++++++++------
packages/origine2/src/locales/zhCn.po | 32 ++++++++++----
.../GraphicalEditor/SentenceEditor/Say.tsx | 6 +--
4 files changed, 85 insertions(+), 37 deletions(-)
diff --git a/packages/origine2/src/locales/en.po b/packages/origine2/src/locales/en.po
index 078733ab5..67473bbbf 100644
--- a/packages/origine2/src/locales/en.po
+++ b/packages/origine2/src/locales/en.po
@@ -203,15 +203,19 @@ msgstr "Snow"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
msgid "不可选项"
-msgstr ""
+msgstr "Not selectable item"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不拼接先前文本框内的语句"
+msgstr "No concat with previous text"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "Hide the role name"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "不继承上一句"
-msgstr ""
+#~ msgid "不继承上一句"
+#~ msgstr ""
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
@@ -553,7 +557,7 @@ msgstr "Transform"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
msgid "可选项"
-msgstr ""
+msgstr "Selectable options"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:52
msgid "右侧"
@@ -701,7 +705,7 @@ msgstr "Dialogue"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:57
msgid "对话框文字"
-msgstr ""
+msgstr "Text in Textbox"
#: src/pages/editor/GraphicalEditor/SentenceEditor/GetUserInput.tsx:32
msgid "对话框标题"
@@ -835,8 +839,8 @@ msgid "当前版本"
msgstr "Current version"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
-msgid "快速执行"
-msgstr ""
+#~ msgid "快速执行"
+#~ msgstr ""
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
@@ -874,6 +878,14 @@ msgstr "Execute to this sentence"
msgid "扩展名"
msgstr "Extension name"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "拼接先前文本框内的语句"
+msgstr "Concat the sentences with previous text"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "拼接模式"
+msgstr "Concat mode"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:88
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:91
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:259
@@ -1012,11 +1024,11 @@ msgstr "Font size"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
msgid "文字展示完执行下一句"
-msgstr ""
+msgstr "Text display complete, execute next sentence"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
msgid "文字展示完等待"
-msgstr ""
+msgstr "Text display complete, wait"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
@@ -1026,6 +1038,10 @@ msgstr "Font color"
msgid "文本对齐"
msgstr "Text alignment"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "文本展示后连续执行"
+msgstr "Text display and continuous execution"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/index.tsx:204
msgid "文本显示"
msgstr "Text display"
@@ -1492,12 +1508,12 @@ msgid "绝对"
msgstr "Absolutely"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "继承上一句"
-msgstr ""
+#~ msgid "继承上一句"
+#~ msgstr ""
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
-msgid "继承模式"
-msgstr ""
+#~ msgid "继承模式"
+#~ msgstr ""
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
diff --git a/packages/origine2/src/locales/ja.po b/packages/origine2/src/locales/ja.po
index 72c492954..a67449ab1 100644
--- a/packages/origine2/src/locales/ja.po
+++ b/packages/origine2/src/locales/ja.po
@@ -203,15 +203,19 @@ msgstr "雪"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
msgid "不可选项"
-msgstr ""
+msgstr "選択できない選択肢"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不拼接先前文本框内的语句"
+msgstr "前のテキストボックス内の文を結合しない"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "キャラクター名は設定不可"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "不继承上一句"
-msgstr ""
+#~ msgid "不继承上一句"
+#~ msgstr ""
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
@@ -553,7 +557,7 @@ msgstr "トランスフォーム"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:58
msgid "可选项"
-msgstr ""
+msgstr "選択可能な選択肢"
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:52
msgid "右侧"
@@ -701,7 +705,7 @@ msgstr "ダイアログ"
#: src/pages/templateEditor/TemplateEditorSidebar/ComponentTree/ComponentTree.tsx:57
msgid "对话框文字"
-msgstr ""
+msgstr "ダイアログテキスト"
#: src/pages/editor/GraphicalEditor/SentenceEditor/GetUserInput.tsx:32
msgid "对话框标题"
@@ -835,8 +839,8 @@ msgid "当前版本"
msgstr "現在のバージョン"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
-msgid "快速执行"
-msgstr ""
+#~ msgid "快速执行"
+#~ msgstr ""
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
@@ -874,6 +878,14 @@ msgstr "この文まで実行"
msgid "扩展名"
msgstr "拡張子"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "拼接先前文本框内的语句"
+msgstr "前のテキストボックスの内容をつなげる"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "拼接模式"
+msgstr "連結モード"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:88
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:91
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:259
@@ -1012,11 +1024,11 @@ msgstr "文字サイズ"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
msgid "文字展示完执行下一句"
-msgstr ""
+msgstr "テキスト表示完了後、次の文を実行"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:146
msgid "文字展示完等待"
-msgstr ""
+msgstr "テキスト表示完了待ち"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Intro.tsx:290
msgid "文字颜色"
@@ -1026,6 +1038,10 @@ msgstr "文字色"
msgid "文本对齐"
msgstr "テキストの配置"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "文本展示后连续执行"
+msgstr "テキスト表示後連続実行"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/index.tsx:204
msgid "文本显示"
msgstr "テキストボックス"
@@ -1492,12 +1508,12 @@ msgid "绝对"
msgstr "絶対"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "继承上一句"
-msgstr ""
+#~ msgid "继承上一句"
+#~ msgstr ""
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
-msgid "继承模式"
-msgstr ""
+#~ msgid "继承模式"
+#~ msgstr ""
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
diff --git a/packages/origine2/src/locales/zhCn.po b/packages/origine2/src/locales/zhCn.po
index e1d0da008..7efbf4961 100644
--- a/packages/origine2/src/locales/zhCn.po
+++ b/packages/origine2/src/locales/zhCn.po
@@ -221,13 +221,17 @@ msgstr "下雪"
msgid "不可选项"
msgstr "不可选项"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "不拼接先前文本框内的语句"
+msgstr "不拼接先前文本框内的语句"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:134
msgid "不显示角色名"
msgstr "不显示角色名"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "不继承上一句"
-msgstr "不继承上一句"
+#~ msgid "不继承上一句"
+#~ msgstr "不继承上一句"
#: src/pages/templateEditor/TemplateGraphicalEditor/WebgalClassEditor/propertyEditor/WGText.tsx:22
msgid "两端对齐"
@@ -855,8 +859,8 @@ msgid "当前版本"
msgstr "当前版本"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
-msgid "快速执行"
-msgstr "快速执行"
+#~ msgid "快速执行"
+#~ msgstr "快速执行"
#: src/pages/dashboard/DashBoard.tsx:170
msgid "忽略此版本"
@@ -894,6 +898,14 @@ msgstr "执行到此句"
msgid "扩展名"
msgstr "扩展名"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
+msgid "拼接先前文本框内的语句"
+msgstr "拼接先前文本框内的语句"
+
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
+msgid "拼接模式"
+msgstr "拼接模式"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:88
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeBg.tsx:91
#: src/pages/editor/GraphicalEditor/SentenceEditor/ChangeFigure.tsx:259
@@ -1046,6 +1058,10 @@ msgstr "文字颜色"
msgid "文本对齐"
msgstr "文本对齐"
+#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:142
+msgid "文本展示后连续执行"
+msgstr "文本展示后连续执行"
+
#: src/pages/editor/GraphicalEditor/SentenceEditor/index.tsx:204
msgid "文本显示"
msgstr "文本显示"
@@ -1512,12 +1528,12 @@ msgid "绝对"
msgstr "绝对"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:140
-msgid "继承上一句"
-msgstr "继承上一句"
+#~ msgid "继承上一句"
+#~ msgstr "继承上一句"
#: src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx:136
-msgid "继承模式"
-msgstr "继承模式"
+#~ msgid "继承模式"
+#~ msgstr "继承模式"
#: src/pages/dashboard/TemplateElement.tsx:82
msgid "编辑模板"
diff --git a/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx b/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
index d2b8b9661..c58ec5a97 100644
--- a/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
+++ b/packages/origine2/src/pages/editor/GraphicalEditor/SentenceEditor/Say.tsx
@@ -133,13 +133,13 @@ export default function Say(props: ISentenceEditorProps) {
submit();
}} onText={t`不显示角色名`} offText={t`显示角色名`} isChecked={isNoSpeaker.value}/>
-
+
{
isConcat.set(newValue);
submit();
- }} onText={t`继承上一句`} offText={t`不继承上一句`} isChecked={isConcat.value}/>
+ }} onText={t`拼接先前文本框内的语句`} offText={t`不拼接先前文本框内的语句`} isChecked={isConcat.value}/>
-
+
{
isNotend.set(newValue);
submit();