yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

Merge branch 'fork/Delton-Leo/i18n-fix'

Browse Source 
# Conflicts:
#	app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
#	app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt
#	app/src/main/res/values-zh-rHK/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/strings.xml
This commit is contained in:
HapeLee
2026-04-18 02:36:44 +08:00
parent 7f8e48fa83 269e54db04
commit a7af2ef752
10 changed files with 124 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/config/coverConfig/CoverConfigScreen.kt
+1 -1
View File
@@ -116,7 +116,7 @@ fun CoverConfigScreen(
SplicedColumnGroup {
DropdownListSettingItem(
title = "封面信息方向",
title = stringResource(R.string.cover_info_orientation),
selectedValue = CoverConfig.coverInfoOrientation,
displayEntries = arrayOf(
stringResource(R.string.screen_portrait),
app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
+2 -1
View File
@@ -211,6 +211,7 @@ fun BookshelfScreen(
else uiState.groups.getOrNull(pagerState.currentPage)?.groupName
?: stringResource(R.string.bookshelf)
}
else -> stringResource(R.string.bookshelf)
}
val title = if (uiState.upBooksCount > 0) {
@@ -261,7 +262,7 @@ fun BookshelfScreen(
leadingIcon = { Icon(Icons.Default.Refresh, null) }
)
RoundDropdownMenuItem(
text = "布局设置",
text = stringResource(R.string.layout_setting),
onClick = { showConfigSheet = true; dismiss() },
leadingIcon = { Icon(Icons.Default.GridView, null) }
)
app/src/main/java/io/legado/app/ui/main/my/MyScreen.kt
+1 -1
View File
@@ -108,7 +108,7 @@ fun MyScreen(
}
SplicedColumnGroup(
title = "规则"
title = stringResource(R.string.rule_segment),
) {
ClickableSettingItem(
title = stringResource(R.string.book_source_manage),
app/src/main/res/layout/dialog_tip_config.xml
+7 -7
View File
@@ -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"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_title_seg_config"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="分段模式"
android:text="@string/split_title_mode"
style="@style/Widget.Material3Expressive.Button.TonalButton"/>
<com.google.android.material.button.MaterialButton
@@ -127,7 +127,7 @@
android:layout_height="wrap_content"
app:max="20"
app:min="-20"
app:title="次行缩放" />
app:title="@string/subtitle_scale" />
<View
android:layout_width="0dp"
@@ -154,7 +154,7 @@
android:layout_height="wrap_content"
app:max="30"
app:min="-30"
app:title="次行距离" />
app:title="@string/subtitle_margin" />
<View
android:layout_width="0dp"
@@ -166,7 +166,7 @@
android:layout_width="108dp"
android:layout_height="wrap_content"
app:max="20"
app:title="标题段距" />
app:title="@string/heading_spacing" />
</LinearLayout>
@@ -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" />
<com.google.android.material.chip.Chip
android:id="@+id/bottom_mode3"
app/src/main/res/values-zh-rCN/strings.xml
+9
View File
@@ -1425,4 +1425,13 @@
<string name="enable_select_vibrator">选择文本时震动</string>
<string name="re_sync_webdav">重新同步远程书籍</string>
<string name="underline_padding">离字间距</string>
<string name="layout_setting">布局设置</string>
<string name="cover_info_orientation">封面信息方向</string>
<string name="rule_segment">Rule</string>
<string name="tool_bar_style">工具栏样式</string>
<string name="split_title">标题分段</string>
<string name="split_title_mode">分段模式</string>
<string name="subtitle_scale">次行缩放</string>
<string name="subtitle_margin">次行距离</string>
<string name="heading_spacing">标题段距</string>
</resources>
app/src/main/res/values-zh-rHK/strings.xml
+9
View File
@@ -1222,6 +1222,15 @@
<string name="top_bar_opacity_summary">%d</string>
<string name="bottom_bar_opacity">底欄不透明度</string>
<string name="bottom_bar_opacity_summary">%d</string>
<string name="layout_setting">佈局設定</string>
<string name="cover_info_orientation">封面資訊方向</string>
<string name="rule_segment">Rule</string>
<string name="tool_bar_style">工具欄樣式</string>
<string name="split_title">標題分段</string>
<string name="split_title_mode">分段模式</string>
<string name="subtitle_scale">次行縮放</string>
<string name="subtitle_margin">次行距離</string>
<string name="heading_spacing">標題段距</string>
<string name="web_file">網頁文件</string>
<string name="show_book_count">顯示分組書籍數量</string>
<string name="dynamic_colors_summary">使用基於桌布的主題顏色</string>
app/src/main/res/values-zh-rTW/strings.xml
+9
View File
@@ -1230,4 +1230,13 @@
<string name="input_value_range">輸入數值（%1$d-%2$d）</string>
<string name="miuix_monet">Miuix Monet</string>
<string name="miuix_monet_summary">為 Miuix 使用 Monet 演算法產生配色。目前主題為動態主題且系統為 Android 12 以上時，會優先使用系統取色；否則使用下方種子色。</string>
<string name="layout_setting">佈局設定</string>
<string name="cover_info_orientation">封面資訊方向</string>
<string name="rule_segment">Rule</string>
<string name="tool_bar_style">工具欄樣式</string>
<string name="split_title">標題分段</string>
<string name="split_title_mode">分段模式</string>
<string name="subtitle_scale">次行縮放</string>
<string name="subtitle_margin">次行距離</string>
<string name="heading_spacing">標題段距</string>
</resources>
app/src/main/res/values/arrays.xml
+6 -6
View File
@@ -116,11 +116,11 @@
</string-array>
<string-array name="click_image_way_title">
<item>新包名行为</item>
<item>预览图片</item>
<item>经典行为</item>
<item>关闭点击</item>
<item>双击生效</item>
<item>New Package Behavior</item>
<item>Preview Image</item>
<item>Classic</item>
<item>Disable Click</item>
<item>Double Click</item>
</string-array>
<string-array name="double_page_title">
@@ -310,5 +310,5 @@
<item>Maximum</item>
</string-array>
<string name="all_version">所有版本</string>
<string name="all_version">All Version</string>
</resources>
app/src/main/res/values/strings.xml
+79 -54
View File
@@ -837,7 +837,7 @@
<string name="non_action">None</string>
<string name="body_title">Title</string>
<string name="show_hide">Show/Hide</string>
<string name="header_footer">Footer <![CDATA[&]]> Header</string>
<string name="header_footer">Header <![CDATA[&]]> Footer</string>
<string name="rule_subscription">Rule Subscription</string>
<string name="rule_sub_empty_msg">Add the rule import address provided by the bosses\nClick to import rules after adding</string>
<string name="get_book_progress">Pull the cloud progress</string>
@@ -926,11 +926,11 @@
<string name="set_source_variable">Set source variable</string>
<string name="set_book_variable">Set book variable</string>
<string name="summary">summary</string>
<string name="cover_config">cover config</string>
<string name="cover_config">Cover config</string>
<string name="cover_config_summary">Generic Cover Rules and Default Cover Style</string>
<string name="cover_show_name">show name</string>
<string name="cover_show_name">Show name</string>
<string name="cover_show_name_summary">Book title shown on cover</string>
<string name="cover_show_author">show author</string>
<string name="cover_show_author">Show author</string>
<string name="cover_show_author_summary">Author shown on cover</string>
<string name="read_aloud_prev_paragraph">Read aloud the previous paragraph</string>
<string name="read_aloud_next_paragraph">Read aloud the next paragraph</string>
@@ -1147,7 +1147,7 @@
<string name="respondTime">respondTime: %1$d ms</string>
<string name="load_word_count">Load word count</string>
<string name="replace_exclude_scope">Exclude range, optional title or source URL</string>
<string name="format_js_rule">格式化规则(formatJs)</string>
<string name="format_js_rule">Format Js Rules</string>
<string name="adjust_pos">Adjustment position</string>
<string name="error_scope_input">Please enter the correct range</string>
<string name="custom_export">Custom Export</string>
@@ -1199,8 +1199,8 @@
<string name="update_to_variant_title">Check Updates for Variants</string>
<string name="update_to_variant_summary">Look for other signature variants when checking for updates</string>
<string name="default_version">Current</string>
<string name="official_version">Official</string>
<string name="beta_release_version">Beta</string>
<string name="official_version">Official Version</string>
<string name="beta_release_version">Beta Version</string>
<string name="beta_releaseA_version">Coexist Version</string>
<string name="stream_read_aloud_audio">Stream Audio Playback</string>
<string name="stream_read_aloud_audio_summary">Play while downloading; may stutter on poor networks. Works only with TTS source</string>
@@ -1209,7 +1209,7 @@
<string name="read_aloud_read_phone_state_permission_rationale">Reading requires phone state access to pause reading aloud during calls</string>
<string name="read_aloud_by_media_button_title">Start Read Aloud via Headset Button</string>
<string name="read_aloud_by_media_button_summary">Use headset button to start reading aloud</string>
<string name="group_sources_by_domain">按域名分组显示</string>
<string name="group_sources_by_domain">Show Groups by Domain</string>
<string name="theme_config">Theme Configuration</string>
<string name="show_manga_ui">Manga Viewer</string>
<string name="disable_manga_scale">Disable Manga Zoom</string>
@@ -1320,31 +1320,31 @@
<string name="author_read">%s • %dNot read</string>
<string name="menu_alpha_sum">Current %d%%</string>
<string name="menu_alpha">Menu transparency</string>
<string name="change_source_option_title">请选择操作</string>
<string name="replace_current_book">替换当前书籍</string>
<string name="add_as_new_book">新增书籍到书架</string>
<string name="quick_add_to_shelf">快速添加到书架</string>
<string name="book_added_to_shelf">书籍已添加到书架</string>
<string name="seed_photo_summary">使用图片生成主题颜色</string>
<string name="seed_photo_alart">若需使用种子颜色，请取消种子图片选择</string>
<string name="change_source_option_title">Select an action</string>
<string name="replace_current_book">Replace current book</string>
<string name="add_as_new_book">Add as new book to shelf</string>
<string name="quick_add_to_shelf">Quick add to shelf</string>
<string name="book_added_to_shelf">Added to shelf</string>
<string name="seed_photo_summary">Generate theme colors from image</string>
<string name="seed_photo_alart">To use a seed color, deselect the seed image</string>
<string name="click_to_delete">Click to delete or change</string>
<string name="tip_custom_mode">由于主题引擎依赖Monet，对于低于Android12的设备，动态取色与自定义主题不会生效。</string>
<string name="restart_required_message">修改该选项需要重启</string>
<string name="restart_later_message">稍后重启</string>
<string name="search_select_group">选择书源分组</string>
<string name="day_night_switch">深浅色模式开关</string>
<string name="manga_long_click">长按保存图片</string>
<string name="read_type_long">长按设置为全局默认模式</string>
<string name="read_slider_mode">滑动条显示样式</string>
<string name="bookshelf_update_limit">书架更新数量限制</string>
<string name="text_shadow_x">X轴距离</string>
<string name="text_shadow_y">Y轴距离</string>
<string name="text_shadow_radius">阴影半径</string>
<string name="text_shadow_color">阴影</string>
<string name="global_read_setting">阅读显示 • 漫画相关</string>
<string name="screen_settings">屏幕显示与亮度</string>
<string name="tip_custom_mode">Since the Theme Engine depends on Monet, dynamic coloring and custom themes will not take effect on devices below Android 12.</string>
<string name="restart_required_message">Restart is required to apply changes</string>
<string name="restart_later_message">Restart later</string>
<string name="search_select_group">Select group</string>
<string name="day_night_switch">Light/Dark mode switch</string>
<string name="manga_long_click">Long press to save image</string>
<string name="read_type_long">Long press to set as global default mode</string>
<string name="read_slider_mode">Slider Style</string>
<string name="bookshelf_update_limit">Bookshelf update limit</string>
<string name="text_shadow_x">X-axis offset</string>
<string name="text_shadow_y">Y-axis offset</string>
<string name="text_shadow_radius">Shadow radius</string>
<string name="text_shadow_color">Text shadow</string>
<string name="global_read_setting">Reading Display • Manga Related</string>
<string name="screen_settings">Display Setting</string>
<string name="reading_behavior">阅读行为</string>
<string name="page_control">翻页控制</string>
<string name="page_control">Page Control</string>
<string name="redirect_policy">网页重定向策略</string>
<string name="redirect_allow_all">允许所有重定向</string>
<string name="redirect_ask_always">总是询问</string>
@@ -1357,35 +1357,35 @@
<string name="sort_new_to_old">从新到旧</string>
<string name="sort_name_asc">名称升序</string>
<string name="sort_name_desc">名称降序</string>
<string name="text_dottedline">下划虚线</string>
<string name="text_dottedline">Dotted Line</string>
<string name="jump_to_volume">跳转到卷</string>
<string name="cancel_select">取消选择</string>
<string name="coll_volume">折叠所有卷</string>
<string name="expand_volume">展开所有卷</string>
<string name="custom">自定义</string>
<string name="global_setting">全局设置</string>
<string name="text_typeface">字体样式</string>
<string name="custom">Custom</string>
<string name="global_setting">Global Setting</string>
<string name="text_typeface">Font Style</string>
<string name="shadow_typeface">阴影样式</string>
<string name="long_click_to_custom">长按自定义</string>
<string name="disable_manga_scroll_animation">禁用翻页动画</string>
<string name="manga_cross_fade">禁用加载淡入动画</string>
<string name="text_shadow_set">阴影设置</string>
<string name="paragraph_typeface">段落样式</string>
<string name="paragraph_typeface">Typography</string>
<string name="same_name_book">已有相同书籍</string>
<string name="underline_color">下划线颜色</string>
<string name="dotted_line_black">实线段长</string>
<string name="dotted_line_while">空隙比例</string>
<string name="underline_height">线段高度</string>
<string name="title_bar_mode">菜单标题显示方式</string>
<string name="underline_color">Underline Color</string>
<string name="dotted_line_black">Dash Length</string>
<string name="dotted_line_while">Gap Length</string>
<string name="underline_height">Underline Height</string>
<string name="title_bar_mode">Title showing mode in menu</string>
<string name="sure_cache_book">是否确认开始缓存？</string>
<string name="auto_check_new_backup_t">自动检查新备份</string>
<string name="auto_check_new_backup_s">打开软件时检查是否有新备份，有新备份时提示是否更新</string>
<string name="auto_check_new_backup_t">Auto-check for new backups</string>
<string name="auto_check_new_backup_s">Check for new backups when opening the app, if new backups are found, prompt the user to update.</string>
<string name="replace_purify_badge">计数替换净化</string>
<string name="page_anim_fade">渐变</string>
<string name="page_anim_fade">Fade</string>
<string name="show_bookshelf_tab_menu">显示更多分组按钮</string>
<string name="show_unread_new">显示新章节更新标志</string>
<string name="read_change_all">换源按钮默认弹出整书换源</string>
<string name="read_change_all_s">反之则默认弹出单章换源</string>
<string name="read_change_all">Source Change Button Defaults to Change Full-Book Source</string>
<string name="read_change_all_s">Otherwise, Only Change Single-Chapter Source.</string>
<string name="show_tip">显示书籍类型</string>
<string name="show_book_count">显示分组书籍数量</string>
<string name="is_reading">在读</string>
@@ -1403,30 +1403,55 @@
<string name="select_operation">选择操作</string>
<string name="text_accent_color">强调</string>
<string name="read_color">颜色样式</string>
<string name="is_reading">Reading</string>
<string name="is_unread">Unread</string>
<string name="is_read_finished">Finished</string>
<string name="manga">Manga</string>
<string name="noval">Novel</string>
<string name="cover_show_shadow">Show Font Shadow</string>
<string name="cover_show_stroke">Show Font Stroke</string>
<string name="default_color">Use Default Font Color</string>
<string name="enable_slider_vibrator">Vibrate when sliding progress bar</string>
<string name="edit_remark">Edit remark</string>
<string name="book_remark">Book Alias</string>
<string name="save_to_local">Save to local</string>
<string name="select_operation">Select an operation</string>
<string name="text_accent_color">Accent Color</string>
<string name="read_color">Color Style</string>
<string name="reverse_volume_key_page">反转音量键翻页方向</string>
<string name="palette_style">调色板样式</string>
<string name="material_version">颜色规格</string>
<string name="tip_compose_set">这里的选项仅可以控制使用Compose重写的界面。对于禁用的选项，会在日后实现时开放，现在仅作占位。</string>
<string name="is_blur_enable">启用控件模糊</string>
<string name="use_underline">总是使用下划线表示强调文本</string>
<string name="adapt_special_style">适配特殊样式</string>
<string name="use_underline">Use Underline to Emphasize Text</string>
<string name="adapt_special_style">Adapt to Special Styles</string>
<string name="compose_engine">主题风格</string>
<string name="container_opacity">容器背景不透明度</string>
<string name="container_opacity_summary">%d</string>
<string name="top_bar_opacity">顶栏不透明度</string>
<string name="top_bar_opacity">Top Bar Opacity</string>
<string name="top_bar_opacity_summary">%d</string>
<string name="bottom_bar_opacity">底栏不透明度</string>
<string name="bottom_bar_opacity">Bottom Bar Opacity</string>
<string name="bottom_bar_opacity_summary">%d</string>
<string name="web_service_auto_start">启动应用时打开Web服务</string>
<string name="web_service_auto_start">Start Web Service on App Startup</string>
<string name="read_aloud_preload">听书预加载数量</string>
<string name="read_aloud_preload_summary">%d</string>
<string name="audio_cache_clean_time">音频缓存保留时间(分钟)</string>
<string name="audio_cache_clean_time_summary">当前%d, 输入 0 代表退出即刻清理。</string>
<string name="show_swipe_animation">启用滑动时动画</string>
<string name="click_image_way">点击图片行为</string>
<string name="click_image_way">Image Clicking</string>
<string name="show_web_log">输出日志</string>
<string name="is_blur_progressive_enable">启用渐变模糊</string>
<string name="enable_select_vibrator">选择文本时震动</string>
<string name="enable_select_vibrator">Vibrate when selecting text</string>
<string name="re_sync_webdav">重新同步远程书籍</string>
<string name="underline_padding">离字间距</string>
<string name="underline_padding">Underline Padding</string>
<string name="layout_setting">Layout Settings</string>
<string name="cover_info_orientation">Cover Info Orientation</string>
<string name="rule_segment">Rule</string>
<string name="tool_bar_style">Tool Bar Style</string>
<string name="split_title">Split Title</string>
<string name="split_title_mode">Split Mode</string>
<string name="subtitle_scale">Subtitle scale</string>
<string name="subtitle_margin">Subtitle margin</string>
<string name="heading_spacing">Heading spacing</string>
<string name="follow_background">Follow Background</string>
</resources>
app/src/main/res/xml/pref_main.xml
+1 -1
View File
@@ -59,7 +59,7 @@
</io.legado.app.lib.prefs.PreferenceCategory>
<io.legado.app.lib.prefs.PreferenceCategory
android:title="规则"
android:title="@string/rule_segment"
app:allowDividerAbove="false"
app:allowDividerBelow="false"
app:iconSpaceReserved="false"