diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx
index 8329e1da1..207a6f7aa 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -35,8 +35,8 @@ export const AlbumListHeaderFilters = ({ toggleGenreTarget }: { toggleGenreTarge
 
     const choice = useMemo(() => {
         return target === GenreTarget.ALBUM
-            ? t('entity.album_other', { postProcess: 'titleCase' })
-            : t('entity.track_other', { postProcess: 'titleCase' });
+            ? t('entity.album', { count: 2, postProcess: 'titleCase' })
+            : t('entity.track', { count: 2, postProcess: 'titleCase' });
     }, [target, t]);
 
     const handleToggleGenreTarget = useCallback(() => {
diff --git a/src/renderer/features/artists/components/artist-list-header.tsx b/src/renderer/features/artists/components/artist-list-header.tsx
index 302076712..b1ef47d10 100644
--- a/src/renderer/features/artists/components/artist-list-header.tsx
+++ b/src/renderer/features/artists/components/artist-list-header.tsx
@@ -19,7 +19,7 @@ interface ArtistListHeaderProps {
 export const ArtistListHeader = ({ title }: ArtistListHeaderProps) => {
     const { t } = useTranslation();
 
-    const pageTitle = title || t('entity.artist_other', { postProcess: 'titleCase' });
+    const pageTitle = title || t('entity.artist', { count: 2, postProcess: 'titleCase' });
 
     return (
         <Stack gap={0}>
diff --git a/src/renderer/features/favorites/components/favorites-header.tsx b/src/renderer/features/favorites/components/favorites-header.tsx
index 2ef738432..7c681d6f2 100644
--- a/src/renderer/features/favorites/components/favorites-header.tsx
+++ b/src/renderer/features/favorites/components/favorites-header.tsx
@@ -87,15 +87,18 @@ export const FavoritesHeader = ({ itemType }: FavoritesHeaderProps) => {
                                         </Group>
                                         <Text isMuted size="sm">
                                             {itemType === LibraryItem.ALBUM &&
-                                                t('entity.album_other', {
+                                                t('entity.album', {
+                                                    count: 2,
                                                     postProcess: 'sentenceCase',
                                                 })}
                                             {itemType === LibraryItem.ALBUM_ARTIST &&
-                                                t('entity.artist_other', {
+                                                t('entity.artist', {
+                                                    count: 2,
                                                     postProcess: 'sentenceCase',
                                                 })}
                                             {itemType === LibraryItem.SONG &&
-                                                t('entity.track_other', {
+                                                t('entity.track', {
+                                                    count: 2,
                                                     postProcess: 'sentenceCase',
                                                 })}
                                         </Text>
@@ -107,14 +110,20 @@ export const FavoritesHeader = ({ itemType }: FavoritesHeaderProps) => {
                                         leftSection={<Icon icon="track" size="xl" />}
                                         onClick={() => handleItemTypeChange(LibraryItem.SONG)}
                                     >
-                                        {t('entity.track_other', { postProcess: 'sentenceCase' })}
+                                        {t('entity.track', {
+                                            count: 2,
+                                            postProcess: 'sentenceCase',
+                                        })}
                                     </DropdownMenu.Item>
                                     <DropdownMenu.Item
                                         isSelected={itemType === LibraryItem.ALBUM}
                                         leftSection={<Icon icon="album" size="xl" />}
                                         onClick={() => handleItemTypeChange(LibraryItem.ALBUM)}
                                     >
-                                        {t('entity.album_other', { postProcess: 'sentenceCase' })}
+                                        {t('entity.album', {
+                                            count: 2,
+                                            postProcess: 'sentenceCase',
+                                        })}
                                     </DropdownMenu.Item>
                                     <DropdownMenu.Item
                                         isSelected={itemType === LibraryItem.ALBUM_ARTIST}
@@ -123,7 +132,10 @@ export const FavoritesHeader = ({ itemType }: FavoritesHeaderProps) => {
                                             handleItemTypeChange(LibraryItem.ALBUM_ARTIST)
                                         }
                                     >
-                                        {t('entity.artist_other', { postProcess: 'sentenceCase' })}
+                                        {t('entity.artist', {
+                                            count: 2,
+                                            postProcess: 'sentenceCase',
+                                        })}
                                     </DropdownMenu.Item>
                                 </DropdownMenu.Dropdown>
                             </DropdownMenu>
diff --git a/src/renderer/features/home/components/featured-genres.tsx b/src/renderer/features/home/components/featured-genres.tsx
index 62974b931..1564aa254 100644
--- a/src/renderer/features/home/components/featured-genres.tsx
+++ b/src/renderer/features/home/components/featured-genres.tsx
@@ -120,7 +120,7 @@ export const FeaturedGenres = () => {
                 <>
                     <Group align="flex-end" justify="space-between">
                         <TextTitle fw={700} isNoSelect order={3}>
-                            {t('entity.genre_other', { postProcess: 'titleCase' })}
+                            {t('entity.genre', { count: 2, postProcess: 'titleCase' })}
                         </TextTitle>
                         <Button
                             component={Link}
diff --git a/src/renderer/features/item-details/components/item-details-modal.tsx b/src/renderer/features/item-details/components/item-details-modal.tsx
index 6e2fcba97..3af8d2c7a 100644
--- a/src/renderer/features/item-details/components/item-details-modal.tsx
+++ b/src/renderer/features/item-details/components/item-details-modal.tsx
@@ -36,6 +36,7 @@ export type ItemDetailsModalProps = {
 };
 
 type ItemDetailRow<T> = {
+    count?: number;
     key?: keyof T;
     label: string;
     postprocess?: string[];
@@ -61,7 +62,10 @@ const handleRow = <T extends AnyLibraryItem>(
     return (
         <Table.Tr key={rule.label}>
             <Table.Th>
-                {t(rule.label, { postProcess: rule.postprocess || 'sentenceCase' })}
+                {t(rule.label, {
+                    ...(rule.count !== undefined && { count: rule.count }),
+                    postProcess: rule.postprocess || 'sentenceCase',
+                })}
             </Table.Th>
             <Table.Td>{value}</Table.Td>
         </Table.Tr>
@@ -135,12 +139,12 @@ const BoolField = (key: boolean) =>
 
 const AlbumPropertyMapping: ItemDetailRow<Album>[] = [
     { key: 'name', label: 'common.title' },
-    { label: 'entity.albumArtist_one', render: (item) => formatArtists(item.albumArtists) },
+    { count: 1, label: 'entity.albumArtist', render: (item) => formatArtists(item.albumArtists) },
     {
         label: 'common.releaseType',
         render: (item, t) => normalizeReleaseTypes(item.releaseTypes, t).join(SEPARATOR_STRING),
     },
-    { label: 'entity.genre_other', render: FormatGenre },
+    { count: 2, label: 'entity.genre', render: FormatGenre },
     {
         label: 'common.duration',
         render: (album) => album.duration && formatDurationString(album.duration),
@@ -198,7 +202,7 @@ const AlbumPropertyMapping: ItemDetailRow<Album>[] = [
 
 const AlbumArtistPropertyMapping: ItemDetailRow<AlbumArtist>[] = [
     { key: 'name', label: 'common.name' },
-    { label: 'entity.genre_other', render: FormatGenre },
+    { count: 2, label: 'entity.genre', render: FormatGenre },
     {
         label: 'common.duration',
         render: (artist) => artist.duration && formatDurationString(artist.duration),
@@ -243,7 +247,7 @@ const AlbumArtistPropertyMapping: ItemDetailRow<AlbumArtist>[] = [
 const PlaylistPropertyMapping: ItemDetailRow<Playlist>[] = [
     { key: 'name', label: 'common.title' },
     { key: 'description', label: 'common.description' },
-    { label: 'entity.genre_other', render: FormatGenre },
+    { count: 2, label: 'entity.genre', render: FormatGenre },
     {
         label: 'common.duration',
         render: (playlist) => playlist.duration && formatDurationString(playlist.duration),
@@ -266,11 +270,17 @@ const PlaylistPropertyMapping: ItemDetailRow<Playlist>[] = [
 const SongPropertyMapping: ItemDetailRow<Song>[] = [
     { key: 'name', label: 'common.title' },
     { key: 'path', label: 'common.path', render: SongPath },
-    { label: 'entity.albumArtist_one', render: (item) => formatArtists(item.albumArtists) },
-    { key: 'artists', label: 'entity.artist_other', render: (item) => formatArtists(item.artists) },
+    { count: 1, label: 'entity.albumArtist', render: (item) => formatArtists(item.albumArtists) },
     {
+        count: 2,
+        key: 'artists',
+        label: 'entity.artist',
+        render: (item) => formatArtists(item.artists),
+    },
+    {
+        count: 1,
         key: 'album',
-        label: 'entity.album_one',
+        label: 'entity.album',
         render: (song) =>
             song.albumId &&
             song.album && (
@@ -304,7 +314,7 @@ const SongPropertyMapping: ItemDetailRow<Song>[] = [
                   ? t('common.clean', { postProcess: 'sentenceCase' })
                   : null,
     },
-    { label: 'entity.genre_other', render: FormatGenre },
+    { count: 2, label: 'entity.genre', render: FormatGenre },
     {
         label: 'common.duration',
         render: (song) => formatDurationString(song.duration),
@@ -314,7 +324,7 @@ const SongPropertyMapping: ItemDetailRow<Song>[] = [
     { key: 'bitRate', label: 'common.bitrate', render: (song) => `${song.bitRate} kbps` },
     { key: 'sampleRate', label: 'common.sampleRate' },
     { key: 'bitDepth', label: 'common.bitDepth' },
-    { key: 'channels', label: 'common.channel_other' },
+    { count: 2, key: 'channels', label: 'common.channel' },
     { key: 'size', label: 'common.size', render: (song) => formatSizeString(song.size) },
     {
         label: 'common.favorite',
diff --git a/src/renderer/features/lyrics/utils/open-lyrics-settings-modal.ts b/src/renderer/features/lyrics/utils/open-lyrics-settings-modal.ts
index ef6faa010..ce7080508 100644
--- a/src/renderer/features/lyrics/utils/open-lyrics-settings-modal.ts
+++ b/src/renderer/features/lyrics/utils/open-lyrics-settings-modal.ts
@@ -19,7 +19,7 @@ export const openLyricsSettingsModal = (settingsKey: string = 'default') => {
                 width: '100%',
             },
         },
-        title: i18n.t('common.setting_other', { postProcess: 'titleCase' }),
+        title: i18n.t('common.setting', { count: 2, postProcess: 'titleCase' }),
         transitionProps: {
             transition: 'pop',
         },
diff --git a/src/renderer/features/player/components/player-config.tsx b/src/renderer/features/player/components/player-config.tsx
index fe771212a..a6e1e1019 100644
--- a/src/renderer/features/player/components/player-config.tsx
+++ b/src/renderer/features/player/components/player-config.tsx
@@ -186,7 +186,7 @@ export const PlayerConfig = () => {
                     size="sm"
                     stopsPropagation
                     tooltip={{
-                        label: t('common.setting_other', { postProcess: 'titleCase' }),
+                        label: t('common.setting', { count: 2, postProcess: 'titleCase' }),
                         openDelay: 0,
                     }}
                     variant="subtle"
diff --git a/src/renderer/features/player/utils/open-visualizer-settings-modal.ts b/src/renderer/features/player/utils/open-visualizer-settings-modal.ts
index cffb2ac7d..65935d51b 100644
--- a/src/renderer/features/player/utils/open-visualizer-settings-modal.ts
+++ b/src/renderer/features/player/utils/open-visualizer-settings-modal.ts
@@ -19,7 +19,7 @@ export const openVisualizerSettingsModal = () => {
                 width: '100%',
             },
         },
-        title: i18n.t('common.setting_other', { postProcess: 'titleCase' }),
+        title: i18n.t('common.setting', { count: 2, postProcess: 'titleCase' }),
         transitionProps: {
             transition: 'pop',
         },
diff --git a/src/renderer/features/search/components/search-header.tsx b/src/renderer/features/search/components/search-header.tsx
index 7e27748fa..2fae44b1d 100644
--- a/src/renderer/features/search/components/search-header.tsx
+++ b/src/renderer/features/search/components/search-header.tsx
@@ -81,7 +81,7 @@ export const SearchHeader = ({ navigationId }: SearchHeaderProps) => {
                             }}
                             variant={itemType === LibraryItem.SONG ? 'filled' : 'default'}
                         >
-                            {t('entity.track_other', { postProcess: 'sentenceCase' })}
+                            {t('entity.track', { count: 2, postProcess: 'sentenceCase' })}
                         </Button>
                         <Button
                             component={Link}
@@ -97,7 +97,7 @@ export const SearchHeader = ({ navigationId }: SearchHeaderProps) => {
                             }}
                             variant={itemType === LibraryItem.ALBUM ? 'filled' : 'default'}
                         >
-                            {t('entity.album_other', { postProcess: 'sentenceCase' })}
+                            {t('entity.album', { count: 2, postProcess: 'sentenceCase' })}
                         </Button>
                         <Button
                             component={Link}
@@ -113,7 +113,7 @@ export const SearchHeader = ({ navigationId }: SearchHeaderProps) => {
                             }}
                             variant={itemType === LibraryItem.ALBUM_ARTIST ? 'filled' : 'default'}
                         >
-                            {t('entity.artist_other', { postProcess: 'sentenceCase' })}
+                            {t('entity.artist', { count: 2, postProcess: 'sentenceCase' })}
                         </Button>
                     </ButtonGroup>
                     <ListConfigMenu {...listConfigMenuProps[itemType]} />
diff --git a/src/renderer/features/songs/components/song-list-header-filters.tsx b/src/renderer/features/songs/components/song-list-header-filters.tsx
index 8c5b38a0f..93961b05a 100644
--- a/src/renderer/features/songs/components/song-list-header-filters.tsx
+++ b/src/renderer/features/songs/components/song-list-header-filters.tsx
@@ -44,8 +44,8 @@ export const SongListHeaderFilters = ({ toggleGenreTarget }: { toggleGenreTarget
 
     const choice = useMemo(() => {
         return target === GenreTarget.ALBUM
-            ? t('entity.album_other', { postProcess: 'titleCase' })
-            : t('entity.track_other', { postProcess: 'titleCase' });
+            ? t('entity.album', { count: 2, postProcess: 'titleCase' })
+            : t('entity.track', { count: 2, postProcess: 'titleCase' });
     }, [target, t]);
 
     const hasActiveFilters = useMemo(() => {