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

# 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
10 changed files with 124 additions and 71 deletions
@@ -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),
@@ -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) }
)
@@ -108,7 +108,7 @@ fun MyScreen(
}
SplicedColumnGroup(
title = "规则"
title = stringResource(R.string.rule_segment),
) {
ClickableSettingItem(
title = stringResource(R.string.book_source_manage),