Merge pull request #937

* i18n Fix II

app/src/main/java/io/legado/app/ui/config/backupConfig/BackupConfigScreen.kt

@@ -209,6 +209,7 @@ fun BackupConfigScreen(
                 SplicedColumnGroup(title = stringResource(R.string.web_dav_set)) {
                     InputSettingItem(
                         title = stringResource(R.string.web_dav_url),
+                        description = stringResource(R.string.web_dav_url_s),
                         value = BackupConfig.webDavUrl,
                         defaultValue = "",
                         onConfirm = { BackupConfig.webDavUrl = it }
@@ -216,7 +217,7 @@ fun BackupConfigScreen(
 
                 ClickableSettingItem(
                     title = stringResource(R.string.web_dav_account),
-                    description = "设置 WebDAV 账号和密码",
+                    description = stringResource(R.string.web_dav_account_d),
                     onClick = {
                         tempAccount = viewModel.getWebDavAccount()
                         tempPassword = viewModel.getWebDavPassword()
@@ -239,18 +240,19 @@ fun BackupConfigScreen(
                 )
 
                 ClickableSettingItem(
-                    title = "测试 WebDav 配置",
-                    description = "测试 WebDav 服务工作状态",
+                    title = stringResource(R.string.test_sync_t),
+                    description = stringResource(R.string.test_sync_d),
+                    
                     onClick = {
                         scope.launch {
                             showLoadingDialog = true
-                            loadingText = "测试中…"
+                            loadingText = context.getString(R.string.test_sync_loading_text)
                             val success = viewModel.testWebDav()
                             showLoadingDialog = false
                             if (success) {
-                                snackbarHostState.showSnackbar("WebDav 配置正确")
+                                snackbarHostState.showSnackbar(context.getString(R.string.test_sync_status_success))
                             } else {
-                                snackbarHostState.showSnackbar("WebDav 配置错误")
+                                snackbarHostState.showSnackbar(context.getString(R.string.test_sync_status_fail))
                             }
                         }
                     }

app/src/main/java/io/legado/app/ui/config/coverConfig/CoverRuleConfigSheet.kt

@@ -82,13 +82,13 @@ fun CoverRuleConfigSheet(
             }
 
             InputSettingItem(
-                title = "搜索URL",
+                title = stringResource(R.string.search_via_url),
                 value = searchUrl,
                 onConfirm = { searchUrl = it }
             )
 
             InputSettingItem(
-                title = "封面规则",
+                title = stringResource(R.string.cover_rule_edit),
                 value = coverRule,
                 onConfirm = { coverRule = it }
             )

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfConfigSheet.kt

@@ -69,7 +69,7 @@ fun BookshelfConfigSheet(
 
             // Sort Order
             CompactDropdownSettingItem(
-                title = "排序方向",
+                title = stringResource(R.string.sort_order),
                 selectedValue = BookshelfConfig.bookshelfSortOrder.toString(),
                 displayEntries = arrayOf(
                     stringResource(R.string.ascending_order),
@@ -85,10 +85,10 @@ fun BookshelfConfigSheet(
                 else BookshelfConfig.bookshelfLayoutModePortrait
 
             CompactDropdownSettingItem(
-                title = "布局模式",
+                title = stringResource(R.string.layout_mode),
                 description = stringResource(if (isLandscape) R.string.screen_landscape else R.string.screen_portrait),
                 selectedValue = layoutMode.toString(),
-                displayEntries = arrayOf("列表", "网格"),
+                displayEntries = arrayOf(stringResource(R.string.layout_mode_list),stringResource(R.string.layout_mode_grid)),
                 entryValues = arrayOf("0", "1"),
                 onValueChange = {
                     if (isLandscape) BookshelfConfig.bookshelfLayoutModeLandscape = it.toInt()
@@ -103,7 +103,7 @@ fun BookshelfConfigSheet(
                     verticalArrangement = Arrangement.spacedBy(8.dp)
                 ) {
                     CompactDropdownSettingItem(
-                        title = "网格样式",
+                        title = stringResource(R.string.grid_style),
                         selectedValue = BookshelfConfig.bookshelfGridLayout.toString(),
                         displayEntries = stringArrayResource(R.array.bookshelf_grid_layout),
                         entryValues = Array(stringArrayResource(R.array.bookshelf_grid_layout).size) { it.toString() },
@@ -125,14 +125,14 @@ fun BookshelfConfigSheet(
                     )
 
                     CompactSwitchSettingItem(
-                        title = "标题小字体",
+                        title = stringResource(R.string.compact_title_font),
                         checked = BookshelfConfig.bookshelfTitleSmallFont,
                         color = MaterialTheme.colorScheme.surface,
                         onCheckedChange = { BookshelfConfig.bookshelfTitleSmallFont = it }
                     )
 
                     CompactSwitchSettingItem(
-                        title = "标题居中",
+                        title = stringResource(R.string.center_aligned_title),
                         checked = BookshelfConfig.bookshelfTitleCenter,
                         color = MaterialTheme.colorScheme.surface,
                         onCheckedChange = { BookshelfConfig.bookshelfTitleCenter = it }
@@ -147,14 +147,14 @@ fun BookshelfConfigSheet(
                     verticalArrangement = Arrangement.spacedBy(8.dp)
                 ) {
                     CompactSwitchSettingItem(
-                        title = "紧凑模式",
+                        title = stringResource(R.string.compact_mode),
                         checked = BookshelfConfig.bookshelfLayoutCompact,
                         color = MaterialTheme.colorScheme.surface,
                         onCheckedChange = { BookshelfConfig.bookshelfLayoutCompact = it }
                     )
 
                     CompactSwitchSettingItem(
-                        title = "显示分隔线",
+                        title = stringResource(R.string.show_divider_line),
                         checked = BookshelfConfig.bookshelfShowDivider,
                         color = MaterialTheme.colorScheme.surface,
                         onCheckedChange = { BookshelfConfig.bookshelfShowDivider = it }
@@ -177,7 +177,7 @@ fun BookshelfConfigSheet(
             }
 
             CompactSliderSettingItem(
-                title = "标题最大行数",
+                title = stringResource(R.string.max_title_lines),
                 value = BookshelfConfig.bookshelfTitleMaxLines.toFloat(),
                 valueRange = 1f..5f,
                 steps = 4,
@@ -185,7 +185,7 @@ fun BookshelfConfigSheet(
             )
 
             CompactSwitchSettingItem(
-                title = "封面阴影",
+                title = stringResource(R.string.cover_shadow),
                 checked = BookshelfConfig.bookshelfCoverShadow,
                 color = MaterialTheme.colorScheme.surface,
                 onCheckedChange = { BookshelfConfig.bookshelfCoverShadow = it }
@@ -251,7 +251,7 @@ fun BookshelfConfigSheet(
             // Refresh Limit
             CompactSliderSettingItem(
                 title = stringResource(R.string.bookshelf_update_limit),
-                description = if (BookshelfConfig.bookshelfRefreshingLimit <= 0) "无限制" else "${BookshelfConfig.bookshelfRefreshingLimit} 本",
+                description = if (BookshelfConfig.bookshelfRefreshingLimit <= 0) stringResource(R.string.refresh_limit_unlimited) else stringResource(R.string.refresh_limit_books, BookshelfConfig.bookshelfRefreshingLimit),
                 value = BookshelfConfig.bookshelfRefreshingLimit.toFloat(),
                 valueRange = 0f..100f,
                 steps = 100,

app/src/main/java/io/legado/app/ui/main/rss/RssScreen.kt

@@ -137,7 +137,7 @@ fun RssScreen(
                     context.startActivity<RssSourceActivity>()
                     dismiss()
                 },
-                text = "订阅源管理"
+                text = stringResource(R.string.rss_feed_management),
             )
             PillDivider()
             RoundDropdownMenuItem(

app/src/main/res/values-zh-rCN/strings.xml

@@ -68,6 +68,7 @@
     <string name="out_favorites">未收藏</string>
     <string name="rss">订阅</string>
     <string name="all">全部</string>
+    <string name="rss_feed_management">订阅源管理</string>
     <string name="recent_reading">最近阅读</string>
     <string name="last_read">最后阅读</string>
     <string name="update_log">更新日志</string>
@@ -380,6 +381,17 @@
     <string name="sort_manual">手动排序</string>
     <string name="sort_default">默认排序</string>
     <string name="sort_by_name">名称排序</string>
+	<string name="sort_order">排序方向</string>
+	<string name="layout_mode">布局模式</string>
+	<string name="layout_mode_list">列表</string>
+	<string name="layout_mode_grid">网格</string>
+	<string name="grid_style">网格模式</string>
+	<string name="compact_title_font">标题小字体</string>
+	<string name="center_aligned_title">标题居中</string>
+	<string name="compact_mode">紧凑模式</string>
+	<string name="show_divider_line">显示分隔线</string>
+	<string name="max_title_lines">标题最大行数</string>
+	<string name="cover_shadow">封面阴影</string>
     <string name="go_to_top">滚动到顶部</string>
     <string name="go_to_bottom">滚动到底部</string>
     <string name="read_y">已读: %s</string>
@@ -623,10 +635,10 @@
     <string name="tts">TTS</string>
     <string name="web_dav_pw">WebDav 密码</string>
     <string name="web_dav_pw_s">输入你的 WebDav 授权密码</string>
-    <string name="web_dav_url_s">输入你的服务器地址</string>
+    <string name="web_dav_url_s">输入你的WebDav服务器地址</string>
     <string name="web_dav_url">WebDav 服务器地址</string>
     <string name="web_dav_account">WebDav 账号</string>
-    <string name="web_dav_account_s">输入你的 WebDav 账号</string>
+    <string name="web_dav_account_d">输入你的 WebDav 账号</string>
     <string name="rss_source">订阅源</string>
     <string name="rss_source_edit">编辑订阅源</string>
     <string name="screen">筛选</string>
@@ -1006,6 +1018,8 @@
     <string name="only_wifi">仅 WiFi</string>
     <string name="only_wifi_summary">仅在 WiFi 下加载网络封面</string>
     <string name="cover_rule">封面规则</string>
+    <string name="search_via_url">搜索URL</string>
+	<string name="cover_rule_edit">封面规则</string>
     <string name="cover_rule_summary">进入详情页时使用封面规则重新获取封面</string>
     <string name="scroll_to_dur_source">定位到当前书源</string>
     <string name="sys_tts_config">系统 TTS 设置</string>
@@ -1173,6 +1187,11 @@
     <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
     <string name="export_all_use_book_source">导出所有书的书源</string>
     <string name="cloud_progress_exceeds_current">云端进度超过当前进度，是否同步？</string>
+    <string name="test_sync_t">测试 WebDav 配置</string>
+    <string name="test_sync_d">测试 WebDav 服务工作状态</string>
+    <string name="test_sync_loading_text">测试中…</string>
+    <string name="test_sync_status_success">WebDav 配置正确</string>
+    <string name="test_sync_status_fail">WebDav 配置错误</string>
     <string name="keep_enable">保留启用状态</string>
     <string name="preview_image_by_click">点击预览图片</string>
     <string name="screen_portrait_reversed">反向竖屏</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -43,6 +43,7 @@
     <string name="out_favorites">未收藏</string>
     <string name="rss">訂閲</string>
     <string name="all">全部</string>
+    <string name="rss_feed_management">订阅源管理</string>
     <string name="recent_reading">最近閲讀</string>
     <string name="last_read">最後閲讀</string>
     <string name="update_log">更新日誌</string>
@@ -356,6 +357,17 @@
     <string name="sort_default">默認排序</string>
     <string name="sort_manual">手動排序</string>
     <string name="sort_by_name">名稱排序</string>
+	<string name="sort_order">排序方向</string>
+	<string name="layout_mode">佈局模式</string>
+	<string name="layout_mode_list">列表</string>
+	<string name="layout_mode_grid">網格</string>
+	<string name="grid_style">網格模式</string>
+	<string name="compact_title_font">標題小字體</string>
+	<string name="center_aligned_title">標題居中</string>
+	<string name="compact_mode">緊湊模式</string>
+	<string name="show_divider_line">顯示分隔線</string>
+	<string name="max_title_lines">標題最大行數</string>
+	<string name="cover_shadow">封面陰影</string>
     <string name="go_to_top">滾動到頂部</string>
     <string name="go_to_bottom">滾動到底部</string>
     <string name="read_y">已讀: %s</string>
@@ -594,7 +606,7 @@
     <string name="web_dav_url_s">輸入你的服務器地址</string>
     <string name="web_dav_url">WebDav 服務器地址</string>
     <string name="web_dav_account">WebDav 賬號</string>
-    <string name="web_dav_account_s">輸入你的 WebDav 賬號</string>
+    <string name="web_dav_account_d">輸入你的 WebDav 賬號</string>
     <string name="rss_source">訂閲源</string>
     <string name="rss_source_edit">編輯訂閲源</string>
     <string name="screen">篩選</string>
@@ -980,6 +992,8 @@
     <string name="only_wifi">仅WIFI</string>
     <string name="only_wifi_summary">仅在wifi下加载网络封面</string>
     <string name="cover_rule">封面规则</string>
+    <string name="search_via_url">搜索URL</string>
+	<string name="cover_rule_edit">封面规则</string>
     <string name="cover_rule_summary">进入详情页时使用封面规则重新获取封面</string>
     <string name="scroll_to_dur_source">定位到当前书源</string>
     <string name="sys_tts_config">系统tts设置</string>
@@ -1148,6 +1162,11 @@
     <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
     <string name="export_all_use_book_source">导出所有书的书源</string>
     <string name="cloud_progress_exceeds_current">雲端進度超過目前進度，是否同步？</string>
+    <string name="test_sync_t">測試 WebDav 配置</string>
+    <string name="test_sync_d">測試 WebDav 服務工作狀態</string>
+    <string name="test_sync_loading_text">測試中…</string>
+    <string name="test_sync_status_success">WebDav 配置正確</string>
+    <string name="test_sync_status_fail">WebDav 配置錯誤</string>
     <string name="keep_enable">保留启用状态</string>
     <string name="preview_image_by_click">点击预览图片</string>
     <string name="screen_portrait_reversed">反向竖屏</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -45,6 +45,7 @@
     <string name="out_favorites">未收藏</string>
     <string name="rss">訂閱</string>
     <string name="all">全部</string>
+    <string name="rss_feed_management">订阅源管理</string>
     <string name="recent_reading">最近閱讀</string>
     <string name="last_read">最後閱讀</string>
     <string name="update_log">更新日誌</string>
@@ -358,6 +359,17 @@
     <string name="sort_default">默認排序</string>
     <string name="sort_manual">手動排序</string>
     <string name="sort_by_name">名稱排序</string>
+	<string name="sort_order">排序方向</string>
+	<string name="layout_mode">佈局模式</string>
+	<string name="layout_mode_list">列表</string>
+	<string name="layout_mode_grid">網格</string>
+	<string name="grid_style">網格模式</string>
+	<string name="compact_title_font">標題小字體</string>
+	<string name="center_aligned_title">標題居中</string>
+	<string name="compact_mode">緊湊模式</string>
+	<string name="show_divider_line">顯示分隔線</string>
+	<string name="max_title_lines">標題最大行數</string>
+	<string name="cover_shadow">封面陰影</string>
     <string name="go_to_top">滾動到頂部</string>
     <string name="go_to_bottom">滾動到底部</string>
     <string name="read_y">已讀：%s</string>
@@ -603,7 +615,7 @@
     <string name="web_dav_url_s">輸入你的伺服器地址</string>
     <string name="web_dav_url">WebDav 伺服器地址</string>
     <string name="web_dav_account">WebDav 帳號</string>
-    <string name="web_dav_account_s">輸入你的WebDav帳號</string>
+    <string name="web_dav_account_d">輸入你的WebDav帳號</string>
     <string name="rss_source">訂閱源</string>
     <string name="rss_source_edit">編輯訂閱源</string>
     <string name="screen">篩選</string>
@@ -983,6 +995,8 @@
     <string name="only_wifi">僅WIFI</string>
     <string name="only_wifi_summary">僅在wifi下載入網路封面</string>
     <string name="cover_rule">封面規則</string>
+    <string name="search_via_url">搜索URL</string>
+	<string name="cover_rule_edit">封面规则</string>
     <string name="cover_rule_summary">進入詳情頁時使用封面規則重新獲取封面</string>
     <string name="scroll_to_dur_source">定位到目前書源</string>
     <string name="sys_tts_config">系統tts設定</string>
@@ -1151,6 +1165,11 @@
     <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
     <string name="export_all_use_book_source">导出所有书的书源</string>
     <string name="cloud_progress_exceeds_current">雲端進度超過目前進度，是否同步？</string>
+    <string name="test_sync_t">測試 WebDav 配置</string>
+    <string name="test_sync_d">測試 WebDav 服務工作狀態</string>
+    <string name="test_sync_loading_text">測試中…</string>
+    <string name="test_sync_status_success">WebDav 配置正確</string>
+    <string name="test_sync_status_fail">WebDav 配置錯誤</string>
     <string name="keep_enable">保留启用状态</string>
     <string name="preview_image_by_click">点击预览图片</string>
     <string name="screen_portrait_reversed">反向竖屏</string>

app/src/main/res/values/arrays.xml

@@ -196,7 +196,7 @@
 	<string-array name="tabletInterface">
 		<item>Auto</item>
 		<item>Always</item>
-		<item>In_Landscape_Mode</item>
+		<item>Landscape Mode</item>
 		<item>Off</item>
 	</string-array>