Merge origin/main into feature/private-group
Resolve conflict in BookInfoSheets.kt: keep MediumPlainButton style from main while preserving showAddGroup logic from PR for correct new group creation.
This commit is contained in:
129 files changed
+6295
-1914
No files matched your search
@@ -1684,6 +1684,8 @@
|
||||
<string name="search_source_progress"> · Progress %1$d/%2$d</string>
|
||||
<string name="search_empty_scope_disable_precision">%1$s group search returned no results. Disable precise search?</string>
|
||||
<string name="search_empty_scope_switch_all">%1$s group search returned no results. Switch to all groups?</string>
|
||||
<string name="search_layout_list">List layout</string>
|
||||
<string name="search_layout_source_grouped">Source grouped</string>
|
||||
<string name="download_cache_config">Download & Cache</string>
|
||||
<string name="http_cache">HTTP Cache</string>
|
||||
<string name="cover_cache">Cover Cache</string>
|
||||
|
||||
Reference in new issue
Block a user