From b25d23ed1bf1afcee1ac97eb1f8abec5d79da5a5 Mon Sep 17 00:00:00 2001 From: "Delton.Leo" Date: Tue, 31 Mar 2026 20:11:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=B8=BA=E8=8B=B1=E8=AF=AD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?App=20UI=20=E4=B8=AD=E8=8B=B1=E6=96=87=E6=B7=B7=E6=90=AD?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/coverConfig/CoverConfigScreen.kt | 2 +- .../app/ui/main/bookshelf/BookshelfScreen.kt | 2 +- .../java/io/legado/app/ui/main/my/MyScreen.kt | 2 +- app/src/main/res/layout/dialog_tip_config.xml | 14 +- app/src/main/res/values-zh-rCN/strings.xml | 11 +- app/src/main/res/values-zh-rHK/strings.xml | 9 ++ app/src/main/res/values-zh-rTW/strings.xml | 9 ++ app/src/main/res/values/arrays.xml | 14 +- app/src/main/res/values/strings.xml | 146 ++++++++++-------- app/src/main/res/xml/pref_main.xml | 2 +- 10 files changed, 124 insertions(+), 87 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverConfigScreen.kt b/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverConfigScreen.kt index 5aee17431..7192aff05 100644 --- a/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverConfigScreen.kt +++ b/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverConfigScreen.kt @@ -118,7 +118,7 @@ fun CoverConfigScreen( SplicedColumnGroup { DropdownListSettingItem( - title = "封面信息方向", + title = stringResource(R.string.cover_info_orientation), selectedValue = CoverConfig.coverInfoOrientation, displayEntries = arrayOf( stringResource(R.string.screen_portrait), diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt index 725167c76..63da0ad31 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt @@ -252,7 +252,7 @@ fun BookshelfScreen( leadingIcon = { Icon(Icons.Default.Refresh, null) } ) RoundDropdownMenuItem( - text = { Text("布局设置") }, + text = { Text(stringResource(R.string.layout_setting)) }, onClick = { showConfigSheet = true; dismiss() }, leadingIcon = { Icon(Icons.Default.GridView, null) } ) diff --git a/app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt b/app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt index d23e1a50b..a150126c2 100644 --- a/app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt +++ b/app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt @@ -142,7 +142,7 @@ fun MyScreen( SplicedColumnGroup( modifier = Modifier.padding(horizontal = 16.dp), - title = "规则" + title = stringResource(R.string.rule_segment), ) { SettingItem( title = stringResource(R.string.book_source_manage), diff --git a/app/src/main/res/layout/dialog_tip_config.xml b/app/src/main/res/layout/dialog_tip_config.xml index 91a52c6db..46471e844 100644 --- a/app/src/main/res/layout/dialog_tip_config.xml +++ b/app/src/main/res/layout/dialog_tip_config.xml @@ -97,14 +97,14 @@ android:id="@+id/btn_title_segType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="标题分段" + android:text="@string/split_title" style="@style/Widget.Material3Expressive.Button.TonalButton"/> + app:title="@string/subtitle_scale" /> + app:title="@string/subtitle_margin" /> + app:title="@string/heading_spacing" /> @@ -200,7 +200,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="工具栏样式" + android:text="@string/tool_bar_style" android:textSize="16sp" android:textStyle="bold"/> @@ -226,7 +226,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checkable="true" - android:text="跟随阅读背景" /> + android:text="@string/follow_background" /> 取消选择 折叠所有卷 展开所有卷 - 自定义 + Custom 全局设置 字体样式 阴影样式 @@ -1413,4 +1413,13 @@ 选择文本时震动 重新同步远程书籍 离字间距 + 布局设置 + 封面信息方向 + Rule + 工具栏样式 + 标题分段 + 分段模式 + 次行缩放 + 次行距离 + 标题段距 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 4c58e6c5c..114177b2d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1220,4 +1220,13 @@ %d 底欄不透明度 %d + 佈局設定 + 封面資訊方向 + Rule + 工具栏样式 + 标题分段 + 分段模式 + 次行缩放 + 次行距离 + 标题段距 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d88fba834..e849df89c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1222,4 +1222,13 @@ %d 底欄不透明度 %d + 佈局設定 + 封面資訊方向 + Rule + 工具栏样式 + 标题分段 + 分段模式 + 次行缩放 + 次行距离 + 标题段距 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a4a405595..cce6f3487 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -116,11 +116,11 @@ - 新包名行为 - 预览图片 - 经典行为 - 关闭点击 - 双击生效 + New Package Behavior + Preview Image + Classic + Disable Click + Double Click @@ -259,8 +259,8 @@ official_version - beta_release_version all_version + beta_release_version beta_releaseA_version @@ -311,5 +311,5 @@ Maximum - 所有版本 + All Version diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5be095fe9..f0fc55855 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -834,7 +834,7 @@ None Title Show/Hide - Footer Header + Header Footer Rule Subscription Add the rule import address provided by the bosses\nClick to import rules after adding Pull the cloud progress @@ -923,11 +923,11 @@ Set source variable Set book variable summary - cover config + Cover config Generic Cover Rules and Default Cover Style - show name + Show name Book title shown on cover - show author + Show author Author shown on cover Read aloud the previous paragraph Read aloud the next paragraph @@ -1144,7 +1144,7 @@ respondTime: %1$d ms Load word count Exclude range, optional title or source URL - 格式化规则(formatJs) + Format Js Rules Adjustment position Please enter the correct range Custom Export @@ -1196,8 +1196,8 @@ Check Updates for Variants Look for other signature variants when checking for updates Current - Official - Beta + Official Version + Beta Version Coexist Version Stream Audio Playback Play while downloading; may stutter on poor networks. Works only with TTS source @@ -1206,7 +1206,7 @@ Reading requires phone state access to pause reading aloud during calls Start Read Aloud via Headset Button Use headset button to start reading aloud - 按域名分组显示 + Show Groups by Domain Theme Configuration Manga Viewer Disable Manga Zoom @@ -1309,31 +1309,31 @@ %s • %dNot read Current %d%% Menu transparency - 请选择操作 - 替换当前书籍 - 新增书籍到书架 - 快速添加到书架 - 书籍已添加到书架 - 使用图片生成主题颜色 - 若需使用种子颜色,请取消种子图片选择 + Select an action + Replace current book + Add as new book to shelf + Quick add to shelf + Added to shelf + Generate theme colors from image + To use a seed color, deselect the seed image Click to delete or change - 由于主题引擎依赖Monet,对于低于Android12的设备,动态取色与自定义主题不会生效。 - 修改该选项需要重启 - 稍后重启 - 选择书源分组 - 深浅色模式开关 - 长按保存图片 - 长按设置为全局默认模式 - 滑动条显示样式 - 书架更新数量限制 - X轴距离 - Y轴距离 - 阴影半径 - 阴影 - 阅读显示 • 漫画相关 - 屏幕显示与亮度 + Since the Theme Engine depends on Monet, dynamic coloring and custom themes will not take effect on devices below Android 12. + Restart is required to apply changes + Restart later + Select group + Light/Dark mode switch + Long press to save image + Long press to set as global default mode + Slider Style + Bookshelf update limit + X-axis offset + Y-axis offset + Shadow radius + Text shadow + Reading Display • 漫画相关 + Display Setting 阅读行为 - 翻页控制 + Page Control 网页重定向策略 允许所有重定向 总是询问 @@ -1346,75 +1346,85 @@ 从新到旧 名称升序 名称降序 - 下划虚线 + Dotted Line 跳转到卷 取消选择 折叠所有卷 展开所有卷 自定义 - 全局设置 - 字体样式 + Global Setting + Font Style 阴影样式 长按自定义 禁用翻页动画 禁用加载淡入动画 阴影设置 - 段落样式 + Typography 已有相同书籍 - 下划线颜色 - 实线段长 - 空隙比例 - 线段高度 - 菜单标题显示方式 + Underline Color + Dash Length + Gap Length + Underline Height + Title showing mode in menu 是否确认开始缓存? - 自动检查新备份 - 打开软件时检查是否有新备份,有新备份时提示是否更新 + Auto-check for new backups + Check for new backups when opening the app, if new backups are found, prompt the user to update. 计数替换净化 - 渐变 + Fade 显示更多分组按钮 显示新章节更新标志 - 换源按钮默认弹出整书换源 - 反之则默认弹出单章换源 + Source Change Button Defaults to Change Full-Book Source + Otherwise, Only Change Single-Chapter Source. 显示书籍类型 - 在读 - 未读 - 已读 - 漫画 - 小说 - 显示字体阴影 - 显示字体描边 - 使用默认字体颜色 - 滑动进度条时震动 - 编辑备注 - 书籍备注 - 保存至本地 - 选择操作 - 强调 - 颜色样式 + Reading + Unread + Finished + Manga + Noval + Show Font Shadow + Show Font Stroke + Use Default Font Color + Vibrate when sliding progress bar + Edit remark + Book Alias + Save to local + Select an operation + Accent Color + Color Style 反转音量键翻页方向 调色板样式 颜色规格 这里的选项仅可以控制使用Compose重写的界面。对于禁用的选项,会在日后实现时开放,现在仅作占位。 启用控件模糊 - 总是使用下划线表示强调文本 - 适配特殊样式 + Use Underline to Emphasize Text + Adapt to Special Styles 主题风格 容器背景不透明度 %d - 顶栏不透明度 + Top Bar Opacity %d - 底栏不透明度 + Bottom Bar Opacity %d - 启动应用时打开Web服务 + Start Web Service on App Startup 听书预加载数量 %d 音频缓存保留时间(分钟) 当前%d, 输入 0 代表退出即刻清理。 启用滑动时动画 - 点击图片行为 + Image Clicking 输出日志 启用渐变模糊 - 选择文本时震动 + Vibrate when selecting text 重新同步远程书籍 - 离字间距 + Underline Padding + Layout Settings + Cover Info Orientation + Rule + Tool Bar Style + Split Title + Split Mode + Subtitle scale + Subtitle margin + Heading spacing + Follow Background diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml index bd6858f48..bd9e7b3c1 100644 --- a/app/src/main/res/xml/pref_main.xml +++ b/app/src/main/res/xml/pref_main.xml @@ -59,7 +59,7 @@ Date: Tue, 31 Mar 2026 20:25:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Fix:=E4=BF=AE=E6=94=B9=E4=BA=86=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=20Strings.xml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6e92fe45c..775865da9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1348,7 +1348,7 @@ 取消选择 折叠所有卷 展开所有卷 - Custom + 自定义 全局设置 字体样式 阴影样式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0fc55855..fcc66a41d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1351,7 +1351,7 @@ 取消选择 折叠所有卷 展开所有卷 - 自定义 + Custom Global Setting Font Style 阴影样式 From 35547aa4bda62c4cf0855225428307d0b400cb6d Mon Sep 17 00:00:00 2001 From: "Delton.Leo" <36940020+Delton-Leo@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:54:23 +0800 Subject: [PATCH 3/5] Apply suggestion from @gemini-code-assist[bot] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 忘记同步修改text=@string/split_title_mode Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- app/src/main/res/layout/dialog_tip_config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/dialog_tip_config.xml b/app/src/main/res/layout/dialog_tip_config.xml index 46471e844..652049488 100644 --- a/app/src/main/res/layout/dialog_tip_config.xml +++ b/app/src/main/res/layout/dialog_tip_config.xml @@ -104,7 +104,7 @@ android:id="@+id/btn_title_seg_config" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Split Mode" + android:text="@string/split_title_mode" style="@style/Widget.Material3Expressive.Button.TonalButton"/> Date: Tue, 31 Mar 2026 20:55:37 +0800 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index cce6f3487..69408797c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -259,8 +259,8 @@ official_version - all_version beta_release_version + all_version beta_releaseA_version diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fcc66a41d..346dae065 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1330,7 +1330,7 @@ Y-axis offset Shadow radius Text shadow - Reading Display • 漫画相关 + Reading Display • Manga Related Display Setting 阅读行为 Page Control @@ -1380,7 +1380,7 @@ Unread Finished Manga - Noval + Novel Show Font Shadow Show Font Stroke Use Default Font Color From 269e54db0431001a2ffe31f510b30f696e0b3953 Mon Sep 17 00:00:00 2001 From: "Delton.Leo" Date: Tue, 31 Mar 2026 21:06:58 +0800 Subject: [PATCH 5/5] Follow bot suggestions for better traditional-chinese i18n effect --- app/src/main/res/values-zh-rHK/strings.xml | 10 +++++----- app/src/main/res/values-zh-rTW/strings.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 114177b2d..0d65ef32c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1223,10 +1223,10 @@ 佈局設定 封面資訊方向 Rule - 工具栏样式 - 标题分段 + 工具欄樣式 + 標題分段 分段模式 - 次行缩放 - 次行距离 - 标题段距 + 次行縮放 + 次行距離 + 標題段距 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e849df89c..c5659045b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1225,10 +1225,10 @@ 佈局設定 封面資訊方向 Rule - 工具栏样式 - 标题分段 + 工具欄樣式 + 標題分段 分段模式 - 次行缩放 - 次行距离 - 标题段距 + 次行縮放 + 次行距離 + 標題段距