diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
index ef9b8517c..86e86ad44 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt
@@ -133,7 +133,7 @@ fun BrowseSourceEHentaiListItem(
         value = withIOContext {
             when (metadata.genre) {
                 "doujinshi" -> GenreColor.DOUJINSHI_COLOR to R.string.doujinshi
-                "manga" -> GenreColor.MANGA_COLOR to R.string.manga_type
+                "manga" -> GenreColor.MANGA_COLOR to R.string.entry_type_manga
                 "artistcg" -> GenreColor.ARTIST_CG_COLOR to R.string.artist_cg
                 "gamecg" -> GenreColor.GAME_CG_COLOR to R.string.game_cg
                 "western" -> GenreColor.WESTERN_COLOR to R.string.western
diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
index 91987a825..4012aa787 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationActionIcon.kt
@@ -60,7 +60,7 @@ fun MigrationActionIcon(
                     },
                 )
                 androidx.compose.material3.DropdownMenuItem(
-                    text = { Text(stringResource(R.string.action_skip_manga)) },
+                    text = { Text(stringResource(R.string.action_skip_entry)) },
                     onClick = {
                         skipManga()
                         closeMenu()
diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt
index db1f4ca0d..de6836e96 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt
@@ -40,7 +40,7 @@ fun MigrationMangaDialog(
         text = {
             Text(
                 text = pluralStringResource(
-                    if (copy) R.plurals.copy_manga else R.plurals.migrate_manga,
+                    if (copy) R.plurals.copy_entry else R.plurals.migrate_entry,
                     count = mangaSet,
                     mangaSet,
                     (if (mangaSkipped > 0) " " + stringResource(R.string.skipping_, mangaSkipped) else ""),
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
index 8080b00c5..347479676 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt
@@ -143,8 +143,8 @@ object SettingsBackupScreen : SearchableSettings {
                 BackupConst.BACKUP_TRACK to R.string.track,
                 BackupConst.BACKUP_HISTORY to R.string.history,
                 // SY -->
-                BackupConst.BACKUP_CUSTOM_INFO to R.string.custom_manga_info,
-                BackupConst.BACKUP_READ_MANGA to R.string.all_read_manga,
+                BackupConst.BACKUP_CUSTOM_INFO to R.string.custom_entry_info,
+                BackupConst.BACKUP_READ_MANGA to R.string.all_read_entries,
                 // SY <--
             )
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt
index 0ed4c8c1d..6b40d4488 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt
@@ -46,7 +46,7 @@ class MigrationListScreen(private val config: MigrationProcedureConfig) : Screen
                 val manualMigrations = screenModel.manualMigrations.value
                 context.toast(
                     context.resources.getQuantityString(
-                        R.plurals.manga_migrated,
+                        R.plurals.entry_migrated,
                         manualMigrations,
                         manualMigrations,
                     ),
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreen.kt
index 7df73842d..c90ab24b8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreen.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreen.kt
@@ -164,7 +164,7 @@ object LibraryScreen : Screen {
                                 selectedMangaIds,
                             )
                         } else {
-                            context.toast(R.string.no_valid_manga)
+                            context.toast(R.string.no_valid_entry)
                         }
                     },
                     onClickAddToMangaDex = screenModel::syncMangaToDex.takeIf { state.showAddToMangadex },
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
index 2f8fe3839..6f1c235e3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
@@ -530,7 +530,7 @@ class MangaScreen(
                         true,
                     ).withFadeTransaction(),
                 )
-                context.toast(R.string.manga_merged)
+                context.toast(R.string.entry_merged)
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
index 6235f98b0..6b233cb51 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
@@ -520,7 +520,7 @@ class MangaInfoScreenModel(
 
     suspend fun smartSearchMerge(manga: Manga, originalMangaId: Long): Manga {
         val originalManga = getManga.await(originalMangaId)
-            ?: throw IllegalArgumentException(context.getString(R.string.merge_unknown_manga, originalMangaId))
+            ?: throw IllegalArgumentException(context.getString(R.string.merge_unknown_entry, originalMangaId))
         if (originalManga.source == MERGED_SOURCE_ID) {
             val children = getMergedReferencesById.await(originalMangaId)
             if (children.any { it.mangaSourceId == manga.source && it.mangaUrl == manga.url }) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
index 75ccb0d2a..5a8c0361d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
@@ -83,8 +83,8 @@ class EditMergedSettingsState(
         val mergeMangaReference = mergedMangaAdapter.currentItems.getOrNull(position)?.mergedMangaReference ?: return
 
         MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.delete_merged_manga)
-            .setMessage(R.string.delete_merged_manga_desc)
+            .setTitle(R.string.delete_merged_entry)
+            .setMessage(R.string.delete_merged_entry_desc)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 onDeleteClick(mergeMangaReference)
                 onDismissRequest()
@@ -95,8 +95,8 @@ class EditMergedSettingsState(
 
     override fun onToggleChapterUpdatesClicked(position: Int) {
         MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.chapter_updates_merged_manga)
-            .setMessage(R.string.chapter_updates_merged_manga_desc)
+            .setTitle(R.string.chapter_updates_merged_entry)
+            .setMessage(R.string.chapter_updates_merged_entry_desc)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 toggleChapterUpdates(position)
             }
@@ -119,8 +119,8 @@ class EditMergedSettingsState(
 
     override fun onToggleChapterDownloadsClicked(position: Int) {
         MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.download_merged_manga)
-            .setMessage(R.string.download_merged_manga_desc)
+            .setTitle(R.string.download_merged_entry)
+            .setMessage(R.string.download_merged_entry_desc)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 toggleChapterDownloads(position)
             }
diff --git a/app/src/main/java/exh/GalleryAdder.kt b/app/src/main/java/exh/GalleryAdder.kt
index 47c354d86..11182cc7b 100755
--- a/app/src/main/java/exh/GalleryAdder.kt
+++ b/app/src/main/java/exh/GalleryAdder.kt
@@ -59,7 +59,7 @@ class GalleryAdder(
         forceSource: UrlImportableSource? = null,
         throttleFunc: suspend () -> Unit = {},
     ): GalleryAddEvent {
-        logger.d(context.getString(R.string.gallery_adder_importing_manga, url, fav.toString(), forceSource))
+        logger.d(context.getString(R.string.gallery_adder_importing_gallery, url, fav.toString(), forceSource))
         try {
             val uri = url.toUri()
 
@@ -115,7 +115,7 @@ class GalleryAdder(
             val realMangaUrl = try {
                 chapterMangaUrl ?: source.mapUrlToMangaUrl(uri)
             } catch (e: Exception) {
-                logger.e(context.getString(R.string.gallery_adder_uri_map_to_manga_error), e)
+                logger.e(context.getString(R.string.gallery_adder_uri_map_to_gallery_error), e)
                 null
             } ?: return GalleryAddEvent.Fail.UnknownType(url, context)
 
@@ -173,7 +173,7 @@ class GalleryAdder(
                 GalleryAddEvent.Success(url, manga, context)
             }
         } catch (e: Exception) {
-            logger.w(context.getString(R.string.gallery_adder_could_not_add_manga, url), e)
+            logger.w(context.getString(R.string.gallery_adder_could_not_add_gallery, url), e)
 
             if (e is EHentai.GalleryNotFoundException) {
                 return GalleryAddEvent.Fail.NotFound(url, context)
diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
index e0e830fb8..b3afc3f7e 100644
--- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
+++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt
@@ -104,7 +104,7 @@ class FavoritesSyncHelper(val context: Context) {
                 val inCategories = getCategories.await(manga.id)
                 status.value = FavoritesSyncStatus.BadLibraryState.MangaInMultipleCategories(manga, inCategories, context)
 
-                logger.w(context.getString(R.string.favorites_sync_manga_multiple_categories_error, manga.id))
+                logger.w(context.getString(R.string.favorites_sync_gallery_multiple_categories_error, manga.id))
                 return
             } else {
                 seenManga += manga.id
@@ -418,7 +418,7 @@ sealed class FavoritesSyncStatus(val message: String) {
             val categories: List<Category>,
             context: Context,
         ) :
-            BadLibraryState(context.getString(R.string.favorites_sync_manga_in_multiple_categories, manga.title, categories.joinToString { it.name }))
+            BadLibraryState(context.getString(R.string.favorites_sync_gallery_in_multiple_categories, manga.title, categories.joinToString { it.name }))
     }
     class Initializing(context: Context) : FavoritesSyncStatus(context.getString(R.string.favorites_sync_initializing))
     class Processing(message: String, isThrottle: Boolean = false, context: Context, val title: String? = null) : FavoritesSyncStatus(
diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt
index 2e70a99da..1222f1c1d 100755
--- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt
+++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt
@@ -74,7 +74,7 @@ class InterceptActivity : BaseActivity() {
                 when (status) {
                     InterceptResult.Idle, InterceptResult.Loading -> {
                         Text(
-                            text = stringResource(R.string.loading_manga),
+                            text = stringResource(R.string.loading_entry),
                             style = MaterialTheme.typography.titleLarge,
                         )
                         CircularProgressIndicator(modifier = Modifier.size(56.dp))
@@ -120,7 +120,7 @@ class InterceptActivity : BaseActivity() {
                     is InterceptResult.Failure -> {
                         MaterialAlertDialogBuilder(this)
                             .setTitle(R.string.chapter_error)
-                            .setMessage(getString(R.string.could_not_open_manga, it.reason))
+                            .setMessage(getString(R.string.could_not_open_entry, it.reason))
                             .setPositiveButton(android.R.string.ok, null)
                             .setOnCancelListener { onBackPressed() }
                             .setOnDismissListener { onBackPressed() }
diff --git a/app/src/main/java/exh/ui/metadata/adapters/MetadataUIUtil.kt b/app/src/main/java/exh/ui/metadata/adapters/MetadataUIUtil.kt
index 1c8398cf3..8fe69bf78 100644
--- a/app/src/main/java/exh/ui/metadata/adapters/MetadataUIUtil.kt
+++ b/app/src/main/java/exh/ui/metadata/adapters/MetadataUIUtil.kt
@@ -29,7 +29,7 @@ object MetadataUIUtil {
 
     fun getGenreAndColour(context: Context, genre: String) = when (genre) {
         "doujinshi", "Doujinshi" -> SourceTagsUtil.GenreColor.DOUJINSHI_COLOR to R.string.doujinshi
-        "manga", "Japanese Manga", "Manga" -> SourceTagsUtil.GenreColor.MANGA_COLOR to R.string.manga_type
+        "manga", "Japanese Manga", "Manga" -> SourceTagsUtil.GenreColor.MANGA_COLOR to R.string.entry_type_manga
         "artistcg", "artist CG", "artist-cg", "Artist CG" -> SourceTagsUtil.GenreColor.ARTIST_CG_COLOR to R.string.artist_cg
         "gamecg", "game CG", "game-cg", "Game CG" -> SourceTagsUtil.GenreColor.GAME_CG_COLOR to R.string.game_cg
         "western" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.western
@@ -38,11 +38,11 @@ object MetadataUIUtil {
         "cosplay" -> SourceTagsUtil.GenreColor.COSPLAY_COLOR to R.string.cosplay
         "asianporn", "asian Porn" -> SourceTagsUtil.GenreColor.ASIAN_PORN_COLOR to R.string.asian_porn
         "misc" -> SourceTagsUtil.GenreColor.MISC_COLOR to R.string.misc
-        "Korean Manhwa" -> SourceTagsUtil.GenreColor.ARTIST_CG_COLOR to R.string.manhwa
-        "Chinese Manhua" -> SourceTagsUtil.GenreColor.GAME_CG_COLOR to R.string.manhua
-        "Comic" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.comic
+        "Korean Manhwa" -> SourceTagsUtil.GenreColor.ARTIST_CG_COLOR to R.string.entry_type_manhwa
+        "Chinese Manhua" -> SourceTagsUtil.GenreColor.GAME_CG_COLOR to R.string.entry_type_manhua
+        "Comic" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.entry_type_comic
         "artbook" -> SourceTagsUtil.GenreColor.IMAGE_SET_COLOR to R.string.artbook
-        "webtoon" -> SourceTagsUtil.GenreColor.NON_H_COLOR to R.string.webtoon
+        "webtoon" -> SourceTagsUtil.GenreColor.NON_H_COLOR to R.string.entry_type_webtoon
         "Video" -> SourceTagsUtil.GenreColor.WESTERN_COLOR to R.string.video
         else -> null
     }?.let { (genreColor, stringId) ->
diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchScreen.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchScreen.kt
index 58ac44abe..da17bc82e 100644
--- a/app/src/main/java/exh/ui/smartsearch/SmartSearchScreen.kt
+++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchScreen.kt
@@ -47,7 +47,7 @@ class SmartSearchScreen(private val sourceId: Long, private val smartSearchConfi
                     router.replaceTopController(transaction)
                 } else {
                     if (results is SmartSearchScreenModel.SearchResults.NotFound) {
-                        context.toast(R.string.could_not_find_manga)
+                        context.toast(R.string.could_not_find_entry)
                     } else {
                         context.toast(R.string.automatic_search_error)
                     }
diff --git a/app/src/main/java/exh/util/MangaType.kt b/app/src/main/java/exh/util/MangaType.kt
index f2c601bfa..4cc4923b0 100644
--- a/app/src/main/java/exh/util/MangaType.kt
+++ b/app/src/main/java/exh/util/MangaType.kt
@@ -13,11 +13,11 @@ import eu.kanade.domain.manga.model.Manga as DomainManga
 fun Manga.mangaType(context: Context): String {
     return context.getString(
         when (mangaType()) {
-            MangaType.TYPE_WEBTOON -> R.string.webtoon
-            MangaType.TYPE_MANHWA -> R.string.manhwa
-            MangaType.TYPE_MANHUA -> R.string.manhua
-            MangaType.TYPE_COMIC -> R.string.comic
-            else -> R.string.manga_type
+            MangaType.TYPE_WEBTOON -> R.string.entry_type_webtoon
+            MangaType.TYPE_MANHWA -> R.string.entry_type_manhwa
+            MangaType.TYPE_MANHUA -> R.string.entry_type_manhua
+            MangaType.TYPE_COMIC -> R.string.entry_type_comic
+            else -> R.string.entry_type_manga
         },
     ).lowercase(Locale.getDefault())
 }
diff --git a/app/src/main/res/layout/edit_merged_settings_header.xml b/app/src/main/res/layout/edit_merged_settings_header.xml
index d56adb660..e069364b0 100644
--- a/app/src/main/res/layout/edit_merged_settings_header.xml
+++ b/app/src/main/res/layout/edit_merged_settings_header.xml
@@ -50,7 +50,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="@string/manga_info_manga"
+            android:text="@string/deduplication_entry_info"
             android:padding="8dp"
             android:gravity="center"
             android:layout_gravity="center_horizontal"/>
diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml
index 29137d372..76d657339 100644
--- a/app/src/main/res/layout/migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/migration_bottom_sheet.xml
@@ -203,7 +203,7 @@
                 android:layout_marginBottom="82dp"
                 android:paddingHorizontal="16.dp"
                 android:paddingVertical="16dp"
-                android:text="@string/hide_not_found_manga" />
+                android:text="@string/hide_not_found_entries" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/values/arrays_sy.xml b/app/src/main/res/values/arrays_sy.xml
index 794dad4bc..cb1bec02c 100644
--- a/app/src/main/res/values/arrays_sy.xml
+++ b/app/src/main/res/values/arrays_sy.xml
@@ -3,7 +3,7 @@
     <string-array name="clean_up_downloads">
         <item>@string/clean_orphaned_downloads</item>
         <item>@string/clean_read_downloads</item>
-        <item>@string/clean_read_manga_not_in_library</item>
+        <item>@string/clean_read_entries_not_in_library</item>
     </string-array>
 
     <string-array name="md_follows_options">
@@ -28,4 +28,4 @@
         <item>@string/center_margin_wide_page</item>
         <item>@string/center_margin_double_and_wide_page</item>
     </string-array>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/i18n/src/main/res/values-fr/strings_sy.xml b/i18n/src/main/res/values-fr/strings_sy.xml
index 2ce40a5b1..4ab156061 100644
--- a/i18n/src/main/res/values-fr/strings_sy.xml
+++ b/i18n/src/main/res/values-fr/strings_sy.xml
@@ -3,7 +3,7 @@
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">Glisser-déposer</string>
     <string name="action_sort_enabled">Activé</string>
-    <string name="action_skip_manga">Ne migrez pas</string>
+    <string name="action_skip_entry">Ne migrez pas</string>
     <string name="action_search_manually">Rechercher manuellement</string>
     <string name="action_migrate_now">Migrez maintenant</string>
     <string name="action_copy_now">Copiez maintenant</string>
@@ -17,10 +17,10 @@
     <string name="buttons_header">Boutons</string>
 
     <!-- Manga Type -->
-    <string name="manhwa">Manhwa</string>
-    <string name="manhua">Manhua</string>
-    <string name="comic">Comic</string>
-    <string name="webtoon">Webtoon</string>
+    <string name="entry_type_manhwa">Manhwa</string>
+    <string name="entry_type_manhua">Manhua</string>
+    <string name="entry_type_comic">Comic</string>
+    <string name="entry_type_webtoon">Webtoon</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">Échec de la résolution dû Captcha</string>
@@ -135,7 +135,7 @@
 <!--    <string name="clean_orphaned_downloads">Clean orphaned</string>-->
 
     <string name="clean_read_downloads">Lecture propre</string>
-    <string name="clean_read_manga_not_in_library">Nettoyer les mangas pas dans la bibliothèque</string>
+    <string name="clean_read_entries_not_in_library">Nettoyer les mangas pas dans la bibliothèque</string>
     <plurals name="cleanup_done">
         <item quantity="one">Nettoyage terminé. Dossier %d supprimé</item>
         <item quantity="other">Nettoyage terminé. Dossiers %d supprimé</item>
@@ -305,16 +305,16 @@
     <string name="no_chapters_found_for_migration">Aucun chapitre trouvé, ce manga ne peut pas être utilisé pour la migration</string>
     <string name="no_alternatives_found">Aucune alternative trouvée</string>
     <string name="stop_migrating">Arrêter la migration?</string>
-    <plurals name="migrate_manga">
+    <plurals name="migrate_entry">
         <item quantity="one">Migrer %1$d%2$s manga?</item>
         <item quantity="other">Migrer %1$d%2$s manga?</item>
     </plurals>
-    <plurals name="copy_manga">
+    <plurals name="copy_entry">
         <item quantity="one">Copie %1$d%2$s manga?</item>
         <item quantity="other">Copie %1$d%2$s mangas?</item>
     </plurals>
     <string name="skipping_">(sauter %1$d)</string>
-    <plurals name="manga_migrated">
+    <plurals name="entry_migrated">
         <item quantity="one">%d manga migré</item>
         <item quantity="other">%d mangas migrés</item>
     </plurals>
@@ -339,7 +339,7 @@
     <string name="favorites_sync_done_errors">Synchronisation des favoris terminée avec des erreurs</string>
     <string name="favorites_sync_done_errors_message">Des erreurs se sont produites pendant le processus de synchronisation qui ont été ignorées:\n%1$s</string>
     <string name="favorites_sync_verifying_library">Vérification de la bibliothèque locale</string>
-    <string name="favorites_sync_manga_multiple_categories_error">Manga %1$d est dans plusieurs catégories!</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">Manga %1$d est dans plusieurs catégories!</string>
     <string name="favorites_sync_downloading">Téléchargement des favoris depuis un serveur</string>
     <string name="favorites_sync_failed_to_featch">Échec de la récupération des favoris du serveur!</string>
     <string name="favorites_sync_could_not_fetch">Impossible de récupérer les favoris!</string>
@@ -362,7 +362,7 @@
     <string name="favorites_sync_failed_to_add_to_local_error">\'%1$s\' %2$s</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">\'%1$s\' (%2$s) n\'est pas une galerie valide!</string>
     <string name="favorites_sync_waiting_for_start">En attente du démarrage de la synchronisation</string>
-    <string name="favorites_sync_manga_in_multiple_categories">La galerie: %1$s appartient à plus d\'une catégorie (%2$s)!</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">La galerie: %1$s appartient à plus d\'une catégorie (%2$s)!</string>
     <string name="favorites_sync_initializing">Initialisation de la synchronisation</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\nLa synchronisation est actuellement en train de ralentir (pour éviter d\'être bannie d\'ExHentai) et peut prendre du temps à se terminer.</string>
     <string name="favorites_sync_notes">REMARQUES IMPORTANTES SUR LA SYNCHRONISATION FAVORIS</string>
@@ -387,19 +387,19 @@
     <string name="batch_add_success_log_message">Ajout du manga: %1$s</string>
     <string name="batch_add_unknown_type_log_message">Type de manga inconnu pour le manga: %1$s</string>
     <string name="batch_add_not_exist_log_message">Le manga n\'existe pas: %1$s</string>
-    <string name="gallery_adder_importing_manga">Importer des mangas (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
+    <string name="gallery_adder_importing_gallery">Importer des mangas (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
     <string name="gallery_adder_source_uri_must_match">Erreur de vérification de correspondance d\'URI source!</string>
-    <string name="gallery_adder_uri_map_to_manga_error">Erreur de mappage d\'URI source vers le manga!</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">Erreur de mappage d\'URI source vers le manga!</string>
     <string name="gallery_adder_uri_clean_error">Erreur de nettoyage de l\'URI source!</string>
     <string name="gallery_adder_chapter_fetch_error">Échec de la mise à jour des chapitres du manga: %1$s!</string>
-    <string name="gallery_adder_could_not_add_manga">Impossible d\'ajouter le manga (url: %1$s)!</string>
+    <string name="gallery_adder_could_not_add_gallery">Impossible d\'ajouter le manga (url: %1$s)!</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">Lancement de l\'application…</string>
     <string name="error_with_reason">Erreur: %1$s</string>
-    <string name="could_not_open_manga">Impossible d\'ouvrir ce manga:\n\n%1$s</string>
-    <string name="manga_id_is_null">L\'ID du manga est non connue!</string>
-    <string name="loading_manga">Chargement du manga…</string>
+    <string name="could_not_open_entry">Impossible d\'ouvrir ce manga:\n\n%1$s</string>
+    <string name="entry_id_is_null">L\'ID du manga est non connue!</string>
+    <string name="loading_entry">Chargement du manga…</string>
 
     <!-- Rating 0-10 (0, 0.5, 1, 1.5 and so fourth) -->
     <string name="rating10">Chef-d\'oeuvre</string>
@@ -492,12 +492,12 @@
     <!-- Merged manga -->
     <string name="merge_settings">Paramètres de fusion</string>
     <string name="fetch_chapter_updates">Récupérer les mises à jour des chapitres</string>
-    <string name="delete_merged_manga">Êtes-vous sûr?</string>
-    <string name="delete_merged_manga_desc">Cela supprimera le manga de la source, son utilisation fera également perdre toutes les modifications non enregistrées appliquées au manga de la nouvelle source.</string>
-    <string name="chapter_updates_merged_manga">Basculer les mises à jour des chapitres</string>
-    <string name="chapter_updates_merged_manga_desc">Activer ou désactiver cette option désactivera ou activera les mises à jour des chapitres pour ce manga</string>
-    <string name="download_merged_manga">Basculer les téléchargements de nouveaux chapitres</string>
-    <string name="download_merged_manga_desc">Activer ou désactiver cette option désactivera ou activera les téléchargements des chapitres pour ce manga</string>
+    <string name="delete_merged_entry">Êtes-vous sûr?</string>
+    <string name="delete_merged_entry_desc">Cela supprimera le manga de la source, son utilisation fera également perdre toutes les modifications non enregistrées appliquées au manga de la nouvelle source.</string>
+    <string name="chapter_updates_merged_entry">Basculer les mises à jour des chapitres</string>
+    <string name="chapter_updates_merged_entry_desc">Activer ou désactiver cette option désactivera ou activera les mises à jour des chapitres pour ce manga</string>
+    <string name="download_merged_entry">Basculer les téléchargements de nouveaux chapitres</string>
+    <string name="download_merged_entry_desc">Activer ou désactiver cette option désactivera ou activera les téléchargements des chapitres pour ce manga</string>
     <string name="merged_references_invalid">Références de fusion non valides</string>
     <string name="merged_chapter_updates_error">Erreur de basculement des mises à jour de chapitre</string>
     <string name="merged_references">Références fusionné</string>
@@ -506,7 +506,7 @@
     <string name="merged_toggle_download_chapters_find_error">Impossible de trouver le manga pour basculer le téléchargements des chapitres</string>
     <string name="allow_deduplication">Autoriser la déduplication:</string>
     <string name="deduplication_mode">Mode de déduplication:</string>
-    <string name="manga_info_manga">Info manga:</string>
+    <string name="deduplication_entry_info">Info manga:</string>
     <string name="toggle_dedupe">Basculer la déduplication</string>
     <string name="refresh_merge">Actualiser pour obtenir les informations appropriées</string>
 
@@ -563,4 +563,4 @@
     <string name="humanize_fallback">un moment auparavant</string>
 
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/i18n/src/main/res/values-in/strings_sy.xml b/i18n/src/main/res/values-in/strings_sy.xml
index 286d350b8..eebb29534 100644
--- a/i18n/src/main/res/values-in/strings_sy.xml
+++ b/i18n/src/main/res/values-in/strings_sy.xml
@@ -3,7 +3,7 @@
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">Seret &amp; Lepas</string>
     <string name="action_sort_enabled">Diaktifkan</string>
-    <string name="action_skip_manga">Jangan pindahkan</string>
+    <string name="action_skip_entry">Jangan pindahkan</string>
     <string name="action_search_manually">Cari manual</string>
     <string name="action_migrate_now">Pindahkan</string>
     <string name="action_copy_now">Salin</string>
@@ -17,10 +17,10 @@
     <string name="buttons_header">Tombol</string>
 
     <!-- Manga Type -->
-    <string name="manhwa">Manhwa</string>
-    <string name="manhua">Manhua</string>
-    <string name="comic">Komik</string>
-    <string name="webtoon">Webtoon</string>
+    <string name="entry_type_manhwa">Manhwa</string>
+    <string name="entry_type_manhua">Manhua</string>
+    <string name="entry_type_comic">Komik</string>
+    <string name="entry_type_webtoon">Webtoon</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">Gagal selesaikan captcha</string>
@@ -140,7 +140,7 @@
     <string name="no_folders_to_cleanup">Tak ada folder yang dihapus</string>
     <string name="clean_orphaned_downloads">Hapus folder kosong</string>
     <string name="clean_read_downloads">Hapus yang sudah dibaca</string>
-    <string name="clean_read_manga_not_in_library">Hapus manga yang tak ada di pustaka</string>
+    <string name="clean_read_entries_not_in_library">Hapus manga yang tak ada di pustaka</string>
     <plurals name="cleanup_done">
         <item quantity="one">Berhasil membersihkan. Menghapus %d folder</item>
         <item quantity="other">Berhasil membersihkan. Menghapus %d folder</item>
@@ -200,8 +200,8 @@
     <string name="pref_local_source_hidden_folders_summery">Izinkan sumber lokal untuk melihat folder tersembunyi</string>
 
     <!-- Backup settings -->
-    <string name="custom_manga_info">Info manga yang diedit</string>
-    <string name="all_read_manga">Semua manga yang dibaca</string>
+    <string name="custom_entry_info">Info manga yang diedit</string>
+    <string name="all_read_entries">Semua manga yang dibaca</string>
 
     <!-- Security settings -->
     <string name="biometric_lock_times">Waktu kunci biometrik</string>
@@ -316,9 +316,9 @@
     <string name="az_recommends">Lihat Rekomendasi</string>
     <string name="merge">Gabungkan</string>
     <string name="merge_with_another_source">Gabungkan Dengan Yang Lain</string>
-    <string name="manga_merged">Manga digabungkan!</string>
+    <string name="entry_merged">Manga digabungkan!</string>
     <string name="failed_merge">Gagal menggabungkan manga: %1$s</string>
-    <string name="merge_unknown_manga">ID manga tak diketahui: %1$d</string>
+    <string name="merge_unknown_entry">ID manga tak diketahui: %1$d</string>
     <string name="merged_already">Manga ini sudah tergabung dengan manga saat ini!</string>
     <string name="merge_duplicate">Manga gabungan ini adalah duplikat!</string>
 
@@ -338,7 +338,7 @@
 
     <!-- Smart Search -->
     <string name="searching_source">Menelusuri…</string>
-    <string name="could_not_find_manga">Tak dapat menemukan manga di sumber ini!</string>
+    <string name="could_not_find_entry">Tak dapat menemukan manga di sumber ini!</string>
     <string name="automatic_search_error">Terjadi kesalahan saat melakukan pencarian!</string>
 
     <!-- Saved Searches -->
@@ -403,7 +403,7 @@
     <string name="use_most_chapters">Pilih sumber dengan bab terbanyak (lambat)</string>
     <string name="use_first_source">Pilih sumber yang pertama terdeteksi</string>
     <string name="skip_this_step_next_time">Lewati langkah ini di lain waktu</string>
-    <string name="hide_not_found_manga">Sembunyikan manga yang tak ditemukan</string>
+    <string name="hide_not_found_entries">Sembunyikan manga yang tak ditemukan</string>
     <string name="search_parameter">Parameter penelusuran (cth. language:english)</string>
     <string name="latest_">Terbaru: %1$s</string>
     <string name="migrating_to">Pindahkan ke</string>
@@ -412,23 +412,23 @@
     <string name="no_chapters_found_for_migration">Bab tak ditemukan, manga ini tak bisa dipindahkan ke sini</string>
     <string name="no_alternatives_found">Tidak Ditemukan</string>
     <string name="stop_migrating">Hentikan migrasi?</string>
-    <plurals name="migrate_manga">
+    <plurals name="migrate_entry">
         <item quantity="one">Pindahkan %1$d%2$s manga?</item>
         <item quantity="other">Pindahkan %1$d%2$s manga?</item>
     </plurals>
-    <plurals name="copy_manga">
+    <plurals name="copy_entry">
         <item quantity="one">Salin %1$d%2$s manga?</item>
         <item quantity="other">Salin %1$d%2$s manga?</item>
     </plurals>
     <string name="skipping_">(melewati %1$d)</string>
-    <plurals name="manga_migrated">
+    <plurals name="entry_migrated">
         <item quantity="one">%d manga dipindahkan</item>
         <item quantity="other">%d manga dipindahkan</item>
     </plurals>
 
     <!-- Library -->
     <!-- Library Actions -->
-    <string name="no_valid_manga">Tak ada yang dipilih</string>
+    <string name="no_valid_entry">Tak ada yang dipilih</string>
 
     <!-- Library Sheet -->
     <string name="lewd">Lewd</string>
@@ -449,7 +449,7 @@
     <string name="favorites_sync_done_errors">Favorites sync complete with errors</string>
     <string name="favorites_sync_done_errors_message">Errors occurred during the sync process that were ignored:\n%1$s</string>
     <string name="favorites_sync_verifying_library">Verifying local library</string>
-    <string name="favorites_sync_manga_multiple_categories_error">Manga %1$d is in multiple categories!</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">Manga %1$d is in multiple categories!</string>
     <string name="favorites_sync_downloading">Downloading favorites from remote server</string>
     <string name="favorites_sync_failed_to_featch">Failed to fetch favorites from remote server!</string>
     <string name="favorites_sync_could_not_fetch">Could not fetch favorites!</string>
@@ -472,7 +472,7 @@
     <string name="favorites_sync_failed_to_add_to_local_error">\'%1$s\' %2$s</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">\'%1$s\' (%2$s) is not a valid gallery!</string>
     <string name="favorites_sync_waiting_for_start">Waiting for sync to start</string>
-    <string name="favorites_sync_manga_in_multiple_categories">The gallery: %1$s is in more than one category (%2$s)!</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">The gallery: %1$s is in more than one category (%2$s)!</string>
     <string name="favorites_sync_initializing">Initializing sync</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\nSync is currently throttling (to avoid being banned from ExHentai) and may take a long time to complete.</string>
     <string name="favorites_sync_notes">IMPORTANT FAVORITES SYNC NOTES</string>
@@ -498,21 +498,21 @@
     <string name="batch_add_unknown_type_log_message">Unknown manga type for manga: %1$s</string>
     <string name="batch_add_unknown_source_log_message">Unknown source for manga: %1$s</string>
     <string name="batch_add_not_exist_log_message">Manga does not exist: %1$s</string>
-    <string name="gallery_adder_importing_manga">Importing manga (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
+    <string name="gallery_adder_importing_gallery">Importing manga (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
     <string name="gallery_adder_source_uri_must_match">Source URI match check error!</string>
-    <string name="gallery_adder_uri_map_to_manga_error">Source URI map-to-manga error!</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">Source URI map-to-manga error!</string>
     <string name="gallery_adder_uri_map_to_chapter_error">Source URI map-to-chapter error!</string>
     <string name="gallery_adder_uri_clean_error">Source URI clean error!</string>
     <string name="gallery_adder_chapter_fetch_error">Failed to update chapters for manga: %1$s!</string>
-    <string name="gallery_adder_could_not_add_manga">Could not add manga (url: %1$s)!</string>
+    <string name="gallery_adder_could_not_add_gallery">Could not add manga (url: %1$s)!</string>
     <string name="gallery_adder_could_not_identify_chapter">Could not identify chapter (url: %1$s)!</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">Launching app…</string>
     <string name="error_with_reason">Error: %1$s</string>
-    <string name="could_not_open_manga">Could not open this manga:\n\n%1$s</string>
-    <string name="manga_id_is_null">Manga ID is null!</string>
-    <string name="loading_manga">Loading manga…</string>
+    <string name="could_not_open_entry">Could not open this manga:\n\n%1$s</string>
+    <string name="entry_id_is_null">Manga ID is null!</string>
+    <string name="loading_entry">Loading manga…</string>
 
     <!-- Rating 0-10 (0, 0.5, 1, 1.5 and so fourth) -->
     <string name="rating10">Masterpiece</string>
@@ -606,12 +606,12 @@
     <!-- Merged manga -->
     <string name="merge_settings">Pengaturan gabung</string>
     <string name="fetch_chapter_updates">Perbarui bab</string>
-    <string name="delete_merged_manga">Apa Anda yakin?</string>
-    <string name="delete_merged_manga_desc">Ini akan menghapus manga dari penggabungan, menggunakan ini juga akan membuat hilangnya semua perubahan yang diterapkan pada manga yang sebelumnya digabungkan</string>
-    <string name="chapter_updates_merged_manga">Tombol pembaruan bab</string>
-    <string name="chapter_updates_merged_manga_desc">Mengalihkan ini akan menonaktifkan atau mengaktifkan pembaruan bab untuk manga gabungan ini</string>
-    <string name="download_merged_manga">Tombol unduhan bab baru</string>
-    <string name="download_merged_manga_desc">Mengalihkan ini akan menonaktifkan atau mengaktifkan unduhan bab untuk manga gabungan ini</string>
+    <string name="delete_merged_entry">Apa Anda yakin?</string>
+    <string name="delete_merged_entry_desc">Ini akan menghapus manga dari penggabungan, menggunakan ini juga akan membuat hilangnya semua perubahan yang diterapkan pada manga yang sebelumnya digabungkan</string>
+    <string name="chapter_updates_merged_entry">Tombol pembaruan bab</string>
+    <string name="chapter_updates_merged_entry_desc">Mengalihkan ini akan menonaktifkan atau mengaktifkan pembaruan bab untuk manga gabungan ini</string>
+    <string name="download_merged_entry">Tombol unduhan bab baru</string>
+    <string name="download_merged_entry_desc">Mengalihkan ini akan menonaktifkan atau mengaktifkan unduhan bab untuk manga gabungan ini</string>
     <string name="merged_references_invalid">Referensi penggabungan tidak valid</string>
     <string name="merged_chapter_updates_error">Tombol kesalahan pembaruan bab</string>
     <string name="merged_references">Referensi penggabungan</string>
@@ -620,7 +620,7 @@
     <string name="merged_toggle_download_chapters_find_error">Tidak dapat menemukan manga untuk unduhan bab</string>
     <string name="allow_deduplication">Izinkan deduplikasi:</string>
     <string name="deduplication_mode">Mode deduplikasi:</string>
-    <string name="manga_info_manga">Info manga:</string>
+    <string name="deduplication_entry_info">Info manga:</string>
     <string name="toggle_dedupe">Tombol deduplikasi</string>
     <string name="refresh_merge">Segarkan untuk mendapatkan info yang tepat</string>
     <string name="no_dedupe">Tak dideduplikasi</string>
@@ -683,4 +683,4 @@
     </plurals>
     <string name="humanize_fallback">Beberapa saat yang lalu</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/i18n/src/main/res/values-pt-rBR/strings_sy.xml b/i18n/src/main/res/values-pt-rBR/strings_sy.xml
index 5d65dc619..262f386b0 100644
--- a/i18n/src/main/res/values-pt-rBR/strings_sy.xml
+++ b/i18n/src/main/res/values-pt-rBR/strings_sy.xml
@@ -3,7 +3,7 @@
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">Arraste e solte</string>
     <string name="action_sort_enabled">Ativado</string>
-    <string name="action_skip_manga">Não migrar</string>
+    <string name="action_skip_entry">Não migrar</string>
     <string name="action_search_manually">Pesquisar manualmente</string>
     <string name="action_migrate_now">Migrar agora</string>
     <string name="action_copy_now">Copiar agora</string>
@@ -17,10 +17,10 @@
     <string name="buttons_header">Botões</string>
 
     <!-- Manga Type -->
-    <string name="manhwa">Manhwa</string>
-    <string name="manhua">Manhua</string>
-    <string name="comic">Comic</string>
-    <string name="webtoon">Webtoon</string>
+    <string name="entry_type_manhwa">Manhwa</string>
+    <string name="entry_type_manhua">Manhua</string>
+    <string name="entry_type_comic">Comic</string>
+    <string name="entry_type_webtoon">Webtoon</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">Falha ao resolver Captcha</string>
@@ -140,7 +140,7 @@
     <string name="no_folders_to_cleanup">Sem pastas para limpar</string>
     <string name="clean_orphaned_downloads">Limpar orfanados</string>
     <string name="clean_read_downloads">Limpar lidos</string>
-    <string name="clean_read_manga_not_in_library">Limpar mangás fora da biblioteca</string>
+    <string name="clean_read_entries_not_in_library">Limpar mangás fora da biblioteca</string>
     <plurals name="cleanup_done">
         <item quantity="one">Limpeza feita. %d pasta removida</item>
         <item quantity="other">Limpeza feita. %d pastas removidas</item>
@@ -196,8 +196,8 @@
     <string name="pref_local_source_hidden_folders_summery">Permitir fontes locais de ler pastas ocultas</string>
 
     <!-- Backup settings -->
-    <string name="custom_manga_info">Info. de mangá personalizada</string>
-    <string name="all_read_manga">Todos os mangás lidos</string>
+    <string name="custom_entry_info">Info. de mangá personalizada</string>
+    <string name="all_read_entries">Todos os mangás lidos</string>
 
     <!-- Security settings -->
     <string name="biometric_lock_times">Tempos de bloqueio biométrico</string>
@@ -382,23 +382,23 @@
     <string name="no_chapters_found_for_migration">Sem capítulos encontrados, este mangá não pode ser usado para migração</string>
     <string name="no_alternatives_found">Sem alternativas encontradas</string>
     <string name="stop_migrating">Parar migração?</string>
-    <plurals name="migrate_manga">
+    <plurals name="migrate_entry">
         <item quantity="one">Migrar %1$d%2$s mangá?</item>
         <item quantity="other">Migrar %1$d%2$s mangás?</item>
     </plurals>
-    <plurals name="copy_manga">
+    <plurals name="copy_entry">
         <item quantity="one">Copiar %1$d%2$s mangá?</item>
         <item quantity="other">Copiar %1$d%2$s mangás?</item>
     </plurals>
     <string name="skipping_">(pulando %1$d)</string>
-    <plurals name="manga_migrated">
+    <plurals name="entry_migrated">
         <item quantity="one">%d mangá migrado</item>
         <item quantity="other">%d mangás migrados</item>
     </plurals>
 
     <!-- Library -->
     <!-- Library Actions -->
-    <string name="no_valid_manga">Sem mangás válidos selecionados</string>
+    <string name="no_valid_entry">Sem mangás válidos selecionados</string>
 
     <!-- Library Sheet -->
     <string name="lewd">Lascivo</string>
@@ -419,7 +419,7 @@
     <string name="favorites_sync_done_errors">Sincronização de favoritos concluída com erros</string>
     <string name="favorites_sync_done_errors_message">Ocorreram erros durante o processo de sincronização que foram ignorados:\n%1$s</string>
     <string name="favorites_sync_verifying_library">Verificando biblioteca local</string>
-    <string name="favorites_sync_manga_multiple_categories_error">Mangá %1$d está em várias categorias!</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">Mangá %1$d está em várias categorias!</string>
     <string name="favorites_sync_downloading">Baixando favoritos do servidor remoto</string>
     <string name="favorites_sync_failed_to_featch">Falha ao buscar favoritos do servidor remoto</string>
     <string name="favorites_sync_could_not_fetch">Não foi possível buscar favoritos</string>
@@ -442,7 +442,7 @@
     <string name="favorites_sync_failed_to_add_to_local_error">\'%1$s\' %2$s</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">\'%1$s\' (%2$s) não é uma galeria válida!</string>
     <string name="favorites_sync_waiting_for_start">Aguardando o início da sincronização</string>
-    <string name="favorites_sync_manga_in_multiple_categories">A galeria: %1$s está em várias categorias (%2$s)!</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">A galeria: %1$s está em várias categorias (%2$s)!</string>
     <string name="favorites_sync_initializing">Iniciando sincronização</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\nSincronização está sendo limitada (para evitar ser banido do ExHentai) e pode levar muito tempo para ser concluída.</string>
     <string name="favorites_sync_notes">NOTAS DE SINCRONIZAÇÃO DE FAVORITOS IMPORTANTES</string>
@@ -468,21 +468,21 @@
     <string name="batch_add_unknown_type_log_message">Tipo de mangá desconhecido do mangá: %1$s</string>
     <string name="batch_add_unknown_source_log_message">Tipo de fonte desconhecida do mangá: %1$s</string>
     <string name="batch_add_not_exist_log_message">Mangá não existe: %1$s</string>
-    <string name="gallery_adder_importing_manga">Importando mangá (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
+    <string name="gallery_adder_importing_gallery">Importando mangá (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
     <string name="gallery_adder_source_uri_must_match">Erro ao verificar relação do URI da fonte!</string>
-    <string name="gallery_adder_uri_map_to_manga_error">Erro map-to-manga do URI da fonte!</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">Erro map-to-manga do URI da fonte!</string>
     <string name="gallery_adder_uri_map_to_chapter_error">Erro map-to-chapter do URI da fonte!</string>
     <string name="gallery_adder_uri_clean_error">Erro so limpar URI da fonte!</string>
     <string name="gallery_adder_chapter_fetch_error">Falha ao atualizar capítulos da galeria: %1$s!</string>
-    <string name="gallery_adder_could_not_add_manga">Mangá não pôde ser adicionado (url: %1$s)!</string>
+    <string name="gallery_adder_could_not_add_gallery">Mangá não pôde ser adicionado (url: %1$s)!</string>
     <string name="gallery_adder_could_not_identify_chapter">Capítulo não pôde ser identificado (url: %1$s)!</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">Iniciando app…</string>
     <string name="error_with_reason">Erro: %1$s</string>
-    <string name="could_not_open_manga">Este mangá não pôde ser aberto:\n\n%1$s</string>
-    <string name="manga_id_is_null">ID do mangá é nulo!</string>
-    <string name="loading_manga">Carregando mangá…</string>
+    <string name="could_not_open_entry">Este mangá não pôde ser aberto:\n\n%1$s</string>
+    <string name="entry_id_is_null">ID do mangá é nulo!</string>
+    <string name="loading_entry">Carregando mangá…</string>
 
     <!-- Rating 0-10 (0, 0.5, 1, 1.5 and so fourth) -->
     <string name="rating10">Obra-prima</string>
@@ -576,12 +576,12 @@
     <!-- Merged manga -->
     <string name="merge_settings">Configurações da junção</string>
     <string name="fetch_chapter_updates">Buscar atualizações de capítulo</string>
-    <string name="delete_merged_manga">Tem certeza?</string>
-    <string name="delete_merged_manga_desc">Isto removerá o mangá da junção e também perderá mudanças não salvas aplicadas ao mangá juntado.</string>
-    <string name="chapter_updates_merged_manga">Alternar atualizações de capítulo</string>
-    <string name="chapter_updates_merged_manga_desc">Mudar isto (des)ativará atualizações de capítulo a este mangá juntado</string>
-    <string name="download_merged_manga">Alternar downloads de capítulo novos</string>
-    <string name="download_merged_manga_desc">Mudar isto (des)ativará downloads de capítulo a este mangá juntado</string>
+    <string name="delete_merged_entry">Tem certeza?</string>
+    <string name="delete_merged_entry_desc">Isto removerá o mangá da junção e também perderá mudanças não salvas aplicadas ao mangá juntado.</string>
+    <string name="chapter_updates_merged_entry">Alternar atualizações de capítulo</string>
+    <string name="chapter_updates_merged_entry_desc">Mudar isto (des)ativará atualizações de capítulo a este mangá juntado</string>
+    <string name="download_merged_entry">Alternar downloads de capítulo novos</string>
+    <string name="download_merged_entry_desc">Mudar isto (des)ativará downloads de capítulo a este mangá juntado</string>
     <string name="merged_references_invalid">Referências juntadas inválidas</string>
     <string name="merged_chapter_updates_error">Alternar erro de atualizações de capítulo</string>
     <string name="merged_references">Referências juntadas</string>
@@ -590,7 +590,7 @@
     <string name="merged_toggle_download_chapters_find_error">Mangá não pôde ser encontrado para alternar downloads de capítulo</string>
     <string name="allow_deduplication">Permitir desduplicação:</string>
     <string name="deduplication_mode">Modo da desduplicação:</string>
-    <string name="manga_info_manga">Informações do mangá:</string>
+    <string name="deduplication_entry_info">Informações do mangá:</string>
     <string name="toggle_dedupe">Alternar desduplicação</string>
     <string name="refresh_merge">Atualize para info. adequada</string>
 
diff --git a/i18n/src/main/res/values-ru/strings_sy.xml b/i18n/src/main/res/values-ru/strings_sy.xml
index 6ece5aaf6..9ff470c35 100644
--- a/i18n/src/main/res/values-ru/strings_sy.xml
+++ b/i18n/src/main/res/values-ru/strings_sy.xml
@@ -4,7 +4,7 @@
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">Перетаскивание</string>
     <string name="action_sort_enabled">Включено</string>
-    <string name="action_skip_manga">Не переносить</string>
+    <string name="action_skip_entry">Не переносить</string>
     <string name="action_search_manually">Искать вручную</string>
     <string name="action_migrate_now">Перенести сейчас</string>
     <string name="action_copy_now">Копировать сейчас</string>
@@ -17,11 +17,12 @@
     <!-- Library fragment -->
     <string name="buttons_header">Кнопки</string>
 
-    <!-- Manga Type -->
-    <string name="manhwa">Манхва</string>
-    <string name="manhua">Маньхуа</string>
-    <string name="comic">Комикс</string>
-    <string name="webtoon">Веб-комикс</string>
+    <!-- Entry Type -->
+    <string name="entry_type_manga">Манга</string>
+    <string name="entry_type_manhwa">Манхва</string>
+    <string name="entry_type_manhua">Маньхуа</string>
+    <string name="entry_type_comic">Комикс</string>
+    <string name="entry_type_webtoon">Веб-комикс</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">Сбой при решении капчи</string>
@@ -137,7 +138,7 @@
     <string name="no_folders_to_cleanup">Нет папок для удаления</string>
     <string name="clean_orphaned_downloads">Очистить потерянное</string>
     <string name="clean_read_downloads">Очистить прочитанное</string>
-    <string name="clean_read_manga_not_in_library">Очистить отсутствующее в библиотеке</string>
+    <string name="clean_read_entries_not_in_library">Очистить отсутствующее в библиотеке</string>
     <plurals name="cleanup_done">
         <item quantity="one">Очистка завершена. %d папка удалена.</item>
         <item quantity="few">Очистка завершена. %d папки удалено.</item>
@@ -203,8 +204,8 @@
     <string name="pref_local_source_hidden_folders_summery">Дать разрешение локальному источнику просматривать скрытые папки</string>
 
     <!-- Backup settings -->
-    <string name="custom_manga_info">Сведенья пользователя</string>
-    <string name="all_read_manga">Прочитанные записи</string>
+    <string name="custom_entry_info">Сведенья пользователя</string>
+    <string name="all_read_entries">Прочитанные записи</string>
 
     <!-- Security settings -->
     <string name="biometric_lock_times">Биометрическое время блокировки</string>
@@ -325,18 +326,18 @@
     <string name="pref_center_margin">Отступ по центру</string>
     <string name="pref_center_margin_summary">Вставить проставку для устранения зазоров на складных устройствах.</string>
 
-    <!-- Manga Page -->
-    <!-- Manga Info -->
+    <!-- Entry Page -->
+    <!-- Entry Info -->
     <string name="az_recommends">Рекомендации</string>
     <string name="merge">Объединение</string>
     <string name="merge_with_another_source">Объединиться</string>
-    <string name="manga_merged">Запись объеденена!</string>
+    <string name="entry_merged">Запись объеденена!</string>
     <string name="failed_merge">Ошибка объединения записи: %1$s</string>
-    <string name="merge_unknown_manga">Неизвестный ID записи: %1$d</string>
+    <string name="merge_unknown_entry">Неизвестный ID записи: %1$d</string>
     <string name="merged_already">Эта запись уже объеденена с текущей записью!</string>
     <string name="merge_duplicate">Эта объеденённая запись является дубликатом!</string>
 
-    <!-- Manga Info Edit -->
+    <!-- Entry Info Edit -->
     <string name="reset_tags">Сбросить тэги</string>
     <string name="add_tag">Добавить тэг</string>
     <string name="title_hint">Название: %1$s</string>
@@ -352,7 +353,7 @@
 
     <!-- Smart Search -->
     <string name="searching_source">Поиск в источнике…</string>
-    <string name="could_not_find_manga">Не удалось найти запись!</string>
+    <string name="could_not_find_entry">Не удалось найти запись!</string>
     <string name="automatic_search_error">Ошибка при выполнении автоматического поиска!</string>
 
     <!-- Saved Searches -->
@@ -401,6 +402,7 @@
     <!-- Extension section -->
     <string name="ext_redundant">Избыточное</string>
     <string name="redundant_extension_message">Это расширение является избыточным и не будет использоваться внутри этой версии Tachiyomi.</string>
+    <string name="repo_extension_message">Это расширение из внешнего репозитория. Нажмите, чтобы просмотреть репозиторий.</string>
 
     <!-- Extension Repos -->
     <string name="information_empty_repos">У вас нет дополнительных репозиториев. Нажмите кнопку «Добавить» чтобы создать репозиторий для добавления внешних расширений.</string>
@@ -434,7 +436,7 @@
     <string name="use_most_chapters">Использовать источник с наибольшим количеством глав (Медленнее)</string>
     <string name="use_first_source">Использовать первый источник с альтернативой</string>
     <string name="skip_this_step_next_time">Не показывать этот экран в следующий раз</string>
-    <string name="hide_not_found_manga">Скрыть не найденные записи</string>
+    <string name="hide_not_found_entries">Скрыть не найденые записи</string>
     <string name="search_parameter">Параметр поиска (Например - language:english)</string>
     <string name="latest_">Последняя: %1$s</string>
     <string name="migrating_to">Перенести в</string>
@@ -443,20 +445,20 @@
     <string name="no_chapters_found_for_migration">Глав не найдено. Эта запись не может быть использована для переноса</string>
     <string name="no_alternatives_found">Альтернатив не найдено</string>
     <string name="stop_migrating">Остановить перенос?</string>
-    <plurals name="migrate_manga">
+    <plurals name="migrate_entry">
         <item quantity="one">Перенести %1$d%2$s запись?</item>
         <item quantity="few">Перенести %1$d%2$s записи?</item>
         <item quantity="many">Перенести %1$d%2$s записей?</item>
         <item quantity="other">Перенести %1$d%2$s записей?</item>
     </plurals>
-    <plurals name="copy_manga">
+    <plurals name="copy_entry">
         <item quantity="one">Копировать %1$d%2$s запись?</item>
         <item quantity="few">Копировать %1$d%2$s записи?</item>
         <item quantity="many">Копировать %1$d%2$s записей?</item>
         <item quantity="other">Копировать %1$d%2$s записей?</item>
     </plurals>
     <string name="skipping_">(Исключая %1$d)</string>
-    <plurals name="manga_migrated">
+    <plurals name="entry_migrated">
         <item quantity="one">%d запись перемещена</item>
         <item quantity="few">%d записи перемещены</item>
         <item quantity="many">%d записей перемещено</item>
@@ -465,7 +467,7 @@
 
     <!-- Library -->
     <!-- Library Actions -->
-    <string name="no_valid_manga">Выбрана недопустимая запись</string>
+    <string name="no_valid_entry">Выбрана недопустимая запись</string>
 
     <!-- Library Sheet -->
     <string name="lewd">Для взрослых</string>
@@ -486,7 +488,7 @@
     <string name="favorites_sync_done_errors">Синхронизация избранного завершилась с ошибками</string>
     <string name="favorites_sync_done_errors_message">Во время процесса синхронизации возникли ошибки, которые были проигнорированы:\n%1$s</string>
     <string name="favorites_sync_verifying_library">Проверка библиотеки</string>
-    <string name="favorites_sync_manga_multiple_categories_error">Запись (%1$d) находится в нескольких категориях!</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">Галерея (%1$d) находится в нескольких категориях!</string>
     <string name="favorites_sync_downloading">Загрузка избранного с удаленного сервера</string>
     <string name="favorites_sync_failed_to_featch">Не удалось получить избранное с удаленного сервера!</string>
     <string name="favorites_sync_could_not_fetch">Не удалось получить избранное!</string>
@@ -509,7 +511,7 @@
     <string name="favorites_sync_failed_to_add_to_local_error">%1$s (%2$s)</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">%1$s (%2$s) является не действительной галерей!</string>
     <string name="favorites_sync_waiting_for_start">Ожидание начала синхронизации</string>
-    <string name="favorites_sync_manga_in_multiple_categories">Галерея %1$s находится более чем в одной категории (%2$s)!</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">Галерея %1$s находится более чем в одной категории (%2$s)!</string>
     <string name="favorites_sync_initializing">Инициализация синхронизации</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\nСинхронизация в настоящее время регулируется (Чтобы избежать блокировки на ExHentai). Выполнение синхронизации может занять много времени</string>
     <string name="favorites_sync_notes">ЗАМЕТКИ О СИНХРОНИЗАЦИИ ИЗБРАННОГО</string>
@@ -535,24 +537,24 @@
     <string name="batch_add_error">[ОШИБКА]</string>
     <string name="batch_add_summary">\nСводка:\nДобавлено: %1$d галерей\nНе добавлено: %2$d галерей</string>
     <string name="batch_add_success_log_message">Добавлена галерея: %1$s</string>
-    <string name="batch_add_unknown_type_log_message">Неизвестный тип комикса для галереи: %1$s</string>
+    <string name="batch_add_unknown_type_log_message">Неизвестный тип записи для галереи: %1$s</string>
     <string name="batch_add_unknown_source_log_message">Неизвестный источник для галереи: %1$s</string>
     <string name="batch_add_not_exist_log_message">Галерея не существует: %1$s</string>
-    <string name="gallery_adder_importing_manga">Импортируется галерея (URL-адрес: %1$s, Избр: %2$s, Источник: %3$s)…</string>
+    <string name="gallery_adder_importing_gallery">Импортируется галерея (URL-адрес: %1$s, Избр: %2$s, Источник: %3$s)…</string>
     <string name="gallery_adder_source_uri_must_match">Ошибка проверки соответствия исходного URI!</string>
-    <string name="gallery_adder_uri_map_to_manga_error">Oшибка исходного URI map-to-manga!</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">Oшибка исходного URI map-to-gallery!</string>
     <string name="gallery_adder_uri_map_to_chapter_error">Ошибка исходного URI map-to-chapter!</string>
     <string name="gallery_adder_uri_clean_error">Ошибка очистки исходного URI!</string>
     <string name="gallery_adder_chapter_fetch_error">Не удалось обновить главы для галереи: %1$s!</string>
-    <string name="gallery_adder_could_not_add_manga">Не удалось добавить запись (URL-адрес: %1$s)!</string>
+    <string name="gallery_adder_could_not_add_gallery">Не удалось добавить галерею (URL-адрес: %1$s)!</string>
     <string name="gallery_adder_could_not_identify_chapter">Не удалось идентифицировать главу (URL-адрес: %1$s)!</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">Запуск приложения…</string>
     <string name="error_with_reason">Ошибка: %1$s</string>
-    <string name="could_not_open_manga">Не удалось открыть эту запись:\n\n%1$s</string>
-    <string name="manga_id_is_null">ID записи равно null!</string>
-    <string name="loading_manga">Загрузка записей…</string>
+    <string name="could_not_open_entry">Не удалось открыть эту запись:\n\n%1$s</string>
+    <string name="entry_id_is_null">ID записи равно null!</string>
+    <string name="loading_entry">Загрузка записи…</string>
 
     <!-- Page previews -->
     <string name="page_previews">Предосмотр страниц</string>
@@ -652,15 +654,15 @@
         <item quantity="other">%2$s, %1$d страниц</item>
     </plurals>
 
-    <!-- Merged manga -->
+    <!-- Merged entry -->
     <string name="merge_settings">Настройки объединения</string>
     <string name="fetch_chapter_updates">Получить обновления глав</string>
-    <string name="delete_merged_manga">Вы уверены?</string>
-    <string name="delete_merged_manga_desc">Это приведёт к удалению записи из объединения, а также будут утеряны все несохранённые изменения, применённые к объединённой записи</string>
-    <string name="chapter_updates_merged_manga">Переключатель обновлений глав</string>
-    <string name="chapter_updates_merged_manga_desc">Переключение этого параметра отключит/включит обновления глав для этой объеденённой записи</string>
-    <string name="download_merged_manga">Переключатель загрузки глав</string>
-    <string name="download_merged_manga_desc">Переключение этого параметра отключит/включит загрузку глав для этой объеденённой записи</string>
+    <string name="delete_merged_entry">Вы уверены?</string>
+    <string name="delete_merged_entry_desc">Это приведёт к удалению записи из объединения, а также будут утеряны все несохранённые изменения, применённые к объединённой записи</string>
+    <string name="chapter_updates_merged_entry">Переключатель обновлений глав</string>
+    <string name="chapter_updates_merged_entry_desc">Переключение этого параметра отключит/включит обновления глав для этой объеденённой записи</string>
+    <string name="download_merged_entry">Переключатель загрузки глав</string>
+    <string name="download_merged_entry_desc">Переключение этого параметра отключит/включит загрузку глав для этой объеденённой записи</string>
     <string name="merged_references_invalid">Недействительные объеденённые ссылки</string>
     <string name="merged_chapter_updates_error">Ошибка переключения обновлений глав</string>
     <string name="merged_references">Объеденённые ссылки</string>
@@ -669,7 +671,7 @@
     <string name="merged_toggle_download_chapters_find_error">Не удалось найти запись для переключения загрузки глав</string>
     <string name="allow_deduplication">Разрешить дедупликацию:</string>
     <string name="deduplication_mode">Режим дедупликации:</string>
-    <string name="manga_info_manga">Сведенья записи:</string>
+    <string name="deduplication_entry_info">Сведенья записи:</string>
     <string name="toggle_dedupe">Переключить дедупликацию</string>
     <string name="refresh_merge">Обновите, чтобы получить правильные сведенья</string>
     <string name="no_dedupe">Без дедупликации</string>
@@ -691,7 +693,7 @@
     <string name="random">Случайная</string>
     <string name="mangadex_push_favorites_to_mangadex">Синхронизировать библиотеку (MangaDex)</string>
     <string name="mangadex_push_favorites_to_mangadex_summary">Синхронизирует любую не отслеживаемую MDList запись как прочитанную на MangaDex</string>
-    <string name="mangadex_similar">Похожее с MangaDex</string>
+    <string name="mangadex_similar">MangaDex похожее</string>
     <string name="community_recommendations">Рекомендации сообщества</string>
 
     <!-- Scanlator filters -->
@@ -699,7 +701,7 @@
 
     <!-- Similar -->
     <string name="similar">Похожее на %1$s</string>
-    <string name="similar_no_results">Похожая запись не найдена</string>
+    <string name="similar_no_results">Похожие записи не найдены</string>
 
     <!-- Mangadex relations-->
     <string name="relation_similar">Похожее</string>
diff --git a/i18n/src/main/res/values-zh-rCN/strings_sy.xml b/i18n/src/main/res/values-zh-rCN/strings_sy.xml
index 2b04d4488..ca8d29d84 100644
--- a/i18n/src/main/res/values-zh-rCN/strings_sy.xml
+++ b/i18n/src/main/res/values-zh-rCN/strings_sy.xml
@@ -3,7 +3,7 @@
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">拖动和放置</string>
     <string name="action_sort_enabled">启用</string>
-    <string name="action_skip_manga">不要迁移</string>
+    <string name="action_skip_entry">不要迁移</string>
     <string name="action_search_manually">手动搜索</string>
     <string name="action_migrate_now">开始迁移</string>
     <string name="action_copy_now">开始复制</string>
@@ -17,10 +17,10 @@
     <string name="buttons_header">按钮</string>
 
     <!-- Manga Type -->
-    <string name="manhwa">韩漫</string>
-    <string name="manhua">漫画</string>
-    <string name="comic">喜剧</string>
-    <string name="webtoon">网络漫画</string>
+    <string name="entry_type_manhwa">韩漫</string>
+    <string name="entry_type_manhua">漫画</string>
+    <string name="entry_type_comic">喜剧</string>
+    <string name="entry_type_webtoon">网络漫画</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">解决验证码失败</string>
@@ -134,7 +134,7 @@
     <string name="no_folders_to_cleanup">没有可清理的文件夹</string>
     <string name="clean_orphaned_downloads">清理孤立的下载</string>
     <string name="clean_read_downloads">清理已读</string>
-    <string name="clean_read_manga_not_in_library">清理不在书架中的漫画</string>
+    <string name="clean_read_entries_not_in_library">清理不在书架中的漫画</string>
     <plurals name="cleanup_done">
         <item quantity="other">清理完成。清理了 %d 个文件夹</item>
     </plurals>
@@ -197,8 +197,8 @@
     <string name="pref_local_source_hidden_folders_summery">允许本地源读取隐藏文件夹</string>
 
     <!-- Backup settings -->
-    <string name="custom_manga_info">自定义漫画信息</string>
-    <string name="all_read_manga">所有已阅读的漫画</string>
+    <string name="custom_entry_info">自定义漫画信息</string>
+    <string name="all_read_entries">所有已阅读的漫画</string>
 
     <!-- Security settings -->
     <string name="biometric_lock_times">生物识别锁定时间表</string>
@@ -320,9 +320,9 @@
     <string name="az_recommends">查看推荐</string>
     <string name="merge">合并</string>
     <string name="merge_with_another_source">与其他合并</string>
-    <string name="manga_merged">漫画已合并！</string>
+    <string name="entry_merged">漫画已合并！</string>
     <string name="failed_merge">漫画合并失败：%1$s</string>
-    <string name="merge_unknown_manga">未知的漫画 ID: %1$d</string>
+    <string name="merge_unknown_entry">未知的漫画 ID: %1$d</string>
     <string name="merged_already">该漫画已与当前漫画合并！</string>
     <string name="merge_duplicate">该已合并的漫画重复了！</string>
 
@@ -342,7 +342,7 @@
 
     <!-- Smart Search -->
     <string name="searching_source">查找来源中……</string>
-    <string name="could_not_find_manga">未能在来源中找到此漫画！</string>
+    <string name="could_not_find_entry">未能在来源中找到此漫画！</string>
     <string name="automatic_search_error">进行自动搜索过程中出现错误！</string>
 
     <!-- Saved Searches -->
@@ -417,7 +417,7 @@
     <string name="use_most_chapters">使用具有最多章节的来源（较慢）。</string>
     <string name="use_first_source">使用第一个来源的备选方案</string>
     <string name="skip_this_step_next_time">下次跳过此步骤</string>
-    <string name="hide_not_found_manga">隐藏未找到的漫画</string>
+    <string name="hide_not_found_entries">隐藏未找到的漫画</string>
     <string name="search_parameter">搜索参数（例如：language:chinese）</string>
     <string name="latest_">最新：%1$s</string>
     <string name="migrating_to">迁移到</string>
@@ -426,20 +426,20 @@
     <string name="no_chapters_found_for_migration">未找到章节，该漫画无法用于迁移</string>
     <string name="no_alternatives_found">未找到替代方案</string>
     <string name="stop_migrating">停止迁移？</string>
-    <plurals name="migrate_manga">
+    <plurals name="migrate_entry">
         <item quantity="other">迁移 %1$d%2$s 漫画？</item>
     </plurals>
-    <plurals name="copy_manga">
+    <plurals name="copy_entry">
         <item quantity="other">复制 %1$d%2$s 漫画？</item>
     </plurals>
     <string name="skipping_">（跳过 %1$d）</string>
-    <plurals name="manga_migrated">
+    <plurals name="entry_migrated">
         <item quantity="other">%d 个漫画已迁移</item>
     </plurals>
 
     <!-- Library -->
     <!-- Library Actions -->
-    <string name="no_valid_manga">未选择有效的漫画</string>
+    <string name="no_valid_entry">未选择有效的漫画</string>
 
     <!-- Library Sheet -->
     <string name="lewd">淫乱</string>
@@ -460,7 +460,7 @@
     <string name="favorites_sync_done_errors">收藏品同步完成，但有错误</string>
     <string name="favorites_sync_done_errors_message">同步过程中被忽略的错误：\n%1$s</string>
     <string name="favorites_sync_verifying_library">本地书架验证中</string>
-    <string name="favorites_sync_manga_multiple_categories_error">漫画 %1$d 在多个类别中！</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">漫画 %1$d 在多个类别中！</string>
     <string name="favorites_sync_downloading">从远程服务器下载收藏夹中</string>
     <string name="favorites_sync_failed_to_featch">从远程服务器获取收藏夹失败！</string>
     <string name="favorites_sync_could_not_fetch">无法获取收藏夹！</string>
@@ -483,7 +483,7 @@
     <string name="favorites_sync_failed_to_add_to_local_error">\'%1$s\' %2$s</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">\'%1$s\' (%2$s) 不是一个有效的画廊！</string>
     <string name="favorites_sync_waiting_for_start">等待同步开始</string>
-    <string name="favorites_sync_manga_in_multiple_categories">画廊：%1$s 在多于一个类别中（%2$s）！</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">画廊：%1$s 在多于一个类别中（%2$s）！</string>
     <string name="favorites_sync_initializing">初始化同步</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\n同步工作目前正在限速（以避免被ExHentai禁止），可能需要很长时间才能完成。</string>
     <string name="favorites_sync_notes">重要的收藏夹同步注意事项</string>
@@ -508,21 +508,21 @@
     <string name="batch_add_unknown_type_log_message">未知漫画类型的漫画：%1$s</string>
     <string name="batch_add_unknown_source_log_message">未知来源的漫画：%1$s</string>
     <string name="batch_add_not_exist_log_message">漫画不存在：%1$s</string>
-    <string name="gallery_adder_importing_manga">导入漫画（地址：%1$s，收藏夹：%2$s，强制使用来源：%3$s）……</string>
+    <string name="gallery_adder_importing_gallery">导入漫画（地址：%1$s，收藏夹：%2$s，强制使用来源：%3$s）……</string>
     <string name="gallery_adder_source_uri_must_match">来源 URI 匹配检查错误！</string>
-    <string name="gallery_adder_uri_map_to_manga_error">来源 URI 映射到漫画错误！</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">来源 URI 映射到漫画错误！</string>
     <string name="gallery_adder_uri_map_to_chapter_error">来源 URI 映射到章节错误！</string>
     <string name="gallery_adder_uri_clean_error">来源 URI 清理错误！</string>
     <string name="gallery_adder_chapter_fetch_error">未能更新漫画的章节：%1$s！</string>
-    <string name="gallery_adder_could_not_add_manga">无法添加漫画（地址：%1$s）！</string>
+    <string name="gallery_adder_could_not_add_gallery">无法添加漫画（地址：%1$s）！</string>
     <string name="gallery_adder_could_not_identify_chapter">无法识别章节（地址：%1$s）！</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">应用启动中……</string>
     <string name="error_with_reason">错误：%1$s</string>
-    <string name="could_not_open_manga">无法打开该漫画：\n\n%1$s</string>
-    <string name="manga_id_is_null">漫画 ID 为空！</string>
-    <string name="loading_manga">漫画加载中……</string>
+    <string name="could_not_open_entry">无法打开该漫画：\n\n%1$s</string>
+    <string name="entry_id_is_null">漫画 ID 为空！</string>
+    <string name="loading_entry">漫画加载中……</string>
 
     <!-- Page previews -->
     <string name="page_previews">页面预览</string>
@@ -612,12 +612,12 @@
     <!-- Merged manga -->
     <string name="merge_settings">合并设置</string>
     <string name="fetch_chapter_updates">获取章节更新</string>
-    <string name="delete_merged_manga">你确定吗？</string>
-    <string name="delete_merged_manga_desc">这将从合并中删除该漫画，使用这个方法会丢失任何应用于合并后的漫画的未保存的修改。</string>
-    <string name="chapter_updates_merged_manga">切换章节更新</string>
-    <string name="chapter_updates_merged_manga_desc">更改此项将禁用或启用该合并漫画的章节更新</string>
-    <string name="download_merged_manga">切换新章节下载</string>
-    <string name="download_merged_manga_desc">更改此项将禁用或启用此合并漫画的章节下载</string>
+    <string name="delete_merged_entry">你确定吗？</string>
+    <string name="delete_merged_entry_desc">这将从合并中删除该漫画，使用这个方法会丢失任何应用于合并后的漫画的未保存的修改。</string>
+    <string name="chapter_updates_merged_entry">切换章节更新</string>
+    <string name="chapter_updates_merged_entry_desc">更改此项将禁用或启用该合并漫画的章节更新</string>
+    <string name="download_merged_entry">切换新章节下载</string>
+    <string name="download_merged_entry_desc">更改此项将禁用或启用此合并漫画的章节下载</string>
     <string name="merged_references_invalid">合并后的引用无效</string>
     <string name="merged_chapter_updates_error">切换章节更新错误</string>
     <string name="merged_references">引用已合并</string>
@@ -626,7 +626,7 @@
     <string name="merged_toggle_download_chapters_find_error">找不到漫画来切换章节下载</string>
     <string name="allow_deduplication">允许删除重复数据：</string>
     <string name="deduplication_mode">去重模式：</string>
-    <string name="manga_info_manga">漫画信息：</string>
+    <string name="deduplication_entry_info">漫画信息：</string>
     <string name="toggle_dedupe">切换去重</string>
     <string name="refresh_merge">刷新以获取正确信息</string>
     <string name="no_dedupe">无重复</string>
diff --git a/i18n/src/main/res/values/strings_sy.xml b/i18n/src/main/res/values/strings_sy.xml
index ea7630d37..5d4fa1f1e 100644
--- a/i18n/src/main/res/values/strings_sy.xml
+++ b/i18n/src/main/res/values/strings_sy.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <!-- Actions -->
     <string name="action_sort_drag_and_drop">Drag &amp; Drop</string>
     <string name="action_sort_enabled">Enabled</string>
-    <string name="action_skip_manga">Don\'t migrate</string>
+    <string name="action_skip_entry">Don\'t migrate</string>
     <string name="action_search_manually">Search manually</string>
     <string name="action_migrate_now">Migrate now</string>
     <string name="action_copy_now">Copy now</string>
@@ -16,12 +17,12 @@
     <!-- Library fragment -->
     <string name="buttons_header">Buttons</string>
 
-    <!-- Manga Type -->
-    <string name="manhwa">Manhwa</string>
-    <string name="manhua">Manhua</string>
-    <string name="comic">Comic</string>
-    <string name="webtoon">Webtoon</string>
-    <string name="manga_type">Manga</string>
+    <!-- Entry Type -->
+    <string name="entry_type_manga">Manga</string>
+    <string name="entry_type_manhwa">Manhwa</string>
+    <string name="entry_type_manhua">Manhua</string>
+    <string name="entry_type_comic">Comic</string>
+    <string name="entry_type_webtoon">Webtoon</string>
 
     <!-- Captcha -->
     <string name="captcha_solve_failure">Captcha solve failure</string>
@@ -135,14 +136,16 @@
     <string name="enable_source_blacklist">Enable source blacklist</string>
     <string name="enable_source_blacklist_summary">Hide extensions/sources that are incompatible with %1$s. Force-restart app after changing.</string>
     <string name="open_debug_menu">Open debug menu</string>
-    <string name="open_debug_menu_summary"><![CDATA[DO NOT TOUCH THIS MENU UNLESS YOU KNOW WHAT YOU ARE DOING! <font color=\'red\'>IT CAN CORRUPT YOUR LIBRARY!</font>]]></string>
+    <string name="open_debug_menu_summary">
+        <![CDATA[DO NOT TOUCH THIS MENU UNLESS YOU KNOW WHAT YOU ARE DOING! <font color=\'red\'>IT CAN CORRUPT YOUR LIBRARY!</font>]]>
+    </string>
     <string name="starting_cleanup">Starting cleanup</string>
     <string name="clean_up_downloaded_chapters">Clean up downloaded chapters</string>
     <string name="delete_unused_chapters">Delete non-existent, partially downloaded, and read chapter folders</string>
     <string name="no_folders_to_cleanup">No folders to cleanup</string>
     <string name="clean_orphaned_downloads">Clean orphaned</string>
     <string name="clean_read_downloads">Clean read</string>
-    <string name="clean_read_manga_not_in_library">Clean manga not in library</string>
+    <string name="clean_read_entries_not_in_library">Clean entries not in library</string>
     <plurals name="cleanup_done">
         <item quantity="one">Cleanup done. Removed %d folder</item>
         <item quantity="other">Cleanup done. Removed %d folders</item>
@@ -160,24 +163,24 @@
     <string name="data_saver_color_bw">Convert to Black And White</string>
     <string name="data_saver_server">Bandwidth Hero Proxy Server</string>
     <string name="data_saver_server_summary">Put Bandwidth Hero Proxy server url here</string>
-    <string name="clear_db_exclude_read">Keep manga with read chapters</string>
+    <string name="clear_db_exclude_read">Keep entries with read chapters</string>
 
     <!-- Log Level -->
     <string name="log_minimal">Minimal</string>
     <string name="log_extra">Extra</string>
     <string name="log_extreme">Extreme</string>
-    <string name="log_minimal_desc">critical errors only</string>
-    <string name="log_extra_desc">log everything</string>
-    <string name="log_extreme_desc">network inspection mode</string>
+    <string name="log_minimal_desc">Critical errors only</string>
+    <string name="log_extra_desc">Log everything</string>
+    <string name="log_extreme_desc">Network inspection mode</string>
 
     <!-- General Settings -->
     <string name="toggle_expand_search_filters">Expand all search filters by default</string>
     <string name="auto_solve_captchas">Automatically solve captcha</string>
     <string name="auto_solve_captchas_summary">Use HIGHLY EXPERIMENTAL automatic ReCAPTCHA solver. Will be grayed out if unsupported by your device.</string>
     <string name="put_recommends_in_overflow">Recommendations in overflow</string>
-    <string name="put_recommends_in_overflow_summary">Put the recommendations button in the overflow menu instead of on the manga page</string>
+    <string name="put_recommends_in_overflow_summary">Put the recommendations button in the overflow menu instead of on the entry page</string>
     <string name="put_merge_in_overflow">Merge in overflow</string>
-    <string name="put_merge_in_overflow_summary">Put the merge button in the overflow menu instead of on the manga page</string>
+    <string name="put_merge_in_overflow_summary">Put the merge button in the overflow menu instead of on the entry page</string>
 
     <!-- Appearance Settings -->
     <string name="pref_category_navbar">Navbar</string>
@@ -206,8 +209,8 @@
     <string name="pref_local_source_hidden_folders_summery">Allow local source to read hidden folders</string>
 
     <!-- Backup settings -->
-    <string name="custom_manga_info">Custom manga info</string>
-    <string name="all_read_manga">All read manga</string>
+    <string name="custom_entry_info">Custom entry info</string>
+    <string name="all_read_entries">All read entries</string>
 
     <!-- Security settings -->
     <string name="biometric_lock_times">Biometric lock times</string>
@@ -251,9 +254,9 @@
     <string name="reader_preload_amount_summary">The amount of pages to preload when reading. Higher values will result in a smoother reading experience, at the cost of higher cache usage, it is recommended to increase the amount of cache you allocate when using larger values</string>
     <string name="reader_cache_size">Reader cache size</string>
     <string name="reader_cache_size_summary">The amount of images to save on device while reading. Higher values will result in a smoother reading experience, at the cost of higher disk space usage</string>
-    <string name="preserve_reading_position">Preserve reading position on read manga</string>
+    <string name="preserve_reading_position">Preserve reading position on read entries</string>
     <string name="auto_webtoon_mode">Auto Webtoon Mode</string>
-    <string name="auto_webtoon_mode_summary">Use auto webtoon mode for manga that are detected to likely use the long strip format</string>
+    <string name="auto_webtoon_mode_summary">Use auto webtoon mode for entries that are detected to likely use the long strip format</string>
     <string name="enable_zoom_out">Enable zoom out</string>
     <string name="tap_scroll_page">Tap scroll by page</string>
     <string name="tap_scroll_page_summary">Tapping will scroll by page instead of screen size when this option is enabled</string>
@@ -325,18 +328,18 @@
     <string name="pref_center_margin">Center margin type</string>
     <string name="pref_center_margin_summary">Insert spacer to accommodate deadspace on foldable devices.</string>
 
-    <!-- Manga Page -->
-    <!-- Manga Info -->
+    <!-- Entry Page -->
+    <!-- Entry Info -->
     <string name="az_recommends">See Recommendations</string>
     <string name="merge">Merge</string>
     <string name="merge_with_another_source">Merge With Another</string>
-    <string name="manga_merged">Manga merged!</string>
-    <string name="failed_merge">Failed to merge manga: %1$s</string>
-    <string name="merge_unknown_manga">Unknown manga ID: %1$d</string>
-    <string name="merged_already">This manga is already merged with the current manga!</string>
-    <string name="merge_duplicate">This merged manga is a duplicate!</string>
+    <string name="entry_merged">Entry merged!</string>
+    <string name="failed_merge">Failed to merge entry: %1$s</string>
+    <string name="merge_unknown_entry">Unknown entry ID: %1$d</string>
+    <string name="merged_already">This entry is already merged with the current entry!</string>
+    <string name="merge_duplicate">This merged entry is a duplicate!</string>
 
-    <!-- Manga Info Edit -->
+    <!-- Entry Info Edit -->
     <string name="reset_tags">Reset Tags</string>
     <string name="add_tag">Add Tag</string>
     <string name="title_hint">Title: %1$s</string>
@@ -352,7 +355,7 @@
 
     <!-- Smart Search -->
     <string name="searching_source">Searching source…</string>
-    <string name="could_not_find_manga">Couldn\'t find the manga in the source!</string>
+    <string name="could_not_find_entry">Couldn\'t find the entry in the source!</string>
     <string name="automatic_search_error">Error performing automatic search!</string>
 
     <!-- Saved Searches -->
@@ -383,9 +386,9 @@
     <string name="pref_tag_sorting">Tag sorting tags</string>
     <string name="tag_sorting">Tag sorting</string>
     <plurals name="pref_tag_sorting_desc">
-        <item quantity="zero">No tags in sorting list. This adds a option in the library to sort by a priority based tag list, which means manga will be sorted in a way to prioritise the ones with the tags you want</item>
-        <item quantity="one">%1$d tag in sorting list. This adds a option in the library to sort by a priority based tag list, which means manga will be sorted in a way to prioritise the ones with the tags you want</item>
-        <item quantity="other">%1$d tags in sorting list. This adds a option in the library to sort by a priority based tag list, which means manga will be sorted in a way to prioritise the ones with the tags you want</item>
+        <item quantity="zero">No tags in sorting list. This adds a option in the library to sort by a priority based tag list, which means entries will be sorted in a way to prioritise the ones with the tags you want</item>
+        <item quantity="one">%1$d tag in sorting list. This adds a option in the library to sort by a priority based tag list, which means entries will be sorted in a way to prioritise the ones with the tags you want</item>
+        <item quantity="other">%1$d tags in sorting list. This adds a option in the library to sort by a priority based tag list, which means entries will be sorted in a way to prioritise the ones with the tags you want</item>
     </plurals>
     <string name="action_add_tags_message">Read this! Tags must be exact, there are no partial matches, you cannot do netorare to filter out female:netorare or similar!\nThe style for namespace tags is\n\"female: sole female\"\nwithout quotes!\nAdding multiple variants of the same tag is supported, so feel free to do \"tag: netorare\" for NHentai and \"female: netorare\" for E-Hentai!</string>
     <string name="action_edit_tags">Edit tags</string>
@@ -432,32 +435,32 @@
     <string name="use_most_chapters">Use source with the most chapters (slower)</string>
     <string name="use_first_source">Use first source with alternative</string>
     <string name="skip_this_step_next_time">Skip this step next time</string>
-    <string name="hide_not_found_manga">Hide not found manga</string>
+    <string name="hide_not_found_entries">Hide not found entries</string>
     <string name="search_parameter">Search parameter (e.g. language:english)</string>
     <string name="latest_">Latest: %1$s</string>
     <string name="migrating_to">migrating to</string>
     <string name="match_pinned_sources">Match pinned sources</string>
     <string name="match_enabled_sources">Match enabled sources</string>
-    <string name="no_chapters_found_for_migration">No chapters found, this manga cannot be used for migration</string>
+    <string name="no_chapters_found_for_migration">No chapters found, this entry cannot be used for migration</string>
     <string name="no_alternatives_found">No Alternatives Found</string>
     <string name="stop_migrating">Stop migrating?</string>
-    <plurals name="migrate_manga">
-        <item quantity="one">Migrate %1$d%2$s manga?</item>
-        <item quantity="other">Migrate %1$d%2$s manga?</item>
+    <plurals name="migrate_entry">
+        <item quantity="one">Migrate %1$d%2$s entry?</item>
+        <item quantity="other">Migrate %1$d%2$s entries?</item>
     </plurals>
-    <plurals name="copy_manga">
-        <item quantity="one">Copy %1$d%2$s manga?</item>
-        <item quantity="other">Copy %1$d%2$s manga?</item>
+    <plurals name="copy_entry">
+        <item quantity="one">Copy %1$d%2$s entry?</item>
+        <item quantity="other">Copy %1$d%2$s entries?</item>
     </plurals>
     <string name="skipping_">(skipping %1$d)</string>
-    <plurals name="manga_migrated">
-        <item quantity="one">%d manga migrated</item>
-        <item quantity="other">%d manga migrated</item>
+    <plurals name="entry_migrated">
+        <item quantity="one">%d entry migrated</item>
+        <item quantity="other">%d entries migrated</item>
     </plurals>
 
     <!-- Library -->
     <!-- Library Actions -->
-    <string name="no_valid_manga">No valid manga selected</string>
+    <string name="no_valid_entry">No valid entry selected</string>
 
     <!-- Library Sheet -->
     <string name="lewd">Lewd</string>
@@ -478,7 +481,7 @@
     <string name="favorites_sync_done_errors">Favorites sync complete with errors</string>
     <string name="favorites_sync_done_errors_message">Errors occurred during the sync process that were ignored:\n%1$s</string>
     <string name="favorites_sync_verifying_library">Verifying local library</string>
-    <string name="favorites_sync_manga_multiple_categories_error">Manga %1$d is in multiple categories!</string>
+    <string name="favorites_sync_gallery_multiple_categories_error">Gallery %1$d is in multiple categories!</string>
     <string name="favorites_sync_downloading">Downloading favorites from remote server</string>
     <string name="favorites_sync_failed_to_featch">Failed to fetch favorites from remote server!</string>
     <string name="favorites_sync_could_not_fetch">Could not fetch favorites!</string>
@@ -501,11 +504,13 @@
     <string name="favorites_sync_failed_to_add_to_local_error">\'%1$s\' %2$s</string>
     <string name="favorites_sync_failed_to_add_to_local_unknown_type">\'%1$s\' (%2$s) is not a valid gallery!</string>
     <string name="favorites_sync_waiting_for_start">Waiting for sync to start</string>
-    <string name="favorites_sync_manga_in_multiple_categories">The gallery: %1$s is in more than one category (%2$s)!</string>
+    <string name="favorites_sync_gallery_in_multiple_categories">The gallery: %1$s is in more than one category (%2$s)!</string>
     <string name="favorites_sync_initializing">Initializing sync</string>
     <string name="favorites_sync_processing_throttle">%1$s\n\nSync is currently throttling (to avoid being banned from ExHentai) and may take a long time to complete.</string>
     <string name="favorites_sync_notes">IMPORTANT FAVORITES SYNC NOTES</string>
-    <string name="favorites_sync_notes_message"><![CDATA[1. Changes to category names in the app are <b>NOT</b> synced! Please <i>change the category names on ExHentai instead</i>. The category names will be copied from the ExHentai servers every sync.<br><br>2. The favorite categories on ExHentai correspond to the <b>first 10 categories in the app</b> (excluding the \'Default\' category). <i>Galleries in other categories will <b>NOT</b> be synced!</i><br><br>3. <font color=\'red\'><b>ENSURE YOU HAVE A STABLE INTERNET CONNECTION WHEN SYNC IS IN PROGRESS!</b></font> If the internet disconnects while the app is syncing, your favorites may be left in a <i>partially-synced state</i>.<br><br>4. Keep the app open while favorites are syncing. Android will close apps that are in the background sometimes and that could be bad if it happens while the app is syncing.<br><br>5. <b>Do NOT put favorites in multiple categories</b> (the app supports this). This can confuse the sync algorithm as ExHentai only allows each favorite to be in one category.<br><br>This dialog will only popup once. You can read these notes again by going to \'Settings > E-Hentai > Show favorites sync notes\'.]]></string>
+    <string name="favorites_sync_notes_message">
+        <![CDATA[1. Changes to category names in the app are <b>NOT</b> synced! Please <i>change the category names on ExHentai instead</i>. The category names will be copied from the ExHentai servers every sync.<br><br>2. The favorite categories on ExHentai correspond to the <b>first 10 categories in the app</b> (excluding the \'Default\' category). <i>Galleries in other categories will <b>NOT</b> be synced!</i><br><br>3. <font color=\'red\'><b>ENSURE YOU HAVE A STABLE INTERNET CONNECTION WHEN SYNC IS IN PROGRESS!</b></font> If the internet disconnects while the app is syncing, your favorites may be left in a <i>partially-synced state</i>.<br><br>4. Keep the app open while favorites are syncing. Android will close apps that are in the background sometimes and that could be bad if it happens while the app is syncing.<br><br>5. <b>Do NOT put favorites in multiple categories</b> (the app supports this). This can confuse the sync algorithm as ExHentai only allows each favorite to be in one category.<br><br>This dialog will only popup once. You can read these notes again by going to \'Settings > E-Hentai > Show favorites sync notes\'.]]>
+    </string>
     <string name="favorites_sync_reset">Are you sure?</string>
     <string name="favorites_sync_reset_message">Resetting the sync state can cause your next sync to be extremely slow.</string>
     <string name="favorites_sync_conformation_message">Are you sure you wish to sync your favorites with E-Hentai?</string>
@@ -519,30 +524,30 @@
     <string name="eh_batch_add_adding_galleries">Adding galleries…</string>
     <string name="eh_batch_add_finish">Finish</string>
     <string name="batch_add_no_valid_galleries">No galleries to add!</string>
-    <string name="batch_add_no_valid_galleries_message">You must specify at least one manga to add!</string>
+    <string name="batch_add_no_valid_galleries_message">You must specify at least one gallery to add!</string>
     <string name="batch_add">Batch add</string>
     <string name="batch_add_ok">[OK]</string>
     <string name="batch_add_error">[ERROR]</string>
     <string name="batch_add_summary">\nSummary:\nAdded: %1$d gallerie(s)\nFailed: %2$d gallerie(s)</string>
-    <string name="batch_add_success_log_message">Added manga: %1$s</string>
-    <string name="batch_add_unknown_type_log_message">Unknown manga type for manga: %1$s</string>
-    <string name="batch_add_unknown_source_log_message">Unknown source for manga: %1$s</string>
-    <string name="batch_add_not_exist_log_message">Manga does not exist: %1$s</string>
-    <string name="gallery_adder_importing_manga">Importing manga (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
+    <string name="batch_add_success_log_message">Added gallery: %1$s</string>
+    <string name="batch_add_unknown_type_log_message">Unknown entry type for gallery: %1$s</string>
+    <string name="batch_add_unknown_source_log_message">Unknown source for gallery: %1$s</string>
+    <string name="batch_add_not_exist_log_message">Gallery does not exist: %1$s</string>
+    <string name="gallery_adder_importing_gallery">Importing gallery (url: %1$s, fav: %2$s, forceSource: %3$s)…</string>
     <string name="gallery_adder_source_uri_must_match">Source URI match check error!</string>
-    <string name="gallery_adder_uri_map_to_manga_error">Source URI map-to-manga error!</string>
+    <string name="gallery_adder_uri_map_to_gallery_error">Source URI map-to-gallery error!</string>
     <string name="gallery_adder_uri_map_to_chapter_error">Source URI map-to-chapter error!</string>
     <string name="gallery_adder_uri_clean_error">Source URI clean error!</string>
-    <string name="gallery_adder_chapter_fetch_error">Failed to update chapters for manga: %1$s!</string>
-    <string name="gallery_adder_could_not_add_manga">Could not add manga (url: %1$s)!</string>
+    <string name="gallery_adder_chapter_fetch_error">Failed to update chapters for gallery: %1$s!</string>
+    <string name="gallery_adder_could_not_add_gallery">Could not add gallery (url: %1$s)!</string>
     <string name="gallery_adder_could_not_identify_chapter">Could not identify chapter (url: %1$s)!</string>
 
     <!-- Intercept Activity -->
     <string name="launching_app">Launching app…</string>
     <string name="error_with_reason">Error: %1$s</string>
-    <string name="could_not_open_manga">Could not open this manga:\n\n%1$s</string>
-    <string name="manga_id_is_null">Manga ID is null!</string>
-    <string name="loading_manga">Loading manga…</string>
+    <string name="could_not_open_entry">Could not open this entry:\n\n%1$s</string>
+    <string name="entry_id_is_null">Entry ID is null!</string>
+    <string name="loading_entry">Loading entry…</string>
 
     <!-- Page previews -->
     <string name="page_previews">Page previews</string>
@@ -638,24 +643,24 @@
         <item quantity="other">%2$s, %1$d pages</item>
     </plurals>
 
-    <!-- Merged manga -->
+    <!-- Merged entry -->
     <string name="merge_settings">Merge settings</string>
     <string name="fetch_chapter_updates">Fetch chapter updates</string>
-    <string name="delete_merged_manga">Are you sure?</string>
-    <string name="delete_merged_manga_desc">This will remove the manga from the merge, using this will also lose any unsaved changes applied to the merged manga</string>
-    <string name="chapter_updates_merged_manga">Toggle chapter updates</string>
-    <string name="chapter_updates_merged_manga_desc">Toggling this will disable or enable chapter updates for this merged manga</string>
-    <string name="download_merged_manga">Toggle new chapter downloads</string>
-    <string name="download_merged_manga_desc">Toggling this will disable or enable chapter downloads for this merged manga</string>
+    <string name="delete_merged_entry">Are you sure?</string>
+    <string name="delete_merged_entry_desc">This will remove the entry from the merge, using this will also lose any unsaved changes applied to the merged entry</string>
+    <string name="chapter_updates_merged_entry">Toggle chapter updates</string>
+    <string name="chapter_updates_merged_entry_desc">Toggling this will disable or enable chapter updates for this merged entry</string>
+    <string name="download_merged_entry">Toggle new chapter downloads</string>
+    <string name="download_merged_entry_desc">Toggling this will disable or enable chapter downloads for this merged entry</string>
     <string name="merged_references_invalid">Merged references invalid</string>
     <string name="merged_chapter_updates_error">Toggle chapter updates error</string>
     <string name="merged_references">Merged references</string>
-    <string name="merged_toggle_chapter_updates_find_error">Could not find manga to toggle chapter updates</string>
+    <string name="merged_toggle_chapter_updates_find_error">Could not find entry to toggle chapter updates</string>
     <string name="merged_toggle_download_chapters_error">Toggle download chapters error</string>
-    <string name="merged_toggle_download_chapters_find_error">Could not find manga to toggle chapter downloads</string>
+    <string name="merged_toggle_download_chapters_find_error">Could not find entry to toggle chapter downloads</string>
     <string name="allow_deduplication">Allow deduplication:</string>
     <string name="deduplication_mode">Dedupe mode:</string>
-    <string name="manga_info_manga">Info manga:</string>
+    <string name="deduplication_entry_info">Info entry:</string>
     <string name="toggle_dedupe">Toggle dedupe</string>
     <string name="refresh_merge">Refresh to get proper info</string>
     <string name="no_dedupe">No dedupe</string>
@@ -667,8 +672,8 @@
     <string name="mdlist">MDList</string>
     <string name="md_follows_unfollowed">Unfollowed</string>
     <string name="mangadex_specific_settings">MangaDex settings</string>
-    <string name="mangadex_sync_follows_to_library">Sync MangaDex manga to your library</string>
-    <string name="mangadex_sync_follows_to_library_summary">Pulls manga from MangaDex into your library if they are not already added.</string>
+    <string name="mangadex_sync_follows_to_library">Sync MangaDex entries to your library</string>
+    <string name="mangadex_sync_follows_to_library_summary">Pulls entries from MangaDex into your library if they are not already added.</string>
     <string name="mangadex_preffered_source">Preferred MangaDex source</string>
     <string name="mangadex_preffered_source_summary">Set your chosen MangaDex source, this will be used for follows and a bunch more features around the app</string>
     <string name="two_factor">2FA Code</string>
@@ -676,8 +681,8 @@
     <string name="mangadex_add_to_follows">Add to MangaDex follows</string>
     <string name="mangadex_follows">MangaDex follows</string>
     <string name="random">Random</string>
-    <string name="mangadex_push_favorites_to_mangadex">Sync library manga to MangaDex</string>
-    <string name="mangadex_push_favorites_to_mangadex_summary">Syncs any non MdList tracked manga to MangaDex as reading.</string>
+    <string name="mangadex_push_favorites_to_mangadex">Sync library entries to MangaDex</string>
+    <string name="mangadex_push_favorites_to_mangadex_summary">Syncs any non MdList tracked entries to MangaDex as reading.</string>
     <string name="mangadex_similar">MangaDex similar</string>
     <string name="community_recommendations">Community recommendations</string>
 
@@ -686,7 +691,7 @@
 
     <!-- Similar -->
     <string name="similar">Similar to %1$s</string>
-    <string name="similar_no_results">No Similar Manga found</string>
+    <string name="similar_no_results">Similar entry not found</string>
 
     <!-- MangaDex relations-->
     <string name="relation_similar">Similar</string>