diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt index c1df00a17..7101b175c 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt @@ -277,6 +277,9 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) { val isDownloadsWiFiOnly: Boolean get() = prefs.getBoolean(KEY_DOWNLOADS_WIFI, false) + val preferredDownloadFormat: DownloadFormat + get() = prefs.getEnumValue(KEY_DOWNLOADS_FORMAT, DownloadFormat.AUTOMATIC) + var isSuggestionsEnabled: Boolean get() = prefs.getBoolean(KEY_SUGGESTIONS, false) set(value) = prefs.edit { putBoolean(KEY_SUGGESTIONS, value) } @@ -552,6 +555,7 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) { const val KEY_MAL = "mal" const val KEY_KITSU = "kitsu" const val KEY_DOWNLOADS_WIFI = "downloads_wifi" + const val KEY_DOWNLOADS_FORMAT = "downloads_format" const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible" const val KEY_DOH = "doh" const val KEY_EXIT_CONFIRM = "exit_confirm" diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt new file mode 100644 index 000000000..72acf3640 --- /dev/null +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/DownloadFormat.kt @@ -0,0 +1,8 @@ +package org.koitharu.kotatsu.core.prefs + +enum class DownloadFormat { + + AUTOMATIC, + SINGLE_CBZ, + MULTIPLE_CBZ, +} diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt index 93573ab75..fb0fea709 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/worker/DownloadWorker.kt @@ -91,6 +91,7 @@ class DownloadWorker @AssistedInject constructor( private val localMangaRepository: LocalMangaRepository, private val mangaDataRepository: MangaDataRepository, private val mangaRepositoryFactory: MangaRepository.Factory, + private val settings: AppSettings, @LocalStorageChanges private val localStorageChanges: MutableSharedFlow, notificationFactoryFactory: DownloadNotificationFactory.Factory, ) : CoroutineWorker(appContext, params) { @@ -182,7 +183,7 @@ class DownloadWorker @AssistedInject constructor( } val repo = mangaRepositoryFactory.create(manga.source) val mangaDetails = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga - output = LocalMangaOutput.getOrCreate(destination, mangaDetails) + output = LocalMangaOutput.getOrCreate(destination, mangaDetails, settings.preferredDownloadFormat) val coverUrl = mangaDetails.largeCoverUrl.ifNullOrEmpty { mangaDetails.coverUrl } if (coverUrl.isNotEmpty()) { downloadFile(coverUrl, destination, repo.source).let { file -> diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt index 1f6cacc8c..b94c04ddf 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt @@ -4,7 +4,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext +import okhttp3.internal.format import okio.Closeable +import org.koitharu.kotatsu.core.prefs.DownloadFormat import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.local.data.input.LocalMangaInput import org.koitharu.kotatsu.parsers.model.Manga @@ -35,22 +37,32 @@ sealed class LocalMangaOutput( const val SUFFIX_TMP = ".tmp" private val mutex = Mutex() - suspend fun getOrCreate(root: File, manga: Manga): LocalMangaOutput = withContext(Dispatchers.IO) { - val preferSingleCbz = manga.chapters.let { - it != null && it.size <= 3 + suspend fun getOrCreate( + root: File, + manga: Manga, + format: DownloadFormat, + ): LocalMangaOutput = withContext(Dispatchers.IO) { + val targetFormat = if (format == DownloadFormat.AUTOMATIC) { + if (manga.chapters.let { it != null && it.size <= 3 }) { + DownloadFormat.SINGLE_CBZ + } else { + DownloadFormat.MULTIPLE_CBZ + } + } else { + format } - checkNotNull(getImpl(root, manga, onlyIfExists = false, preferSingleCbz)) + checkNotNull(getImpl(root, manga, onlyIfExists = false, format = targetFormat)) } suspend fun get(root: File, manga: Manga): LocalMangaOutput? = withContext(Dispatchers.IO) { - getImpl(root, manga, onlyIfExists = true, preferSingleCbz = false) + getImpl(root, manga, onlyIfExists = true, format = DownloadFormat.AUTOMATIC) } private suspend fun getImpl( root: File, manga: Manga, onlyIfExists: Boolean, - preferSingleCbz: Boolean, + format: DownloadFormat, ): LocalMangaOutput? { mutex.withLock { var i = 0 @@ -75,10 +87,10 @@ sealed class LocalMangaOutput( continue } - !onlyIfExists -> if (preferSingleCbz) { - LocalMangaZipOutput(zip, manga) - } else { - LocalMangaDirOutput(dir, manga) + !onlyIfExists -> when (format) { + DownloadFormat.AUTOMATIC -> null + DownloadFormat.SINGLE_CBZ -> LocalMangaZipOutput(zip, manga) + DownloadFormat.MULTIPLE_CBZ -> LocalMangaDirOutput(dir, manga) } else -> null diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt index 25375fae8..e0c96fb31 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt @@ -54,7 +54,7 @@ class AppearanceSettingsFragment : } summaryProvider = Preference.SummaryProvider { val locale = AppCompatDelegate.getApplicationLocales().get(0) - locale?.getDisplayName(locale)?.toTitleCase(locale) ?: getString(R.string.automatic) + locale?.getDisplayName(locale)?.toTitleCase(locale) ?: getString(R.string.follow_system) } setDefaultValueCompat("") } @@ -105,7 +105,7 @@ class AppearanceSettingsFragment : .sortedWithSafe(LocaleComparator()) preference.entries = Array(locales.size + 1) { i -> if (i == 0) { - getString(R.string.automatic) + getString(R.string.follow_system) } else { val lc = locales[i - 1] lc.getDisplayName(lc).toTitleCase(lc) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt index b9631cc14..1a2922728 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/DownloadsSettingsFragment.kt @@ -7,6 +7,7 @@ import android.os.Bundle import android.view.View import androidx.activity.result.contract.ActivityResultContracts import androidx.documentfile.provider.DocumentFile +import androidx.preference.ListPreference import androidx.preference.Preference import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint @@ -15,13 +16,17 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.prefs.AppSettings +import org.koitharu.kotatsu.core.prefs.DownloadFormat +import org.koitharu.kotatsu.core.prefs.ReaderAnimation import org.koitharu.kotatsu.core.ui.BasePreferenceFragment import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.core.util.ext.resolveFile +import org.koitharu.kotatsu.core.util.ext.setDefaultValueCompat import org.koitharu.kotatsu.core.util.ext.tryLaunch import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope import org.koitharu.kotatsu.download.ui.worker.DownloadWorker import org.koitharu.kotatsu.local.data.LocalStorageManager +import org.koitharu.kotatsu.parsers.util.names import org.koitharu.kotatsu.settings.storage.MangaDirectorySelectDialog import org.koitharu.kotatsu.settings.storage.directories.MangaDirectoriesActivity import org.koitharu.kotatsu.settings.utils.DozeHelper @@ -46,6 +51,10 @@ class DownloadsSettingsFragment : override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.pref_downloads) + findPreference(AppSettings.KEY_DOWNLOADS_FORMAT)?.run { + entryValues = DownloadFormat.entries.names() + setDefaultValueCompat(DownloadFormat.AUTOMATIC.name) + } dozeHelper.updatePreference() } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3e5a38be5..11d9dd88f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -37,7 +37,7 @@ جاري التنزيل… انشاء اختصار… مظهر - حسب النظام + حسب النظام شارك %s في طور معالجة… محدث @@ -338,4 +338,4 @@ يمكنك اختيار مكان في الذاكرة يحتوي على أرشيفات أو صور. سيتم التعرف على كل أرشيف (أو مجلد فرعي) على أنه فصل. السرعة استيراد نسخة احتياطية تم إنشاؤها لبيانات المستخدم. - \ No newline at end of file + diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index fc804ae43..423a2dcac 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -45,7 +45,7 @@ Тэма Светлая Цёмная - Як у сістэме + Як у сістэме Старонкi Ачысціць Вы ўпэўненыя, што жадаеце ачысціць гісторыю\? @@ -593,4 +593,4 @@ Каталог захавання старонкі па змаўчанні Выдаліць з гісторыі Захаванне старонак - \ No newline at end of file + diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 0cf689bc3..48122d9e9 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -64,7 +64,7 @@ থিম আলো আঁধার - সিস্টেম অনুযায়ী + সিস্টেম অনুযায়ী পৃষ্ঠাগুলি ওয়েবটুন পড়ার মোড @@ -159,4 +159,4 @@ পরামর্শ: %s এখানে খালি… সম্পন্ন - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a0a3dbf51..38c99f343 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -33,7 +33,7 @@ Téma Světlé Tmavé - Následovat systém + Následovat systém Odstranit \"%s\" smazáno z místního uložiště Sdílet obrázek @@ -444,4 +444,4 @@ Vyčistit cookies pouze pro specifikované domény. Ve většině případech bude neplatná autorizace Vyberte kapitoly manuálně Popis - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0a1a8fc28..db81d4962 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4,7 +4,7 @@ Gesamten Leseverlauf unwiderruflich löschen\? Design Seiten - Wie System + Wie System Dunkel Hell Filter @@ -580,4 +580,4 @@ Zwei Seiten Nächstes Kapitel Vorherige Seite - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 8fdbc251c..d7200db64 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -31,7 +31,7 @@ Βαθμολογία Φίλτρο Σκοτεινό - Όπως στο σύστημα + Όπως στο σύστημα Εκκαθάριση Να διαγράψετε μόνιμα όλο το ιστορικό ανάγνωσης; Διαγραφή @@ -556,4 +556,4 @@ Τα πρόσφατα διαβασμένα manga σου Μπορεί να βοηθήσει σε περίπτωση κάποιων προβλημάτων. Όλες οι εξουσιοδοτήσεις θα ανακληθούν Αυτή η κατηγορία αποκρύφτηκε από την αρχική οθόνη και είναι προσβάσιμη μέσω του Μενού → Διαχείριση κατηγοριών - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9a31abb36..1ca413dcf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -45,7 +45,7 @@ Tema Claro Oscuro - De acuerdo al sistema + De acuerdo al sistema Páginas Limpiar Borrar todo el historial de lectura de forma permanente\? @@ -593,4 +593,4 @@ Eliminar del historial Guardar páginas Directorio predeterminado para guardar páginas - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index d94cc7042..9173a535e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -168,7 +168,7 @@ skaala mood Täiustatud Ainult Wi-Fi-l - Jälgne süsteemile + Jälgne süsteemile Sünkroniseeri seadeid Must Mis sa loed näidatakse siin @@ -439,4 +439,4 @@ Allalaadimised on jätkanud Värvide ümberpööramine Puhverserver - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 77866dd57..7f9682476 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -14,7 +14,7 @@ حافظه ی درونی راست به چپ پیکربندی انتخاب شده برای این مانگا بخاطر خواهد ماند - تم سیستم + تم سیستم صفحات پاکسازی دامنه @@ -255,4 +255,4 @@ فعال کردن اعلان ها حذف نشانه نشانه ها - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9bf16d703..a0c638f24 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -137,7 +137,7 @@ Haluatko todella tyhjentää koko lukuhistoriasi\? Tyhjennä Sivut - Automaattinen + Automaattinen Tumma Vaalea Teema diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 950153174..04534279c 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -7,7 +7,7 @@ Pansala Tema Madilim - Sundan ang sistema + Sundan ang sistema May nangyaring error Error sa network Mga detalye @@ -593,4 +593,4 @@ Naka-disable ang pagsuri para sa mga bagong kabanata Ipakita ang tinantyang oras ng pagbabasa Maaaring hindi tumpak ang halaga ng pagtatantya ng oras - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index acfedc563..3c54b4af8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -134,7 +134,7 @@ Effacer définitivement l\'historique de lecture \? Effacer Pages - Suivre le système + Suivre le système Sombre Clair Thème @@ -593,4 +593,4 @@ Afficher les étiquettes dans la barre de navigation Sauvegarder les pages Zoom webtoon par défaut - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 36d0581db..e873eb4e6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -61,7 +61,7 @@ सूची फिल्टर थीम - फोन जैसा + फोन जैसा पन्ने कोई विवरण नहीं है अपडेट @@ -128,4 +128,4 @@ होगाया जाँच मत करो पासवर्ड दर्ज करें - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 321ff563b..a23b4e429 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -32,7 +32,7 @@ Értékelés Szűrő Fényes - Rendszer alapján + Rendszer alapján Törlés Véglegesen törli az összes olvasási előzményt? Eltávolítás @@ -60,4 +60,4 @@ %s törölve lett a helyi tárhelyből Mentve Törlés - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 0701a68fa..725adc346 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -42,7 +42,7 @@ Tema Terang Gelap - Ikuti sistem + Ikuti sistem Halaman Bersihkan Hapus @@ -581,4 +581,4 @@ Kembalikan pengaturan ke bawaan? Tindakan ini tidak bisa dibatalkan. Gunakan tata letak dua halaman pada orientasi landscape (beta) Masukkan email dan sandi untuk melanjutkan - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 442d30b7f..93ffb9ecd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -9,7 +9,7 @@ Pagina salvata correttamente Salva la pagina Pagine - Automatico + Automatico Scuro Chiaro Tema @@ -561,4 +561,4 @@ Questa categoria è stata nascosta dalla schermata principale ed è accessibile tramite Menù → Gestisci categorie Tempo rimanente approssimativo %1$s %2$s - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3ed22dfcf..c4267a8c8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -38,7 +38,7 @@ 最新 評価 並べ替え - システムに従う + システムに従う 消去 すべての履歴を永久に消去しますか？ 削除 @@ -483,4 +483,4 @@ 右下にズームコントロールボタンを表示するかどうか ズームボタンを表示 ズームアウト - \ No newline at end of file + diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml index c8e2c2223..330624939 100644 --- a/app/src/main/res/values-kk/strings.xml +++ b/app/src/main/res/values-kk/strings.xml @@ -48,7 +48,7 @@ Кейіп Қараңғы Ақшыл - Жүйедегідей + Жүйедегідей Беттер Тазалау Жою @@ -520,4 +520,4 @@ Әзірге мына жерде қолжетімді дереккөз жоқ. Жаңарту күтіңіз Қолжетімді: %1$d Басқа - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 27c49dc27..ecbac6fa4 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -62,7 +62,7 @@ 처리중… 최근 업데이트 순 최근 발간 순 - 시스템 설정 + 시스템 설정 지우기 바이트|kB|MB|GB|TB 페이지 캐시 지우기 @@ -352,4 +352,4 @@ 초기화 저장되지 않은 변경 사항을 저장하거나 삭제하시겠습니까\? 오류 세부정보:<br><tt>%1$s</tt><br><br>1. <a href=%2$s>웹 브라우저에서 만화를 열어</a> 소스에서 사용할 수 있는지 확인하세요<br>2. <a href=kotatsu://about>최신 버전의 Kotatsu</a><br>를 사용하고 있는지 확인하세요.3. 사용 가능한 경우 개발자에게 오류 보고서를 보냅니다. - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 99ce57fb4..89ef7c91b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -45,7 +45,7 @@ Tapis Terang Gelap - Ikut sistem + Ikut sistem Muka surat Kosongkan Kosongkan semua sejarah pembacaan selama-lamanya? @@ -314,4 +314,4 @@ Data tidak sah dikembalikan atau fail rosak Pada peranti Panduan - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 4884bfd7b..ab439641e 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -137,7 +137,7 @@ Fjern Tøm Sider - Følg systemet + Følg systemet Mørk Lys Navn diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 68743bd6b..f79ba34f4 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -34,7 +34,7 @@ क्रमबद्ध क्रम थीम उज्यालो - सिस्टम पालना गर्नुहोस् + सिस्टम पालना गर्नुहोस् कम्प्युटिङ… मनपर्ने विवरण @@ -231,4 +231,4 @@ त्रुटि विवरण:<br> <tt>%1$s</tt><br><br> 1. <a href=%2$s>वेब ब्राउजरमा मंगा खोल्ने</a> प्रयास गर्नुहोस् कि यो यसको स्रोतमा उपलब्ध छ<br> 2. निश्चित गर्नुहोस् कि तपाइँ <a href=kotatsu://about>Kotatsu को नवीनतम संस्करण</a> प्रयोग गर्दै हुनुहुन्छ<br> 3. यदि यो उपलब्ध छ भने, विकासकर्ताहरूलाई त्रुटि रिपोर्ट पठाउनुहोस्। जानरा अलग गर्नु सुझावहरू अपडेट गर्दै - \ No newline at end of file + diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 97607cb09..1a69ace94 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -100,7 +100,7 @@ Namn Oppdatert Vising - Lyd systemet + Lyd systemet Mørk Hent noko først Ikkje tilgjengeleg @@ -404,4 +404,4 @@ Stansa hentingane Du kan logge inn på ein konto du alt har, eller lage ein ny ein Ugild verdi - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f79a1cf48..38405b237 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -174,7 +174,7 @@ Ustawienia powiadomień Zewnętrzne źródła Motyw - Systemowy + Systemowy Wyczyść pamięć podręczną stron B|kB|MB|GB|TB Wielkość siatki @@ -486,4 +486,4 @@ Określa, czy wyświetlać elementy sterujące powiększeniem w prawym dolnym rogu Pozostaw ekran włączony Nie wyłączaj ekranu podczas czytania mangi - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 409395e4c..c82cf6c55 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -188,7 +188,7 @@ Vários idiomas Limpar todo o histórico de leitura permanentemente\? Esta operação não é suportada - Automático (segue o sistema) + Automático (segue o sistema) %1$d de %2$d em Webtoon Alternar páginas @@ -584,4 +584,4 @@ Diminuir zoom padrão do webtoon Modo de tela cheia Ocultar a barra de status e navegação - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fdc4c6169..9009493da 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -34,7 +34,7 @@ Ordem de classificação Filtro Escuro - Siga o sistema + Siga o sistema Páginas Limpar Limpar todo o histórico de leitura permanentemente\? @@ -588,4 +588,4 @@ A verificação de novos capítulos está desativada Mostrar tempo estimado de leitura O valor do tempo estimado pode ser impreciso - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5c4e8b07f..c0ce50958 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -45,7 +45,7 @@ Тема Светлая Тёмная - Как в системе + Как в системе Страницы Очистить Очистить всю историю чтения полностью\? @@ -593,4 +593,4 @@ Убрать из истории Показывать подписи на панели навигации Папка для сохранений по умолчанию - \ No newline at end of file + diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 162ea41d6..69a720b58 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -85,7 +85,7 @@ Најновије Светла Мрачна - Прати систем + Прати систем Филтер Тема Странице @@ -588,4 +588,4 @@ Вредност процене времена може бити нетачна Провера нових поглавља је искључена Режим целог екрана - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7aa01f538..36dd7bdf9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -39,7 +39,7 @@ Laddar ned… Behandlar… Tema - Systemtema + Systemtema Ta bort B|kB|MB|GB|TB Ny kategori diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 138be52bb..a2c5d9d49 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1,7 +1,7 @@ สว่าง - ตั้งค่าตามเครื่อง + ตั้งค่าตามเครื่อง จะเคลียร์ประวัติการอ่านทั้งหมดแบบถาวรใช่ไหม\? ลบ \"%s\" ได้ถูกลบจากที่จัดเก็บในเครื่องแล้ว @@ -402,4 +402,4 @@ ดำเนินการต่อ หยุดชั่วคราว หยุด - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d16754c6f..64fa5b5bb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -37,7 +37,7 @@ Tema Açık Koyu - Sistemle uyumlu + Sistemle uyumlu Sayfalar Temizle Tüm okuma geçmişi kalıcı olarak silinsin mi\? @@ -593,4 +593,4 @@ Her seferinde hedef dizini sor Öntanımlı sayfa kaydetme dizini Geçmişten kaldır - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 73afd7678..8ba9438e8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -191,7 +191,7 @@ Завантаження… Очистити Завантаження - Як в системі + Як в системі Розділ відсутній Жанри За умовчанням @@ -593,4 +593,4 @@ Видалити з історії Показувати мітки на панелі навігації Директорія збереження сторінки за замовчуванням - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ce33a4b93..315f669b0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -201,7 +201,7 @@ Sắp xếp theo Tối Sáng - Theo hệ thống + Theo hệ thống \"%s\" đã bị xoá khỏi bộ nhớ cục bộ Chia sẻ hình ảnh Đã lưu @@ -448,4 +448,4 @@ Trắng Đã lên kế hoạch Đen - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 73328b103..46d493ddf 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -74,7 +74,7 @@ 主题 深色 浅色 - 跟随系统 + 跟随系统 页面 清除 确定永久清除所有阅读历史吗? @@ -593,4 +593,4 @@ 图片保存 图片默认保存目录 删除阅读历史 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 71e9e85c1..66d53f688 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -236,7 +236,7 @@ 評分 排列順序 深色 - 跟隨系統 + 跟隨系統 頁數 匯入 沒有描述 @@ -564,4 +564,4 @@ 減少色帶，但可能會影響效能 大約剩餘時間 %1$s %2$s - \ No newline at end of file + diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 0abbd7895..6bea0c5d2 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,7 +1,7 @@ - @string/automatic + @string/follow_system @string/light @string/dark @@ -82,4 +82,9 @@ @string/chapters @string/pages + + @string/automatic + @string/single_cbz_file + @string/multiple_cbz_files + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc7f8e99b..54dc0a92d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,7 +48,7 @@ Light Dark - Follow system + Follow system Pages Clear Clear all reading history permanently? @@ -599,4 +599,8 @@ Default page save directory Remove from history Location + Preferred download format + Automatic + Single CBZ file + Multiple CBZ files diff --git a/app/src/main/res/xml/pref_downloads.xml b/app/src/main/res/xml/pref_downloads.xml index d1de75189..40e67c123 100644 --- a/app/src/main/res/xml/pref_downloads.xml +++ b/app/src/main/res/xml/pref_downloads.xml @@ -13,6 +13,12 @@ android:persistent="false" android:title="@string/manga_save_location" /> + +