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/settings/HistorySettingsFragment.kt
#	app/src/main/res/values/strings.xml
This commit is contained in:
Zakhar Timoshenko
2023-01-04 18:51:59 +03:00
parent eef449af49 738299e8d3
commit 2c71110fa5
75 changed files with 1487 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
<string name="favourites">Favourites</string>
<string name="history">History</string>
<string name="error_occurred">An error occurred</string>
<string name="network_error">Could not connect to the Internet</string>
<string name="network_error">Network error</string>
<string name="details">Details</string>
<string name="chapters">Chapters</string>
<string name="list">List</string>
@@ -399,4 +399,5 @@
<string name="clear_new_chapters_counters">Also clear information about new chapters</string>
<string name="compact">Compact</string>
<string name="mal" translatable="false">MyAnimeList</string>
<string name="source_disabled">Source disabled</string>
</resources>