mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-17 14:37:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inorichi/tachiyomi

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/ActivityMixin.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/FragmentMixin.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/ChapterCountEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFavoriteEvent.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingFragment.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt
#	app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt
#	app/src/main/res/layout/activity_download_manager.xml
#	app/src/main/res/layout/activity_edit_categories.xml
#	app/src/main/res/layout/activity_manga.xml
#	app/src/main/res/layout/activity_preferences.xml
#	app/src/main/res/layout/fragment_backup.xml
#	app/src/main/res/layout/fragment_download_queue.xml
#	app/src/main/res/layout/fragment_library.xml
#	app/src/main/res/layout/fragment_library_category.xml
#	app/src/main/res/layout/item_chapter.xml
#	app/src/main/res/layout/item_recent_chapters.xml
#	app/src/main/res/layout/toolbar.xml
#	app/src/main/res/raw/changelog_release.xml
#	app/src/main/res/values/arrays.xml
#	app/src/main/res/xml/pref_about.xml
#	app/src/main/res/xml/pref_advanced.xml
#	app/src/main/res/xml/pref_downloads.xml
#	app/src/main/res/xml/pref_general.xml
#	app/src/main/res/xml/pref_reader.xml
#	app/src/main/res/xml/pref_sources.xml
#	app/src/main/res/xml/pref_tracking.xml

Migrate to Tachiyomi 6.1
Rewrite batch add UI
This commit is contained in:
NerdNumber9
2017-08-24 11:24:23 -04:00
parent 029f159aea bfa386acba
commit 3da7c47bf5
301 changed files with 12222 additions and 10356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
app/src/main/res/values-it/strings.xml
View File

@@ -1,3 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="name">Nome</string>
@@ -78,7 +79,6 @@
<string name="pref_category_reader">Lettore</string>
<string name="pref_category_downloads">Download</string>
<string name="pref_category_sources">Fonti</string>
<string name="pref_category_sync">Sincronizzazione</string>
<string name="pref_category_advanced">Avanzate</string>
<string name="pref_category_about">Informazioni</string>
@@ -219,7 +219,7 @@
<string name="no_valid_sources">Per favore abilita almeno una fonte valida</string>
<!-- Manga activity -->
<string name="manga_not_in_db">Questo manga è stato rimosso dal database</string>
<string name="manga_not_in_db">Questo manga è stato rimosso dal database!</string>
<!-- Manga info fragment -->
<string name="manga_detail_tab">Informazioni</string>
@@ -275,12 +275,11 @@
<string name="plan_to_read">Lettura pianificata</string>
<string name="score">Punteggio</string>
<string name="title">Titolo</string>
<string name="title_hint">Titolo…</string>
<string name="status">Stato</string>
<string name="chapters">Capitoli</string>
<!-- Category activity -->
<string name="error_category_exists">Esiste già una categoria con questo nome</string>
<string name="error_category_exists">Esiste già una categoria con questo nome!</string>
<!-- Dialog remove recently view -->
<string name="dialog_with_checkbox_remove_description">Questo rimuoverà la data lettura di questo capitolo. Sei sicuro?</string>
@@ -309,10 +308,6 @@
<!-- Backup fragment -->
<string name="backup">Backup</string>
<string name="restore">Ripristina</string>
<string name="backup_please_wait">Backup in corso. Attendere prego…</string>
<string name="backup_completed">Backup ripristinato con successo</string>
<string name="restore_please_wait">Ripristino backup in corso. Attendere prego…</string>
<!-- Recent manga fragment -->
<string name="recent_manga_source">%1$s - Cap.%2$s</string>
@@ -369,4 +364,76 @@
<string name="download_notifier_text_only_wifi">Nessuna connessione Wi-Fi disponibile</string>
<string name="download_notifier_no_network">Nessuna connessione di rete disponibile</string>
<string name="categories">Categorie</string>
<string name="manga">Manga</string>
<string name="history">Cronologia</string>
<string name="action_sort_total">Capitoli totali</string>
<string name="action_add">Aggiungi</string>
<string name="action_close">Chiudi</string>
<string name="action_move">Sposta</string>
<string name="action_undo">Annulla</string>
<string name="action_export">Esporta</string>
<string name="action_open_log">Apri log</string>
<string name="action_create">Crea</string>
<string name="action_restore">Ripristina</string>
<string name="app_not_available">Applicazione non disponibile</string>
<string name="short_recent_updates">Aggiornamenti</string>
<string name="update_weekly">Settimanalmente</string>
<string name="update_monthly">Mensilmente</string>
<string name="amoled_theme">Tema AMOLED</string>
<string name="default_category">Categoria predefinita</string>
<string name="track">Monitoraggio</string>
<string name="pref_category_tracking">Monitoraggio</string>
<string name="default_category_summary">Chiedi sempre</string>
<string name="pref_crop_borders">Ritaglia i bordi</string>
<string name="pref_read_with_volume_keys_inverted">Inverti i tasti del volume</string>
<string name="pref_download_new_categories">Categorie da includere nel download</string>
<string name="pref_create_backup">Crea backup</string>
<string name="pref_create_backup_summ">Può essere usato per ripristinare la libreria attuale</string>
<string name="pref_restore_backup">Ripristina backup</string>
<string name="pref_restore_backup_summ">Ripristina la libreria da un file di backup</string>
<string name="pref_backup_directory">Cartella di backup</string>
<string name="pref_backup_interval">Frequenza di backup</string>
<string name="pref_backup_slots">Backup automatici massimi</string>
<string name="backup_created">Backup creato</string>
<string name="restore_completed">Ripristino completato</string>
<string name="error_opening_log">Impossibile aprire log</string>
<string name="pref_backup_service_category">Servizio</string>
<string name="dialog_restoring_backup">Ripristino backup
%1$s aggiunto alla libreria</string>
<string name="source_not_found">Sorgente non trovata</string>
<string name="dialog_restoring_source_not_found">Ripristino backup
%1$s sorgente non trovata</string>
<string name="restore_completed_content">Il ripristino ha impiegato %1$s.
%2$s errori.</string>
<string name="backup_restore_content">Il ripristino usa la sorgente per recuperare i dati, potrebbero essere applicati costi dell\'operatore.
Prima del ripristino assicurati anche di avere effettuato l\'accesso per le sorgenti che lo richiedono.</string>
<string name="file_saved">File salvato in %1$s</string>
<string name="backup_choice">Di cosa vuoi effettuare il backup?</string>
<string name="restoring_backup">Ripristino backup</string>
<string name="creating_backup">Creazione backup</string>
<string name="pref_refresh_library_tracking">Ricarica metadati di monitoraggio</string>
<string name="pref_refresh_library_tracking_summary">Aggiorna stato, punteggio e ultimo capitolo letto a partire dai servizi di monotoraggio</string>
<string name="also_delete_chapters">Elimina anche i capitoli scaricati</string>
<string name="no_more_results">Non ci sono altri risultati</string>
<string name="local_source">Manga locale</string>
<string name="added_to_library">Il manga è stato aggiunto alla tua libreria</string>
<string name="manga_info_last_chapter_label">Ultimo capitolo</string>
<string name="delete_downloads_for_manga">Eliminare i capitoli scaricati?</string>
<string name="chapter_paused">In pausa</string>
<string name="manga_tracking_tab">Monitoraggio</string>
<string name="snack_add_to_library">Aggiungi manga alla libreria?</string>
<string name="download_notifier_download_paused">Download in pausa</string>
</resources>