prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into feature/mal

Browse Source 
# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/ScrobblingModule.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/domain/model/ScrobblerService.kt
#	app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
#	app/src/main/res/xml/pref_history.xml
This commit is contained in:
Zakhar Timoshenko
2023-01-30 00:53:13 +03:00
parent 2c71110fa5 6ca6ec28ac
commit ee2538ba7f
158 changed files with 3006 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/values/strings.xml
View File

@@ -273,6 +273,7 @@
<string name="removal_completed">Removal completed</string>
<string name="batch_manga_save_confirm">Download all selected manga and its chapters\? This can consume a lot of traffic and storage.</string>
<string name="shikimori" translatable="false">Shikimori</string>
<string name="anilist" translatable="false">AniList</string>
<string name="parallel_downloads">Parallel downloads</string>
<string name="download_slowdown">Download slowdown</string>
<string name="download_slowdown_summary">Helps avoid blocking your IP address</string>
@@ -400,4 +401,11 @@
<string name="compact">Compact</string>
<string name="mal" translatable="false">MyAnimeList</string>
<string name="source_disabled">Source disabled</string>
<string name="prefetch_content">Content preloading</string>
<string name="mark_as_current">Mark as current</string>
<string name="language">Language</string>
<string name="share_logs">Share logs</string>
<string name="enable_logging">Enable logging</string>
<string name="enable_logging_summary">Record some actions for debug purposes</string>
<string name="show_suspicious_content">Show suspicious content</string>
</resources>