diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index 519f3a294..aa319e39f 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -415,7 +415,7 @@ const coverType = useStorage('queue:cover-type', CoverType.COVER_ART)
               {{ labels.queue }}
               <div class="sub header">
                 <div>
-                  {{ $t('components.Queue.display.queuePosition', {index: currentIndex +1, length: queue.length}) }}
+                  {{ $t('components.Queue.meta.queuePosition', {index: currentIndex +1, length: queue.length}) }}
                   <template v-if="!$store.state.radios.running">
                     <span class="middle ellipses symbol" />
                     <span :title="labels.duration">
diff --git a/front/src/components/audio/ChannelForm.vue b/front/src/components/audio/ChannelForm.vue
index ee2c51c74..3f01b1b25 100644
--- a/front/src/components/audio/ChannelForm.vue
+++ b/front/src/components/audio/ChannelForm.vue
@@ -380,7 +380,7 @@ defineExpose({
       class="ui active inverted dimmer"
     >
       <div class="ui text loader">
-        {{ $t('components.audio.ChannelForm.message.loading') }}
+        {{ $t('components.audio.ChannelForm.loader.loading') }}
       </div>
     </div>
   </form>
diff --git a/front/src/components/audio/Search.vue b/front/src/components/audio/Search.vue
index 98726d739..784c69404 100644
--- a/front/src/components/audio/Search.vue
+++ b/front/src/components/audio/Search.vue
@@ -101,7 +101,7 @@ const labels = computed(() => ({
         </div>
       </div>
       <p v-else>
-        {{ $t('components.audio.Search.message.noArtists') }}
+        {{ $t('components.audio.Search.empty.noArtists') }}
       </p>
     </template>
     <template v-if="query.length > 0">
@@ -124,7 +124,7 @@ const labels = computed(() => ({
         </div>
       </div>
       <p v-else>
-        {{ $t('components.audio.Search.message.noAlbums') }}
+        {{ $t('components.audio.Search.empty.noAlbums') }}
       </p>
     </template>
   </div>
diff --git a/front/src/components/audio/SearchBar.vue b/front/src/components/audio/SearchBar.vue
index d1f3abe75..662b5c810 100644
--- a/front/src/components/audio/SearchBar.vue
+++ b/front/src/components/audio/SearchBar.vue
@@ -50,12 +50,12 @@ onKeyboardShortcut(['ctrl', 'k'], () => (focused.value = true), true)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  placeholder: t('components.audio.SearchBar.placeHolderLabel'),
-  searchContent: t('components.audio.SearchBar.searchContentLabel'),
-  artist: t('components.audio.SearchBar.artistLabel'),
-  album: t('components.audio.SearchBar.albumLabel'),
-  track: t('components.audio.SearchBar.trackLabel'),
-  tag: t('components.audio.SearchBar.tagLabel')
+  placeholder: t('components.audio.SearchBar.placeholder.search'),
+  searchContent: t('components.audio.SearchBar.label.search'),
+  artist: t('components.audio.SearchBar.label.artist'),
+  album: t('components.audio.SearchBar.label.album'),
+  track: t('components.audio.SearchBar.label.track'),
+  tag: t('components.audio.SearchBar.label.tag')
 }))
 
 const router = useRouter()
@@ -77,11 +77,11 @@ const blur = () => {
 const categories = computed(() => [
   {
     code: 'federation',
-    name: t('components.audio.SearchBar.federationCategory')
+    name: t('components.audio.SearchBar.label.category.federation')
   },
   {
     code: 'podcasts',
-    name: t('components.audio.SearchBar.podcastsCategory')
+    name: t('components.audio.SearchBar.label.category.podcasts')
   },
   {
     code: 'artists',
@@ -138,8 +138,8 @@ onMounted(() => {
     showNoResults: true,
     error: {
       // @ts-expect-error Semantic is broken
-      noResultsHeader: t('components.audio.SearchBar.noResultsHeader'),
-      noResults: t('components.audio.SearchBar.noResultsMessage')
+      noResultsHeader: t('components.audio.SearchBar.header.noResults'),
+      noResults: t('components.audio.SearchBar.empty.noResults')
     },
 
     onSelect (result, response) {
@@ -179,7 +179,7 @@ onMounted(() => {
           if (category.code === 'federation' && id) {
             resultsEmpty = false
             results[category.code]?.results.push({
-              title: t('components.audio.SearchBar.fediverseSearchLabel'),
+              title: t('components.audio.SearchBar.link.fediverse'),
               routerUrl: {
                 name: 'search',
                 query: { id }
@@ -190,7 +190,7 @@ onMounted(() => {
           if (category.code === 'podcasts' && id) {
             resultsEmpty = false
             results[category.code]?.results.push({
-              title: t('components.audio.SearchBar.rssSearchLabel'),
+              title: t('components.audio.SearchBar.link.rss'),
               routerUrl: {
                 name: 'search',
                 query: { id, type: 'rss' }
@@ -200,7 +200,7 @@ onMounted(() => {
 
           if (category.code === 'more') {
             results[category.code]?.results.push({
-              title: t('components.audio.SearchBar.moreResultsLabel'),
+              title: t('components.audio.SearchBar.link.more'),
               routerUrl: {
                 name: 'search',
                 query: { type: 'artists', q: query.value }
diff --git a/front/src/components/audio/VolumeControl.vue b/front/src/components/audio/VolumeControl.vue
index 271e213c9..c4e0adf59 100644
--- a/front/src/components/audio/VolumeControl.vue
+++ b/front/src/components/audio/VolumeControl.vue
@@ -9,9 +9,9 @@ const expanded = ref(false)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  unmute: t('components.audio.VolumeControl.unmuteLabel'),
-  mute: t('components.audio.VolumeControl.muteLabel'),
-  slider: t('components.audio.VolumeControl.sliderLabel')
+  unmute: t('components.audio.VolumeControl.button.unmute'),
+  mute: t('components.audio.VolumeControl.button.mute'),
+  slider: t('components.audio.VolumeControl.label.slider')
 }))
 
 const { start, stop } = useTimeoutFn(() => (expanded.value = false), 500, { immediate: false })
diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue
index 3c17c5633..15483e47e 100644
--- a/front/src/components/audio/album/Card.vue
+++ b/front/src/components/audio/album/Card.vue
@@ -63,7 +63,7 @@ const imageUrl = computed(() => props.album.cover?.urls.original
         <span class="middle middledot symbol" />
       </span>
       <span>
-        {{ $t('components.audio.album.Card.trackCount', album.tracks_count) }}
+        {{ $t('components.audio.album.Card.meta.tracks', album.tracks_count) }}
       </span>
       <play-button
         class="right floated basic icon"
diff --git a/front/src/components/audio/album/Widget.vue b/front/src/components/audio/album/Widget.vue
index e142230f7..146ba2df3 100644
--- a/front/src/components/audio/album/Widget.vue
+++ b/front/src/components/audio/album/Widget.vue
@@ -112,7 +112,7 @@ watch(
         :class="['ui', 'basic', 'button']"
         @click="fetchData(nextPage)"
       >
-        {{ $t('components.audio.album.Widget.showMore') }}
+        {{ $t('components.audio.album.Widget.button.more') }}
       </button>
     </template>
   </div>
diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue
index a97290612..a9dbf51d9 100644
--- a/front/src/components/audio/artist/Card.vue
+++ b/front/src/components/audio/artist/Card.vue
@@ -65,12 +65,12 @@ const imageUrl = computed(() => cover.value?.urls.original
       <span
         v-if="artist.content_category === 'music'"
       >
-        {{ $t('components.audio.artist.Card.trackCount', artist.tracks_count) }}
+        {{ $t('components.audio.artist.Card.meta.tracks', artist.tracks_count) }}
       </span>
       <span
         v-else
       >
-        {{ $t('components.audio.artist.Card.episodeCount', artist.tracks_count) }}
+        {{ $t('components.audio.artist.Card.meta.episodes', artist.tracks_count) }}
       </span>
       <play-button
         class="right floated basic icon"
diff --git a/front/src/components/audio/artist/Widget.vue b/front/src/components/audio/artist/Widget.vue
index 4b6c47f3b..2890da65d 100644
--- a/front/src/components/audio/artist/Widget.vue
+++ b/front/src/components/audio/artist/Widget.vue
@@ -108,7 +108,7 @@ watch(
         :class="['ui', 'basic', 'button']"
         @click="fetchData(nextPage)"
       >
-        {{ $t('components.audio.artist.Widget.showMore') }}
+        {{ $t('components.audio.artist.Widget.button.more') }}
       </button>
     </template>
   </div>
diff --git a/front/src/components/audio/podcast/MobileRow.vue b/front/src/components/audio/podcast/MobileRow.vue
index ed029dd4c..4feeb8dd8 100644
--- a/front/src/components/audio/podcast/MobileRow.vue
+++ b/front/src/components/audio/podcast/MobileRow.vue
@@ -53,7 +53,7 @@ const { isPlaying } = usePlayer()
 const { activateTrack } = usePlayOptions(props)
 
 const { t } = useI18n()
-const actionsButtonLabel = computed(() => t('components.audio.podcast.MobileRow.actionsButtonlabel'))
+const actionsButtonLabel = computed(() => t('components.audio.podcast.MobileRow.button.actions'))
 </script>
 
 <template>
diff --git a/front/src/components/audio/podcast/Modal.vue b/front/src/components/audio/podcast/Modal.vue
index e7cccf8eb..eac44e513 100644
--- a/front/src/components/audio/podcast/Modal.vue
+++ b/front/src/components/audio/podcast/Modal.vue
@@ -60,31 +60,31 @@ const isFavorite = computed(() => store.getters['favorites/isFavorite'](props.tr
 
 const { t } = useI18n()
 const favoriteButton = computed(() => isFavorite.value
-  ? t('components.audio.podcast.Modal.removeFromFavorites')
-  : t('components.audio.podcast.Modal.addToFavorites')
+  ? t('components.audio.podcast.Modal.button.removeFromFavorites')
+  : t('components.audio.podcast.Modal.button.addToFavorites')
 )
 
 const trackDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.podcast.Modal.episodeDetails')
-  : t('components.audio.podcast.Modal.trackDetails')
+  ? t('components.audio.podcast.Modal.button.episodeDetails')
+  : t('components.audio.podcast.Modal.button.trackDetails')
 )
 
 const albumDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.podcast.Modal.seriesDetails')
-  : t('components.audio.podcast.Modal.albumDetails')
+  ? t('components.audio.podcast.Modal.button.seriesDetails')
+  : t('components.audio.podcast.Modal.button.albumDetails')
 )
 
 const artistDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.podcast.Modal.channelDetails')
-  : t('components.audio.podcast.Modal.artistDetails')
+  ? t('components.audio.podcast.Modal.button.channelDetails')
+  : t('components.audio.podcast.Modal.button.artistDetails')
 )
 
 const labels = computed(() => ({
-  startRadio: t('components.audio.podcast.Modal.startRadio'),
-  playNow: t('components.audio.podcast.Modal.playNow'),
-  addToQueue: t('components.audio.podcast.Modal.addToQueue'),
-  playNext: t('components.audio.podcast.Modal.playNext'),
-  addToPlaylist: t('components.audio.podcast.Modal.addToPlaylist')
+  startRadio: t('components.audio.podcast.Modal.button.startRadio'),
+  playNow: t('components.audio.podcast.Modal.button.playNow'),
+  addToQueue: t('components.audio.podcast.Modal.button.addToQueue'),
+  playNext: t('components.audio.podcast.Modal.button.playNext'),
+  addToPlaylist: t('components.audio.podcast.Modal.button.addToPlaylist')
 }))
 </script>
 
diff --git a/front/src/components/audio/track/MobileRow.vue b/front/src/components/audio/track/MobileRow.vue
index 391878875..99a29f572 100644
--- a/front/src/components/audio/track/MobileRow.vue
+++ b/front/src/components/audio/track/MobileRow.vue
@@ -53,7 +53,7 @@ const { isPlaying } = usePlayer()
 const { activateTrack } = usePlayOptions(props)
 
 const { t } = useI18n()
-const actionsButtonLabel = computed(() => t('components.audio.track.MobileRow.actionsButtonlabel'))
+const actionsButtonLabel = computed(() => t('components.audio.track.MobileRow.button.actions'))
 </script>
 
 <template>
diff --git a/front/src/components/audio/track/Modal.vue b/front/src/components/audio/track/Modal.vue
index c8c27e7d8..02368f9b3 100644
--- a/front/src/components/audio/track/Modal.vue
+++ b/front/src/components/audio/track/Modal.vue
@@ -60,31 +60,31 @@ const isFavorite = computed(() => store.getters['favorites/isFavorite'](props.tr
 
 const { t } = useI18n()
 const favoriteButton = computed(() => isFavorite.value
-  ? t('components.audio.track.Modal.removeFromFavorites')
-  : t('components.audio.track.Modal.addToFavorites')
+  ? t('components.audio.track.Modal.button.removeFromFavorites')
+  : t('components.audio.track.Modal.button.addToFavorites')
 )
 
 const trackDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.track.Modal.episodeDetails')
-  : t('components.audio.track.Modal.trackDetails')
+  ? t('components.audio.track.Modal.button.episodeDetails')
+  : t('components.audio.track.Modal.button.trackDetails')
 )
 
 const albumDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.track.Modal.seriesDetails')
-  : t('components.audio.track.Modal.albumDetails')
+  ? t('components.audio.track.Modal.button.seriesDetails')
+  : t('components.audio.track.Modal.button.albumDetails')
 )
 
 const artistDetailsButton = computed(() => props.track.artist?.content_category === 'podcast'
-  ? t('components.audio.track.Modal.channelDetails')
-  : t('components.audio.track.Modal.artistDetails')
+  ? t('components.audio.track.Modal.button.channelDetails')
+  : t('components.audio.track.Modal.button.artistDetails')
 )
 
 const labels = computed(() => ({
-  startRadio: t('components.audio.track.Modal.startRadio'),
-  playNow: t('components.audio.track.Modal.playNow'),
-  addToQueue: t('components.audio.track.Modal.addToQueue'),
-  playNext: t('components.audio.track.Modal.playNext'),
-  addToPlaylist: t('components.audio.track.Modal.addToPlaylist')
+  startRadio: t('components.audio.track.Modal.button.startRadio'),
+  playNow: t('components.audio.track.Modal.button.playNow'),
+  addToQueue: t('components.audio.track.Modal.button.addToQueue'),
+  playNext: t('components.audio.track.Modal.button.playNext'),
+  addToPlaylist: t('components.audio.track.Modal.button.addToPlaylist')
 }))
 </script>
 
diff --git a/front/src/components/audio/track/Table.vue b/front/src/components/audio/track/Table.vue
index 966da3275..86cf5d7c7 100644
--- a/front/src/components/audio/track/Table.vue
+++ b/front/src/components/audio/track/Table.vue
@@ -95,9 +95,9 @@ const allTracks = computed(() => {
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  title: t('components.audio.track.Table.titleLabel'),
-  album: t('components.audio.track.Table.albumLabel'),
-  artist: t('components.audio.track.Table.albumLabel')
+  title: t('components.audio.track.Table.table.header.title'),
+  album: t('components.audio.track.Table.table.header.album'),
+  artist: t('components.audio.track.Table.table.header.artist')
 }))
 
 const isLoading = ref(false)
diff --git a/front/src/components/audio/track/Widget.vue b/front/src/components/audio/track/Widget.vue
index 447af4a46..aba4a567f 100644
--- a/front/src/components/audio/track/Widget.vue
+++ b/front/src/components/audio/track/Widget.vue
@@ -201,7 +201,7 @@ watch(() => props.websocketHandlers.includes('Listen'), (to) => {
     >
       <div class="ui icon header">
         <i class="music icon" />
-        {{ $t('components.audio.track.Widget.noResultsMessage') }}
+        {{ $t('components.audio.track.Widget.empty.noResults') }}
       </div>
       <div
         v-if="isLoading"
@@ -216,7 +216,7 @@ watch(() => props.websocketHandlers.includes('Listen'), (to) => {
         :class="['ui', 'basic', 'button']"
         @click="fetchData(nextPage as string)"
       >
-        {{ $t('components.audio.track.Widget.showMore') }}
+        {{ $t('components.audio.track.Widget.button.more') }}
       </button>
     </template>
   </div>
diff --git a/front/src/components/auth/ApplicationEdit.vue b/front/src/components/auth/ApplicationEdit.vue
index 40d3e22b2..4c2303042 100644
--- a/front/src/components/auth/ApplicationEdit.vue
+++ b/front/src/components/auth/ApplicationEdit.vue
@@ -20,7 +20,7 @@ const { t } = useI18n()
 const application = ref()
 
 const labels = computed(() => ({
-  title: t('components.auth.ApplicationEdit.editApplicationLabel')
+  title: t('components.auth.ApplicationEdit.title')
 }))
 
 const isLoading = ref(false)
@@ -72,17 +72,17 @@ store.state.auth.applicationSecret = undefined
         </div>
         <template v-else>
           <router-link :to="{name: 'settings'}">
-            {{ $t('components.auth.ApplicationEdit.backToSettingsLink') }}
+            {{ $t('components.auth.ApplicationEdit.link.settings') }}
           </router-link>
           <h2 class="ui header">
-            {{ $t('components.auth.ApplicationEdit.appDetailsHeader') }}
+            {{ $t('components.auth.ApplicationEdit.header.appDetails') }}
           </h2>
           <div class="ui form">
             <p>
-              {{ $t('components.auth.ApplicationEdit.appDetailsDescription') }}
+              {{ $t('components.auth.ApplicationEdit.help.appDetails') }}
             </p>
             <div class="field">
-              <label for="copy-id">{{ $t('components.auth.ApplicationEdit.appIdLabel') }}</label>
+              <label for="copy-id">{{ $t('components.auth.ApplicationEdit.label.appId') }}</label>
               <copy-input
                 id="copy-id"
                 :value="application.client_id"
@@ -94,14 +94,14 @@ store.state.auth.applicationSecret = undefined
             >
               <div class="ui small warning message">
                 <h3 class="header">
-                  {{ $t('components.auth.ApplicationEdit.appSecretWarningTitle') }}
+                  {{ $t('components.auth.ApplicationEdit.header.appSecretWarning') }}
                 </h3>
                 <p>
-                  {{ $t('components.auth.ApplicationEdit.appSecretWarningMessage') }}
+                  {{ $t('components.auth.ApplicationEdit.message.appSecretWarning') }}
                 </p>
               </div>
 
-              <label for="copy-secret">{{ $t('components.auth.ApplicationEdit.appSecretLabel') }}</label>
+              <label for="copy-secret">{{ $t('components.auth.ApplicationEdit.label.appSecret') }}</label>
               <copy-input
                 id="copy-secret"
                 :value="secret"
@@ -111,7 +111,7 @@ store.state.auth.applicationSecret = undefined
               v-if="application.token != undefined"
               class="field"
             >
-              <label for="copy-secret">{{ $t('components.auth.ApplicationEdit.accessTokenLabel') }}</label>
+              <label for="copy-secret">{{ $t('components.auth.ApplicationEdit.label.accessToken') }}</label>
               <copy-input
                 id="copy-secret"
                 :value="application.token"
@@ -121,12 +121,12 @@ store.state.auth.applicationSecret = undefined
                 @click.prevent="refreshToken"
               >
                 <i class="refresh icon" />
-                {{ $t('components.auth.ApplicationEdit.regenerateTokenLink') }}
+                {{ $t('components.auth.ApplicationEdit.button.regenerateToken') }}
               </a>
             </div>
           </div>
           <h2 class="ui header">
-            {{ $t('components.auth.ApplicationEdit.editAppHeader') }}
+            {{ $t('components.auth.ApplicationEdit.header.editApp') }}
           </h2>
           <application-form
             :app="application"
diff --git a/front/src/components/auth/ApplicationForm.vue b/front/src/components/auth/ApplicationForm.vue
index f34001d88..c7b6d9680 100644
--- a/front/src/components/auth/ApplicationForm.vue
+++ b/front/src/components/auth/ApplicationForm.vue
@@ -86,14 +86,14 @@ const toggleAllScopes = (parent: typeof allScopes['value'][number]) => {
 const scopeParents = computedEager(() => [
   {
     id: 'read',
-    label: t('components.auth.ApplicationForm.readScopeLabel'),
-    description: t('components.auth.ApplicationForm.readScopeDescription'),
+    label: t('components.auth.ApplicationForm.label.scopes.read.label'),
+    description: t('components.auth.ApplicationForm.label.scopes.read.description'),
     value: scopeArray.value.includes('read')
   },
   {
     id: 'write',
-    label: t('components.auth.ApplicationForm.writeScopeLabel'),
-    description: t('components.auth.ApplicationForm.writeScopeDescription'),
+    label: t('components.auth.ApplicationForm.label.scopes.write.label'),
+    description: t('components.auth.ApplicationForm.label.scopes.write.description'),
     value: scopeArray.value.includes('write')
   }
 ])
@@ -120,7 +120,7 @@ const allScopes = computed(() => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.auth.ApplicationForm.saveFailureMessage') }}
+        {{ $t('components.auth.ApplicationForm.header.failure') }}
       </h4>
       <ul class="list">
         <li
@@ -132,7 +132,7 @@ const allScopes = computed(() => {
       </ul>
     </div>
     <div class="ui field">
-      <label for="application-name">{{ $t('components.auth.ApplicationForm.applicationNameLabel') }}</label>
+      <label for="application-name">{{ $t('components.auth.ApplicationForm.label.name') }}</label>
       <input
         id="application-name"
         v-model="fields.name"
@@ -142,7 +142,7 @@ const allScopes = computed(() => {
       >
     </div>
     <div class="ui field">
-      <label for="redirect-uris">{{ $t('components.auth.ApplicationForm.redirectUrisLabel') }}</label>
+      <label for="redirect-uris">{{ $t('components.auth.ApplicationForm.label.redirectUri') }}</label>
       <input
         id="redirect-uris"
         v-model="fields.redirect_uris"
@@ -150,13 +150,13 @@ const allScopes = computed(() => {
         type="text"
       >
       <p class="help">
-        {{ $t('components.auth.ApplicationForm.redirectUrisHelp') }}
+        {{ $t('components.auth.ApplicationForm.help.redirectUri') }}
       </p>
     </div>
     <div class="ui field">
-      <label>{{ $t('components.auth.ApplicationForm.scopesLabel') }}</label>
+      <label>{{ $t('components.auth.ApplicationForm.label.scopes.label') }}</label>
       <p>
-        {{ $t('components.auth.ApplicationForm.scopesDescription') }}
+        {{ $t('components.auth.ApplicationForm.label.scopes.description') }}
       </p>
       <div class="ui stackable two column grid">
         <div
@@ -205,12 +205,12 @@ const allScopes = computed(() => {
       <span
         v-if="app !== null"
       >
-        {{ $t('components.auth.ApplicationForm.updateButtonLabel') }}
+        {{ $t('components.auth.ApplicationForm.button.update') }}
       </span>
       <span
         v-else
       >
-        {{ $t('components.auth.ApplicationForm.createButtonLabel') }}
+        {{ $t('components.auth.ApplicationForm.button.create') }}
       </span>
     </button>
   </form>
diff --git a/front/src/components/auth/ApplicationNew.vue b/front/src/components/auth/ApplicationNew.vue
index 5ac5b4721..94581e152 100644
--- a/front/src/components/auth/ApplicationNew.vue
+++ b/front/src/components/auth/ApplicationNew.vue
@@ -55,7 +55,7 @@ const created = (application: Application) => {
     <div class="ui vertical stripe segment">
       <section class="ui text container">
         <router-link :to="{name: 'settings'}">
-          {{ $t('components.auth.ApplicationNew.backToSettingsLink') }}
+          {{ $t('components.auth.ApplicationNew.link.settings') }}
         </router-link>
         <h2 class="ui header">
           {{ title }}
diff --git a/front/src/components/auth/Authorize.vue b/front/src/components/auth/Authorize.vue
index e88213583..d572aea4c 100644
--- a/front/src/components/auth/Authorize.vue
+++ b/front/src/components/auth/Authorize.vue
@@ -119,7 +119,7 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
     <section class="ui vertical stripe segment">
       <div class="ui small text container">
         <h2>
-          <i class="lock open icon" />{{ $t('components.auth.Authorize.authorizeThirdPartyAppHeader') }}
+          <i class="lock open icon" />{{ $t('components.auth.Authorize.header.authorize') }}
         </h2>
         <div
           v-if="errors.length > 0"
@@ -130,13 +130,13 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
             v-if="application"
             class="header"
           >
-            {{ $t('components.auth.Authorize.authorizeFailureMessage') }}
+            {{ $t('components.auth.Authorize.header.authorizeFailure') }}
           </h4>
           <h4
             v-else
             class="header"
           >
-            {{ $t('components.auth.Authorize.fetchDataFailureMessage') }}
+            {{ $t('components.auth.Authorize.header.fetchFailure') }}
           </h4>
           <ul class="list">
             <li
@@ -159,7 +159,7 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
           @submit.prevent="submit"
         >
           <h3>
-            {{ $t('components.auth.Authorize.appAccessHeader', {app_name: application.name}) }}
+            {{ $t('components.auth.Authorize.header.access', {app_name: application.name}) }}
           </h3>
 
           <h4
@@ -172,20 +172,20 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
               :class="['ui', 'basic', 'right floated', 'tiny', 'vertically-spaced component-label label']"
             >
               <i class="pencil icon" />
-              {{ $t('components.auth.Authorize.writeOnlyScopeHeader') }}
+              {{ $t('components.auth.Authorize.header.writeOnly') }}
             </span>
             <span
               v-else-if="!topic.write && topic.read"
               :class="['ui', 'basic', 'right floated', 'tiny', 'vertically-spaced component-label label']"
             >
-              {{ $t('components.auth.Authorize.writeOnlyScopeHeader') }}
+              {{ $t('components.auth.Authorize.header.readOnly') }}
             </span>
             <span
               v-else-if="topic.write && topic.read"
               :class="['ui', 'basic', 'right floated', 'tiny', 'vertically-spaced component-label label']"
             >
               <i class="pencil icon" />
-              {{ $t('components.auth.Authorize.allScopesHeader') }}
+              {{ $t('components.auth.Authorize.header.allScopes') }}
             </span>
             <i :class="[topic.icon, 'icon']" />
             <div class="content">
@@ -196,7 +196,7 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
             </div>
           </h4>
           <div v-if="unknownRequestedScopes.length > 0">
-            <p><strong>{{ $t('components.auth.Authorize.unknownPermissionsMessage') }}</strong></p>
+            <p><strong>{{ $t('components.auth.Authorize.message.unknownPermissions') }}</strong></p>
             <ul
               v-for="(unknownscope, key) in unknownRequestedScopes"
               :key="key"
@@ -209,21 +209,21 @@ whenever(() => props.clientId, fetchApplication, { immediate: true })
             type="submit"
           >
             <i class="lock open icon" />
-            {{ $t('components.auth.Authorize.authorizeAppButton', { app: application.name }) }}
+            {{ $t('components.auth.Authorize.button.authorize', { app: application.name }) }}
           </button>
           <p
             v-if="redirectUri === 'urn:ietf:wg:oauth:2.0:oob'"
           >
-            {{ $t('components.auth.Authorize.copyCodeHelp') }}
+            {{ $t('components.auth.Authorize.help.copyCode') }}
           </p>
           <p
             v-else
           >
-            {{ $t('components.auth.Authorize.redirectHelp', {url: redirectUri}) }}
+            {{ $t('components.auth.Authorize.help.redirect', {url: redirectUri}) }}
           </p>
         </form>
         <div v-else-if="code">
-          <p><strong>{{ $t('components.auth.Authorize.copyCodeDescription') }}</strong></p>
+          <p><strong>{{ $t('components.auth.Authorize.help.pasteCode') }}</strong></p>
           <copy-input :value="code" />
         </div>
       </div>
diff --git a/front/src/components/auth/LoginForm.vue b/front/src/components/auth/LoginForm.vue
index d08268730..0c90ab958 100644
--- a/front/src/components/auth/LoginForm.vue
+++ b/front/src/components/auth/LoginForm.vue
@@ -30,7 +30,7 @@ const credentials = reactive({
 })
 
 const labels = computed(() => ({
-  usernamePlaceholder: t('components.auth.LoginForm.usernamePlaceholder')
+  usernamePlaceholder: t('components.auth.LoginForm.placeholder.username')
 }))
 
 const username = ref()
@@ -75,14 +75,14 @@ const submit = async () => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.auth.LoginForm.loginFailureHeader') }}
+        {{ $t('components.auth.LoginForm.header.loginFailure') }}
       </h4>
       <ul class="list">
         <li v-if="errors[0] == 'invalid_credentials' && $store.state.instance.settings.moderation.signup_approval_enabled.value">
-          {{ $t('components.auth.LoginForm.approvalRequiredHelp') }}
+          {{ $t('components.auth.LoginForm.help.approvalRequired') }}
         </li>
         <li v-else-if="errors[0] == 'invalid_credentials'">
-          {{ $t('components.auth.LoginForm.invalidCredentialsHelp') }}
+          {{ $t('components.auth.LoginForm.help.invalidCredentials') }}
         </li>
         <li v-else>
           {{ errors[0] }}
@@ -92,11 +92,11 @@ const submit = async () => {
     <template v-if="domain === $store.getters['instance/domain']">
       <div class="field">
         <label for="username-field">
-          {{ $t('components.auth.LoginForm.usernameFieldLabel') }}
+          {{ $t('components.auth.LoginForm.label.username') }}
           <template v-if="showSignup">
             <span class="middle pipe symbol" />
             <router-link :to="{path: '/signup'}">
-              {{ $t('components.auth.LoginForm.createAccountLink') }}
+              {{ $t('components.auth.LoginForm.link.createAccount') }}
             </router-link>
           </template>
         </label>
@@ -113,12 +113,13 @@ const submit = async () => {
       </div>
       <div class="field">
         <label for="password-field">
-          {{ $t('components.auth.LoginForm.passwordFieldLabel') }}
+          {{ $t('components.auth.LoginForm.label.password') }}
+          <span class="middle pipe symbol" />
           <router-link
             tabindex="1"
             :to="{name: 'auth.password-reset', query: {email: credentials.username}}"
           >
-            {{ $t('components.auth.LoginForm.resetPasswordLink') }}
+            {{ $t('components.auth.LoginForm.link.resetPassword') }}
           </router-link>
         </label>
         <password-input
@@ -130,14 +131,14 @@ const submit = async () => {
     </template>
     <template v-else>
       <p>
-        {{ $t('components.auth.LoginForm.redirectMessage', { domain: $store.getters['instance/domain'] }) }}
+        {{ $t('components.auth.LoginForm.message.redirect', { domain: $store.getters['instance/domain'] }) }}
       </p>
     </template>
     <button
       :class="['ui', {'loading': isLoading}, 'right', 'floated', buttonClasses, 'button']"
       type="submit"
     >
-      {{ $t('components.auth.LoginForm.loginButton') }}
+      {{ $t('components.auth.LoginForm.button.login') }}
     </button>
   </form>
 </template>
diff --git a/front/src/components/auth/Logout.vue b/front/src/components/auth/Logout.vue
index 1aca50c12..9bb2cdddd 100644
--- a/front/src/components/auth/Logout.vue
+++ b/front/src/components/auth/Logout.vue
@@ -19,16 +19,16 @@ const labels = computed(() => ({
         class="ui small text container"
       >
         <h2>
-          {{ $t('components.auth.Logout.confirmHeader') }}
+          {{ $t('components.auth.Logout.header.confirm') }}
         </h2>
         <p>
-          {{ $t('components.auth.Logout.loggedInUsername', { username: $store.state.auth.username }) }}
+          {{ $t('components.auth.Logout.message.loggedIn', { username: $store.state.auth.username }) }}
         </p>
         <button
           class="ui button"
           @click="$store.dispatch('auth/logout')"
         >
-          {{ $t('components.auth.Logout.confirmLogoutButton') }}
+          {{ $t('components.auth.Logout.button.logout') }}
         </button>
       </div>
       <div
@@ -36,13 +36,13 @@ const labels = computed(() => ({
         class="ui small text container"
       >
         <h2>
-          {{ $t('components.auth.Logout.loggedOutHeader') }}
+          {{ $t('components.auth.Logout.header.unauthenticated') }}
         </h2>
         <router-link
           to="/login"
           class="ui button"
         >
-          {{ $t('components.auth.Logout.logInLink') }}
+          {{ $t('components.auth.Logout.link.login') }}
         </router-link>
       </div>
     </section>
diff --git a/front/src/components/auth/Plugin.vue b/front/src/components/auth/Plugin.vue
index dad0f2273..bce020461 100644
--- a/front/src/components/auth/Plugin.vue
+++ b/front/src/components/auth/Plugin.vue
@@ -69,7 +69,7 @@ const submitAndScan = async () => {
         target="_blank"
       >
         <i class="external icon" />
-        {{ $t('components.auth.Plugin.documentationLink') }}
+        {{ $t('components.auth.Plugin.link.documentation') }}
       </a>
     </template>
     <div class="ui clearing hidden divider" />
@@ -79,7 +79,7 @@ const submitAndScan = async () => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.auth.Plugin.saveFailureHeader') }}
+        {{ $t('components.auth.Plugin.header.failure') }}
       </h4>
       <ul class="list">
         <li
@@ -97,7 +97,7 @@ const submitAndScan = async () => {
           v-model="enabled"
           type="checkbox"
         >
-        <label :for="`${plugin.name}-enabled`">{{ $t('components.auth.Plugin.pluginEnabledLabel') }}</label>
+        <label :for="`${plugin.name}-enabled`">{{ $t('components.auth.Plugin.label.pluginEnabled') }}</label>
       </div>
     </div>
     <div class="ui clearing hidden divider" />
@@ -105,7 +105,7 @@ const submitAndScan = async () => {
       v-if="plugin.source"
       class="field"
     >
-      <label for="plugin-library">{{ $t('components.auth.Plugin.libraryLabel') }}</label>
+      <label for="plugin-library">{{ $t('components.auth.Plugin.label.library') }}</label>
       <select
         id="plugin-library"
         v-model="values['library']"
@@ -119,7 +119,7 @@ const submitAndScan = async () => {
         </option>
       </select>
       <div>
-        {{ $t('components.auth.Plugin.libraryDescription') }}
+        {{ $t('components.auth.Plugin.description.library') }}
       </div>
     </div>
     <template v-if="(plugin.conf?.length ?? 0) > 0">
@@ -194,14 +194,14 @@ const submitAndScan = async () => {
       type="submit"
       :class="['ui', {'loading': isLoading}, 'right', 'floated', 'button']"
     >
-      {{ $t('components.auth.Plugin.saveButton') }}
+      {{ $t('components.auth.Plugin.button.save') }}
     </button>
     <button
       v-if="plugin.source"
       :class="['ui', {'loading': isLoading}, 'right', 'floated', 'button']"
       @click.prevent="submitAndScan"
     >
-      {{ $t('components.auth.Plugin.scanButton') }}
+      {{ $t('components.auth.Plugin.button.scan') }}
     </button>
     <div class="ui clearing hidden divider" />
   </form>
diff --git a/front/src/components/auth/Settings.vue b/front/src/components/auth/Settings.vue
index 5c5d4b38f..bc1689ed9 100644
--- a/front/src/components/auth/Settings.vue
+++ b/front/src/components/auth/Settings.vue
@@ -224,7 +224,7 @@ const deleteAccount = async () => {
     await axios.delete('users/me/', { data: payload })
 
     store.commit('ui/addMessage', {
-      content: t('components.auth.Settings.deletionRequest'),
+      content: t('components.auth.Settings.message.confirmDelete'),
       date: new Date()
     })
 
@@ -276,7 +276,7 @@ fetchOwnedApps()
     <div class="ui vertical stripe segment">
       <section class="ui text container">
         <h2 class="ui header">
-          {{ $t('components.auth.Settings.accountSettingsHeader') }}
+          {{ $t('components.auth.Settings.header.accountSettings') }}
         </h2>
         <form
           class="ui form"
@@ -287,7 +287,7 @@ fetchOwnedApps()
             class="ui positive message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.settingsUpdatedHeader') }}
+              {{ $t('components.auth.Settings.header.settingsUpdated') }}
             </h4>
           </div>
           <div
@@ -296,7 +296,7 @@ fetchOwnedApps()
             class="ui negative message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.settingsUpdateFailureHeader') }}
+              {{ $t('components.auth.Settings.header.updateFailure') }}
             </h4>
             <ul class="list">
               <li
@@ -340,14 +340,14 @@ fetchOwnedApps()
             :class="['ui', { loading: isLoading }, 'button']"
             type="submit"
           >
-            {{ $t('components.auth.Settings.updateSettingsButton') }}
+            {{ $t('components.auth.Settings.button.updateSettings') }}
           </button>
         </form>
       </section>
       <section class="ui text container">
         <div class="ui hidden divider" />
         <h2 class="ui header">
-          {{ $t('components.auth.Settings.avatarHeader') }}
+          {{ $t('components.auth.Settings.header.avatar') }}
         </h2>
         <div class="ui form">
           <div
@@ -356,7 +356,7 @@ fetchOwnedApps()
             class="ui negative message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.avatarSaveFailureHeader') }}
+              {{ $t('components.auth.Settings.header.avatarFailure') }}
             </h4>
             <ul class="list">
               <li
@@ -373,7 +373,7 @@ fetchOwnedApps()
             @update:model-value="submitAvatar($event)"
             @delete="avatar = {uuid: null}"
           >
-            {{ $t('components.auth.Settings.avatarInputLabel') }}
+            {{ $t('components.auth.Settings.label.avatar') }}
           </attachment-input>
         </div>
       </section>
@@ -381,10 +381,10 @@ fetchOwnedApps()
       <section class="ui text container">
         <div class="ui hidden divider" />
         <h2 class="ui header">
-          {{ $t('components.auth.Settings.changePasswordHeader') }}
+          {{ $t('components.auth.Settings.header.changePassword') }}
         </h2>
         <div class="ui message">
-          {{ $t('components.auth.Settings.changePasswordMessage') }}&nbsp;{{ $t('components.auth.Settings.changePasswordMessageContinued') }}
+          {{ $t('components.auth.Settings.description.changePassword.paragraph1') }}&nbsp;{{ $t('components.auth.Settings.description.changePassword.paragraph2') }}
         </div>
         <form
           class="ui form"
@@ -396,16 +396,16 @@ fetchOwnedApps()
             class="ui negative message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.changePasswordFailureMessage') }}
+              {{ $t('components.auth.Settings.header.passwordFailure') }}
             </h4>
             <ul class="list">
               <li v-if="passwordError == 'invalid_credentials'">
-                {{ $t('components.auth.Settings.changePasswordHelp') }}
+                {{ $t('components.auth.Settings.help.changePassword') }}
               </li>
             </ul>
           </div>
           <div class="field">
-            <label for="old-password-field">{{ $t('components.auth.Settings.currentPasswordLabel') }}</label>
+            <label for="old-password-field">{{ $t('components.auth.Settings.label.currentPassword') }}</label>
             <password-input
               v-model="credentials.oldPassword"
               field-id="old-password-field"
@@ -413,7 +413,7 @@ fetchOwnedApps()
             />
           </div>
           <div class="field">
-            <label for="new-password-field">{{ $t('components.auth.Settings.newPasswordLabel') }}</label>
+            <label for="new-password-field">{{ $t('components.auth.Settings.label.newPassword') }}</label>
             <password-input
               v-model="credentials.newPassword"
               field-id="new-password-field"
@@ -424,30 +424,30 @@ fetchOwnedApps()
             :class="['ui', {'loading': isLoadingPassword}, {disabled: !credentials.newPassword || !credentials.oldPassword}, 'warning', 'button']"
             :action="submitPassword"
           >
-            {{ $t('components.auth.Settings.changePasswordButton') }}
+            {{ $t('components.auth.Settings.button.password') }}
             <template #modal-header>
               <p>
-                {{ $t('components.auth.Settings.changePasswordModalHeader') }}
+                {{ $t('components.auth.Settings.modal.changePassword.header') }}
               </p>
             </template>
             <template #modal-content>
               <div>
                 <p>
-                  {{ $t('components.auth.Settings.changePasswordWarning') }}
+                  {{ $t('components.auth.Settings.modal.changePassword.content.warning') }}
                 </p>
                 <ul>
                   <li>
-                    {{ $t('components.auth.Settings.changePasswordLogout') }}
+                    {{ $t('components.auth.Settings.modal.changePassword.content.logout') }}
                   </li>
                   <li>
-                    {{ $t('components.auth.Settings.changePasswordSubsonic') }}
+                    {{ $t('components.auth.Settings.modal.changePassword.content.subsonic') }}
                   </li>
                 </ul>
               </div>
             </template>
             <template #modal-confirm>
               <div>
-                {{ $t('components.auth.Settings.disableSubsonicMessage') }}
+                {{ $t('components.auth.Settings.button.disableSubsonic') }}
               </div>
             </template>
           </dangerous-button>
@@ -464,11 +464,11 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="eye slash outline icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.contentFiltersHeader') }}
+            {{ $t('components.auth.Settings.header.contentFilters') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.contentFiltersDescription') }}
+          {{ $t('components.auth.Settings.description.contentFilters') }}
         </p>
 
         <button
@@ -476,19 +476,19 @@ fetchOwnedApps()
           @click="$store.dispatch('moderation/fetchContentFilters')"
         >
           <i class="refresh icon" />&nbsp;
-          {{ $t('components.auth.Settings.refreshButton') }}
+          {{ $t('components.auth.Settings.button.refresh') }}
         </button>
         <h3 class="ui header">
-          {{ $t('components.auth.Settings.hiddenArtistsHeader') }}
+          {{ $t('components.auth.Settings.header.hiddenArtists') }}
         </h3>
         <table class="ui compact very basic unstackable table">
           <thead>
             <tr>
               <th>
-                {{ $t('components.auth.Settings.artistNameTableHeader') }}
+                {{ $t('components.auth.Settings.table.artists.header.name') }}
               </th>
               <th>
-                {{ $t('components.auth.Settings.filterCreationDateTableHeader') }}
+                {{ $t('components.auth.Settings.table.artists.header.creationDate') }}
               </th>
               <th />
             </tr>
@@ -511,7 +511,7 @@ fetchOwnedApps()
                   class="ui basic tiny button"
                   @click="$store.dispatch('moderation/deleteContentFilter', filter.uuid)"
                 >
-                  {{ $t('components.auth.Settings.filterDeleteButton') }}
+                  {{ $t('components.auth.Settings.button.delete') }}
                 </button>
               </td>
             </tr>
@@ -526,18 +526,18 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="open lock icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.authorizedAppsHeader') }}
+            {{ $t('components.auth.Settings.header.authorizedApps') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.authorizedAppsDescription') }}
+          {{ $t('components.auth.Settings.description.authorizedApps') }}
         </p>
         <button
           :class="['ui', 'icon', { loading: isLoadingApps }, 'button']"
           @click="fetchApps()"
         >
           <i class="refresh icon" />&nbsp;
-          {{ $t('components.auth.Settings.refreshButton') }}
+          {{ $t('components.auth.Settings.button.refresh') }}
         </button>
         <table
           v-if="apps.length > 0"
@@ -546,10 +546,10 @@ fetchOwnedApps()
           <thead>
             <tr>
               <th>
-                {{ $t('components.auth.Settings.appNameTableHeader') }}
+                {{ $t('components.auth.Settings.table.authorizedApps.header.application') }}
               </th>
               <th>
-                {{ $t('components.auth.Settings.appPermissionsTableHeader') }}
+                {{ $t('components.auth.Settings.table.authorizedApps.header.permissions') }}
               </th>
               <th />
             </tr>
@@ -570,20 +570,20 @@ fetchOwnedApps()
                   :class="['ui', 'tiny', 'danger', { loading: isRevoking.has(app.client_id) }, 'button']"
                   @confirm="revokeApp(app.client_id)"
                 >
-                  {{ $t('components.auth.Settings.permissionDeleteButton') }}
+                  {{ $t('components.auth.Settings.button.revoke') }}
                   <template #modal-header>
                     <p>
-                      {{ $t('components.auth.Settings.revokePermissionModalMessage', {app: app.name}) }}
+                      {{ $t('components.auth.Settings.modal.revokeApp.header', {app: app.name}) }}
                     </p>
                   </template>
                   <template #modal-content>
                     <p>
-                      {{ $t('components.auth.Settings.revokePermissionModalWarning') }}
+                      {{ $t('components.auth.Settings.modal.revokeApp.content.warning') }}
                     </p>
                   </template>
                   <template #modal-confirm>
                     <div>
-                      {{ $t('components.auth.Settings.revokeAccessButton') }}
+                      {{ $t('components.auth.Settings.button.revokeAccess') }}
                     </div>
                   </template>
                 </dangerous-button>
@@ -593,9 +593,9 @@ fetchOwnedApps()
         </table>
         <empty-state v-else>
           <template #title>
-            {{ $t('components.auth.Settings.emptyAppMessage') }}
+            {{ $t('components.auth.Settings.header.noApps') }}
           </template>
-          {{ $t('components.auth.Settings.emptyAppHelp') }}
+          {{ $t('components.auth.Settings.help.noApps') }}
         </empty-state>
       </section>
       <section
@@ -606,17 +606,17 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="code icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.personalAppsHeader') }}
+            {{ $t('components.auth.Settings.header.yourApps') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.personalAppsDescription') }}
+          {{ $t('components.auth.Settings.description.yourApps') }}
         </p>
         <router-link
           class="ui success button"
           :to="{name: 'settings.applications.new'}"
         >
-          {{ $t('components.auth.Settings.newAppLink') }}
+          {{ $t('components.auth.Settings.link.newApp') }}
         </router-link>
         <table
           v-if="ownedApps.length > 0"
@@ -625,13 +625,13 @@ fetchOwnedApps()
           <thead>
             <tr>
               <th>
-                {{ $t('components.auth.Settings.personalAppNameTableHeader') }}
+                {{ $t('components.auth.Settings.table.yourApps.header.application') }}
               </th>
               <th>
-                {{ $t('components.auth.Settings.personalAppScopesTableHeader') }}
+                {{ $t('components.auth.Settings.table.yourApps.header.scopes') }}
               </th>
               <th>
-                {{ $t('components.auth.Settings.personalAppCreationDateTableHeader') }}
+                {{ $t('components.auth.Settings.table.yourApps.header.creationDate') }}
               </th>
               <th />
             </tr>
@@ -657,25 +657,25 @@ fetchOwnedApps()
                   class="ui tiny success button"
                   :to="{name: 'settings.applications.edit', params: {id: app.client_id}}"
                 >
-                  {{ $t('components.auth.Settings.personalAppEditLink') }}
+                  {{ $t('components.auth.Settings.button.edit') }}
                 </router-link>
                 <dangerous-button
                   :class="['ui', 'tiny', 'danger', { loading: isDeleting.has(app.client_id) }, 'button']"
                   @confirm="deleteApp(app.client_id)"
                 >
-                  {{ $t('components.auth.Settings.personalAppDeleteLink') }}
+                  {{ $t('components.auth.Settings.button.remove') }}
                   <template #modal-header>
                     <p />
-                    {{ $t('components.auth.Settings.deletePersonalAppModalMessage', {app: app.name}) }}
+                    {{ $t('components.auth.Settings.modal.deleteApp.header', {app: app.name}) }}
                   </template>
                   <template #modal-content>
                     <p>
-                      {{ $t('components.auth.Settings.deletePersonalAppModalWarning') }}
+                      {{ $t('components.auth.Settings.modal.deleteApp.content.warning') }}
                     </p>
                   </template>
                   <template #modal-confirm>
                     <div>
-                      {{ $t('components.auth.Settings.deletePersonalAppButton') }}
+                      {{ $t('components.auth.Settings.button.removeApp') }}
                     </div>
                   </template>
                 </dangerous-button>
@@ -685,9 +685,9 @@ fetchOwnedApps()
         </table>
         <empty-state v-else>
           <template #title>
-            {{ $t('components.auth.Settings.emptyPersonalAppMessage') }}
+            {{ $t('components.auth.Settings.header.noPersonalApps') }}
           </template>
-          {{ $t('components.auth.Settings.emptyPersonalAppHelp') }}
+          {{ $t('components.auth.Settings.help.noPersonalApps') }}
         </empty-state>
       </section>
 
@@ -699,17 +699,17 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="code icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.pluginsHeader') }}
+            {{ $t('components.auth.Settings.header.plugins') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.pluginsDescription') }}
+          {{ $t('components.auth.Settings.description.plugins') }}
         </p>
         <router-link
           class="ui success button"
           :to="{name: 'settings.plugins'}"
         >
-          {{ $t('components.auth.Settings.managePluginsLink') }}
+          {{ $t('components.auth.Settings.link.managePlugins') }}
         </router-link>
       </section>
       <section class="ui text container">
@@ -717,14 +717,14 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="comment icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.changeEmailHeader') }}
+            {{ $t('components.auth.Settings.header.changeEmail') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.changeEmailDescription') }}
+          {{ $t('components.auth.Settings.description.changeEmail') }}
         </p>
         <p>
-          {{ $t('components.auth.Settings.currentEmailLabel', { email: email }) }}
+          {{ $t('components.auth.Settings.message.currentEmail', { email: email }) }}
         </p>
         <form
           class="ui form"
@@ -736,7 +736,7 @@ fetchOwnedApps()
             class="ui negative message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.changeEmailFailureMessage') }}
+              {{ $t('components.auth.Settings.header.emailFailure') }}
             </h4>
             <ul class="list">
               <li
@@ -748,7 +748,7 @@ fetchOwnedApps()
             </ul>
           </div>
           <div class="field">
-            <label for="new-email">{{ $t('components.auth.Settings.newEmailLabel') }}</label>
+            <label for="new-email">{{ $t('components.auth.Settings.label.newEmail') }}</label>
             <input
               id="new-email"
               v-model="newEmail"
@@ -757,7 +757,7 @@ fetchOwnedApps()
             >
           </div>
           <div class="field">
-            <label for="current-password-field-email">{{ $t('components.auth.Settings.currentPasswordLabel') }}</label>
+            <label for="current-password-field-email">{{ $t('components.auth.Settings.label.password') }}</label>
             <password-input
               v-model="emailPassword"
               field-id="current-password-field-email"
@@ -768,7 +768,7 @@ fetchOwnedApps()
             type="submit"
             class="ui button"
           >
-            {{ $t('components.auth.Settings.updateEmailButton') }}
+            {{ $t('components.auth.Settings.button.update') }}
           </button>
         </form>
       </section>
@@ -777,17 +777,17 @@ fetchOwnedApps()
         <h2 class="ui header">
           <i class="trash icon" />
           <div class="content">
-            {{ $t('components.auth.Settings.deleteAccountHeader') }}
+            {{ $t('components.auth.Settings.header.deleteAccount') }}
           </div>
         </h2>
         <p>
-          {{ $t('components.auth.Settings.deleteAccountDescription') }}
+          {{ $t('components.auth.Settings.description.deleteAccount') }}
         </p>
         <div
           role="alert"
           class="ui warning message"
         >
-          {{ $t('components.auth.Settings.deleteAccountWarning') }}
+          {{ $t('components.auth.Settings.warning.deleteAccount') }}
         </div>
         <div class="ui form">
           <div
@@ -796,7 +796,7 @@ fetchOwnedApps()
             class="ui negative message"
           >
             <h4 class="header">
-              {{ $t('components.auth.Settings.deleteAccountFailureMessage') }}
+              {{ $t('components.auth.Settings.header.accountFailure') }}
             </h4>
             <ul class="list">
               <li
@@ -808,7 +808,7 @@ fetchOwnedApps()
             </ul>
           </div>
           <div class="field">
-            <label for="current-password-field">{{ $t('components.auth.Settings.currentPasswordLabel') }}</label>
+            <label for="current-password-field">{{ $t('components.auth.Settings.label.currentPassword') }}</label>
             <password-input
               v-model="deleteAccountPassword"
               field-id="current-password-field"
@@ -819,22 +819,22 @@ fetchOwnedApps()
             :class="['ui', {'loading': isDeletingAccount}, {disabled: !deleteAccountPassword}, {danger: deleteAccountPassword}, 'button']"
             :action="deleteAccount"
           >
-            {{ $t('components.auth.Settings.deleteAccountButton') }}
+            {{ $t('components.auth.Settings.button.deleteAccount') }}
             <template #modal-header>
               <p>
-                {{ $t('components.auth.Settings.deleteAccountConfirmationMessage') }}
+                {{ $t('components.auth.Settings.modal.deleteAccount.header') }}
               </p>
             </template>
             <template #modal-content>
               <div>
                 <p>
-                  {{ $t('components.auth.Settings.deleteAccountConfirmationWarning') }}
+                  {{ $t('components.auth.Settings.modal.deleteAccount.content.warning') }}
                 </p>
               </div>
             </template>
             <template #modal-confirm>
               <div>
-                {{ $t('components.auth.Settings.deleteAccountConfirmButton') }}
+                {{ $t('components.auth.Settings.button.deleteAccountConfirm') }}
               </div>
             </template>
           </dangerous-button>
diff --git a/front/src/components/auth/SignupForm.vue b/front/src/components/auth/SignupForm.vue
index 9625be291..e08cbb1a7 100644
--- a/front/src/components/auth/SignupForm.vue
+++ b/front/src/components/auth/SignupForm.vue
@@ -35,9 +35,9 @@ const logger = useLogger()
 const store = useStore()
 
 const labels = computed(() => ({
-  placeholder: t('components.auth.SignupForm.invitationCodePlaceholder'),
-  usernamePlaceholder: t('components.auth.SignupForm.usernamePlaceholder'),
-  emailPlaceholder: t('components.auth.SignupForm.emailPlaceholder')
+  placeholder: t('components.auth.SignupForm.placeholder.invitation'),
+  usernamePlaceholder: t('components.auth.SignupForm.placeholder.username'),
+  emailPlaceholder: t('components.auth.SignupForm.placeholder.email')
 }))
 
 const signupRequiresApproval = computed(() => props.signupApprovalEnabled ?? store.state.instance.settings.moderation.signup_approval_enabled.value)
@@ -88,14 +88,14 @@ fetchInstanceSettings()
   <div v-if="submitted">
     <div class="ui success message">
       <p v-if="signupRequiresApproval">
-        {{ $t('components.auth.SignupForm.awaitingReviewMessage') }}
+        {{ $t('components.auth.SignupForm.message.awaitingReview') }}
       </p>
       <p v-else>
-        {{ $t('components.auth.SignupForm.accountCreationSuccessMessage') }}
+        {{ $t('components.auth.SignupForm.message.accountCreated') }}
       </p>
     </div>
     <h2>
-      {{ $t('components.auth.SignupForm.loginHeader') }}
+      {{ $t('components.auth.SignupForm.header.login') }}
     </h2>
     <login-form
       button-classes="basic success"
@@ -111,13 +111,13 @@ fetchInstanceSettings()
       v-if="!$store.state.instance.settings.users.registration_enabled.value"
       class="ui message"
     >
-      {{ $t('components.auth.SignupForm.registrationClosedMessage') }}
+      {{ $t('components.auth.SignupForm.message.registrationClosed') }}
     </p>
     <p
       v-else-if="signupRequiresApproval"
       class="ui message"
     >
-      {{ $t('components.auth.SignupForm.requiresReviewMessage') }}
+      {{ $t('components.auth.SignupForm.message.requiresReview') }}
     </p>
     <template v-if="formCustomization?.help_text">
       <rendered-description
@@ -133,7 +133,7 @@ fetchInstanceSettings()
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.auth.SignupForm.signupFailureMessage') }}
+        {{ $t('components.auth.SignupForm.header.signupFailure') }}
       </h4>
       <ul class="list">
         <li
@@ -145,7 +145,7 @@ fetchInstanceSettings()
       </ul>
     </div>
     <div class="required field">
-      <label for="username-field">{{ $t('components.auth.SignupForm.usernameFieldLabel') }}</label>
+      <label for="username-field">{{ $t('components.auth.SignupForm.label.username') }}</label>
       <input
         id="username-field"
         ref="username"
@@ -158,7 +158,7 @@ fetchInstanceSettings()
       >
     </div>
     <div class="required field">
-      <label for="email-field">{{ $t('components.auth.SignupForm.emailFieldLabel') }}</label>
+      <label for="email-field">{{ $t('components.auth.SignupForm.label.email') }}</label>
       <input
         id="email-field"
         ref="email"
@@ -170,7 +170,7 @@ fetchInstanceSettings()
       >
     </div>
     <div class="required field">
-      <label for="password-field">{{ $t('components.auth.SignupForm.passwordFieldLabel') }}</label>
+      <label for="password-field">{{ $t('components.auth.SignupForm.label.password') }}</label>
       <password-input
         v-model="payload.password1"
         field-id="password-field"
@@ -180,7 +180,7 @@ fetchInstanceSettings()
       v-if="!$store.state.instance.settings.users.registration_enabled.value"
       class="required field"
     >
-      <label for="invitation-code">{{ $t('components.auth.SignupForm.invitationCodeFieldLabel') }}</label>
+      <label for="invitation-code">{{ $t('components.auth.SignupForm.label.invitation') }}</label>
       <input
         id="invitation-code"
         v-model="payload.invitation"
@@ -217,7 +217,7 @@ fetchInstanceSettings()
       :class="['ui', buttonClasses, {'loading': isLoading}, ' right floated button']"
       type="submit"
     >
-      {{ $t('components.auth.SignupForm.createAccountButton') }}
+      {{ $t('components.auth.SignupForm.button.create') }}
     </button>
   </form>
 </template>
diff --git a/front/src/components/auth/SubsonicTokenForm.vue b/front/src/components/auth/SubsonicTokenForm.vue
index 3062bf15a..b3bdb7145 100644
--- a/front/src/components/auth/SubsonicTokenForm.vue
+++ b/front/src/components/auth/SubsonicTokenForm.vue
@@ -13,7 +13,7 @@ const store = useStore()
 
 const subsonicEnabled = computed(() => store.state.instance.settings.subsonic.enabled.value)
 const labels = computed(() => ({
-  subsonicField: t('components.auth.SubsonicTokenForm.subsonicFieldLabel')
+  subsonicField: t('components.auth.SubsonicTokenForm.label.subsonicField')
 }))
 
 const errors = ref([] as string[])
@@ -38,7 +38,7 @@ const fetchToken = async () => {
 const showToken = ref(false)
 const successMessage = ref('')
 const requestNewToken = async () => {
-  successMessage.value = t('components.auth.SubsonicTokenForm.successMessage')
+  successMessage.value = t('components.auth.SubsonicTokenForm.message.passwordUpdated')
   success.value = false
   errors.value = []
   isLoading.value = true
@@ -56,7 +56,7 @@ const requestNewToken = async () => {
 }
 
 const disable = async () => {
-  successMessage.value = t('components.auth.SubsonicTokenForm.disabledMessage')
+  successMessage.value = t('components.auth.SubsonicTokenForm.message.accessDisabled')
   success.value = false
   errors.value = []
   isLoading.value = true
@@ -82,26 +82,26 @@ fetchToken()
     @submit.prevent="requestNewToken()"
   >
     <h2>
-      {{ $t('components.auth.SubsonicTokenForm.subsonicHeader') }}
+      {{ $t('components.auth.SubsonicTokenForm.header.subsonic') }}
     </h2>
     <p
       v-if="!subsonicEnabled"
       class="ui message"
     >
-      {{ $t('components.auth.SubsonicTokenForm.unavailableMessage') }}
+      {{ $t('components.auth.SubsonicTokenForm.message.unavailable') }}
     </p>
     <p>
-      {{ $t('components.auth.SubsonicTokenForm.subsonicApiDescription') }}&nbsp;{{ $t('components.auth.SubsonicTokenForm.subsonicApiDescriptionContinued') }}
+      {{ $t('components.auth.SubsonicTokenForm.description.subsonic.paragraph1') }}&nbsp;{{ $t('components.auth.SubsonicTokenForm.description.subsonic.paragraph2') }}
     </p>
     <p>
-      {{ $t('components.auth.SubsonicTokenForm.subsonicPasswordInfo') }}
+      {{ $t('components.auth.SubsonicTokenForm.description.subsonic.paragraph3') }}
     </p>
     <p>
       <a
         href="https://docs.funkwhale.audio/users/apps.html#subsonic-compatible-clients"
         target="_blank"
       >
-        {{ $t('components.auth.SubsonicTokenForm.appsLink') }}
+        {{ $t('components.auth.SubsonicTokenForm.link.apps') }}
       </a>
     </p>
     <div
@@ -118,7 +118,7 @@ fetchToken()
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.auth.SubsonicTokenForm.errorHeader') }}
+        {{ $t('components.auth.SubsonicTokenForm.header.error') }}
       </h4>
       <ul class="list">
         <li
@@ -152,20 +152,20 @@ fetchToken()
         :class="['ui', {'loading': isLoading}, 'button']"
         :action="requestNewToken"
       >
-        {{ $t('components.auth.SubsonicTokenForm.requestNewTokenButton') }}
+        {{ $t('components.auth.SubsonicTokenForm.button.newPassword') }}
         <template #modal-header>
           <p>
-            {{ $t('components.auth.SubsonicTokenForm.requestNewTokenModalHeader') }}
+            {{ $t('components.auth.SubsonicTokenForm.modal.newPassword.header') }}
           </p>
         </template>
         <template #modal-content>
           <p>
-            {{ $t('components.auth.SubsonicTokenForm.requestNewTokenWarning') }}
+            {{ $t('components.auth.SubsonicTokenForm.modal.newPassword.content.warning') }}
           </p>
         </template>
         <template #modal-confirm>
           <div>
-            {{ $t('components.auth.SubsonicTokenForm.requestNewTokenButton') }}
+            {{ $t('components.auth.SubsonicTokenForm.button.confirmNewPassword') }}
           </div>
         </template>
       </dangerous-button>
@@ -175,27 +175,27 @@ fetchToken()
         :class="['ui', {'loading': isLoading}, 'button']"
         @click="requestNewToken"
       >
-        {{ $t('components.auth.SubsonicTokenForm.requestTokenButton') }}
+        {{ $t('components.auth.SubsonicTokenForm.button.confirmNewPassword') }}
       </button>
       <dangerous-button
         v-if="token"
         :class="['ui', {'loading': isLoading}, 'warning', 'button']"
         :action="disable"
       >
-        {{ $t('components.auth.SubsonicTokenForm.disableSubsonicAccessButton') }}
+        {{ $t('components.auth.SubsonicTokenForm.button.disable') }}
         <template #modal-header>
           <p>
-            {{ $t('components.auth.SubsonicTokenForm.disableSubsonicAccessModalHeader') }}
+            {{ $t('components.auth.SubsonicTokenForm.modal.disableSubsonic.header') }}
           </p>
         </template>
         <template #modal-content>
           <p>
-            {{ $t('components.auth.SubsonicTokenForm.disableSubsonicAccessWarning') }}
+            {{ $t('components.auth.SubsonicTokenForm.modal.disableSubsonic.content.warning') }}
           </p>
         </template>
         <template #modal-confirm>
           <div>
-            {{ $t('components.auth.SubsonicTokenForm.disableSubsonicAccessConfirm') }}
+            {{ $t('components.auth.SubsonicTokenForm.button.confirmDisable') }}
           </div>
         </template>
       </dangerous-button>
diff --git a/front/src/components/channels/AlbumForm.vue b/front/src/components/channels/AlbumForm.vue
index 12f98295c..6f14bf4f1 100644
--- a/front/src/components/channels/AlbumForm.vue
+++ b/front/src/components/channels/AlbumForm.vue
@@ -59,7 +59,7 @@ defineExpose({
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.channels.AlbumForm.errorHeader') }}
+        {{ $t('components.channels.AlbumForm.header.error') }}
       </h4>
       <ul class="list">
         <li
@@ -72,7 +72,7 @@ defineExpose({
     </div>
     <div class="ui required field">
       <label for="album-title">
-        {{ $t('components.channels.AlbumForm.titleLabel') }}
+        {{ $t('components.channels.AlbumForm.label.albumTitle') }}
       </label>
       <input
         v-model="title"
diff --git a/front/src/components/channels/AlbumModal.vue b/front/src/components/channels/AlbumModal.vue
index d1ce60380..b8064aa0f 100644
--- a/front/src/components/channels/AlbumModal.vue
+++ b/front/src/components/channels/AlbumModal.vue
@@ -36,12 +36,12 @@ const albumForm = ref()
       <span
         v-if="channel.content_category === 'podcast'"
       >
-        {{ $t('components.channels.AlbumModal.newSeriesHeader') }}
+        {{ $t('components.channels.AlbumModal.header.newSeries') }}
       </span>
       <span
         v-else
       >
-        {{ $t('components.channels.AlbumModal.newAlbumHeader') }}
+        {{ $t('components.channels.AlbumModal.header.newAlbum') }}
       </span>
     </h4>
     <div class="scrolling content">
@@ -55,14 +55,14 @@ const albumForm = ref()
     </div>
     <div class="actions">
       <button class="ui basic cancel button">
-        {{ $t('components.channels.AlbumModal.cancelButton') }}
+        {{ $t('components.channels.AlbumModal.button.cancel') }}
       </button>
       <button
         :class="['ui', 'primary', {loading: isLoading}, 'button']"
         :disabled="!submittable"
         @click.stop.prevent="albumForm.submit()"
       >
-        {{ $t('components.channels.AlbumModal.createButton') }}
+        {{ $t('components.channels.AlbumModal.button.create') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/channels/AlbumSelect.vue b/front/src/components/channels/AlbumSelect.vue
index 550823292..eb037101a 100644
--- a/front/src/components/channels/AlbumSelect.vue
+++ b/front/src/components/channels/AlbumSelect.vue
@@ -49,10 +49,10 @@ watch(() => props.channel, fetchData, { immediate: true })
     <label for="album-dropdown">
       <span
         v-if="channel && channel.artist && channel.artist.content_category === 'podcast'"
-      >{{ $t('components.channels.AlbumSelect.seriesLabel') }}</span>
+      >{{ $t('components.channels.AlbumSelect.label.series') }}</span>
       <span
         v-else
-      >{{ $t('components.channels.AlbumSelect.albumLabel') }}</span>
+      >{{ $t('components.channels.AlbumSelect.label.album') }}</span>
     </label>
     <select
       id="album-dropdown"
@@ -60,7 +60,7 @@ watch(() => props.channel, fetchData, { immediate: true })
       class="ui search normal dropdown"
     >
       <option value="">
-        {{ $t('components.channels.AlbumSelect.noneLabel') }}
+        {{ $t('components.channels.AlbumSelect.option.none') }}
       </option>
       <option
         v-for="album in albums"
@@ -69,7 +69,7 @@ watch(() => props.channel, fetchData, { immediate: true })
       >
         {{ album.title }}
         <span>
-          {{ $t('components.channels.AlbumSelect.trackCount', { tracks_count: album.tracks_count }) }}
+          {{ $t('components.channels.AlbumSelect.meta.tracks', { tracks_count: album.tracks_count }) }}
         </span>
       </option>
     </select>
diff --git a/front/src/components/channels/LicenseSelect.vue b/front/src/components/channels/LicenseSelect.vue
index bf8089600..9fb0d75b4 100644
--- a/front/src/components/channels/LicenseSelect.vue
+++ b/front/src/components/channels/LicenseSelect.vue
@@ -55,7 +55,7 @@ fetchLicenses()
 <template>
   <div>
     <label for="license-dropdown">
-      {{ $t('components.channels.LicenseSelect.licenseLabel') }}
+      {{ $t('components.channels.LicenseSelect.label.license') }}
     </label>
     <select
       id="license-dropdown"
@@ -63,7 +63,7 @@ fetchLicenses()
       class="ui search normal dropdown"
     >
       <option value="">
-        {{ $t('components.channels.LicenseSelect.noneLabel') }}
+        {{ $t('components.channels.LicenseSelect.option.none') }}
       </option>
       <option
         v-for="l in featuredLicenses"
@@ -84,7 +84,7 @@ fetchLicenses()
         target="_blank"
         rel="noreferrer noopener"
       >
-        {{ $t('components.channels.LicenseSelect.licenseInfo') }}
+        {{ $t('components.channels.LicenseSelect.link.license') }}
       </a>
     </p>
   </div>
diff --git a/front/src/components/channels/SubscribeButton.vue b/front/src/components/channels/SubscribeButton.vue
index f3b04f732..8c05ded2f 100644
--- a/front/src/components/channels/SubscribeButton.vue
+++ b/front/src/components/channels/SubscribeButton.vue
@@ -24,12 +24,12 @@ const store = useStore()
 
 const isSubscribed = computed(() => store.getters['channels/isSubscribed'](props.channel.uuid))
 const title = computed(() => isSubscribed.value
-  ? t('components.channels.SubscribeButton.unsubscribeLabel')
-  : t('components.channels.SubscribeButton.subscribeLabel')
+  ? t('components.channels.SubscribeButton.title.unsubscribe')
+  : t('components.channels.SubscribeButton.title.subscribe')
 )
 
 const message = computed(() => ({
-  authMessage: t('components.channels.SubscribeButton.authMessage')
+  authMessage: t('components.channels.SubscribeButton.help.auth')
 }))
 
 const toggle = async () => {
diff --git a/front/src/components/channels/UploadForm.vue b/front/src/components/channels/UploadForm.vue
index 7cbfdb9da..e98ba6330 100644
--- a/front/src/components/channels/UploadForm.vue
+++ b/front/src/components/channels/UploadForm.vue
@@ -396,7 +396,7 @@ watchEffect(() => {
 })
 
 const labels = computed(() => ({
-  editTitle: t('components.channels.UploadForm.editTitle')
+  editTitle: t('components.channels.UploadForm.button.edit')
 }))
 </script>
 
@@ -411,7 +411,7 @@ const labels = computed(() => ({
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.channels.UploadForm.failureHeader') }}
+        {{ $t('components.channels.UploadForm.header.error') }}
       </h4>
       <ul class="list">
         <li
@@ -424,7 +424,7 @@ const labels = computed(() => ({
     </div>
     <div :class="['ui', 'required', {hidden: step > 1}, 'field']">
       <label for="channel-dropdown">
-        {{ $t('components.channels.UploadForm.channelLabel') }}
+        {{ $t('components.channels.UploadForm.label.channel') }}
       </label>
       <div
         id="channel-dropdown"
@@ -447,7 +447,7 @@ const labels = computed(() => ({
       <div class="content">
         <p>
           <i class="copyright icon" />
-          {{ $t('components.channels.UploadForm.licenseTip') }}
+          {{ $t('components.channels.UploadForm.help.license') }}
         </p>
       </div>
     </div>
@@ -460,7 +460,7 @@ const labels = computed(() => ({
         <div class="content">
           <p>
             <i class="warning icon" />
-            {{ $t('components.channels.UploadForm.noSpaceWarning') }}
+            {{ $t('components.channels.UploadForm.warning.quota') }}
           </p>
         </div>
       </div>
@@ -471,19 +471,19 @@ const labels = computed(() => ({
         >
           <p>
             <i class="redo icon" />
-            {{ $t('components.channels.UploadForm.pendingDraftsMessage') }}
+            {{ $t('components.channels.UploadForm.message.pending') }}
           </p>
           <button
             class="ui basic button"
             @click.stop.prevent="includeDraftUploads = false"
           >
-            {{ $t('components.channels.UploadForm.ignoreButton') }}
+            {{ $t('components.channels.UploadForm.button.ignore') }}
           </button>
           <button
             class="ui basic button"
             @click.stop.prevent="includeDraftUploads = true"
           >
-            {{ $t('components.channels.UploadForm.resumeButton') }}
+            {{ $t('components.channels.UploadForm.button.resume') }}
           </button>
         </div>
         <div
@@ -539,17 +539,17 @@ const labels = computed(() => ({
                   <span
                     v-if="file.active"
                   >
-                    {{ $t('components.channels.UploadForm.uploadingStatus') }}
+                    {{ $t('components.channels.UploadForm.status.uploading') }}
                   </span>
                   <span
                     v-else-if="file.error"
                   >
-                    {{ $t('components.channels.UploadForm.erroredStatus') }}
+                    {{ $t('components.channels.UploadForm.status.errored') }}
                   </span>
                   <span
                     v-else
                   >
-                    {{ $t('components.channels.UploadForm.pendingStatus') }}
+                    {{ $t('components.channels.UploadForm.status.pending') }}
                   </span>
                   <span class="middle middledot symbol" />
                   {{ humanSize(file.size ?? 0) }}
@@ -559,12 +559,12 @@ const labels = computed(() => ({
                 </template>
                 <span class="middle middledot symbol" />
                 <a @click.stop.prevent="remove(file)">
-                  {{ $t('components.channels.UploadForm.removeUpload') }}
+                  {{ $t('components.channels.UploadForm.button.remove') }}
                 </a>
                 <template v-if="file.error">
                   <span class="middle middledot symbol" />
                   <a @click.stop.prevent="retry(file)">
-                    {{ $t('components.channels.UploadForm.retryUpload') }}
+                    {{ $t('components.channels.UploadForm.button.retry') }}
                   </a>
                 </template>
               </div>
@@ -583,7 +583,7 @@ const labels = computed(() => ({
           <div class="content">
             <p>
               <i class="info icon" />
-              {{ $t('components.channels.UploadForm.supportedExtensions', {extensions: $store.state.ui.supportedExtensions.join(', ')}) }}
+              {{ $t('components.channels.UploadForm.description.extensions', {extensions: $store.state.ui.supportedExtensions.join(', ')}) }}
             </p>
           </div>
         </div>
@@ -602,11 +602,11 @@ const labels = computed(() => ({
         >
           <div>
             <i class="upload icon" />&nbsp;
-            {{ $t('components.channels.UploadForm.dragAndDrop') }}
+            {{ $t('components.channels.UploadForm.message.dragAndDrop') }}
           </div>
           <div class="ui very small divider" />
           <div>
-            {{ $t('components.channels.UploadForm.openFileBrowser') }}
+            {{ $t('components.channels.UploadForm.label.openBrowser') }}
           </div>
         </file-upload-widget>
         <div class="ui hidden divider" />
diff --git a/front/src/components/channels/UploadMetadataForm.vue b/front/src/components/channels/UploadMetadataForm.vue
index 428e9c5af..2fe03f204 100644
--- a/front/src/components/channels/UploadMetadataForm.vue
+++ b/front/src/components/channels/UploadMetadataForm.vue
@@ -33,7 +33,7 @@ watch(newValues, (values) => emit('update:values', values), { immediate: true })
   <div :class="['ui', {loading: isLoading}, 'form']">
     <div class="ui required field">
       <label for="upload-title">
-        {{ $t('components.channels.UploadMetadataForm.titleLabel') }}
+        {{ $t('components.channels.UploadMetadataForm.label.title') }}
       </label>
       <input
         v-model="newValues.title"
@@ -44,13 +44,13 @@ watch(newValues, (values) => emit('update:values', values), { immediate: true })
       v-model="newValues.cover"
       @delete="newValues.cover = ''"
     >
-      {{ $t('components.channels.UploadMetadataForm.trackImage') }}
+      {{ $t('components.channels.UploadMetadataForm.label.image') }}
     </attachment-input>
     <div class="ui small hidden divider" />
     <div class="ui two fields">
       <div class="ui field">
         <label for="upload-tags">
-          {{ $t('components.channels.UploadMetadataForm.tagsLabel') }}
+          {{ $t('components.channels.UploadMetadataForm.label.tags') }}
         </label>
         <tags-selector
           id="upload-tags"
@@ -60,7 +60,7 @@ watch(newValues, (values) => emit('update:values', values), { immediate: true })
       </div>
       <div class="ui field">
         <label for="upload-position">
-          {{ $t('components.channels.UploadMetadataForm.uploadPosition') }}
+          {{ $t('components.channels.UploadMetadataForm.label.position') }}
         </label>
         <input
           v-model="newValues.position"
@@ -72,7 +72,7 @@ watch(newValues, (values) => emit('update:values', values), { immediate: true })
     </div>
     <div class="ui field">
       <label for="upload-description">
-        {{ $t('components.channels.UploadMetadataForm.descriptionLabel') }}
+        {{ $t('components.channels.UploadMetadataForm.label.description') }}
       </label>
       <content-form
         v-model="newValues.description"
diff --git a/front/src/components/channels/UploadModal.vue b/front/src/components/channels/UploadModal.vue
index 080deb66c..87d4232e1 100644
--- a/front/src/components/channels/UploadModal.vue
+++ b/front/src/components/channels/UploadModal.vue
@@ -29,7 +29,7 @@ const statusInfo = computed(() => {
   }
 
   if (statusData.value.totalFiles) {
-    const msg = t('components.channels.UploadModal.fileCount', { count: statusData.value.totalFiles })
+    const msg = t('components.channels.UploadModal.meta.files', { count: statusData.value.totalFiles })
     info.push(msg)
   }
 
@@ -57,22 +57,22 @@ const isLoading = ref(false)
       <span
         v-if="step === 1"
       >
-        {{ $t('components.channels.UploadModal.publishStep') }}
+        {{ $t('components.channels.UploadModal.header.publish') }}
       </span>
       <span
         v-else-if="step === 2"
       >
-        {{ $t('components.channels.UploadModal.uploadStep') }}
+        {{ $t('components.channels.UploadModal.header.uploadFiles') }}
       </span>
       <span
         v-else-if="step === 3"
       >
-        {{ $t('components.channels.UploadModal.uploadDetails') }}
+        {{ $t('components.channels.UploadModal.header.uploadDetails') }}
       </span>
       <span
         v-else-if="step === 4"
       >
-        {{ $t('components.channels.UploadModal.processingUploads') }}
+        {{ $t('components.channels.UploadModal.header.processing') }}
       </span>
     </h4>
     <div class="scrolling content">
@@ -91,7 +91,7 @@ const isLoading = ref(false)
         </template>
         <div class="ui very small hidden divider" />
         <template v-if="statusData && statusData.quotaStatus">
-          {{ $t('components.channels.UploadModal.remainingSpace', humanSize((statusData.quotaStatus.remaining - statusData.uploadedSize) * 1000 * 1000)) }}
+          {{ $t('components.channels.UploadModal.meta.quota', humanSize((statusData.quotaStatus.remaining - statusData.uploadedSize) * 1000 * 1000)) }}
         </template>
       </div>
       <div class="ui hidden clearing divider mobile-only" />
@@ -99,28 +99,28 @@ const isLoading = ref(false)
         v-if="step === 1"
         class="ui basic cancel button"
       >
-        {{ $t('components.channels.UploadModal.cancelButton') }}
+        {{ $t('components.channels.UploadModal.button.cancel') }}
       </button>
       <button
         v-else-if="step < 3"
         class="ui basic button"
         @click.stop.prevent="uploadForm.step -= 1"
       >
-        {{ $t('components.channels.UploadModal.previousButton') }}
+        {{ $t('components.channels.UploadModal.button.previous') }}
       </button>
       <button
         v-else-if="step === 3"
         class="ui basic button"
         @click.stop.prevent="uploadForm.step -= 1"
       >
-        {{ $t('components.channels.UploadModal.updateButton') }}
+        {{ $t('components.channels.UploadModal.button.update') }}
       </button>
       <button
         v-if="step === 1"
         class="ui primary button"
         @click.stop.prevent="uploadForm.step += 1"
       >
-        {{ $t('components.channels.UploadModal.nextButton') }}
+        {{ $t('components.channels.UploadModal.button.next') }}
       </button>
       <div
         v-if="step === 2"
@@ -132,7 +132,7 @@ const isLoading = ref(false)
           :disabled="!statusData?.canSubmit || undefined"
           @click.prevent.stop="uploadForm.publish"
         >
-          {{ $t('components.channels.UploadModal.publishButton') }}
+          {{ $t('components.channels.UploadModal.button.publish') }}
         </button>
         <button
           ref="dropdown"
@@ -147,7 +147,7 @@ const isLoading = ref(false)
               class="basic item"
               @click="update(false)"
             >
-              {{ $t('components.channels.UploadModal.finishLaterButton') }}
+              {{ $t('components.channels.UploadModal.button.finishLater') }}
             </div>
           </div>
         </button>
@@ -157,7 +157,7 @@ const isLoading = ref(false)
         class="ui basic cancel button"
         @click="update(false)"
       >
-        {{ $t('components.channels.UploadModal.closeButton') }}
+        {{ $t('components.channels.UploadModal.button.close') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
index 34aade66f..7d870813a 100644
--- a/front/src/components/common/ActionTable.vue
+++ b/front/src/components/common/ActionTable.vue
@@ -123,10 +123,10 @@ const toggleCheck = (event: MouseEvent, id: string, index: number) => {
 }
 
 const labels = computed(() => ({
-  refresh: t('components.common.ActionTable.refreshLabel'),
-  selectAllItems: t('components.common.ActionTable.selectAllLabel'),
-  performAction: t('components.common.ActionTable.performActionLabel'),
-  selectItem: t('components.common.ActionTable.selectItemLabel')
+  refresh: t('components.common.ActionTable.button.refresh'),
+  selectAllItems: t('components.common.ActionTable.button.selectAll'),
+  performAction: t('components.common.ActionTable.label.performAction'),
+  selectItem: t('components.common.ActionTable.button.select')
 }))
 
 const errors = ref([] as string[])
@@ -167,7 +167,7 @@ const launchAction = async () => {
               class="right floated"
             >
               <span v-if="needsRefresh">
-                {{ $t('components.common.ActionTable.contentUpdatedMessage') }}
+                {{ $t('components.common.ActionTable.message.needsRefresh') }}
               </span>
               <button
                 class="ui basic icon button"
@@ -185,7 +185,7 @@ const launchAction = async () => {
             >
               <div class="ui inline fields">
                 <div class="field">
-                  <label for="actions-select">{{ $t('components.common.ActionTable.actionsLabel') }}</label>
+                  <label for="actions-select">{{ $t('components.common.ActionTable.label.actions') }}</label>
                   <select
                     id="actions-select"
                     v-model="currentActionName"
@@ -208,13 +208,13 @@ const launchAction = async () => {
                     :aria-label="labels.performAction"
                     @confirm="launchAction"
                   >
-                    {{ $t('components.common.ActionTable.performActionButton') }}
+                    {{ $t('components.common.ActionTable.button.go') }}
                     <template #modal-header>
                       <p>
                         <span
                           key="1"
                         >
-                          {{ $t('components.common.ActionTable.performActionConfirmation', {action: currentActionName, count: affectedObjectsCount} ) }}
+                          {{ $t('components.common.ActionTable.modal.performAction.header', {action: currentActionName, count: affectedObjectsCount} ) }}
                         </span>
                       </p>
                     </template>
@@ -226,13 +226,13 @@ const launchAction = async () => {
                         <span
                           v-else
                         >
-                          {{ $t('components.common.ActionTable.performActionWarning') }}
+                          {{ $t('components.common.ActionTable.modal.performAction.content.warning') }}
                         </span>
                       </p>
                     </template>
                     <template #modal-confirm>
                       <div :aria-label="labels.performAction">
-                        {{ $t('components.common.ActionTable.launchActionButton') }}
+                        {{ $t('components.common.ActionTable.button.launch') }}
                       </div>
                     </template>
                   </dangerous-button>
@@ -243,19 +243,19 @@ const launchAction = async () => {
                     :class="['ui', {disabled: checked.length === 0}, {'loading': isLoading}, 'button']"
                     @click="launchAction"
                   >
-                    {{ $t('components.common.ActionTable.performActionButton') }}
+                    {{ $t('components.common.ActionTable.button.go') }}
                   </button>
                 </div>
                 <div class="count field">
                   <span
                     v-if="selectAll"
                   >
-                    {{ $t('components.common.ActionTable.allElementsSelectedMessage', {count: objectsData.count}) }}
+                    {{ $t('components.common.ActionTable.button.allSelected', {count: objectsData.count}) }}
                   </span>
                   <span
                     v-else
                   >
-                    {{ $t('components.common.ActionTable.elementsSelectedMessage', {count: checked.length, total: objectsData.count}) }}
+                    {{ $t('components.common.ActionTable.button.selected', {count: checked.length, total: objectsData.count}) }}
                   </span>
                   <template v-if="currentAction?.allowAll && checkable.length > 0 && checkable.length === checked.length">
                     <a
@@ -266,7 +266,7 @@ const launchAction = async () => {
                       <span
                         key="3"
                       >
-                        {{ $t('components.common.ActionTable.selectElementsMessage', {total: objectsData.count}) }}
+                        {{ $t('components.common.ActionTable.button.selectElement', {total: objectsData.count}) }}
                       </span>
                     </a>
                     <a
@@ -276,7 +276,7 @@ const launchAction = async () => {
                     >
                       <span
                         key="4"
-                      >{{ $t('components.common.ActionTable.selectCurrentPage') }}</span>
+                      >{{ $t('components.common.ActionTable.button.selectCurrentPage') }}</span>
                     </a>
                   </template>
                 </div>
@@ -287,7 +287,7 @@ const launchAction = async () => {
                 class="ui negative message"
               >
                 <h4 class="header">
-                  {{ $t('components.common.ActionTable.actionErrorMessage') }}
+                  {{ $t('components.common.ActionTable.header.error') }}
                 </h4>
                 <ul class="list">
                   <li
@@ -304,7 +304,7 @@ const launchAction = async () => {
               >
                 <p>
                   <span>
-                    {{ $t('components.common.ActionTable.actionSuccessMessage', {action: result.action, count: result.updated}) }}
+                    {{ $t('components.common.ActionTable.message.success', {action: result.action, count: result.updated}) }}
                   </span>
                 </p>
 
diff --git a/front/src/components/common/AttachmentInput.vue b/front/src/components/common/AttachmentInput.vue
index c6e37aa3e..613621040 100644
--- a/front/src/components/common/AttachmentInput.vue
+++ b/front/src/components/common/AttachmentInput.vue
@@ -107,7 +107,7 @@ const getAttachmentUrl = (uuid: string) => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.common.AttachmentInput.saveFailureMessage') }}
+        {{ $t('components.common.AttachmentInput.header.failure') }}
       </h4>
       <ul class="list">
         <li
@@ -144,7 +144,7 @@ const getAttachmentUrl = (uuid: string) => {
         <div class="eleven wide column">
           <div class="file-input">
             <label :for="attachmentId">
-              {{ $t('components.common.AttachmentInput.uploadLabel') }}
+              {{ $t('components.common.AttachmentInput.label.upload') }}
             </label>
             <input
               :id="attachmentId"
@@ -159,21 +159,21 @@ const getAttachmentUrl = (uuid: string) => {
           </div>
           <div class="ui very small hidden divider" />
           <p>
-            {{ $t('components.common.AttachmentInput.uploadHelp') }}
+            {{ $t('components.common.AttachmentInput.help.upload') }}
           </p>
           <button
             v-if="value"
             class="ui basic tiny button"
             @click.stop.prevent="remove(value as string)"
           >
-            {{ $t('components.common.AttachmentInput.removeButton') }}
+            {{ $t('components.common.AttachmentInput.button.remove') }}
           </button>
           <div
             v-if="isLoading"
             class="ui active inverted dimmer"
           >
             <div class="ui indeterminate text loader">
-              {{ $t('components.common.AttachmentInput.uploadingMessage') }}
+              {{ $t('components.common.AttachmentInput.loader.uploading') }}
             </div>
           </div>
         </div>
diff --git a/front/src/components/common/CollapseLink.vue b/front/src/components/common/CollapseLink.vue
index 2fc972dd1..98df6f642 100644
--- a/front/src/components/common/CollapseLink.vue
+++ b/front/src/components/common/CollapseLink.vue
@@ -23,12 +23,12 @@ const value = useVModel(props, 'modelValue', emit)
     <span
       v-if="value"
     >
-      {{ $t('components.common.CollapseLink.expandLabel') }}
+      {{ $t('components.common.CollapseLink.button.expand') }}
     </span>
     <span
       v-else
     >
-      {{ $t('components.common.CollapseLink.collapseLabel') }}
+      {{ $t('components.common.CollapseLink.button.collapse') }}
     </span>
     <i :class="[{ down: !value, right: value }, 'angle', 'icon']" />
   </a>
diff --git a/front/src/components/common/ContentForm.vue b/front/src/components/common/ContentForm.vue
index fbb0ea3df..3905cdb55 100644
--- a/front/src/components/common/ContentForm.vue
+++ b/front/src/components/common/ContentForm.vue
@@ -36,7 +36,7 @@ const preview = ref()
 const isLoadingPreview = ref(false)
 
 const labels = computed(() => ({
-  placeholder: props.placeholder ?? t('components.common.ContentForm.placeHolderLabel')
+  placeholder: props.placeholder ?? t('components.common.ContentForm.placeholder.input')
 }))
 
 const remainingChars = computed(() => props.charLimit - props.modelValue.length)
@@ -86,13 +86,13 @@ onMounted(async () => {
           :class="[{active: !isPreviewing}, 'item']"
           @click.prevent="isPreviewing = false"
         >
-          {{ $t('components.common.ContentForm.writeButton') }}
+          {{ $t('components.common.ContentForm.button.write') }}
         </button>
         <button
           :class="[{active: isPreviewing}, 'item']"
           @click.prevent="isPreviewing = true"
         >
-          {{ $t('components.common.ContentForm.previewButton') }}
+          {{ $t('components.common.ContentForm.button.preview') }}
         </button>
       </div>
       <template v-if="isPreviewing">
@@ -108,7 +108,7 @@ onMounted(async () => {
           </div>
         </div>
         <p v-else-if="!preview">
-          {{ $t('components.common.ContentForm.noContentMessage') }}
+          {{ $t('components.common.ContentForm.empty.noContent') }}
         </p>
         <sanitized-html
           v-else
@@ -135,7 +135,7 @@ onMounted(async () => {
         {{ remainingChars }}
       </span>
       <p>
-        {{ $t('components.common.ContentForm.markdownMessage') }}
+        {{ $t('components.common.ContentForm.help.markdown') }}
       </p>
     </div>
   </div>
diff --git a/front/src/components/common/CopyInput.vue b/front/src/components/common/CopyInput.vue
index 6ca40bf37..3db76f031 100644
--- a/front/src/components/common/CopyInput.vue
+++ b/front/src/components/common/CopyInput.vue
@@ -22,7 +22,7 @@ const { copy, isSupported: canCopy, copied } = useClipboard({ source: value, cop
       v-if="copied"
       class="message"
     >
-      {{ $t('components.common.CopyInput.copySuccessMessage') }}
+      {{ $t('components.common.CopyInput.message.success') }}
     </p>
     <input
       :id="id"
@@ -37,7 +37,7 @@ const { copy, isSupported: canCopy, copied } = useClipboard({ source: value, cop
       @click="copy()"
     >
       <i class="copy icon" />
-      {{ $t('components.common.CopyInput.copyButton') }}
+      {{ $t('components.common.CopyInput.button.copy') }}
     </button>
   </div>
 </template>
diff --git a/front/src/components/common/DangerousButton.vue b/front/src/components/common/DangerousButton.vue
index 38e34e96e..fd7207a8a 100644
--- a/front/src/components/common/DangerousButton.vue
+++ b/front/src/components/common/DangerousButton.vue
@@ -42,7 +42,7 @@ const confirm = () => {
     >
       <h4 class="header">
         <slot name="modal-header">
-          {{ $t('components.common.DangerousButton.confirmAction') }}
+          {{ $t('components.common.DangerousButton.header.confirm') }}
         </slot>
       </h4>
       <div class="scrolling content">
@@ -52,14 +52,14 @@ const confirm = () => {
       </div>
       <div class="actions">
         <button class="ui basic cancel button">
-          {{ $t('components.common.DangerousButton.cancelButton') }}
+          {{ $t('components.common.DangerousButton.button.cancel') }}
         </button>
         <button
           :class="['ui', 'confirm', confirmColor, 'button']"
           @click="confirm"
         >
           <slot name="modal-confirm">
-            {{ $t('components.common.DangerousButton.confirmButton') }}
+            {{ $t('components.common.DangerousButton.button.confirm') }}
           </slot>
         </button>
       </div>
diff --git a/front/src/components/common/Duration.vue b/front/src/components/common/Duration.vue
index bf517d628..c7a417bda 100644
--- a/front/src/components/common/Duration.vue
+++ b/front/src/components/common/Duration.vue
@@ -20,9 +20,9 @@ const duration = computed(() => {
   <span>
     <span
       v-if="duration.hours > 0"
-    >{{ $t('components.common.Duration.hoursFormat', {hours: duration.hours, minutes: duration.minutes}) }}</span>
+    >{{ $t('components.common.Duration.meta.hours', {hours: duration.hours, minutes: duration.minutes}) }}</span>
     <span
       v-else
-    >{{ $t('components.common.Duration.minutesFormat', {minutes: duration.minutes}) }}</span>
+    >{{ $t('components.common.Duration.meta.minutes', {minutes: duration.minutes}) }}</span>
   </span>
 </template>
diff --git a/front/src/components/common/EmptyState.vue b/front/src/components/common/EmptyState.vue
index ad60f82fe..0dfa822cc 100644
--- a/front/src/components/common/EmptyState.vue
+++ b/front/src/components/common/EmptyState.vue
@@ -19,7 +19,7 @@ withDefaults(defineProps<Props>(), {
       <div class="content">
         <slot name="title">
           <i class="search icon" />
-          {{ $t('components.common.EmptyState.emptyState') }}
+          {{ $t('components.common.EmptyState.header.noResults') }}
         </slot>
       </div>
     </h4>
@@ -30,7 +30,7 @@ withDefaults(defineProps<Props>(), {
         class="ui button"
         @click="emit('refresh')"
       >
-        {{ $t('components.common.EmptyState.refreshButton') }}
+        {{ $t('components.common.EmptyState.button.refresh') }}
       </button>
     </div>
   </div>
diff --git a/front/src/components/common/ExpandableDiv.vue b/front/src/components/common/ExpandableDiv.vue
index 9218f0b8a..19ad0f545 100644
--- a/front/src/components/common/ExpandableDiv.vue
+++ b/front/src/components/common/ExpandableDiv.vue
@@ -28,10 +28,10 @@ const truncated = computed(() => props.content.slice(0, props.length))
       <br>
       <span
         v-if="expanded"
-      >{{ $t('components.common.ExpandableDiv.showLess') }}</span>
+      >{{ $t('components.common.ExpandableDiv.button.less') }}</span>
       <span
         v-else
-      >{{ $t('components.common.ExpandableDiv.showMore') }}</span>
+      >{{ $t('components.common.ExpandableDiv.button.more') }}</span>
     </a>
   </div>
 </template>
diff --git a/front/src/components/common/InlineSearchBar.vue b/front/src/components/common/InlineSearchBar.vue
index 2a73e03b7..c5e314180 100644
--- a/front/src/components/common/InlineSearchBar.vue
+++ b/front/src/components/common/InlineSearchBar.vue
@@ -22,8 +22,8 @@ const value = useVModel(props, 'modelValue', emit)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.common.InlineSearchBar.searchPlaceholder'),
-  clear: t('components.common.InlineSearchBar.clearLabel')
+  searchPlaceholder: t('components.common.InlineSearchBar.placeholder.search'),
+  clear: t('components.common.InlineSearchBar.button.clear')
 }))
 
 const search = () => {
@@ -42,7 +42,7 @@ const search = () => {
         for="search-query"
         class="hidden"
       >
-        {{ $t('components.common.InlineSearchBar.searchLabel') }}
+        {{ $t('components.common.InlineSearchBar.label.search') }}
       </label>
       <input
         id="search-query"
diff --git a/front/src/components/common/LoginModal.vue b/front/src/components/common/LoginModal.vue
index f74d0508b..b6212d870 100644
--- a/front/src/components/common/LoginModal.vue
+++ b/front/src/components/common/LoginModal.vue
@@ -18,10 +18,10 @@ const show = ref(false)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  header: t('components.common.LoginModal.header'),
-  login: t('components.common.LoginModal.loginLabel'),
-  signup: t('components.common.LoginModal.signupLabel'),
-  description: t('components.common.LoginModal.noAccessDescription')
+  header: t('components.common.LoginModal.header.unauthenticated'),
+  login: t('components.common.LoginModal.link.login'),
+  signup: t('components.common.LoginModal.link.signup'),
+  description: t('components.common.LoginModal.description.noAccess')
 }))
 </script>
 
diff --git a/front/src/components/common/RenderedDescription.vue b/front/src/components/common/RenderedDescription.vue
index bcb0b9cfd..164051a31 100644
--- a/front/src/components/common/RenderedDescription.vue
+++ b/front/src/components/common/RenderedDescription.vue
@@ -91,19 +91,19 @@ const submit = async () => {
           href=""
           @click.stop.prevent="showMore = true"
         >
-          {{ $t('components.common.RenderedDescription.showMore') }}
+          {{ $t('components.common.RenderedDescription.button.more') }}
         </a>
         <a
           v-else
           href=""
           @click.stop.prevent="showMore = false"
         >
-          {{ $t('components.common.RenderedDescription.showLess') }}
+          {{ $t('components.common.RenderedDescription.button.less') }}
         </a>
       </template>
     </template>
     <p v-else-if="!isUpdating">
-      {{ $t('components.common.RenderedDescription.noDescription') }}
+      {{ $t('components.common.RenderedDescription.empty.noDescription') }}
     </p>
     <template v-if="!isUpdating && canUpdate && updateUrl">
       <div class="ui hidden divider" />
@@ -112,7 +112,7 @@ const submit = async () => {
         @click="isUpdating = true"
       >
         <i class="pencil icon" />
-        {{ $t('components.common.RenderedDescription.editButton') }}
+        {{ $t('components.common.RenderedDescription.button.edit') }}
       </span>
     </template>
     <form
@@ -126,7 +126,7 @@ const submit = async () => {
         class="ui negative message"
       >
         <h4 class="header">
-          {{ $t('components.common.RenderedDescription.updateFailureHeader') }}
+          {{ $t('components.common.RenderedDescription.header.failure') }}
         </h4>
         <ul class="list">
           <li
@@ -145,14 +145,14 @@ const submit = async () => {
         class="left floated"
         @click.prevent="isUpdating = false"
       >
-        {{ $t('components.common.RenderedDescription.cancelButton') }}
+        {{ $t('components.common.RenderedDescription.button.cancel') }}
       </a>
       <button
         :class="['ui', {'loading': isLoading}, 'right', 'floated', 'button']"
         type="submit"
         :disabled="isLoading"
       >
-        {{ $t('components.common.RenderedDescription.updateButton') }}
+        {{ $t('components.common.RenderedDescription.button.update') }}
       </button>
       <div class="ui clearing hidden divider" />
     </form>
diff --git a/front/src/components/common/UserLink.vue b/front/src/components/common/UserLink.vue
index 1b215815c..4c4d9f0d2 100644
--- a/front/src/components/common/UserLink.vue
+++ b/front/src/components/common/UserLink.vue
@@ -33,6 +33,6 @@ const defaultAvatarStyle = computed(() => ({ backgroundColor: `#${userColor.valu
       >{{ user.username[0] }}</span>
       &nbsp;
     </template>
-    {{ $t('components.common.UserLink.username', {username: user.username}) }}
+    {{ $t('components.common.UserLink.link.username', {username: user.username}) }}
   </span>
 </template>
diff --git a/front/src/components/common/UserMenu.vue b/front/src/components/common/UserMenu.vue
index 4b8d2d6da..166c4c7b5 100644
--- a/front/src/components/common/UserMenu.vue
+++ b/front/src/components/common/UserMenu.vue
@@ -17,21 +17,21 @@ const themes = useThemeList()
 const { theme } = useTheme()
 
 const labels = computed(() => ({
-  profile: t('components.common.UserMenu.profileLabel'),
-  settings: t('components.common.UserMenu.settingsLabel'),
-  logout: t('components.common.UserMenu.logoutLabel'),
-  about: t('components.common.UserMenu.aboutLabel'),
-  shortcuts: t('components.common.UserMenu.shortcutsLabel'),
-  support: t('components.common.UserMenu.supportLabel'),
-  forum: t('components.common.UserMenu.forumLabel'),
-  docs: t('components.common.UserMenu.docsLabel'),
-  language: t('components.common.UserMenu.languageLabel'),
-  theme: t('components.common.UserMenu.themeLabel'),
-  chat: t('components.common.UserMenu.chatLabel'),
-  git: t('components.common.UserMenu.gitLabel'),
-  login: t('components.common.UserMenu.loginLabel'),
-  signup: t('components.common.UserMenu.signupLabel'),
-  notifications: t('components.common.UserMenu.notificationsLabel')
+  profile: t('components.common.UserMenu.link.profile'),
+  settings: t('components.common.UserMenu.link.settings'),
+  logout: t('components.common.UserMenu.link.logout'),
+  about: t('components.common.UserMenu.link.about'),
+  shortcuts: t('components.common.UserMenu.label.shortcuts'),
+  support: t('components.common.UserMenu.link.support'),
+  forum: t('components.common.UserMenu.link.forum'),
+  docs: t('components.common.UserMenu.link.docs'),
+  language: t('components.common.UserMenu.label.language'),
+  theme: t('components.common.UserMenu.label.theme'),
+  chat: t('components.common.UserMenu.link.chat'),
+  git: t('components.common.UserMenu.link.git'),
+  login: t('components.common.UserMenu.link.login'),
+  signup: t('components.common.UserMenu.link.signup'),
+  notifications: t('components.common.UserMenu.link.notifications')
 }))
 </script>
 
diff --git a/front/src/components/common/UserModal.vue b/front/src/components/common/UserModal.vue
index 2d5dee2e1..f0a0a353e 100644
--- a/front/src/components/common/UserModal.vue
+++ b/front/src/components/common/UserModal.vue
@@ -26,24 +26,24 @@ const themes = useThemeList()
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  header: t('components.common.UserModal.optionsLabel'),
-  profile: t('components.common.UserModal.profileLabel'),
-  settings: t('components.common.UserModal.settingsLabel'),
-  logout: t('components.common.UserModal.logoutLabel'),
-  about: t('components.common.UserModal.aboutLabel'),
-  shortcuts: t('components.common.UserModal.shortcutsLabel'),
-  support: t('components.common.UserModal.supportLabel'),
-  forum: t('components.common.UserModal.forumLabel'),
-  docs: t('components.common.UserModal.docsLabel'),
-  help: t('components.common.UserModal.supportLabel'),
-  language: t('components.common.UserModal.languageLabel'),
-  theme: t('components.common.UserModal.themeLabel'),
-  chat: t('components.common.UserModal.chatLabel'),
-  git: t('components.common.UserModal.gitLabel'),
-  login: t('components.common.UserModal.loginLabel'),
-  signup: t('components.common.UserModal.signupLabel'),
-  notifications: t('components.common.UserModal.notificationsLabel'),
-  useOtherInstance: t('components.common.UserModal.useOtherInstanceLabel')
+  header: t('components.common.UserModal.header.options'),
+  profile: t('components.common.UserModal.link.profile'),
+  settings: t('components.common.UserModal.link.settings'),
+  logout: t('components.common.UserModal.link.logout'),
+  about: t('components.common.UserModal.link.about'),
+  shortcuts: t('components.common.UserModal.label.shortcuts'),
+  support: t('components.common.UserModal.link.support'),
+  forum: t('components.common.UserModal.link.forum'),
+  docs: t('components.common.UserModal.link.docs'),
+  help: t('components.common.UserModal.link.support'),
+  language: t('components.common.UserModal.label.language'),
+  theme: t('components.common.UserModal.label.theme'),
+  chat: t('components.common.UserModal.link.chat'),
+  git: t('components.common.UserModal.link.git'),
+  login: t('components.common.UserModal.link.login'),
+  signup: t('components.common.UserModal.link.signup'),
+  notifications: t('components.common.UserModal.link.notifications'),
+  useOtherInstance: t('components.common.UserModal.button.switchInstance')
 }))
 </script>
 
diff --git a/front/src/components/favorites/List.vue b/front/src/components/favorites/List.vue
index d2161e07a..b8e4b943f 100644
--- a/front/src/components/favorites/List.vue
+++ b/front/src/components/favorites/List.vue
@@ -112,7 +112,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
     <section class="ui vertical center aligned stripe segment">
       <div :class="['ui', { 'active': isLoading }, 'inverted', 'dimmer']">
         <div class="ui text loader">
-          {{ $t('components.favorites.List.loadingMessage') }}
+          {{ $t('components.favorites.List.loader.loading') }}
         </div>
       </div>
       <h2
@@ -120,7 +120,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
         class="ui center aligned icon header"
       >
         <i class="circular inverted heart pink icon" />
-        {{ $t('components.favorites.List.favoritesCount', {count: $store.state.favorites.count}) }}
+        {{ $t('components.favorites.List.header.favorites', {count: $store.state.favorites.count}) }}
       </h2>
       <radio-button
         v-if="$store.state.favorites.count > 0"
@@ -135,7 +135,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
         <div class="fields">
           <div class="field">
             <label for="favorites-ordering">
-              {{ $t('components.favorites.List.favoritesOrderingLabel') }}
+              {{ $t('components.favorites.List.ordering.label') }}
             </label>
             <select
               id="favorites-ordering"
@@ -153,7 +153,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
           </div>
           <div class="field">
             <label for="favorites-ordering-direction">
-              {{ $t('components.favorites.List.favoritesOrderingDirectionLabel') }}
+              {{ $t('components.favorites.List.ordering.direction.label') }}
             </label>
             <select
               id="favorites-ordering-direction"
@@ -161,16 +161,16 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
               class="ui dropdown"
             >
               <option value="+">
-                {{ $t('components.favorites.List.orderingDirectionAscending') }}
+                {{ $t('components.favorites.List.ordering.direction.ascending') }}
               </option>
               <option value="-">
-                {{ $t('components.favorites.List.orderingDirectionDescending') }}
+                {{ $t('components.favorites.List.ordering.direction.descending') }}
               </option>
             </select>
           </div>
           <div class="field">
             <label for="favorites-results">
-              {{ $t('components.favorites.List.favoritesResultsPerPageLabel') }}
+              {{ $t('components.favorites.List.pagination.results') }}
             </label>
             <select
               id="favorites-results"
@@ -209,14 +209,14 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
     >
       <div class="ui icon header">
         <i class="broken heart icon" />
-        {{ $t('components.favorites.List.emptyState') }}
+        {{ $t('components.favorites.List.empty.noFavorites') }}
       </div>
       <router-link
         :to="'/library'"
         class="ui success labeled icon button"
       >
         <i class="headphones icon" />
-        {{ $t('components.favorites.List.libraryLink') }}
+        {{ $t('components.favorites.List.link.library') }}
       </router-link>
     </div>
   </main>
diff --git a/front/src/components/favorites/TrackFavoriteIcon.vue b/front/src/components/favorites/TrackFavoriteIcon.vue
index df8db3120..c2ca0d9ef 100644
--- a/front/src/components/favorites/TrackFavoriteIcon.vue
+++ b/front/src/components/favorites/TrackFavoriteIcon.vue
@@ -23,8 +23,8 @@ const store = useStore()
 
 const isFavorite = computed(() => store.getters['favorites/isFavorite'](props.track.id))
 const title = computed(() => isFavorite.value
-  ? t('components.favorites.TrackFavoriteIcon.removeFromFavorites')
-  : t('components.favorites.TrackFavoriteIcon.addToFavorites')
+  ? t('components.favorites.TrackFavoriteIcon.button.remove')
+  : t('components.favorites.TrackFavoriteIcon.button.add')
 )
 </script>
 
@@ -38,12 +38,12 @@ const title = computed(() => isFavorite.value
     <span
       v-if="isFavorite"
     >
-      {{ $t('components.favorites.TrackFavoriteIcon.isFavorited') }}
+      {{ $t('components.favorites.TrackFavoriteIcon.label.inFavorites') }}
     </span>
     <span
       v-else
     >
-      {{ $t('components.favorites.TrackFavoriteIcon.addToFavorites') }}
+      {{ $t('components.favorites.TrackFavoriteIcon.button.add') }}
     </span>
   </button>
   <button
diff --git a/front/src/components/federation/FetchButton.vue b/front/src/components/federation/FetchButton.vue
index 81403dbee..531551a6a 100644
--- a/front/src/components/federation/FetchButton.vue
+++ b/front/src/components/federation/FetchButton.vue
@@ -80,7 +80,7 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
       class="small"
     >
       <h3 class="header">
-        {{ $t('components.federation.FetchButton.remoteRefreshHeader') }}
+        {{ $t('components.federation.FetchButton.header.refresh') }}
       </h3>
       <div class="scrolling content">
         <template v-if="data && data.status != 'pending'">
@@ -89,10 +89,10 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
             class="ui message"
           >
             <h4 class="header">
-              {{ $t('components.federation.FetchButton.refreshSkippedHeader') }}
+              {{ $t('components.federation.FetchButton.header.skipped') }}
             </h4>
             <p>
-              {{ $t('components.federation.FetchButton.unsupportedDataMessage') }}
+              {{ $t('components.federation.FetchButton.description.skipped') }}
             </p>
           </div>
           <div
@@ -100,10 +100,10 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
             class="ui success message"
           >
             <h4 class="header">
-              {{ $t('components.federation.FetchButton.refreshSuccessHeader') }}
+              {{ $t('components.federation.FetchButton.header.success') }}
             </h4>
             <p>
-              {{ $t('components.federation.FetchButton.refreshSuccessMessage') }}
+              {{ $t('components.federation.FetchButton.description.success') }}
             </p>
           </div>
           <div
@@ -111,16 +111,16 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
             class="ui error message"
           >
             <h4 class="header">
-              {{ $t('components.federation.FetchButton.refreshFailureHeader') }}
+              {{ $t('components.federation.FetchButton.header.failure') }}
             </h4>
             <p>
-              {{ $t('components.federation.FetchButton.refreshFailureMessage') }}
+              {{ $t('components.federation.FetchButton.description.failure') }}
             </p>
             <table class="ui very basic collapsing celled table">
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.federation.FetchButton.errorTypeTableHeader') }}
+                    {{ $t('components.federation.FetchButton.table.error.label.type') }}
                   </td>
                   <td>
                     {{ data.detail.error_code }}
@@ -128,48 +128,48 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.federation.FetchButton.errorDetailTableRow') }}
+                    {{ $t('components.federation.FetchButton.table.error.label.detail') }}
                   </td>
                   <td>
                     <span
                       v-if="data.detail.error_code === 'http' && data.detail.status_code"
                     >
-                      {{ $t('components.federation.FetchButton.httpStatusMessage', {status: data.detail.status_code}) }}
+                      {{ $t('components.federation.FetchButton.table.error.value.httpStatus', {status: data.detail.status_code}) }}
                     </span>
                     <span
                       v-else-if="['http', 'request'].indexOf(data.detail.error_code) > -1"
                     >
-                      {{ $t('components.federation.FetchButton.httpErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.httpError') }}
                     </span>
                     <span
                       v-else-if="data.detail.error_code === 'timeout'"
                     >
-                      {{ $t('components.federation.FetchButton.timeoutErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.timeoutError') }}
                     </span>
                     <span
                       v-else-if="data.detail.error_code === 'connection'"
                     >
-                      {{ $t('components.federation.FetchButton.connectionErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.connectionError') }}
                     </span>
                     <span
                       v-else-if="['invalid_json', 'invalid_jsonld', 'missing_jsonld_type'].indexOf(data.detail.error_code) > -1"
                     >
-                      {{ $t('components.federation.FetchButton.invalidJsonErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.invalidJsonError') }}
                     </span>
                     <span
                       v-else-if="data.detail.error_code === 'validation'"
                     >
-                      {{ $t('components.federation.FetchButton.invalidAttributesErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.invalidAttributesError') }}
                     </span>
                     <span
                       v-else-if="data.detail.error_code === 'unhandled'"
                     >
-                      {{ $t('components.federation.FetchButton.unknownErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.unknownError') }}
                     </span>
                     <span
                       v-else
                     >
-                      {{ $t('components.federation.FetchButton.unknownErrorMessage') }}
+                      {{ $t('components.federation.FetchButton.table.error.value.unknownError') }}
                     </span>
                   </td>
                 </tr>
@@ -182,7 +182,7 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
           class="ui active inverted dimmer"
         >
           <div class="ui text loader">
-            {{ $t('components.federation.FetchButton.fetchRequestLoader') }}
+            {{ $t('components.federation.FetchButton.loader.fetchRequest') }}
           </div>
         </div>
         <div
@@ -190,7 +190,7 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
           class="ui active inverted dimmer"
         >
           <div class="ui text loader">
-            {{ $t('components.federation.FetchButton.awaitingResultLoader') }}
+            {{ $t('components.federation.FetchButton.loader.awaitingResult') }}
           </div>
         </div>
         <div
@@ -199,7 +199,7 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
           class="ui negative message"
         >
           <h4 class="header">
-            {{ $t('components.federation.FetchButton.loadingFailureMessage') }}
+            {{ $t('components.federation.FetchButton.header.saveFailure') }}
           </h4>
           <ul class="list">
             <li
@@ -216,23 +216,23 @@ const { start: startPolling } = useTimeoutFn(poll, 1000, { immediate: false })
           class="ui warning message"
         >
           <h4 class="header">
-            {{ $t('components.federation.FetchButton.pendingRefreshHeader') }}
+            {{ $t('components.federation.FetchButton.header.pending') }}
           </h4>
           <p>
-            {{ $t('components.federation.FetchButton.pendingRefreshMessage') }}
+            {{ $t('components.federation.FetchButton.description.pending') }}
           </p>
         </div>
       </div>
       <div class="actions">
         <button class="ui basic cancel button">
-          {{ $t('components.federation.FetchButton.closeButton') }}
+          {{ $t('components.federation.FetchButton.button.close') }}
         </button>
         <button
           v-if="data && data.status === 'finished'"
           class="ui confirm success button"
           @click.prevent="showModal = false; emit('refresh')"
         >
-          {{ $t('components.federation.FetchButton.reloadButton') }}
+          {{ $t('components.federation.FetchButton.button.reload') }}
         </button>
       </div>
     </semantic-modal>
diff --git a/front/src/components/federation/LibraryWidget.vue b/front/src/components/federation/LibraryWidget.vue
index 6872eb108..ffe34a217 100644
--- a/front/src/components/federation/LibraryWidget.vue
+++ b/front/src/components/federation/LibraryWidget.vue
@@ -64,7 +64,7 @@ fetchData()
       v-if="!isLoading && libraries.length === 0"
       class="ui subtitle"
     >
-      {{ $t('components.federation.LibraryWidget.noMatchMessage') }}
+      {{ $t('components.federation.LibraryWidget.empty.noMatch') }}
     </p>
     <div class="ui hidden divider" />
     <div class="ui cards">
@@ -90,7 +90,7 @@ fetchData()
         :class="['ui', 'basic', 'button']"
         @click="fetchData(nextPage)"
       >
-        {{ $t('components.federation.LibraryWidget.showMoreButton') }}
+        {{ $t('components.federation.LibraryWidget.button.showMore') }}
       </button>
     </template>
   </div>
diff --git a/front/src/components/forms/PasswordInput.vue b/front/src/components/forms/PasswordInput.vue
index fc444fa57..c8ba7e54a 100644
--- a/front/src/components/forms/PasswordInput.vue
+++ b/front/src/components/forms/PasswordInput.vue
@@ -27,8 +27,8 @@ const showPassword = ref(props.defaultShow)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  title: t('components.federation.PasswordInput.title'),
-  copy: t('components.federation.PasswordInput.copyLabel')
+  title: t('components.forms.PasswordInput.title'),
+  copy: t('components.forms.PasswordInput.button.copy')
 }))
 
 const passwordInputType = computed(() => showPassword.value ? 'text' : 'password')
@@ -38,7 +38,7 @@ const { isSupported: canCopy, copy } = useClipboard({ source: value })
 const copyPassword = () => {
   copy()
   store.commit('ui/addMessage', {
-    content: t('components.federation.PasswordInput.copySuccessMessage'),
+    content: t('components.forms.PasswordInput.message.copy'),
     date: new Date()
   })
 }
diff --git a/front/src/components/library/AlbumBase.vue b/front/src/components/library/AlbumBase.vue
index 018a274aa..e85086dbc 100644
--- a/front/src/components/library/AlbumBase.vue
+++ b/front/src/components/library/AlbumBase.vue
@@ -180,12 +180,12 @@ const remove = async () => {
                     <span
                       v-if="isSerie"
                     >
-                      {{ $t('components.library.AlbumBase.episodeCount', {episode_count: totalTracks}) }}
+                      {{ $t('components.library.AlbumBase.meta.episodes', {episode_count: totalTracks}) }}
                     </span>
                     <span
                       v-else
                     >
-                      {{ $t('components.library.AlbumBase.trackCount', {tracks_count: totalTracks}) }}
+                      {{ $t('components.library.AlbumBase.meta.tracks', {tracks_count: totalTracks}) }}
                     </span>
                   </template>
                   <div class="ui small hidden divider" />
@@ -263,12 +263,12 @@ const remove = async () => {
                 <span
                   v-if="isSerie"
                 >
-                  {{ $t('components.library.AlbumBase.episodeCount', {episode_count: totalTracks}) }}
+                  {{ $t('components.library.AlbumBase.meta.episodes', {episode_count: totalTracks}) }}
                 </span>
                 <span
                   v-else
                 >
-                  {{ $t('components.library.AlbumBase.trackCount', {tracks_count: totalTracks}) }}
+                  {{ $t('components.library.AlbumBase.meta.tracks', {tracks_count: totalTracks}) }}
                 </span>
                 <span class="middle middledot symbol" />
               </template>
@@ -311,7 +311,7 @@ const remove = async () => {
                   :to="{name: 'library.albums.edit', params: {id: object.id }}"
                 >
                   <i class="pencil icon" />
-                  {{ $t('components.library.AlbumBase.addDescription') }}
+                  {{ $t('components.library.AlbumBase.link.addDescription') }}
                 </router-link>
               </div>
             </div>
@@ -327,7 +327,7 @@ const remove = async () => {
                 :to="{name: 'library.albums.edit', params: {id: object.id }}"
               >
                 <i class="pencil icon" />
-                {{ $t('components.library.AlbumBase.addDescription') }}
+                {{ $t('components.library.AlbumBase.link.addDescription') }}
               </router-link>
             </template>
           </div>
diff --git a/front/src/components/library/AlbumDetail.vue b/front/src/components/library/AlbumDetail.vue
index 5bf7ffe64..1e42c61bf 100644
--- a/front/src/components/library/AlbumDetail.vue
+++ b/front/src/components/library/AlbumDetail.vue
@@ -61,10 +61,10 @@ const paginatedDiscs = computed(() => props.object.tracks.slice(props.paginateBy
   <div v-else-if="object">
     <h2 class="ui header">
       <span v-if="isSerie">
-        {{ $t('components.library.AlbumDetail.episodesHeader') }}
+        {{ $t('components.library.AlbumDetail.header.episodes') }}
       </span>
       <span v-else>
-        {{ $t('components.library.AlbumDetail.tracksHeader') }}
+        {{ $t('components.library.AlbumDetail.header.tracks') }}
       </span>
     </h2>
 
@@ -88,7 +88,7 @@ const paginatedDiscs = computed(() => props.object.tracks.slice(props.paginateBy
               :tracks="discs[index]"
             />
             <h3>
-              {{ $t('components.library.AlbumDetail.volumeNumber', {number: tracks[0].disc_number}) }}
+              {{ $t('components.library.AlbumDetail.meta.volume', {number: tracks[0].disc_number}) }}
             </h3>
             <track-table
               :is-album="true"
@@ -128,13 +128,13 @@ const paginatedDiscs = computed(() => props.object.tracks.slice(props.paginateBy
 
     <template v-if="!artist.channel && !isSerie">
       <h2>
-        {{ $t('components.library.AlbumDetail.userLibraryHeader') }}
+        {{ $t('components.library.AlbumDetail.header.libraries') }}
       </h2>
       <library-widget
         :url="'albums/' + object.id + '/libraries/'"
         @loaded="emit('libraries-loaded', $event)"
       >
-        {{ $t('components.library.AlbumDetail.userLibraryDescription') }}
+        {{ $t('components.library.AlbumDetail.description.libraries') }}
       </library-widget>
     </template>
   </div>
diff --git a/front/src/components/library/AlbumDropdown.vue b/front/src/components/library/AlbumDropdown.vue
index a83aaf92f..cdcded483 100644
--- a/front/src/components/library/AlbumDropdown.vue
+++ b/front/src/components/library/AlbumDropdown.vue
@@ -35,7 +35,7 @@ const domain = computed(() => getDomain(props.object.fid))
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  more: t('components.library.AlbumDropdown.moreLabel')
+  more: t('components.library.AlbumDropdown.button.more')
 }))
 
 const isEmbedable = computed(() => (props.isChannel && props.artist?.channel?.actor) || props.publicLibraries.length)
@@ -53,7 +53,7 @@ const remove = () => emit('remove')
       v-model:show="showEmbedModal"
     >
       <h4 class="header">
-        {{ $t('components.library.AlbumDropdown.embedModalHeader') }}
+        {{ $t('components.library.AlbumDropdown.modal.embed.header') }}
       </h4>
       <div class="scrolling content">
         <div class="description">
@@ -66,7 +66,7 @@ const remove = () => emit('remove')
       </div>
       <div class="actions">
         <button class="ui basic deny button">
-          {{ $t('components.channels.AlbumModal.cancelButton') }}
+          {{ $t('components.library.AlbumDropdown.button.cancel') }}
         </button>
       </div>
     </semantic-modal>
@@ -84,7 +84,7 @@ const remove = () => emit('remove')
           class="basic item"
         >
           <i class="external icon" />
-          {{ $t('components.library.AlbumDropdown.domainViewLink') }}
+          {{ $t('components.library.AlbumDropdown.link.domain') }}
         </a>
 
         <div
@@ -94,7 +94,7 @@ const remove = () => emit('remove')
           @click="showEmbedModal = !showEmbedModal"
         >
           <i class="code icon" />
-          {{ $t('components.audio.EmbedWizard.copyButton') }}
+          {{ $t('components.library.AlbumDropdown.button.embed') }}
         </div>
         <a
           v-if="isAlbum && musicbrainzUrl"
@@ -104,7 +104,7 @@ const remove = () => emit('remove')
           class="basic item"
         >
           <i class="external icon" />
-          {{ $t('components.library.AlbumDropdown.musicbrainzLink') }}
+          {{ $t('components.library.AlbumDropdown.link.musicbrainz') }}
         </a>
         <a
           v-if="!isChannel && isAlbum"
@@ -114,7 +114,7 @@ const remove = () => emit('remove')
           class="basic item"
         >
           <i class="external icon" />
-          {{ $t('components.library.AlbumDropdown.discogsLink') }}
+          {{ $t('components.library.AlbumDropdown.link.discogs') }}
         </a>
         <router-link
           v-if="object.is_local"
@@ -122,7 +122,7 @@ const remove = () => emit('remove')
           class="basic item"
         >
           <i class="edit icon" />
-          {{ $t('components.library.AlbumDropdown.editButton') }}
+          {{ $t('components.library.AlbumDropdown.button.edit') }}
         </router-link>
         <dangerous-button
           v-if="artist && $store.state.auth.authenticated && artist.channel && artist.attributed_to.full_username === $store.state.auth.fullUsername"
@@ -130,22 +130,22 @@ const remove = () => emit('remove')
           @confirm="remove()"
         >
           <i class="ui trash icon" />
-          {{ $t('components.library.AlbumDropdown.deleteButton') }}
+          {{ $t('components.library.AlbumDropdown.button.delete') }}
           <template #modal-header>
             <p>
-              {{ $t('components.library.AlbumDropdown.deleteModalHeader') }}
+              {{ $t('components.library.AlbumDropdown.modal.delete.header') }}
             </p>
           </template>
           <template #modal-content>
             <div>
               <p>
-                {{ $t('components.library.AlbumDropdown.deleteModalMessage') }}
+                {{ $t('components.library.AlbumDropdown.modal.delete.content.warning') }}
               </p>
             </div>
           </template>
           <template #modal-confirm>
             <p>
-              {{ $t('components.library.AlbumDropdown.deleteButton') }}
+              {{ $t('components.library.AlbumDropdown.button.delete') }}
             </p>
           </template>
         </dangerous-button>
@@ -166,7 +166,7 @@ const remove = () => emit('remove')
           :to="{name: 'manage.library.albums.detail', params: {id: object.id}}"
         >
           <i class="wrench icon" />
-          {{ $t('components.library.AlbumDropdown.moderationLink') }}
+          {{ $t('components.library.AlbumDropdown.link.moderation') }}
         </router-link>
         <a
           v-if="$store.state.auth.profile && $store.state.auth.profile?.is_superuser"
@@ -176,7 +176,7 @@ const remove = () => emit('remove')
           rel="noopener noreferrer"
         >
           <i class="wrench icon" />
-          {{ $t('components.library.AlbumDropdown.djangoLink') }}
+          {{ $t('components.library.AlbumDropdown.link.django') }}
         </a>
       </div>
     </button>
diff --git a/front/src/components/library/AlbumEdit.vue b/front/src/components/library/AlbumEdit.vue
index ab46f3cf4..11c309079 100644
--- a/front/src/components/library/AlbumEdit.vue
+++ b/front/src/components/library/AlbumEdit.vue
@@ -25,19 +25,19 @@ const canEdit = store.state.auth.availablePermissions.library
         <span
           v-if="canEdit"
         >
-          {{ $t('components.library.AlbumEdit.editAlbumHeader') }}
+          {{ $t('components.library.AlbumEdit.header.edit') }}
         </span>
         <span
           v-else
         >
-          {{ $t('components.library.AlbumEdit.suggestEditHeader') }}
+          {{ $t('components.library.AlbumEdit.header.suggest') }}
         </span>
       </h2>
       <div
         v-if="!object.is_local"
         class="ui message"
       >
-        {{ $t('components.library.AlbumEdit.remoteObjectWarning') }}
+        {{ $t('components.library.AlbumEdit.message.remote') }}
       </div>
       <edit-form
         v-else
diff --git a/front/src/components/library/Albums.vue b/front/src/components/library/Albums.vue
index 4a0d6555f..aab3ef9f3 100644
--- a/front/src/components/library/Albums.vue
+++ b/front/src/components/library/Albums.vue
@@ -110,7 +110,7 @@ onMounted(() => $('.ui.dropdown').dropdown())
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.library.Albums.searchPlaceholder'),
+  searchPlaceholder: t('components.library.Albums.placeholder.search'),
   title: t('components.library.Albums.title')
 }))
 
@@ -121,7 +121,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
   <main v-title="labels.title">
     <section class="ui vertical stripe segment">
       <h2 class="ui header">
-        {{ $t('components.library.Albums.albumBrowseHeader') }}
+        {{ $t('components.library.Albums.header.browse') }}
       </h2>
       <form
         :class="['ui', {'loading': isLoading}, 'form']"
@@ -130,7 +130,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
         <div class="fields">
           <div class="field">
             <label for="albums-search">
-              {{ $t('components.library.Albums.searchLabel') }}
+              {{ $t('components.library.Albums.label.search') }}
             </label>
             <div class="ui action input">
               <input
@@ -143,18 +143,18 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
               <button
                 class="ui icon button"
                 type="submit"
-                :aria-label="t('components.library.Albums.searchLabel')"
+                :aria-label="t('components.library.Albums.button.search')"
               >
                 <i class="search icon" />
               </button>
             </div>
           </div>
           <div class="field">
-            <label for="tags-search">{{ $t('components.library.Albums.tagsLabel') }}</label>
+            <label for="tags-search">{{ $t('components.library.Albums.label.tags') }}</label>
             <tags-selector v-model="tags" />
           </div>
           <div class="field">
-            <label for="album-ordering">{{ $t('components.library.Albums.orderingLabel') }}</label>
+            <label for="album-ordering">{{ $t('components.library.Albums.ordering.label') }}</label>
             <select
               id="album-ordering"
               v-model="ordering"
@@ -170,22 +170,22 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
             </select>
           </div>
           <div class="field">
-            <label for="album-ordering-direction">{{ $t('components.library.Albums.orderingDirectionLabel') }}</label>
+            <label for="album-ordering-direction">{{ $t('components.library.Albums.ordering.direction.label') }}</label>
             <select
               id="album-ordering-direction"
               v-model="orderingDirection"
               class="ui dropdown"
             >
               <option value="+">
-                {{ $t('components.library.Albums.ascendingOrdering') }}
+                {{ $t('components.library.Albums.ordering.direction.ascending') }}
               </option>
               <option value="-">
-                {{ $t('components.library.Albums.descendingOrdering') }}
+                {{ $t('components.library.Albums.ordering.direction.descending') }}
               </option>
             </select>
           </div>
           <div class="field">
-            <label for="album-results">{{ $t('components.library.Albums.resultsPerPageLabel') }}</label>
+            <label for="album-results">{{ $t('components.library.Albums.pagination.results') }}</label>
             <select
               id="album-results"
               v-model="paginateBy"
@@ -228,7 +228,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
         >
           <div class="ui icon header">
             <i class="compact disc icon" />
-            {{ $t('components.library.Albums.emptyStateMessage') }}
+            {{ $t('components.library.Albums.empty.noResults') }}
           </div>
           <router-link
             v-if="$store.state.auth.authenticated"
@@ -236,7 +236,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
             class="ui success button labeled icon"
           >
             <i class="upload icon" />
-            {{ $t('components.library.Albums.addMusicLink') }}
+            {{ $t('components.library.Albums.link.addMusic') }}
           </router-link>
         </div>
       </div>
diff --git a/front/src/components/library/ArtistBase.vue b/front/src/components/library/ArtistBase.vue
index ae37351a4..a1371a195 100644
--- a/front/src/components/library/ArtistBase.vue
+++ b/front/src/components/library/ArtistBase.vue
@@ -118,7 +118,7 @@ watch(() => props.id, fetchData, { immediate: true })
                 class="sub header"
               >
                 <div>
-                  {{ $t('components.library.ArtistBase.tracksCount', {count: totalTracks, albums: totalAlbums}) }}
+                  {{ $t('components.library.ArtistBase.meta.tracks', {count: totalTracks, albums: totalAlbums}) }}
                 </div>
               </div>
             </div>
@@ -141,7 +141,7 @@ watch(() => props.id, fetchData, { immediate: true })
                 class="vibrant"
                 :artist="object"
               >
-                {{ $t('components.library.ArtistBase.playAllButton') }}
+                {{ $t('components.library.ArtistBase.button.play') }}
               </play-button>
             </div>
 
@@ -150,7 +150,7 @@ watch(() => props.id, fetchData, { immediate: true })
               v-model:show="showEmbedModal"
             >
               <h4 class="header">
-                {{ $t('components.library.ArtistBase.embedModalHeader') }}
+                {{ $t('components.library.ArtistBase.modal.embed.header') }}
               </h4>
               <div class="scrolling content">
                 <div class="description">
@@ -162,7 +162,7 @@ watch(() => props.id, fetchData, { immediate: true })
               </div>
               <div class="actions">
                 <button class="ui deny button">
-                  {{ $t('components.library.ArtistBase.cancelButton') }}
+                  {{ $t('components.library.ArtistBase.button.cancel') }}
                 </button>
               </div>
             </semantic-modal>
@@ -171,7 +171,7 @@ watch(() => props.id, fetchData, { immediate: true })
                 class="ui button"
                 @click="dropdown.click()"
               >
-                {{ $t('components.library.ArtistBase.moreButton') }}
+                {{ $t('components.library.ArtistBase.button.more') }}
               </button>
               <button
                 ref="dropdown"
@@ -187,7 +187,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     class="basic item"
                   >
                     <i class="external icon" />
-                    {{ $t('components.library.ArtistBase.domainViewLink', {domain: domain}) }}
+                    {{ $t('components.library.ArtistBase.link.domain', {domain: domain}) }}
                   </a>
 
                   <button
@@ -197,7 +197,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     @click.prevent="showEmbedModal = !showEmbedModal"
                   >
                     <i class="code icon" />
-                    {{ $t('components.library.ArtistBase.embedButton') }}
+                    {{ $t('components.library.ArtistBase.button.embed') }}
                   </button>
                   <a
                     :href="wikipediaUrl"
@@ -206,7 +206,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     class="basic item"
                   >
                     <i class="wikipedia w icon" />
-                    {{ $t('components.library.ArtistBase.wikipediaLink') }}
+                    {{ $t('components.library.ArtistBase.link.wikipedia') }}
                   </a>
                   <a
                     v-if="musicbrainzUrl"
@@ -216,7 +216,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     class="basic item"
                   >
                     <i class="external icon" />
-                    {{ $t('components.library.ArtistBase.musicbrainzLink') }}
+                    {{ $t('components.library.ArtistBase.link.musicbrainz') }}
                   </a>
                   <a
                     :href="discogsUrl"
@@ -225,7 +225,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     class="basic item"
                   >
                     <i class="external icon" />
-                    {{ $t('components.library.ArtistBase.discogsLink') }}
+                    {{ $t('components.library.ArtistBase.link.discogs') }}
                   </a>
                   <router-link
                     v-if="object.is_local"
@@ -233,7 +233,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     class="basic item"
                   >
                     <i class="edit icon" />
-                    {{ $t('components.library.ArtistBase.editButton') }}
+                    {{ $t('components.library.ArtistBase.button.edit') }}
                   </router-link>
                   <div class="divider" />
                   <div
@@ -253,7 +253,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     :to="{name: 'manage.library.artists.detail', params: {id: object.id}}"
                   >
                     <i class="wrench icon" />
-                    {{ $t('components.library.ArtistBase.moderationLink') }}
+                    {{ $t('components.library.ArtistBase.link.moderation') }}
                   </router-link>
                   <a
                     v-if="$store.state.auth.profile && $store.state.auth.profile.is_superuser"
@@ -263,7 +263,7 @@ watch(() => props.id, fetchData, { immediate: true })
                     rel="noopener noreferrer"
                   >
                     <i class="wrench icon" />
-                    {{ $t('components.library.ArtistBase.djangoLink') }}
+                    {{ $t('components.library.ArtistBase.link.django') }}
                   </a>
                 </div>
               </button>
diff --git a/front/src/components/library/ArtistDetail.vue b/front/src/components/library/ArtistDetail.vue
index a111fcbe2..87e593ed2 100644
--- a/front/src/components/library/ArtistDetail.vue
+++ b/front/src/components/library/ArtistDetail.vue
@@ -65,19 +65,19 @@ const loadMoreAlbums = async () => {
       <div class="ui hidden divider" />
       <div class="ui message">
         <p>
-          {{ $t('components.library.ArtistDetail.hiddenContentMessage') }}
+          {{ $t('components.library.ArtistDetail.message.filter') }}
         </p>
         <router-link
           class="right floated"
           :to="{name: 'settings'}"
         >
-          {{ $t('components.library.ArtistDetail.reviewFiltersLink') }}
+          {{ $t('components.library.ArtistDetail.link.filter') }}
         </router-link>
         <button
           class="ui basic tiny button"
           @click="$store.dispatch('moderation/deleteContentFilter', contentFilter.uuid)"
         >
-          {{ $t('components.library.ArtistDetail.removeFilterButton') }}
+          {{ $t('components.library.ArtistDetail.button.filter') }}
         </button>
       </div>
     </div>
@@ -92,7 +92,7 @@ const loadMoreAlbums = async () => {
       class="ui vertical stripe segment"
     >
       <h2>
-        {{ $t('components.library.ArtistDetail.artistAlbumsHeader') }}
+        {{ $t('components.library.ArtistDetail.header.album') }}
       </h2>
       <div class="ui cards app-cards">
         <album-card
@@ -107,7 +107,7 @@ const loadMoreAlbums = async () => {
         :class="['ui', {loading: isLoadingMoreAlbums}, 'button']"
         @click="loadMoreAlbums()"
       >
-        {{ $t('components.library.ArtistDetail.loadMoreButton') }}
+        {{ $t('components.library.ArtistDetail.button.more') }}
       </button>
     </section>
     <section
@@ -122,7 +122,7 @@ const loadMoreAlbums = async () => {
       >
         <template #header>
           <h2>
-            {{ $t('components.library.ArtistDetail.newTracksHeader') }}
+            {{ $t('components.library.ArtistDetail.header.track') }}
           </h2>
           <div class="ui hidden divider" />
         </template>
@@ -130,13 +130,13 @@ const loadMoreAlbums = async () => {
     </section>
     <section class="ui vertical stripe segment">
       <h2>
-        {{ $t('components.library.ArtistDetail.userLibraryHeader') }}
+        {{ $t('components.library.ArtistDetail.header.library') }}
       </h2>
       <library-widget
         :url="'artists/' + object.id + '/libraries/'"
         @loaded="emit('libraries-loaded', $event)"
       >
-        {{ $t('components.library.ArtistDetail.userLibraryDescription') }}
+        {{ $t('components.library.ArtistDetail.description.library') }}
       </library-widget>
     </section>
   </div>
diff --git a/front/src/components/library/ArtistEdit.vue b/front/src/components/library/ArtistEdit.vue
index 613b2e703..d047b9b6b 100644
--- a/front/src/components/library/ArtistEdit.vue
+++ b/front/src/components/library/ArtistEdit.vue
@@ -25,19 +25,19 @@ const canEdit = store.state.auth.availablePermissions.library
         <span
           v-if="canEdit"
         >
-          {{ $t('components.library.ArtistEdit.editArtistHeader') }}
+          {{ $t('components.library.ArtistEdit.header.edit') }}
         </span>
         <span
           v-else
         >
-          {{ $t('components.library.ArtistEdit.suggestEditHeader') }}
+          {{ $t('components.library.ArtistEdit.header.suggest') }}
         </span>
       </h2>
       <div
         v-if="!object.is_local"
         class="ui message"
       >
-        {{ $t('components.library.ArtistEdit.remoteObjectWarning') }}
+        {{ $t('components.library.ArtistEdit.message.remote') }}
       </div>
       <edit-form
         v-else
diff --git a/front/src/components/library/Artists.vue b/front/src/components/library/Artists.vue
index c2a5bab20..4bfd1935b 100644
--- a/front/src/components/library/Artists.vue
+++ b/front/src/components/library/Artists.vue
@@ -111,7 +111,7 @@ onMounted(() => $('.ui.dropdown').dropdown())
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.library.Artists.searchPlaceholder'),
+  searchPlaceholder: t('components.library.Artists.placeholder.search'),
   title: t('components.library.Artists.title')
 }))
 
@@ -122,7 +122,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
   <main v-title="labels.title">
     <section class="ui vertical stripe segment">
       <h2 class="ui header">
-        {{ $t('components.library.Artists.artistBrowseHeader') }}
+        {{ $t('components.library.Artists.header.browse') }}
       </h2>
       <form
         :class="['ui', {'loading': isLoading}, 'form']"
@@ -131,7 +131,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
         <div class="fields">
           <div class="field">
             <label for="artist-search">
-              {{ $t('components.library.Artists.searchLabel') }}
+              {{ $t('components.library.Artists.label.search') }}
             </label>
             <div class="ui action input">
               <input
@@ -144,18 +144,18 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
               <button
                 class="ui icon button"
                 type="submit"
-                :aria-label="t('components.library.Artists.searchButton')"
+                :aria-label="t('components.library.Artists.button.search')"
               >
                 <i class="search icon" />
               </button>
             </div>
           </div>
           <div class="field">
-            <label for="tags-search">{{ $t('components.library.Artists.tagsLabel') }}</label>
+            <label for="tags-search">{{ $t('components.library.Artists.label.tags') }}</label>
             <tags-selector v-model="tags" />
           </div>
           <div class="field">
-            <label for="artist-ordering">{{ $t('components.library.Artists.orderingLabel') }}</label>
+            <label for="artist-ordering">{{ $t('components.library.Artists.ordering.label') }}</label>
             <select
               id="artist-ordering"
               v-model="ordering"
@@ -171,22 +171,22 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
             </select>
           </div>
           <div class="field">
-            <label for="artist-ordering-direction">{{ $t('components.library.Artists.orderingDirectionLabel') }}</label>
+            <label for="artist-ordering-direction">{{ $t('components.library.Artists.ordering.direction.label') }}</label>
             <select
               id="artist-ordering-direction"
               v-model="orderingDirection"
               class="ui dropdown"
             >
               <option value="+">
-                {{ $t('components.library.Artists.ascendingOrdering') }}
+                {{ $t('components.library.Artists.ordering.direction.ascending') }}
               </option>
               <option value="-">
-                {{ $t('components.library.Artists.descendingOrdering') }}
+                {{ $t('components.library.Artists.ordering.direction.descending') }}
               </option>
             </select>
           </div>
           <div class="field">
-            <label for="artist-results">{{ $t('components.library.Artists.resultsPerPageLabel') }}</label>
+            <label for="artist-results">{{ $t('components.library.Artists.pagination.results') }}</label>
             <select
               id="artist-results"
               v-model="paginateBy"
@@ -202,7 +202,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
             </select>
           </div>
           <div class="field">
-            <span id="excludeHeader">{{ $t('components.library.Artists.excludeCompilationArtistsLabel') }}</span>
+            <span id="excludeHeader">{{ $t('components.library.Artists.label.excludeCompilation') }}</span>
             <div
               id="excludeCompilation"
               class="ui toggle checkbox"
@@ -217,7 +217,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
               <label
                 for="exclude-compilation"
                 class="visually-hidden"
-              >{{ $t('components.library.Artists.excludeCompilationArtistsLabel') }}</label>
+              >{{ $t('components.library.Artists.label.excludeCompilation') }}</label>
             </div>
           </div>
         </div>
@@ -246,7 +246,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
       >
         <div class="ui icon header">
           <i class="compact disc icon" />
-          {{ $t('components.library.Artists.emptyStateMessage') }}
+          {{ $t('components.library.Artists.empty.noResults') }}
         </div>
         <router-link
           v-if="$store.state.auth.authenticated"
@@ -254,7 +254,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
           class="ui success button labeled icon"
         >
           <i class="upload icon" />
-          {{ $t('components.library.Artists.addMusicLink') }}
+          {{ $t('components.library.Artists.button.upload') }}
         </router-link>
       </div>
       <div class="ui center aligned basic segment">
diff --git a/front/src/components/library/EditCard.vue b/front/src/components/library/EditCard.vue
index 44746f053..390155781 100644
--- a/front/src/components/library/EditCard.vue
+++ b/front/src/components/library/EditCard.vue
@@ -156,7 +156,7 @@ const approve = async (approved: boolean) => {
     <div class="content">
       <h4 class="header">
         <router-link :to="detailUrl">
-          {{ $t('components.library.EditCard.modificationHeader', {id: obj.uuid.substring(0, 8)}) }}
+          {{ $t('components.library.EditCard.header.modification', {id: obj.uuid.substring(0, 8)}) }}
         </router-link>
       </h4>
       <div class="meta">
@@ -165,7 +165,7 @@ const approve = async (approved: boolean) => {
           :to="{name: 'library.tracks.detail', params: {id: obj.target.id }}"
         >
           <i class="music icon" />
-          {{ $t('components.library.EditCard.trackLink', {id: obj.target.id, name: obj.target.repr}) }}
+          {{ $t('components.library.EditCard.link.track', {id: obj.target.id, name: obj.target.repr}) }}
         </router-link>
         <br>
         <human-date
@@ -176,19 +176,19 @@ const approve = async (approved: boolean) => {
         <span class="right floated">
           <span v-if="obj.is_approved && obj.is_applied">
             <i class="success check icon" />
-            {{ $t('components.library.EditCard.appliedStatus') }}
+            {{ $t('components.library.EditCard.status.applied') }}
           </span>
           <span v-else-if="obj.is_approved">
             <i class="success check icon" />
-            {{ $t('components.library.EditCard.approvedStatus') }}
+            {{ $t('components.library.EditCard.status.approved') }}
           </span>
           <span v-else-if="obj.is_approved === null">
             <i class="warning hourglass icon" />
-            {{ $t('components.library.EditCard.pendingReviewStatus') }}
+            {{ $t('components.library.EditCard.status.pending') }}
           </span>
           <span v-else-if="obj.is_approved === false">
             <i class="danger x icon" />
-            {{ $t('components.library.EditCard.rejectedStatus') }}
+            {{ $t('components.library.EditCard.status.rejected') }}
           </span>
         </span>
       </div>
@@ -207,13 +207,13 @@ const approve = async (approved: boolean) => {
         <thead>
           <tr>
             <th>
-              {{ $t('components.library.EditCard.fieldTableHeader') }}
+              {{ $t('components.library.EditCard.table.update.header.field') }}
             </th>
             <th>
-              {{ $t('components.library.EditCard.oldValueTableHeader') }}
+              {{ $t('components.library.EditCard.table.update.header.oldValue') }}
             </th>
             <th>
-              {{ $t('components.library.EditCard.newValueTableHeader') }}
+              {{ $t('components.library.EditCard.table.update.header.newValue') }}
             </th>
           </tr>
         </thead>
@@ -243,7 +243,7 @@ const approve = async (approved: boolean) => {
               </template>
             </td>
             <td v-else>
-              {{ $t('components.library.EditCard.notApplicable') }}
+              {{ $t('components.library.EditCard.table.update.notApplicable') }}
             </td>
 
             <td
@@ -301,36 +301,36 @@ const approve = async (approved: boolean) => {
         :class="['ui', {loading: isLoading}, 'success', 'basic', 'button']"
         @click="approve(true)"
       >
-        {{ $t('components.library.EditCard.approveButton') }}
+        {{ $t('components.library.EditCard.button.approve') }}
       </button>
       <button
         v-if="canApprove && obj.is_approved === null"
         :class="['ui', {loading: isLoading}, 'warning', 'basic', 'button']"
         @click="approve(false)"
       >
-        {{ $t('components.library.EditCard.rejectButton') }}
+        {{ $t('components.library.EditCard.button.reject') }}
       </button>
       <dangerous-button
         v-if="canDelete"
         :class="['ui', {loading: isLoading}, 'basic danger button']"
         :action="remove"
       >
-        {{ $t('components.library.EditCard.deleteButton') }}
+        {{ $t('components.library.EditCard.button.delete') }}
         <template #modal-header>
           <p>
-            {{ $t('components.library.EditCard.deleteSuggestionModalHeader') }}
+            {{ $t('components.library.EditCard.modal.delete.header') }}
           </p>
         </template>
         <template #modal-content>
           <div>
             <p>
-              {{ $t('components.library.EditCard.deleteSuggestionModalMessage') }}
+              {{ $t('components.library.EditCard.modal.content.warning') }}
             </p>
           </div>
         </template>
         <template #modal-confirm>
           <p>
-            {{ $t('components.library.EditCard.deleteButton') }}
+            {{ $t('components.library.EditCard.button.delete') }}
           </p>
         </template>
       </dangerous-button>
diff --git a/front/src/components/library/EditForm.vue b/front/src/components/library/EditForm.vue
index 64864e672..bff715d94 100644
--- a/front/src/components/library/EditForm.vue
+++ b/front/src/components/library/EditForm.vue
@@ -46,7 +46,7 @@ const canEdit = computed(() => {
 })
 
 const labels = computed(() => ({
-  summaryPlaceholder: t('components.library.EditForm.summaryPlaceholder')
+  summaryPlaceholder: t('components.library.EditForm.placeholder.summary')
 }))
 
 const mutationsUrl = computed(() => props.objectType === 'track'
@@ -148,7 +148,7 @@ const resetField = (fieldId: string) => {
   <div v-if="submittedMutation">
     <div class="ui positive message">
       <h4 class="header">
-        {{ $t('components.library.EditForm.submissionSuccessHeader') }}
+        {{ $t('components.library.EditForm.header.success') }}
       </h4>
     </div>
     <edit-card
@@ -159,7 +159,7 @@ const resetField = (fieldId: string) => {
       class="ui button"
       @click.prevent="submittedMutation = null"
     >
-      {{ $t('components.library.EditForm.newEditButton') }}
+      {{ $t('components.library.EditForm.button.new') }}
     </button>
   </div>
   <div v-else>
@@ -171,27 +171,27 @@ const resetField = (fieldId: string) => {
     >
       <div>
         <template v-if="showPendingReview">
-          {{ $t('components.library.EditForm.editsAwaitingReview') }}
+          {{ $t('components.library.EditForm.header.unreviewed') }}
           <button
             class="ui tiny basic right floated button"
             @click.prevent="showPendingReview = false"
           >
-            {{ $t('components.library.EditForm.showEditsButton') }}
+            {{ $t('components.library.EditForm.button.showAll') }}
           </button>
         </template>
         <template v-else>
-          {{ $t('components.library.EditForm.recentEdits') }}
+          {{ $t('components.library.EditForm.header.recentEdits') }}
           <button
             class="ui tiny basic right floated button"
             @click.prevent="showPendingReview = true"
           >
-            {{ $t('components.library.EditForm.onlyUnreviewed') }}
+            {{ $t('components.library.EditForm.button.showUnreviewed') }}
           </button>
         </template>
       </div>
       <template #empty-state>
         <empty-state>
-          {{ $t('components.library.EditForm.emptyStateMessage') }}
+          {{ $t('components.library.EditForm.empty.suggestEdit') }}
         </empty-state>
       </template>
     </edit-list>
@@ -206,7 +206,7 @@ const resetField = (fieldId: string) => {
         class="ui negative message"
       >
         <h4 class="header">
-          {{ $t('components.library.EditForm.submissionFailureHeader') }}
+          {{ $t('components.library.EditForm.header.failure') }}
         </h4>
         <ul class="list">
           <li
@@ -221,7 +221,7 @@ const resetField = (fieldId: string) => {
         v-if="!canEdit"
         class="ui message"
       >
-        {{ $t('components.library.EditForm.noPermissionWarning') }}
+        {{ $t('components.library.EditForm.message.noPermission') }}
       </div>
       <template v-if="values">
         <div
@@ -266,7 +266,7 @@ const resetField = (fieldId: string) => {
               @click.prevent="values[fieldConfig.id] = null"
             >
               <i class="x icon" />
-              {{ $t('components.library.EditForm.clearButton') }}
+              {{ $t('components.library.EditForm.button.clear') }}
             </button>
           </template>
           <template v-else-if="fieldConfig.type === 'content'">
@@ -303,7 +303,7 @@ const resetField = (fieldId: string) => {
               @click.prevent="values[fieldConfig.id] = []"
             >
               <i class="x icon" />
-              {{ $t('components.library.EditForm.clearButton') }}
+              {{ $t('components.library.EditForm.button.clear') }}
             </button>
           </template>
           <div v-if="fieldValuesChanged(fieldConfig.id)">
@@ -313,13 +313,13 @@ const resetField = (fieldId: string) => {
               @click.prevent="resetField(fieldConfig.id)"
             >
               <i class="undo icon" />
-              {{ $t('components.library.EditForm.resetButton') }}
+              {{ $t('components.library.EditForm.button.reset') }}
             </button>
           </div>
         </div>
       </template>
       <div class="field">
-        <label for="summary">{{ $t('components.library.EditForm.summaryLabel') }}</label>
+        <label for="summary">{{ $t('components.library.EditForm.label.summary') }}</label>
         <textarea
           id="change-summary"
           v-model="summary"
@@ -333,7 +333,7 @@ const resetField = (fieldId: string) => {
         class="ui left floated button"
         :to="{name: 'library.tracks.detail', params: {id: object.id }}"
       >
-        {{ $t('components.library.EditForm.cancelButton') }}
+        {{ $t('components.library.EditForm.button.cancel') }}
       </router-link>
       <button
         :class="['ui', {'loading': isLoading}, 'right', 'floated', 'success', 'button']"
@@ -343,12 +343,12 @@ const resetField = (fieldId: string) => {
         <span
           v-if="canEdit"
         >
-          {{ $t('components.library.EditForm.submitEditButton') }}
+          {{ $t('components.library.EditForm.button.submit') }}
         </span>
         <span
           v-else
         >
-          {{ $t('components.library.EditForm.submitSuggestionButton') }}
+          {{ $t('components.library.EditForm.button.suggest') }}
         </span>
       </button>
     </form>
diff --git a/front/src/components/library/FileUpload.vue b/front/src/components/library/FileUpload.vue
index 79ff649e8..797875cd6 100644
--- a/front/src/components/library/FileUpload.vue
+++ b/front/src/components/library/FileUpload.vue
@@ -43,13 +43,13 @@ const supportedExtensions = computed(() => store.state.ui.supportedExtensions)
 
 const labels = computed(() => ({
   tooltips: {
-    denied: t('components.library.FileUpload.deniedTooltip'),
-    server: t('components.library.FileUpload.serverTooltip'),
-    network: t('components.library.FileUpload.networkTooltip'),
-    timeout: t('components.library.FileUpload.timeoutTooltip'),
-    retry: t('components.library.FileUpload.retryTooltip'),
+    denied: t('components.library.FileUpload.tooltip.denied'),
+    server: t('components.library.FileUpload.tooltip.size'),
+    network: t('components.library.FileUpload.tooltip.network'),
+    timeout: t('components.library.FileUpload.tooltip.timeout'),
+    retry: t('components.library.FileUpload.tooltip.retry'),
     extension: t(
-      'components.library.FileUpload.extensionTooltip',
+      'components.library.FileUpload.tooltip.extension',
       { extensions: supportedExtensions.value.join(', ') }
     )
   } as Record<string, string>
@@ -282,7 +282,7 @@ const retry = (files: Omit<VueUploadItem, 'xhr'>[]) => {
 useEventListener(window, 'beforeunload', (event) => {
   if (!hasActiveUploads.value) return null
   event.preventDefault()
-  return (event.returnValue = t('components.library.FileUpload.eventListenerMessage'))
+  return (event.returnValue = t('components.library.FileUpload.message.listener'))
 })
 </script>
 
@@ -294,12 +294,12 @@ useEventListener(window, 'beforeunload', (event) => {
         :class="['item', {active: currentTab === 'uploads'}]"
         @click.prevent="currentTab = 'uploads'"
       >
-        {{ $t('components.library.FileUpload.uploadingStatus') }}
+        {{ $t('components.library.FileUpload.link.uploading') }}
         <div
           v-if="files.length === 0"
           class="ui label"
         >
-          {{ $t('components.library.FileUpload.noActionableFiles') }}
+          {{ $t('components.library.FileUpload.empty.noFiles') }}
         </div>
         <div
           v-else-if="files.length > uploadedFilesCount + erroredFilesCount"
@@ -323,12 +323,12 @@ useEventListener(window, 'beforeunload', (event) => {
         :class="['item', {active: currentTab === 'processing'}]"
         @click.prevent="currentTab = 'processing'"
       >
-        {{ $t('components.library.FileUpload.processingStatus') }}
+        {{ $t('components.library.FileUpload.link.processing') }}
         <div
           v-if="processableFiles === 0"
           class="ui label"
         >
-          {{ $t('components.library.FileUpload.noActionableFiles') }}
+          {{ $t('components.library.FileUpload.empty.noFiles') }}
         </div>
         <div
           v-else-if="processableFiles > processedFilesCount"
@@ -352,7 +352,7 @@ useEventListener(window, 'beforeunload', (event) => {
       <div :class="['ui', {loading: isLoadingQuota}, 'container']">
         <div :class="['ui', {red: remainingSpace === 0}, {warning: remainingSpace > 0 && remainingSpace <= 50}, 'small', 'statistic']">
           <div class="label">
-            {{ $t('components.library.FileUpload.storageSpaceLabel') }}
+            {{ $t('components.library.FileUpload.label.remainingSpace') }}
           </div>
           <div class="value">
             {{ humanSize(remainingSpace * 1000 * 1000) }}
@@ -360,25 +360,25 @@ useEventListener(window, 'beforeunload', (event) => {
         </div>
         <div class="ui divider" />
         <h2 class="ui header">
-          {{ $t('components.library.FileUpload.localUploadHeader') }}
+          {{ $t('components.library.FileUpload.header.local') }}
         </h2>
         <div class="ui message">
           <p>
-            {{ $t('components.library.FileUpload.localUploadMessage') }}
+            {{ $t('components.library.FileUpload.message.local.message') }}
           </p>
           <ul>
             <li v-if="library.privacy_level != 'me'">
-              {{ $t('components.library.FileUpload.localUploadCopyright') }}
+              {{ $t('components.library.FileUpload.message.local.copyright') }}
             </li>
             <li>
-              {{ $t('components.library.FileUpload.localUploadTag') }}&nbsp;
+              {{ $t('components.library.FileUpload.message.local.tag') }}&nbsp;
               <a
                 href="http://picard.musicbrainz.org/"
                 target="_blank"
-              >{{ $t('components.library.FileUpload.localUploadPicardLink') }}</a>
+              >{{ $t('components.library.FileUpload.link.picard') }}</a>
             </li>
             <li>
-              {{ $t('components.library.FileUpload.localUploadSupportedFormats') }}
+              {{ $t('components.library.FileUpload.message.local.format') }}
             </li>
           </ul>
         </div>
@@ -396,11 +396,11 @@ useEventListener(window, 'beforeunload', (event) => {
           @input-file="inputFile"
         >
           <i class="upload icon" />&nbsp;
-          {{ $t('components.library.FileUpload.uploadWidgetLabel') }}
+          {{ $t('components.library.FileUpload.label.uploadWidget') }}
           <br>
           <br>
           <i>
-            {{ $t('components.library.FileUpload.fileUploadSupportedFormats', {extensions: supportedExtensions.join(', ')}) }}
+            {{ $t('components.library.FileUpload.label.extensions', {extensions: supportedExtensions.join(', ')}) }}
           </i>
         </file-upload-widget>
       </div>
@@ -413,16 +413,16 @@ useEventListener(window, 'beforeunload', (event) => {
           <thead>
             <tr>
               <th class="ten wide">
-                {{ $t('components.library.FileUpload.filenameTableHeader') }}
+                {{ $t('components.library.FileUpload.table.upload.header.filename') }}
               </th>
               <th>
-                {{ $t('components.library.FileUpload.sizeTableHeader') }}
+                {{ $t('components.library.FileUpload.table.upload.header.size') }}
               </th>
               <th>
-                {{ $t('components.library.FileUpload.statusTableHeader') }}
+                {{ $t('components.library.FileUpload.table.upload.header.status') }}
               </th>
               <th>
-                {{ $t('components.library.FileUpload.actionsTableHeader') }}
+                {{ $t('components.library.FileUpload.table.upload.header.actions') }}
               </th>
             </tr>
             <tr v-if="retryableFiles.length > 1">
@@ -434,7 +434,7 @@ useEventListener(window, 'beforeunload', (event) => {
                   class="ui right floated small basic button"
                   @click.prevent="retry(retryableFiles)"
                 >
-                  {{ $t('components.library.FileUpload.retryButton') }}
+                  {{ $t('components.library.FileUpload.button.retry') }}
                 </button>
               </th>
             </tr>
@@ -464,7 +464,7 @@ useEventListener(window, 'beforeunload', (event) => {
                 >
                   <span
                     key="1"
-                  >{{ $t('components.library.FileUpload.uploadedStatusLabel') }}</span>
+                  >{{ $t('components.library.FileUpload.table.upload.status.uploaded') }}</span>
                 </span>
                 <span
                   v-else-if="file.active"
@@ -473,9 +473,9 @@ useEventListener(window, 'beforeunload', (event) => {
                   <span
                     key="2"
                   >
-                    {{ $t('components.library.FileUpload.uploadingStatusLabel') }}
+                    {{ $t('components.library.FileUpload.table.upload.status.uploading') }}
                   </span>
-                  {{ $t('components.library.FileUpload.uploadingProgress', {percent: parseFloat(file.progress ?? '0.00')}) }}
+                  {{ $t('components.library.FileUpload.table.upload.progress', {percent: parseFloat(file.progress ?? '0.00')}) }}
                 </span>
                 <span
                   v-else
@@ -484,7 +484,7 @@ useEventListener(window, 'beforeunload', (event) => {
                   <span
                     key="3"
                   >
-                    {{ $t('components.library.FileUpload.pendingStatusLabel') }}
+                    {{ $t('components.library.FileUpload.table.upload.status.pending') }}
                   </span>
                 </span>
               </td>
@@ -514,7 +514,7 @@ useEventListener(window, 'beforeunload', (event) => {
       </div>
       <div class="ui divider" />
       <h2 class="ui header">
-        {{ $t('components.library.FileUpload.serverUploadHeader') }}
+        {{ $t('components.library.FileUpload.header.server') }}
       </h2>
       <div
         v-if="fsErrors.length > 0"
@@ -522,7 +522,7 @@ useEventListener(window, 'beforeunload', (event) => {
         class="ui negative message"
       >
         <h3 class="header">
-          {{ $t('components.library.FileUpload.uploadFailureHeader') }}
+          {{ $t('components.library.FileUpload.header.failure') }}
         </h3>
         <ul class="list">
           <li
@@ -541,13 +541,13 @@ useEventListener(window, 'beforeunload', (event) => {
       />
       <template v-if="fsStatus && fsStatus.import">
         <h3 class="ui header">
-          {{ $t('components.library.FileUpload.importStatusHeader') }}
+          {{ $t('components.library.FileUpload.header.status') }}
         </h3>
         <p v-if="fsStatus.import.reference !== importReference">
-          {{ $t('components.library.FileUpload.previousImportStatusMessage') }}
+          {{ $t('components.library.FileUpload.description.previousImport') }}
         </p>
         <p v-else>
-          {{ $t('components.library.FileUpload.currentImportStatusMessage') }}
+          {{ $t('components.library.FileUpload.description.import') }}
         </p>
 
         <button
@@ -555,7 +555,7 @@ useEventListener(window, 'beforeunload', (event) => {
           class="ui button"
           @click="cancelFsScan"
         >
-          {{ $t('components.library.FileUpload.cancelButton') }}
+          {{ $t('components.library.FileUpload.button.cancel') }}
         </button>
         <fs-logs :data="fsStatus.import" />
       </template>
diff --git a/front/src/components/library/FsBrowser.vue b/front/src/components/library/FsBrowser.vue
index a1640da9c..a6aa99d0b 100644
--- a/front/src/components/library/FsBrowser.vue
+++ b/front/src/components/library/FsBrowser.vue
@@ -42,7 +42,7 @@ const handleClick = (entry: FSEntry) => {
         class="ui button"
         @click.prevent="emit('import')"
       >
-        {{ $t('components.library.FsBrowser.importButton') }}
+        {{ $t('components.library.FsBrowser.button.import') }}
       </button>
     </div>
     <div class="ui list component-fs-browser">
diff --git a/front/src/components/library/FsLogs.vue b/front/src/components/library/FsLogs.vue
index 70dd2d6ee..ebcb93e80 100644
--- a/front/src/components/library/FsLogs.vue
+++ b/front/src/components/library/FsLogs.vue
@@ -15,7 +15,7 @@ defineProps<Props>()
       class="ui active dimmer"
     >
       <div class="ui text loader">
-        {{ $t('components.library.FsLogs.emptyStateMessage') }}
+        {{ $t('components.library.FsLogs.empty.notStarted') }}
       </div>
     </div>
     <template v-else>
diff --git a/front/src/components/library/Home.vue b/front/src/components/library/Home.vue
index 1a96a8010..8ff6b2552 100644
--- a/front/src/components/library/Home.vue
+++ b/front/src/components/library/Home.vue
@@ -67,7 +67,7 @@ fetchData()
             :websocket-handlers="['Listen']"
           >
             <template #title>
-              {{ $t('components.library.Home.recentlyListenedLabel') }}
+              {{ $t('components.library.Home.header.recentlyListened') }}
             </template>
           </track-widget>
         </div>
@@ -77,7 +77,7 @@ fetchData()
             :filters="{scope: scope, ordering: '-creation_date'}"
           >
             <template #title>
-              {{ $t('components.library.Home.recentlyFavoritedLabel') }}
+              {{ $t('components.library.Home.header.recentlyFavorited') }}
             </template>
           </track-widget>
         </div>
@@ -87,7 +87,7 @@ fetchData()
             :filters="{scope: scope, playable: true, ordering: '-modification_date'}"
           >
             <template #title>
-              {{ $t('components.library.Home.playlistsLabel') }}
+              {{ $t('components.library.Home.header.playlists') }}
             </template>
           </playlist-widget>
         </div>
@@ -97,14 +97,14 @@ fetchData()
         <div class="column">
           <album-widget :filters="{scope: scope, playable: true, ordering: '-creation_date'}">
             <template #title>
-              {{ $t('components.library.Home.recentlyAddedLabel') }}
+              {{ $t('components.library.Home.header.recentlyAdded') }}
             </template>
           </album-widget>
         </div>
       </div>
       <template v-if="scope === 'all'">
         <h3 class="ui header">
-          {{ $t('components.library.Home.newChannelsLabel') }}
+          {{ $t('components.library.Home.header.newChannels') }}
         </h3>
         <channels-widget
           :show-modification-date="true"
diff --git a/front/src/components/library/ImportStatusModal.vue b/front/src/components/library/ImportStatusModal.vue
index 620fef4b9..b83937e3b 100644
--- a/front/src/components/library/ImportStatusModal.vue
+++ b/front/src/components/library/ImportStatusModal.vue
@@ -58,11 +58,11 @@ const getErrorData = (upload: Upload) => {
     supportUrl: 'https://forum.funkwhale.audio/t/support',
     documentationUrl: `https://docs.funkwhale.audio/users/upload.html#${errorCode}`,
     label: errorCode === 'invalid_metadata'
-      ? t('components.library.ImportStatusModal.invalidMetadataLabel')
-      : t('components.library.ImportStatusModal.unknownErrorLabel'),
+      ? t('components.library.ImportStatusModal.error.invalidMetadata.label')
+      : t('components.library.ImportStatusModal.error.unknownError.label'),
     detail: errorCode === 'invalid_metadata'
-      ? t('components.library.ImportStatusModal.invalidMetadataMessage')
-      : t('components.library.ImportStatusModal.unknownErrorMessage'),
+      ? t('components.library.ImportStatusModal.error.invalidMetadata.message')
+      : t('components.library.ImportStatusModal.error.unknownError.message'),
     errorRows: errorCode === 'invalid_metadata'
       ? getErrors(payload.detail ?? {})
       : [],
@@ -77,7 +77,7 @@ const getErrorData = (upload: Upload) => {
 <template>
   <semantic-modal v-model:show="show">
     <h4 class="header">
-      {{ $t('components.library.ImportStatusModal.importDetailHeader') }}
+      {{ $t('components.library.ImportStatusModal.header.importDetail') }}
     </h4>
     <div
       v-if="Object.keys(upload).length > 0"
@@ -88,33 +88,33 @@ const getErrorData = (upload: Upload) => {
           v-if="upload.import_status === 'pending'"
           class="ui message"
         >
-          {{ $t('components.library.ImportStatusModal.importDetailMessage') }}
+          {{ $t('components.library.ImportStatusModal.message.importDetail') }}
         </div>
         <div
           v-if="upload.import_status === 'finished'"
           class="ui success message"
         >
-          {{ $t('components.library.ImportStatusModal.importSuccessMessage') }}
+          {{ $t('components.library.ImportStatusModal.message.importSuccess') }}
         </div>
         <div
           v-if="upload.import_status === 'skipped'"
           role="alert"
           class="ui warning message"
         >
-          {{ $t('components.library.ImportStatusModal.importSkippedWarning') }}
+          {{ $t('components.library.ImportStatusModal.warning.importSkipped') }}
         </div>
         <div
           v-if="upload.import_status === 'errored'"
           class="ui error message"
         >
-          {{ $t('components.library.ImportStatusModal.importFailureMessage') }}
+          {{ $t('components.library.ImportStatusModal.error.importFailure') }}
         </div>
         <template v-if="upload.import_status === 'errored'">
           <table class="ui very basic collapsing celled table">
             <tbody>
               <tr>
                 <td>
-                  {{ $t('components.library.ImportStatusModal.errorType') }}
+                  {{ $t('components.library.ImportStatusModal.table.error.errorType') }}
                 </td>
                 <td>
                   {{ getErrorData(upload).label }}
@@ -122,7 +122,7 @@ const getErrorData = (upload: Upload) => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.ImportStatusModal.errorDetail') }}
+                  {{ $t('components.library.ImportStatusModal.table.error.errorDetail') }}
                 </td>
                 <td>
                   {{ getErrorData(upload).detail }}
@@ -140,7 +140,7 @@ const getErrorData = (upload: Upload) => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.ImportStatusModal.gettingHelp') }}
+                  {{ $t('components.library.ImportStatusModal.table.error.help') }}
                 </td>
                 <td>
                   <ul>
@@ -149,7 +149,7 @@ const getErrorData = (upload: Upload) => {
                         :href="getErrorData(upload).documentationUrl"
                         target="_blank"
                       >
-                        {{ $t('components.library.ImportStatusModal.documentationLink') }}
+                        {{ $t('components.library.ImportStatusModal.link.documentation') }}
                       </a>
                     </li>
                     <li>
@@ -157,7 +157,7 @@ const getErrorData = (upload: Upload) => {
                         :href="getErrorData(upload).supportUrl"
                         target="_blank"
                       >
-                        {{ $t('components.library.ImportStatusModal.supportLink') }}
+                        {{ $t('components.library.ImportStatusModal.link.support') }}
                       </a>
                     </li>
                   </ul>
@@ -165,7 +165,7 @@ const getErrorData = (upload: Upload) => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.ImportStatusModal.debugInformation') }}
+                  {{ $t('components.library.ImportStatusModal.table.error.debug') }}
                 </td>
                 <td>
                   <div class="ui form">
@@ -184,7 +184,7 @@ const getErrorData = (upload: Upload) => {
     </div>
     <div class="actions">
       <button class="ui deny button">
-        {{ $t('components.library.ImportStatusModal.closeButton') }}
+        {{ $t('components.library.ImportStatusModal.button.close') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/library/Podcasts.vue b/front/src/components/library/Podcasts.vue
index edd81bb16..c01ee6a1c 100644
--- a/front/src/components/library/Podcasts.vue
+++ b/front/src/components/library/Podcasts.vue
@@ -112,7 +112,7 @@ onMounted(() => $('.ui.dropdown').dropdown())
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.library.Podcasts.searchPlaceholder'),
+  searchPlaceholder: t('components.library.Podcasts.placeholder.search'),
   title: t('components.library.Podcasts.title')
 }))
 
@@ -123,7 +123,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
   <main v-title="labels.title">
     <section class="ui vertical stripe segment">
       <h2 class="ui header">
-        {{ $t('components.library.Podcasts.podcastBrowseHeader') }}
+        {{ $t('components.library.Podcasts.header.browse') }}
       </h2>
       <form
         :class="['ui', {'loading': isLoading}, 'form']"
@@ -132,7 +132,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
         <div class="fields">
           <div class="field">
             <label for="artist-search">
-              {{ $t('components.library.Podcasts.searchLabel') }}
+              {{ $t('components.library.Podcasts.label.search') }}
             </label>
             <div class="ui action input">
               <input
@@ -145,18 +145,18 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
               <button
                 class="ui icon button"
                 type="submit"
-                :aria-label="t('components.library.Podcasts.searchButton')"
+                :aria-label="t('components.library.Podcasts.button.search')"
               >
                 <i class="search icon" />
               </button>
             </div>
           </div>
           <div class="field">
-            <label for="tags-search">{{ $t('components.library.Podcasts.tagsLabel') }}</label>
+            <label for="tags-search">{{ $t('components.library.Podcasts.label.tags') }}</label>
             <tags-selector v-model="tags" />
           </div>
           <div class="field">
-            <label for="artist-ordering">{{ $t('components.library.Podcasts.orderingLabel') }}</label>
+            <label for="artist-ordering">{{ $t('components.library.Podcasts.ordering.label') }}</label>
             <select
               id="artist-ordering"
               v-model="ordering"
@@ -172,22 +172,22 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
             </select>
           </div>
           <div class="field">
-            <label for="artist-ordering-direction">{{ $t('components.library.Podcasts.orderingDirectionLabel') }}</label>
+            <label for="artist-ordering-direction">{{ $t('components.library.Podcasts.ordering.direction.label') }}</label>
             <select
               id="artist-ordering-direction"
               v-model="orderingDirection"
               class="ui dropdown"
             >
               <option value="+">
-                {{ $t('components.library.Podcasts.ascendingOrdering') }}
+                {{ $t('components.library.Podcasts.ordering.direction.ascending') }}
               </option>
               <option value="-">
-                {{ $t('components.library.Podcasts.descendingOrdering') }}
+                {{ $t('components.library.Podcasts.ordering.direction.descending') }}
               </option>
             </select>
           </div>
           <div class="field">
-            <label for="artist-results">{{ $t('components.library.Podcasts.resultsPerPageLabel') }}</label>
+            <label for="artist-results">{{ $t('components.library.Podcasts.pagination.results') }}</label>
             <select
               id="artist-results"
               v-model="paginateBy"
@@ -228,7 +228,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
       >
         <div class="ui icon header">
           <i class="podcast icon" />
-          {{ $t('components.library.Podcasts.emptyStateMessage') }}
+          {{ $t('components.library.Podcasts.empty.noResults') }}
         </div>
         <router-link
           v-if="$store.state.auth.authenticated"
@@ -236,7 +236,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
           class="ui success button labeled icon"
         >
           <i class="upload icon" />
-          {{ $t('components.library.Podcasts.addChannelLink') }}
+          {{ $t('components.library.Podcasts.button.channel') }}
         </router-link>
         <h1
           v-if="$store.state.auth.authenticated"
@@ -245,7 +245,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
           <div class="actions">
             <a @click.stop.prevent="showSubscribeModal = true">
               <i class="plus icon" />
-              {{ $t('components.library.Podcasts.subscribeLink') }}
+              {{ $t('components.library.Podcasts.button.feed') }}
             </a>
           </div>
         </h1>
@@ -265,7 +265,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
       :fullscreen="false"
     >
       <h2 class="header">
-        {{ $t('components.library.Podcasts.subscriptionModalHeader') }}
+        {{ $t('components.library.Podcasts.modal.subscription.header') }}
       </h2>
       <div
         ref="modalContent"
@@ -281,7 +281,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
       </div>
       <div class="actions">
         <button class="ui basic deny button">
-          {{ $t('components.library.Podcasts.cancelButton') }}
+          {{ $t('components.library.Podcasts.button.cancel') }}
         </button>
         <button
           form="remote-search"
@@ -289,7 +289,7 @@ const paginateOptions = computed(() => sortedUniq([12, 30, 50, paginateBy.value]
           class="ui primary button"
         >
           <i class="bookmark icon" />
-          {{ $t('components.library.Podcasts.subscribeButton') }}
+          {{ $t('components.library.Podcasts.button.subscribe') }}
         </button>
       </div>
     </semantic-modal>
diff --git a/front/src/components/library/Radios.vue b/front/src/components/library/Radios.vue
index 5b0b4c4cb..2aecca81c 100644
--- a/front/src/components/library/Radios.vue
+++ b/front/src/components/library/Radios.vue
@@ -101,7 +101,7 @@ onMounted(() => $('.ui.dropdown').dropdown())
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.library.Radios.searchPlaceholder'),
+  searchPlaceholder: t('components.library.Radios.placeholder.search'),
   title: t('components.library.Podcasts.title')
 }))
 
@@ -112,12 +112,12 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
   <main v-title="labels.title">
     <section class="ui vertical stripe segment">
       <h2 class="ui header">
-        {{ $t('components.library.Radios.radioBrowseHeader') }}
+        {{ $t('components.library.Radios.header.browse') }}
       </h2>
       <div class="ui hidden divider" />
       <div class="ui row">
         <h3 class="ui header">
-          {{ $t('components.library.Radios.instanceRadioHeader') }}
+          {{ $t('components.library.Radios.header.instance') }}
         </h3>
         <div class="ui cards">
           <radio-card
@@ -140,14 +140,14 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
 
       <div class="ui hidden divider" />
       <h3 class="ui header">
-        {{ $t('components.library.Radios.userRadioHeader') }}
+        {{ $t('components.library.Radios.header.user') }}
       </h3>
       <router-link
         v-if="isAuthenticated"
         class="ui success button"
         to="/library/radios/build"
       >
-        {{ $t('components.library.Radios.createRadioLink') }}
+        {{ $t('components.library.Radios.button.create') }}
       </router-link>
       <div class="ui hidden divider" />
       <form
@@ -156,7 +156,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
       >
         <div class="fields">
           <div class="field">
-            <label for="radios-search">{{ $t('components.library.Radios.searchLabel') }}</label>
+            <label for="radios-search">{{ $t('components.library.Radios.label.search') }}</label>
             <div class="ui action input">
               <input
                 id="radios-search"
@@ -168,14 +168,14 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
               <button
                 class="ui icon button"
                 type="submit"
-                :aria-label="t('components.library.Radios.searchButton')"
+                :aria-label="t('components.library.Radios.button.search')"
               >
                 <i class="search icon" />
               </button>
             </div>
           </div>
           <div class="field">
-            <label for="radios-ordering">{{ $t('components.library.Radios.orderingLabel') }}</label>
+            <label for="radios-ordering">{{ $t('components.library.Radios.ordering.label') }}</label>
             <select
               id="radios-ordering"
               v-model="ordering"
@@ -191,22 +191,22 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
             </select>
           </div>
           <div class="field">
-            <label for="radios-ordering-direction">{{ $t('components.library.Radios.orderingDirectionLabel') }}</label>
+            <label for="radios-ordering-direction">{{ $t('components.library.Radios.ordering.direction.label') }}</label>
             <select
               id="radios-ordering-direction"
               v-model="orderingDirection"
               class="ui dropdown"
             >
               <option value="+">
-                {{ $t('components.library.Radios.ascendingOrdering') }}
+                {{ $t('components.library.Radios.ordering.direction.ascending') }}
               </option>
               <option value="-">
-                {{ $t('components.library.Radios.descendingOrdering') }}
+                {{ $t('components.library.Radios.ordering.direction.descending') }}
               </option>
             </select>
           </div>
           <div class="field">
-            <label for="radios-results">{{ $t('components.library.Radios.resultsPerPageLabel') }}</label>
+            <label for="radios-results">{{ $t('components.library.Radios.pagination.results') }}</label>
             <select
               id="radios-results"
               v-model="paginateBy"
@@ -230,7 +230,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
       >
         <div class="ui icon header">
           <i class="feed icon" />
-          {{ $t('components.library.Radios.emptyStateMessage') }}
+          {{ $t('components.library.Radios.empty.noResults') }}
         </div>
         <router-link
           v-if="$store.state.auth.authenticated"
@@ -238,7 +238,7 @@ const paginateOptions = computed(() => sortedUniq([12, 25, 50, paginateBy.value]
           class="ui success button labeled icon"
         >
           <i class="rss icon" />
-          {{ $t('components.library.Radios.addRadioLink') }}
+          {{ $t('components.library.Radios.button.add') }}
         </router-link>
       </div>
       <div
diff --git a/front/src/components/library/TagDetail.vue b/front/src/components/library/TagDetail.vue
index f497a3a47..1bd8ccc2a 100644
--- a/front/src/components/library/TagDetail.vue
+++ b/front/src/components/library/TagDetail.vue
@@ -36,7 +36,7 @@ const labels = computed(() => ({
         :to="{name: 'manage.library.tags.detail', params: {id: id}}"
       >
         <i class="wrench icon" />
-        {{ $t('components.library.TagDetail.moderationLink') }}
+        {{ $t('components.library.TagDetail.link.moderation') }}
       </router-link>
 
       <div class="ui hidden divider" />
@@ -48,14 +48,14 @@ const labels = computed(() => ({
         >
           <template #title>
             <router-link :to="{name: 'library.artists.browse', query: {tag: id}}">
-              {{ $t('components.library.TagDetail.artistsLabel') }}
+              {{ $t('components.library.TagDetail.link.artists') }}
             </router-link>
           </template>
         </artist-widget>
         <div class="ui hidden divider" />
         <div class="ui hidden divider" />
         <h3 class="ui header">
-          {{ $t('components.library.TagDetail.channelsLabel') }}
+          {{ $t('components.library.TagDetail.header.channels') }}
         </h3>
         <channels-widget
           :key="'channels' + id"
@@ -73,7 +73,7 @@ const labels = computed(() => ({
         >
           <template #title>
             <router-link :to="{name: 'library.albums.browse', query: {tag: id}}">
-              {{ $t('components.library.TagDetail.albumsLabel') }}
+              {{ $t('components.library.TagDetail.link.albums') }}
             </router-link>
           </template>
         </album-widget>
@@ -89,7 +89,7 @@ const labels = computed(() => ({
           :filters="{playable: true, ordering: '-creation_date', tag: id}"
         >
           <template #title>
-            {{ $t('components.library.TagDetail.tracksLabel') }}
+            {{ $t('components.library.TagDetail.header.tracks') }}
           </template>
         </track-widget>
         <div class="ui clearing hidden divider" />
diff --git a/front/src/components/library/TagsSelector.vue b/front/src/components/library/TagsSelector.vue
index f8ce32525..312ccf918 100644
--- a/front/src/components/library/TagsSelector.vue
+++ b/front/src/components/library/TagsSelector.vue
@@ -99,7 +99,7 @@ onMounted(async () => {
       class="search"
     >
     <div class="default text">
-      {{ $t('components.library.TagSelector.searchPlaceholder') }}
+      {{ $t('components.library.TagSelector.placeholder.search') }}
     </div>
   </div>
 </template>
diff --git a/front/src/components/library/TrackBase.vue b/front/src/components/library/TrackBase.vue
index df1fa5758..da2d80d62 100644
--- a/front/src/components/library/TrackBase.vue
+++ b/front/src/components/library/TrackBase.vue
@@ -90,8 +90,8 @@ const subtitle = computed(() => {
 const { t } = useI18n()
 const labels = computed(() => ({
   title: t('components.library.TrackBase.title'),
-  download: t('components.library.TrackBase.downloadLabel'),
-  more: t('components.library.TrackBase.moreLabel')
+  download: t('components.library.TrackBase.button.download'),
+  more: t('components.library.TrackBase.button.more')
 }))
 
 const isLoading = ref(false)
@@ -155,7 +155,7 @@ const remove = async () => {
                 class="vibrant"
                 :track="track"
               >
-                {{ $t('components.library.TrackBase.playButton') }}
+                {{ $t('components.library.TrackBase.button.play') }}
               </play-button>
               &nbsp;
               <track-favorite-icon
@@ -185,7 +185,7 @@ const remove = async () => {
                 v-model:show="showEmbedModal"
               >
                 <h4 class="header">
-                  {{ $t('components.library.TrackBase.embedModalHeader') }}
+                  {{ $t('components.library.TrackBase.modal.embed.header') }}
                 </h4>
                 <div class="scrolling content">
                   <div class="description">
@@ -197,7 +197,7 @@ const remove = async () => {
                 </div>
                 <div class="actions">
                   <button class="ui basic deny button">
-                    {{ $t('components.library.TrackBase.cancelButton') }}
+                    {{ $t('components.library.TrackBase.button.cancel') }}
                   </button>
                 </div>
               </semantic-modal>
@@ -218,7 +218,7 @@ const remove = async () => {
                     class="basic item"
                   >
                     <i class="external icon" />
-                    {{ $t('components.library.TrackBase.domainViewLink', {domain: domain}) }}
+                    {{ $t('components.library.TrackBase.link.domain', {domain: domain}) }}
                   </a>
                   <div
                     v-if="isEmbedable"
@@ -227,7 +227,7 @@ const remove = async () => {
                     @click="showEmbedModal = !showEmbedModal"
                   >
                     <i class="code icon" />
-                    {{ $t('components.library.TrackBase.embedButton') }}
+                    {{ $t('components.library.TrackBase.button.embed') }}
                   </div>
                   <a
                     :href="wikipediaUrl"
@@ -236,7 +236,7 @@ const remove = async () => {
                     class="basic item"
                   >
                     <i class="wikipedia w icon" />
-                    {{ $t('components.library.TrackBase.wikipediaLink') }}
+                    {{ $t('components.library.TrackBase.link.wikipedia') }}
                   </a>
                   <a
                     v-if="discogsUrl"
@@ -246,7 +246,7 @@ const remove = async () => {
                     class="basic item"
                   >
                     <i class="external icon" />
-                    {{ $t('components.library.TrackBase.discogsLink') }}
+                    {{ $t('components.library.TrackBase.link.discogs') }}
                   </a>
                   <router-link
                     v-if="track.is_local"
@@ -254,7 +254,7 @@ const remove = async () => {
                     class="basic item"
                   >
                     <i class="edit icon" />
-                    {{ $t('components.library.TrackBase.editButton') }}
+                    {{ $t('components.library.TrackBase.button.edit') }}
                   </router-link>
                   <dangerous-button
                     v-if="artist && $store.state.auth.authenticated && artist.channel && artist.attributed_to.full_username === $store.state.auth.fullUsername"
@@ -262,22 +262,22 @@ const remove = async () => {
                     @confirm="remove()"
                   >
                     <i class="ui trash icon" />
-                    {{ $t('components.library.TrackBase.deleteButton') }}
+                    {{ $t('components.library.TrackBase.button.delete') }}
                     <template #modal-header>
                       <p>
-                        {{ $t('components.library.TrackBase.deleteModalHeader') }}
+                        {{ $t('components.library.TrackBase.modal.delete.header') }}
                       </p>
                     </template>
                     <template #modal-content>
                       <div>
                         <p>
-                          {{ $t('components.library.TrackBase.deleteModalMessage') }}
+                          {{ $t('components.library.TrackBase.modal.delete.content.warning') }}
                         </p>
                       </div>
                     </template>
                     <template #modal-confirm>
                       <p>
-                        {{ $t('components.library.TrackBase.deleteButton') }}
+                        {{ $t('components.library.TrackBase.button.delete') }}
                       </p>
                     </template>
                   </dangerous-button>
@@ -298,7 +298,7 @@ const remove = async () => {
                     :to="{name: 'manage.library.tracks.detail', params: {id: track.id}}"
                   >
                     <i class="wrench icon" />
-                    {{ $t('components.library.TrackBase.moderationLink') }}
+                    {{ $t('components.library.TrackBase.link.moderation') }}
                   </router-link>
                   <a
                     v-if="$store.state.auth.profile && $store.state.auth.profile.is_superuser"
@@ -308,7 +308,7 @@ const remove = async () => {
                     rel="noopener noreferrer"
                   >
                     <i class="wrench icon" />
-                    {{ $t('components.library.TrackBase.djangoLink') }}
+                    {{ $t('components.library.TrackBase.link.django') }}
                   </a>
                 </div>
               </button>
diff --git a/front/src/components/library/TrackDetail.vue b/front/src/components/library/TrackDetail.vue
index 93c797556..e6446bd3f 100644
--- a/front/src/components/library/TrackDetail.vue
+++ b/front/src/components/library/TrackDetail.vue
@@ -79,19 +79,19 @@ watchEffect(() => {
               <span
                 v-if="track.artist?.content_category === 'music'"
               >
-                {{ $t('components.library.TrackDetail.trackDetails') }}
+                {{ $t('components.library.TrackDetail.header.track') }}
               </span>
               <span
                 v-else
               >
-                {{ $t('components.library.TrackDetail.episodeDetails') }}
+                {{ $t('components.library.TrackDetail.header.episode') }}
               </span>
             </h3>
             <table class="ui basic table">
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.library.TrackDetail.durationTableHeader') }}
+                    {{ $t('components.library.TrackDetail.table.track.duration') }}
                   </td>
                   <td class="right aligned">
                     <template v-if="upload.duration">
@@ -106,7 +106,7 @@ watchEffect(() => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.library.TrackDetail.sizeTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.track.size') }}
                   </td>
                   <td class="right aligned">
                     <template v-if="upload.size">
@@ -121,7 +121,7 @@ watchEffect(() => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.library.TrackDetail.codecTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.track.codec') }}
                   </td>
                   <td class="right aligned">
                     <template v-if="upload.extension">
@@ -136,11 +136,11 @@ watchEffect(() => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.library.TrackDetail.bitrateTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.track.bitrate.label') }}
                   </td>
                   <td class="right aligned">
                     <template v-if="upload.bitrate">
-                      {{ $t('components.library.TrackDetail.uploadBitrateTableLabel', {bitrate: humanSize(upload.bitrate)}) }}
+                      {{ $t('components.library.TrackDetail.table.track.bitrate.value', {bitrate: humanSize(upload.bitrate)}) }}
                     </template>
                     <span
                       v-else
@@ -151,7 +151,7 @@ watchEffect(() => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.library.TrackDetail.downloadsTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.track.downloads') }}
                   </td>
                   <td class="right aligned">
                     {{ track.downloads_count }}
@@ -172,13 +172,13 @@ watchEffect(() => {
             :can-update="false"
           />
           <h2 class="ui header">
-            {{ $t('components.library.TrackDetail.releaseDetailsHeader') }}
+            {{ $t('components.library.TrackDetail.header.release') }}
           </h2>
           <table class="ui basic table ellipsis-rows">
             <tbody>
               <tr>
                 <td>
-                  {{ $t('components.library.TrackDetail.artistTableLabel') }}
+                  {{ $t('components.library.TrackDetail.table.release.artist') }}
                 </td>
                 <td class="right aligned">
                   <router-link :to="{name: 'library.artists.detail', params: {id: track.artist?.id}}">
@@ -191,12 +191,12 @@ watchEffect(() => {
                   <span
                     v-if="track.album.artist.content_category === 'music'"
                   >
-                    {{ $t('components.library.TrackDetail.albumTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.release.album') }}
                   </span>
                   <span
                     v-else
                   >
-                    {{ $t('components.library.TrackDetail.seriesTableLabel') }}
+                    {{ $t('components.library.TrackDetail.table.release.series') }}
                   </span>
                 </td>
                 <td class="right aligned">
@@ -207,7 +207,7 @@ watchEffect(() => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.TrackDetail.yearTableLabel') }}
+                  {{ $t('components.library.TrackDetail.table.release.year') }}
                 </td>
                 <td class="right aligned">
                   <template v-if="track.album && track.album.release_date">
@@ -220,7 +220,7 @@ watchEffect(() => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.TrackDetail.copyrightTableLabel') }}
+                  {{ $t('components.library.TrackDetail.table.release.copyright') }}
                 </td>
                 <td class="right aligned">
                   <span
@@ -234,7 +234,7 @@ watchEffect(() => {
               </tr>
               <tr>
                 <td>
-                  {{ $t('components.library.TrackDetail.licenseTableLabel') }}
+                  {{ $t('components.library.TrackDetail.table.release.license') }}
                 </td>
                 <td class="right aligned">
                   <a
@@ -252,7 +252,7 @@ watchEffect(() => {
               </tr>
               <tr v-if="!track.is_local">
                 <td>
-                  {{ $t('components.library.TrackDetail.urlTableLabel') }}
+                  {{ $t('components.library.TrackDetail.table.release.url') }}
                 </td>
                 <td :title="track.fid">
                   <a
@@ -273,10 +273,10 @@ watchEffect(() => {
             rel="noreferrer noopener"
           >
             <i class="external icon" />
-            {{ $t('components.library.TrackDetail.musicbrainzLink') }}
+            {{ $t('components.library.TrackDetail.link.musicbrainz') }}
           </a>
           <h2 class="ui header">
-            {{ $t('components.library.TrackDetail.relatedPlaylistsHeader') }}
+            {{ $t('components.library.TrackDetail.header.playlists') }}
           </h2>
           <playlist-widget
             :url="'playlists/'"
@@ -284,13 +284,13 @@ watchEffect(() => {
           />
 
           <h2 class="ui header">
-            {{ $t('components.library.TrackDetail.userLibraryHeader') }}
+            {{ $t('components.library.TrackDetail.header.library') }}
           </h2>
           <library-widget
             :url="`tracks/${track.id}/libraries/`"
             @loaded="emit('libraries-loaded', $event)"
           >
-            {{ $t('components.library.TrackDetail.userLibraryDescription') }}
+            {{ $t('components.library.TrackDetail.description.library') }}
           </library-widget>
         </div>
       </div>
diff --git a/front/src/components/library/TrackEdit.vue b/front/src/components/library/TrackEdit.vue
index 65fe6940e..e29f2a93e 100644
--- a/front/src/components/library/TrackEdit.vue
+++ b/front/src/components/library/TrackEdit.vue
@@ -47,19 +47,19 @@ fetchLicenses()
         <span
           v-if="canEdit"
         >
-          {{ $t('components.library.TrackEdit.editTrackHeader') }}
+          {{ $t('components.library.TrackEdit.header.edit') }}
         </span>
         <span
           key="2"
         >
-          {{ $t('components.library.TrackEdit.suggestEditHeader') }}
+          {{ $t('components.library.TrackEdit.header.suggest') }}
         </span>
       </h2>
       <div
         v-if="!object.is_local"
         class="ui message"
       >
-        {{ $t('components.library.TrackEdit.remoteObjectWarning') }}
+        {{ $t('components.library.TrackEdit.message.remote') }}
       </div>
       <edit-form
         v-else-if="!isLoadingLicenses"
diff --git a/front/src/components/library/radios/Builder.vue b/front/src/components/library/radios/Builder.vue
index b8b170cae..b4e7695e4 100644
--- a/front/src/components/library/radios/Builder.vue
+++ b/front/src/components/library/radios/Builder.vue
@@ -57,8 +57,8 @@ const router = useRouter()
 const labels = computed(() => ({
   title: t('components.library.radios.Builder.title'),
   placeholder: {
-    description: t('components.library.radios.Builder.descriptionPlaceholder'),
-    name: t('components.library.radios.Builder.namePlaceholder')
+    description: t('components.library.radios.Builder.placeholder.description'),
+    name: t('components.library.radios.Builder.placeholder.name')
   }
 }))
 
@@ -203,10 +203,10 @@ onMounted(() => {
     <div>
       <section>
         <h2 class="ui header">
-          {{ $t('components.library.radios.Builder.builderHeader') }}
+          {{ $t('components.library.radios.Builder.header.builder') }}
         </h2>
         <p>
-          {{ $t('components.library.radios.Builder.builderDescription') }}
+          {{ $t('components.library.radios.Builder.description.builder') }}
         </p>
         <div class="ui form">
           <div
@@ -215,16 +215,16 @@ onMounted(() => {
           >
             <h4 class="header">
               <template v-if="radioName">
-                {{ $t('components.library.radios.Builder.radioUpdateSuccess') }}
+                {{ $t('components.library.radios.Builder.header.updated') }}
               </template>
               <template v-else>
-                {{ $t('components.library.radios.Builder.radioCreateSuccess') }}
+                {{ $t('components.library.radios.Builder.header.created') }}
               </template>
             </h4>
           </div>
           <div class="">
             <div class="field">
-              <label for="name">{{ $t('components.library.radios.Builder.radioNameLabel') }}</label>
+              <label for="name">{{ $t('components.library.radios.Builder.label.name') }}</label>
               <input
                 id="name"
                 v-model="radioName"
@@ -234,7 +234,7 @@ onMounted(() => {
               >
             </div>
             <div class="field">
-              <label for="description">{{ $t('components.library.radios.Builder.radioDescriptionLabel') }}</label>
+              <label for="description">{{ $t('components.library.radios.Builder.label.description') }}</label>
               <textarea
                 id="description"
                 v-model="radioDesc"
@@ -249,7 +249,7 @@ onMounted(() => {
                 v-model="isPublic"
                 type="checkbox"
               >
-              <label for="public">{{ $t('components.library.radios.Builder.publicLabel') }}</label>
+              <label for="public">{{ $t('components.library.radios.Builder.label.public') }}</label>
             </div>
             <div class="ui hidden divider" />
             <button
@@ -257,7 +257,7 @@ onMounted(() => {
               :class="['ui', 'success', {loading: isLoading}, 'button']"
               @click="save"
             >
-              {{ $t('components.library.radios.Builder.saveButton') }}
+              {{ $t('components.library.radios.Builder.button.save') }}
             </button>
             <radio-button
               v-if="id"
@@ -271,14 +271,14 @@ onMounted(() => {
             <label
               id="radioFilterLabel"
               for="radio-filters"
-            >{{ $t('components.library.radios.Builder.addFiltersLabel') }}</label>
+            >{{ $t('components.library.radios.Builder.label.filter') }}</label>
             <select
               id="radio-filters"
               v-model="currentFilterType"
               class="ui dropdown"
             >
               <option value="">
-                {{ $t('components.library.radios.Builder.selectFilterLabel') }}
+                {{ $t('components.library.radios.Builder.option.filter') }}
               </option>
               <option
                 v-for="f in availableFilters"
@@ -294,7 +294,7 @@ onMounted(() => {
               class="ui button"
               @click="add"
             >
-              {{ $t('components.library.radios.Builder.addFilterButton') }}
+              {{ $t('components.library.radios.Builder.button.filter') }}
             </button>
           </div>
           <p v-if="currentFilter">
@@ -305,19 +305,19 @@ onMounted(() => {
           <thead>
             <tr>
               <th class="two wide">
-                {{ $t('components.library.radios.Builder.filterNameTableHeader') }}
+                {{ $t('components.library.radios.Builder.table.filter.header.name') }}
               </th>
               <th class="one wide">
-                {{ $t('components.library.radios.Builder.excludeTableHeader') }}
+                {{ $t('components.library.radios.Builder.table.filter.header.exclude') }}
               </th>
               <th class="six wide">
-                {{ $t('components.library.radios.Builder.configTableHeader') }}
+                {{ $t('components.library.radios.Builder.table.filter.header.config') }}
               </th>
               <th class="five wide">
-                {{ $t('components.library.radios.Builder.candidatesTableHeader') }}
+                {{ $t('components.library.radios.Builder.table.filter.header.candidates') }}
               </th>
               <th class="two wide">
-                {{ $t('components.library.radios.Builder.actionsTableHeader') }}
+                {{ $t('components.library.radios.Builder.table.filter.header.actions') }}
               </th>
             </tr>
           </thead>
@@ -337,7 +337,7 @@ onMounted(() => {
           <h3
             class="ui header"
           >
-            {{ $t('components.library.radios.Builder.matchingTracks', {count: checkResult.candidates.count}) }}
+            {{ $t('components.library.radios.Builder.header.matches', {count: checkResult.candidates.count}) }}
           </h3>
           <track-table
             v-if="checkResult.candidates.sample"
diff --git a/front/src/components/manage/ChannelsTable.vue b/front/src/components/manage/ChannelsTable.vue
index 0ff03909b..3f99b1bc3 100644
--- a/front/src/components/manage/ChannelsTable.vue
+++ b/front/src/components/manage/ChannelsTable.vue
@@ -82,8 +82,8 @@ fetchData()
 const sharedLabels = useSharedLabels()
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.ChannelsTable.searchPlaceholder'),
-  openModeration: t('components.manage.ChannelsTable.openModeration')
+  searchPlaceholder: t('components.manage.ChannelsTable.placeholder.search'),
+  openModeration: t('components.manage.ChannelsTable.link.moderation')
 }))
 </script>
 
@@ -92,7 +92,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="channel-search">{{ $t('components.manage.ChannelsTable.searchLabel') }}</label>
+          <label for="channel-search">{{ $t('components.manage.ChannelsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="channel-search"
@@ -105,7 +105,7 @@ const labels = computed(() => ({
           </form>
         </div>
         <div class="field">
-          <label for="channel-category">{{ $t('components.manage.ChannelsTable.categoryLabel') }}</label>
+          <label for="channel-category">{{ $t('components.manage.ChannelsTable.label.category') }}</label>
           <select
             id="channel-category"
             class="ui dropdown"
@@ -113,7 +113,7 @@ const labels = computed(() => ({
             @change="addSearchToken('category', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.ChannelsTable.allOption') }}
+              {{ $t('components.manage.ChannelsTable.option.all') }}
             </option>
             <option value="podcast">
               {{ sharedLabels.fields.content_category.choices.podcast }}
@@ -127,7 +127,7 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="channel-ordering">{{ $t('components.manage.ChannelsTable.orderingLabel') }}</label>
+          <label for="channel-ordering">{{ $t('components.manage.ChannelsTable.ordering.label') }}</label>
           <select
             id="channel-ordering"
             v-model="ordering"
@@ -143,17 +143,17 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="channel-ordering-direction">{{ $t('components.manage.ChannelsTable.orderingDirectionLabel') }}</label>
+          <label for="channel-ordering-direction">{{ $t('components.manage.ChannelsTable.ordering.direction.label') }}</label>
           <select
             id="channel-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.ChannelsTable.ascendingOrdering') }}
+              {{ $t('components.manage.ChannelsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.ChannelsTable.descendingOrdering') }}
+              {{ $t('components.manage.ChannelsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -176,22 +176,22 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.ChannelsTable.nameTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.ChannelsTable.accountTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.account') }}
           </th>
           <th>
-            {{ $t('components.manage.ChannelsTable.domainTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.ChannelsTable.albumsTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.albums') }}
           </th>
           <th>
-            {{ $t('components.manage.ChannelsTable.tracksTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.tracks') }}
           </th>
           <th>
-            {{ $t('components.manage.ChannelsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.ChannelsTable.table.channel.header.creationDate') }}
           </th>
         </template>
         <template
@@ -232,7 +232,7 @@ const labels = computed(() => ({
               @click.prevent="addSearchToken('domain', scope.obj.attributed_to.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.ChannelsTable.localLink') }}
+              {{ $t('components.manage.ChannelsTable.link.local') }}
             </a>
           </td>
           <td>
@@ -257,7 +257,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.ChannelsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.ChannelsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/AlbumsTable.vue b/front/src/components/manage/library/AlbumsTable.vue
index c00e1ed7f..e12cfbc34 100644
--- a/front/src/components/manage/library/AlbumsTable.vue
+++ b/front/src/components/manage/library/AlbumsTable.vue
@@ -54,8 +54,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.AlbumsTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.AlbumsTable.deleteActionConfirmation'),
+    label: t('components.manage.library.AlbumsTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.AlbumsTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -94,8 +94,8 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.AlbumsTable.searchPlaceholder'),
-  openModeration: t('components.manage.library.AlbumsTable.openModeration')
+  searchPlaceholder: t('components.manage.library.AlbumsTable.placeholder.search'),
+  openModeration: t('components.manage.library.AlbumsTable.link.moderation')
 }))
 </script>
 
@@ -104,7 +104,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="albums-search">{{ $t('components.manage.library.AlbumsTable.searchLabel') }}</label>
+          <label for="albums-search">{{ $t('components.manage.library.AlbumsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="albums-search"
@@ -117,7 +117,7 @@ const labels = computed(() => ({
           </form>
         </div>
         <div class="field">
-          <label for="albums-ordering">{{ $t('components.manage.library.AlbumsTable.orderingLabel') }}</label>
+          <label for="albums-ordering">{{ $t('components.manage.library.AlbumsTable.ordering.label') }}</label>
           <select
             id="albums-ordering"
             v-model="ordering"
@@ -133,16 +133,16 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="albums-ordering-direction">{{ $t('components.manage.library.AlbumsTable.orderingDirectionLabel') }}</label>
+          <label for="albums-ordering-direction">{{ $t('components.manage.library.AlbumsTable.ordering.direction.label') }}</label>
           <select
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.AlbumsTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.AlbumsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.AlbumsTable.descendingOrdering') }}
+              {{ $t('components.manage.library.AlbumsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -165,22 +165,22 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.nameTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.artistTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.artist') }}
           </th>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.domainTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.tracksTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.tracks') }}
           </th>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.releaseDateTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.releaseDate') }}
           </th>
           <th>
-            {{ $t('components.manage.library.AlbumsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.AlbumsTable.table.album.header.creationDate') }}
           </th>
         </template>
         <template
@@ -222,7 +222,7 @@ const labels = computed(() => ({
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.library.AlbumsTable.localLink') }}
+              {{ $t('components.manage.library.AlbumsTable.link.local') }}
             </a>
           </td>
           <td>
@@ -255,7 +255,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.AlbumsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.AlbumsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/ArtistsTable.vue b/front/src/components/manage/library/ArtistsTable.vue
index ae4510bcb..151cf41ca 100644
--- a/front/src/components/manage/library/ArtistsTable.vue
+++ b/front/src/components/manage/library/ArtistsTable.vue
@@ -52,8 +52,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.ArtistsTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.ArtistsTable.deleteActionConfirmation'),
+    label: t('components.manage.library.ArtistsTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.ArtistsTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -93,7 +93,7 @@ fetchData()
 const sharedLabels = useSharedLabels()
 const { t } = useI18n()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.ArtistsTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.ArtistsTable.placeholder.search')
 }))
 
 const getUrl = (artist: { channel?: number; id: number }) => {
@@ -108,7 +108,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="artists-serarch">{{ $t('components.manage.library.ArtistsTable.searchLabel') }}</label>
+          <label for="artists-serarch">{{ $t('components.manage.library.ArtistsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="artists-search"
@@ -121,7 +121,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
           </form>
         </div>
         <div class="field">
-          <label for="artists-category">{{ $t('components.manage.library.ArtistsTable.categoryLabel') }}</label>
+          <label for="artists-category">{{ $t('components.manage.library.ArtistsTable.label.category') }}</label>
           <select
             id="artists-category"
             class="ui dropdown"
@@ -129,7 +129,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
             @change="addSearchToken('category', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.library.ArtistsTable.allOption') }}
+              {{ $t('components.manage.library.ArtistsTable.option.all') }}
             </option>
             <option value="podcast">
               {{ sharedLabels.fields.content_category.choices.podcast }}
@@ -143,7 +143,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
           </select>
         </div>
         <div class="field">
-          <label for="artists-ordering">{{ $t('components.manage.library.ArtistsTable.orderingLabel') }}</label>
+          <label for="artists-ordering">{{ $t('components.manage.library.ArtistsTable.ordering.label') }}</label>
           <select
             id="artists-ordering"
             v-model="ordering"
@@ -159,17 +159,17 @@ const getUrl = (artist: { channel?: number; id: number }) => {
           </select>
         </div>
         <div class="field">
-          <label for="artists-ordering-direction">{{ $t('components.manage.library.ArtistsTable.orderingDirectionLabel') }}</label>
+          <label for="artists-ordering-direction">{{ $t('components.manage.library.ArtistsTable.ordering.direction.label') }}</label>
           <select
             id="artists-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.ArtistsTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.ArtistsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.ArtistsTable.descendingOrdering') }}
+              {{ $t('components.manage.library.ArtistsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -192,19 +192,19 @@ const getUrl = (artist: { channel?: number; id: number }) => {
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.ArtistsTable.nameTableHeader') }}
+            {{ $t('components.manage.library.ArtistsTable.table.artist.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.library.ArtistsTable.domainTableHeader') }}
+            {{ $t('components.manage.library.ArtistsTable.table.artist.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.library.ArtistsTable.albumsTableHeader') }}
+            {{ $t('components.manage.library.ArtistsTable.table.artist.header.albums') }}
           </th>
           <th>
-            {{ $t('components.manage.library.ArtistsTable.tracksTableHeader') }}
+            {{ $t('components.manage.library.ArtistsTable.table.artist.header.tracks') }}
           </th>
           <th>
-            {{ $t('components.manage.library.ArtistsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.ArtistsTable.table.artist.header.creationDate') }}
           </th>
         </template>
         <template
@@ -234,7 +234,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.library.ArtistsTable.localLink') }}
+              {{ $t('components.manage.library.ArtistsTable.link.local') }}
             </a>
           </td>
           <td>
@@ -259,7 +259,7 @@ const getUrl = (artist: { channel?: number; id: number }) => {
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.ArtistsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.ArtistsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/EditsCardList.vue b/front/src/components/manage/library/EditsCardList.vue
index b884a202c..a61b1e670 100644
--- a/front/src/components/manage/library/EditsCardList.vue
+++ b/front/src/components/manage/library/EditsCardList.vue
@@ -142,7 +142,7 @@ fetchData()
 const { t } = useI18n()
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.EditsCardList.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.EditsCardList.placeholder.search')
 }))
 
 const handle = (type: 'delete' | 'approved', id: string, value: boolean) => {
@@ -165,7 +165,7 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
     <div class="ui inline form">
       <div class="fields">
         <div class="ui field">
-          <label for="search-edits">{{ $t('components.manage.library.EditsCardList.searchPlaceholder') }}</label>
+          <label for="search-edits">{{ $t('components.manage.library.EditsCardList.placeholder.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="search-edits"
@@ -178,7 +178,7 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
           </form>
         </div>
         <div class="field">
-          <label for="edit-status">{{ $t('components.manage.library.EditsCardList.statusLabel') }}</label>
+          <label for="edit-status">{{ $t('components.manage.library.EditsCardList.label.status') }}</label>
           <select
             id="edit-status"
             class="ui dropdown"
@@ -186,21 +186,21 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
             @change="addSearchToken('is_approved', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.library.EditsCardList.allOption') }}
+              {{ $t('components.manage.library.EditsCardList.option.all') }}
             </option>
             <option value="null">
-              {{ $t('components.manage.library.EditsCardList.pendingReviewLabel') }}
+              {{ $t('components.manage.library.EditsCardList.option.pending') }}
             </option>
             <option value="yes">
-              {{ $t('components.manage.library.EditsCardList.approvedLabel') }}
+              {{ $t('components.manage.library.EditsCardList.option.approved') }}
             </option>
             <option value="no">
-              {{ $t('components.manage.library.EditsCardList.rejectedLabel') }}
+              {{ $t('components.manage.library.EditsCardList.option.rejected') }}
             </option>
           </select>
         </div>
         <div class="field">
-          <label for="edit-ordering">{{ $t('components.manage.library.EditsCardList.orderingLabel') }}</label>
+          <label for="edit-ordering">{{ $t('components.manage.library.EditsCardList.ordering.label') }}</label>
           <select
             id="edit-ordering"
             v-model="ordering"
@@ -216,17 +216,17 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
           </select>
         </div>
         <div class="field">
-          <label for="edit-ordering-direction">{{ $t('components.manage.library.EditsCardList.orderingDirectionLabel') }}</label>
+          <label for="edit-ordering-direction">{{ $t('components.manage.library.EditsCardList.ordering.direction.label') }}</label>
           <select
             id="edit-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.EditsCardList.ascendingOrdering') }}
+              {{ $t('components.manage.library.EditsCardList.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.EditsCardList.descendingOrdering') }}
+              {{ $t('components.manage.library.EditsCardList.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -266,7 +266,7 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.EditsCardList.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.EditsCardList.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/LibrariesTable.vue b/front/src/components/manage/library/LibrariesTable.vue
index 5cffd7eff..5c12e61c4 100644
--- a/front/src/components/manage/library/LibrariesTable.vue
+++ b/front/src/components/manage/library/LibrariesTable.vue
@@ -54,8 +54,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.LibrariesTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.LibrariesTable.deleteActionConfirmation'),
+    label: t('components.manage.library.LibrariesTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.LibrariesTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -94,7 +94,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.LibrariesTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.LibrariesTable.placeholder.search')
 }))
 
 const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
@@ -107,7 +107,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="libraries-search">{{ $t('components.manage.library.LibrariesTable.searchLabel') }}</label>
+          <label for="libraries-search">{{ $t('components.manage.library.LibrariesTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="libraries-search"
@@ -120,7 +120,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </form>
         </div>
         <div class="field">
-          <label for="libraries-visibility">{{ $t('components.manage.library.LibrariesTable.visibilityLabel') }}</label>
+          <label for="libraries-visibility">{{ $t('components.manage.library.LibrariesTable.label.visibility') }}</label>
           <select
             id="libraries-visibility"
             class="ui dropdown"
@@ -128,7 +128,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
             @change="addSearchToken('privacy_level', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.library.LibrariesTable.allOption') }}
+              {{ $t('components.manage.library.LibrariesTable.option.all') }}
             </option>
             <option value="me">
               {{ sharedLabels.fields.privacy_level.shortChoices.me }}
@@ -142,7 +142,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </select>
         </div>
         <div class="field">
-          <label for="libraries-ordering">{{ $t('components.manage.library.LibrariesTable.orderingLabel') }}</label>
+          <label for="libraries-ordering">{{ $t('components.manage.library.LibrariesTable.ordering.label') }}</label>
           <select
             id="libraries-ordering"
             v-model="ordering"
@@ -158,17 +158,17 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </select>
         </div>
         <div class="field">
-          <label for="libraries-ordering-direction">{{ $t('components.manage.library.LibrariesTable.orderingDirectionLabel') }}</label>
+          <label for="libraries-ordering-direction">{{ $t('components.manage.library.LibrariesTable.ordering.direction.label') }}</label>
           <select
             id="libraries-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.LibrariesTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.LibrariesTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.LibrariesTable.descendingOrdering') }}
+              {{ $t('components.manage.library.LibrariesTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -191,25 +191,25 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.nameTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.accountTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.account') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.domainTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.visibilityTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.visibility') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.uploadsTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.uploads') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.followersTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.followers') }}
           </th>
           <th>
-            {{ $t('components.manage.library.LibrariesTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.LibrariesTable.table.library.header.creationDate') }}
           </th>
         </template>
         <template #row-cells="scope">
@@ -248,7 +248,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.library.LibrariesTable.localLink') }}
+              {{ $t('components.manage.library.LibrariesTable.link.local') }}
             </a>
           </td>
           <td>
@@ -283,7 +283,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.LibrariesTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.LibrariesTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/TagsTable.vue b/front/src/components/manage/library/TagsTable.vue
index 9b6eca650..5ccbcdcf4 100644
--- a/front/src/components/manage/library/TagsTable.vue
+++ b/front/src/components/manage/library/TagsTable.vue
@@ -57,8 +57,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.TagsTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.TagsTable.deleteActionConfirmation'),
+    label: t('components.manage.library.TagsTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.TagsTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -97,7 +97,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.TagsTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.TagsTable.placeholder.search')
 }))
 
 const detailedUpload = ref()
@@ -109,7 +109,7 @@ const showUploadDetailModal = ref(false)
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="tags-search">{{ $t('components.manage.library.TagsTable.searchLabel') }}</label>
+          <label for="tags-search">{{ $t('components.manage.library.TagsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="tags-search"
@@ -122,7 +122,7 @@ const showUploadDetailModal = ref(false)
           </form>
         </div>
         <div class="field">
-          <label for="tags-ordering">{{ $t('components.manage.library.TagsTable.orderingLabel') }}</label>
+          <label for="tags-ordering">{{ $t('components.manage.library.TagsTable.ordering.label') }}</label>
           <select
             id="tags-ordering"
             v-model="ordering"
@@ -138,17 +138,17 @@ const showUploadDetailModal = ref(false)
           </select>
         </div>
         <div class="field">
-          <label for="tags-ordering-direction">{{ $t('components.manage.library.TagsTable.orderingDirectionLabel') }}</label>
+          <label for="tags-ordering-direction">{{ $t('components.manage.library.TagsTable.ordering.direction.label') }}</label>
           <select
             id="tags-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.TagsTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.TagsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.TagsTable.descendingOrdering') }}
+              {{ $t('components.manage.library.TagsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -177,19 +177,19 @@ const showUploadDetailModal = ref(false)
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.TagsTable.nameTableHeader') }}
+            {{ $t('components.manage.library.TagsTable.table.tag.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TagsTable.artistsTableHeader') }}
+            {{ $t('components.manage.library.TagsTable.table.tag.header.artists') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TagsTable.albumsTableHeader') }}
+            {{ $t('components.manage.library.TagsTable.table.tag.header.albums') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TagsTable.tracksTableHeader') }}
+            {{ $t('components.manage.library.TagsTable.table.tag.header.tracks') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TagsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.TagsTable.table.tag.header.creationDate') }}
           </th>
         </template>
         <template
@@ -225,7 +225,7 @@ const showUploadDetailModal = ref(false)
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.TagsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.TagsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/TracksTable.vue b/front/src/components/manage/library/TracksTable.vue
index a27e1dd6e..3d4c52560 100644
--- a/front/src/components/manage/library/TracksTable.vue
+++ b/front/src/components/manage/library/TracksTable.vue
@@ -52,8 +52,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.TracksTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.TracksTable.deleteActionConfirmation'),
+    label: t('components.manage.library.TracksTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.TracksTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -92,7 +92,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.TracksTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.TracksTable.placeholder.search')
 }))
 </script>
 
@@ -101,7 +101,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="tracks-search">{{ $t('components.manage.library.TracksTable.searchLabel') }}</label>
+          <label for="tracks-search">{{ $t('components.manage.library.TracksTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="tracks-search"
@@ -114,7 +114,7 @@ const labels = computed(() => ({
           </form>
         </div>
         <div class="field">
-          <label for="tracks-ordering">{{ $t('components.manage.library.TracksTable.orderingLabel') }}</label>
+          <label for="tracks-ordering">{{ $t('components.manage.library.TracksTable.ordering.label') }}</label>
           <select
             id="tracks-ordering"
             v-model="ordering"
@@ -130,17 +130,17 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="tracks-ordering-direction">{{ $t('components.manage.library.TracksTable.orderingDirectionLabel') }}</label>
+          <label for="tracks-ordering-direction">{{ $t('components.manage.library.TracksTable.ordering.direction.label') }}</label>
           <select
             id="tracks-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.TracksTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.TracksTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.TracksTable.descendingOrdering') }}
+              {{ $t('components.manage.library.TracksTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -163,22 +163,22 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.TracksTable.titleTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.title') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TracksTable.albumTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.album') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TracksTable.artistTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.artist') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TracksTable.domainTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TracksTable.licenseTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.license') }}
           </th>
           <th>
-            {{ $t('components.manage.library.TracksTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.TracksTable.table.track.header.creationDate') }}
           </th>
         </template>
         <template
@@ -232,7 +232,7 @@ const labels = computed(() => ({
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.library.TracksTable.localLink') }}
+              {{ $t('components.manage.library.TracksTable.link.local') }}
             </a>
           </td>
           <td>
@@ -265,7 +265,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.TracksTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.TracksTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/library/UploadsTable.vue b/front/src/components/manage/library/UploadsTable.vue
index c20ca2a9a..843177d0a 100644
--- a/front/src/components/manage/library/UploadsTable.vue
+++ b/front/src/components/manage/library/UploadsTable.vue
@@ -59,8 +59,8 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.library.UploadsTable.deleteActionLabel'),
-    confirmationMessage: t('components.manage.library.UploadsTable.deleteActionConfirmation'),
+    label: t('components.manage.library.UploadsTable.action.delete.label'),
+    confirmationMessage: t('components.manage.library.UploadsTable.action.delete.warning'),
     isDangerous: true,
     allowAll: false,
     confirmColor: 'danger'
@@ -99,7 +99,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.library.UploadsTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.library.UploadsTable.placeholder.search')
 }))
 
 const displayName = (upload: Upload): string => {
@@ -123,7 +123,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="uploads-search">{{ $t('components.manage.library.UploadsTable.searchLabel') }}</label>
+          <label for="uploads-search">{{ $t('components.manage.library.UploadsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="uploads-search"
@@ -136,7 +136,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </form>
         </div>
         <div class="field">
-          <label for="uploads-visibility">{{ $t('components.manage.library.UploadsTable.visibilityLabel') }}</label>
+          <label for="uploads-visibility">{{ $t('components.manage.library.UploadsTable.label.visibility') }}</label>
           <select
             id="uploads-visibility"
             class="ui dropdown"
@@ -144,7 +144,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
             @change="addSearchToken('privacy_level', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.library.UploadsTable.allOption') }}
+              {{ $t('components.manage.library.UploadsTable.option.all') }}
             </option>
             <option value="me">
               {{ sharedLabels.fields.privacy_level.shortChoices.me }}
@@ -158,7 +158,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </select>
         </div>
         <div class="field">
-          <label for="uploads-status">{{ $t('components.manage.library.UploadsTable.importStatusLabel') }}</label>
+          <label for="uploads-status">{{ $t('components.manage.library.UploadsTable.label.status') }}</label>
           <select
             id="uploads-status"
             class="ui dropdown"
@@ -166,24 +166,24 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
             @change="addSearchToken('status', ($event.target as HTMLSelectElement).value)"
           >
             <option value="">
-              {{ $t('components.manage.library.UploadsTable.allOption') }}
+              {{ $t('components.manage.library.UploadsTable.option.all') }}
             </option>
             <option value="pending">
-              {{ $t('components.manage.library.UploadsTable.pendingStatus') }}
+              {{ $t('components.manage.library.UploadsTable.option.pending') }}
             </option>
             <option value="skipped">
-              {{ $t('components.manage.library.UploadsTable.skippedStatus') }}
+              {{ $t('components.manage.library.UploadsTable.option.skipped') }}
             </option>
             <option value="errored">
-              {{ $t('components.manage.library.UploadsTable.failedStatus') }}
+              {{ $t('components.manage.library.UploadsTable.option.failed') }}
             </option>
             <option value="finished">
-              {{ $t('components.manage.library.UploadsTable.finishedStatus') }}
+              {{ $t('components.manage.library.UploadsTable.option.finished') }}
             </option>
           </select>
         </div>
         <div class="field">
-          <label for="uploads-ordering">{{ $t('components.manage.library.UploadsTable.orderingLabel') }}</label>
+          <label for="uploads-ordering">{{ $t('components.manage.library.UploadsTable.ordering.label') }}</label>
           <select
             id="uploads-ordering"
             v-model="ordering"
@@ -199,17 +199,17 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
           </select>
         </div>
         <div class="field">
-          <label for="uploads-ordering-direction">{{ $t('components.manage.library.UploadsTable.orderingDirectionLabel') }}</label>
+          <label for="uploads-ordering-direction">{{ $t('components.manage.library.UploadsTable.ordering.direction.label') }}</label>
           <select
             id="uploads-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.library.UploadsTable.ascendingOrdering') }}
+              {{ $t('components.manage.library.UploadsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.library.UploadsTable.descendingOrdering') }}
+              {{ $t('components.manage.library.UploadsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -238,31 +238,31 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.library.UploadsTable.nameTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.libraryTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.library') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.accountTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.account') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.domainTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.visibilityTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.visibility') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.importStatusTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.importStatus') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.sizeTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.size') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.creationDate') }}
           </th>
           <th>
-            {{ $t('components.manage.library.UploadsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.library.UploadsTable.table.upload.header.accessedDate') }}
           </th>
         </template>
         <template #row-cells="scope">
@@ -312,7 +312,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.library.UploadsTable.localLink') }}
+              {{ $t('components.manage.library.UploadsTable.link.local') }}
             </a>
           </td>
           <td>
@@ -377,7 +377,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.library.UploadsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.library.UploadsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/moderation/AccountsTable.vue b/front/src/components/manage/moderation/AccountsTable.vue
index e1a74bf54..69904b2af 100644
--- a/front/src/components/manage/moderation/AccountsTable.vue
+++ b/front/src/components/manage/moderation/AccountsTable.vue
@@ -56,7 +56,7 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'purge',
-    label: t('components.manage.moderation.AccountsTable.purgeLabel'),
+    label: t('components.manage.moderation.AccountsTable.action.purge.label'),
     isDangerous: true
   }
 ])
@@ -93,7 +93,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.moderation.AccountsTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.moderation.AccountsTable.placeholder.search')
 }))
 </script>
 
@@ -102,7 +102,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui six wide field">
-          <label for="accounts-search">{{ $t('components.manage.moderation.AccountsTable.searchLabel') }}</label>
+          <label for="accounts-search">{{ $t('components.manage.moderation.AccountsTable.label.search') }}</label>
           <form @submit.prevent="query = search.value">
             <input
               id="accounts-search"
@@ -115,7 +115,7 @@ const labels = computed(() => ({
           </form>
         </div>
         <div class="field">
-          <label for="accounts-ordering">{{ $t('components.manage.moderation.AccountsTable.orderingLabel') }}</label>
+          <label for="accounts-ordering">{{ $t('components.manage.moderation.AccountsTable.ordering.label') }}</label>
           <select
             id="accounts-ordering"
             v-model="ordering"
@@ -131,17 +131,17 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="accounts-ordering-direction">{{ $t('components.manage.moderation.AccountsTable.orderingDirectionLabel') }}</label>
+          <label for="accounts-ordering-direction">{{ $t('components.manage.moderation.AccountsTable.ordering.direction.label') }}</label>
           <select
             id="accounts-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.moderation.AccountsTable.ascendingOrdering') }}
+              {{ $t('components.manage.moderation.AccountsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.moderation.AccountsTable.descendingOrdering') }}
+              {{ $t('components.manage.moderation.AccountsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -164,22 +164,22 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.nameTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.domainTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.domain') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.uploadsTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.uploads') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.firstSeenTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.firstSeen') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.lastSeenTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.lastSeen') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.AccountsTable.moderationRuleTableHeader') }}
+            {{ $t('components.manage.moderation.AccountsTable.table.account.header.moderationRule') }}
           </th>
         </template>
         <template
@@ -209,7 +209,7 @@ const labels = computed(() => ({
               @click.prevent="addSearchToken('domain', scope.obj.domain)"
             >
               <i class="home icon" />
-              {{ $t('components.manage.moderation.AccountsTable.localLink') }}
+              {{ $t('components.manage.moderation.AccountsTable.link.local') }}
             </a>
           </td>
           <td>
@@ -225,7 +225,7 @@ const labels = computed(() => ({
             />
           </td>
           <td>
-            <span v-if="scope.obj.instance_policy"><i class="shield icon" />{{ $t('components.manage.moderation.AccountsTable.moderationRuleStatus') }}</span>
+            <span v-if="scope.obj.instance_policy"><i class="shield icon" />{{ $t('components.manage.moderation.AccountsTable.table.account.moderationRule') }}</span>
           </td>
         </template>
       </action-table>
@@ -240,7 +240,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.moderation.AccountsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.moderation.AccountsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/moderation/DomainsTable.vue b/front/src/components/manage/moderation/DomainsTable.vue
index da727c19a..b0d2c3e78 100644
--- a/front/src/components/manage/moderation/DomainsTable.vue
+++ b/front/src/components/manage/moderation/DomainsTable.vue
@@ -50,19 +50,19 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'purge',
-    label: t('components.manage.moderation.DomainsTable.purgeLabel'),
+    label: t('components.manage.moderation.DomainsTable.action.purge.label'),
     isDangerous: true
   },
   {
     name: 'allow_list_add',
-    label: t('components.manage.moderation.DomainsTable.allowListAddLabel'),
+    label: t('components.manage.moderation.DomainsTable.action.add.label'),
     filterCheckable: (obj: { allowed: boolean }) => {
       return !obj.allowed
     }
   },
   {
     name: 'allow_list_remove',
-    label: t('components.manage.moderation.DomainsTable.allowListRemoveLabel'),
+    label: t('components.manage.moderation.DomainsTable.action.remove.label'),
     filterCheckable: (obj: { allowed: boolean }) => {
       return obj.allowed
     }
@@ -108,8 +108,8 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.moderation.DomainsTable.searchPlaceholder'),
-  allowListTitle: t('components.manage.moderation.DomainsTable.allowListTitle')
+  searchPlaceholder: t('components.manage.moderation.DomainsTable.placeholder.search'),
+  allowListTitle: t('components.manage.moderation.DomainsTable.link.list')
 }))
 </script>
 
@@ -118,7 +118,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui field">
-          <label for="domains-search">{{ $t('components.manage.moderation.DomainsTable.searchLabel') }}</label>
+          <label for="domains-search">{{ $t('components.manage.moderation.DomainsTable.label.search') }}</label>
           <input
             id="domains-search"
             v-model="query"
@@ -131,25 +131,25 @@ const labels = computed(() => ({
           v-if="allowListEnabled"
           class="field"
         >
-          <label for="domains-allow-list">{{ $t('components.manage.moderation.DomainsTable.inAllowListLabel') }}</label>
+          <label for="domains-allow-list">{{ $t('components.manage.moderation.DomainsTable.label.inList') }}</label>
           <select
             id="domains-allow-list"
             v-model="allowed"
             class="ui dropdown"
           >
             <option :value="null">
-              {{ $t('components.manage.moderation.DomainsTable.allOption') }}
+              {{ $t('components.manage.moderation.DomainsTable.option.all') }}
             </option>
             <option :value="true">
-              {{ $t('components.manage.moderation.DomainsTable.positiveOption') }}
+              {{ $t('components.manage.moderation.DomainsTable.option.yes') }}
             </option>
             <option :value="false">
-              {{ $t('components.manage.moderation.DomainsTable.negativeOption') }}
+              {{ $t('components.manage.moderation.DomainsTable.option.no') }}
             </option>
           </select>
         </div>
         <div class="field">
-          <label for="domains-ordering">{{ $t('components.manage.moderation.DomainsTable.orderingLabel') }}</label>
+          <label for="domains-ordering">{{ $t('components.manage.moderation.DomainsTable.ordering.label') }}</label>
           <select
             id="domains-ordering"
             v-model="ordering"
@@ -165,17 +165,17 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="domains-ordering-direction">{{ $t('components.manage.moderation.DomainsTable.orderingDirectionLabel') }}</label>
+          <label for="domains-ordering-direction">{{ $t('components.manage.moderation.DomainsTable.ordering.direction.label') }}</label>
           <select
             id="domains-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.moderation.DomainsTable.ascendingOrdering') }}
+              {{ $t('components.manage.moderation.DomainsTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.moderation.DomainsTable.descendingOrdering') }}
+              {{ $t('components.manage.moderation.DomainsTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -199,19 +199,19 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.moderation.DomainsTable.nameTableHeader') }}
+            {{ $t('components.manage.moderation.DomainsTable.table.domain.header.name') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.DomainsTable.usersTableHeader') }}
+            {{ $t('components.manage.moderation.DomainsTable.table.domain.header.users') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.DomainsTable.receivedMessagesTableHeader') }}
+            {{ $t('components.manage.moderation.DomainsTable.table.domain.header.receivedMessages') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.DomainsTable.firstSeenTableHeader') }}
+            {{ $t('components.manage.moderation.DomainsTable.table.domain.header.firstSeen') }}
           </th>
           <th>
-            {{ $t('components.manage.moderation.DomainsTable.moderationRuleTableHeader') }}
+            {{ $t('components.manage.moderation.DomainsTable.table.domain.header.moderationRule') }}
           </th>
         </template>
         <template
@@ -237,7 +237,7 @@ const labels = computed(() => ({
             <human-date :date="scope.obj.creation_date" />
           </td>
           <td>
-            <span v-if="scope.obj.instance_policy"><i class="shield icon" />{{ $t('components.manage.moderation.DomainsTable.moderationRuleStatus') }}</span>
+            <span v-if="scope.obj.instance_policy"><i class="shield icon" />{{ $t('components.manage.moderation.DomainsTable.table.domain.moderationRule') }}</span>
           </td>
         </template>
       </action-table>
@@ -247,7 +247,7 @@ const labels = computed(() => ({
       >
         <div class="ui icon header">
           <i class="server icon" />
-          {{ $t('components.manage.moderation.DomainsTable.emptyState') }}
+          {{ $t('components.manage.moderation.DomainsTable.empty.noPods') }}
         </div>
       </div>
     </div>
@@ -261,7 +261,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.moderation.DomainsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.moderation.DomainsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/moderation/InstancePolicyCard.vue b/front/src/components/manage/moderation/InstancePolicyCard.vue
index 55c454fe0..ac5fd7277 100644
--- a/front/src/components/manage/moderation/InstancePolicyCard.vue
+++ b/front/src/components/manage/moderation/InstancePolicyCard.vue
@@ -25,18 +25,18 @@ const summary = useMarkdown(() => props.object.summary)
       <i class="user icon" />{{ object.actor }}  &nbsp;
       <template v-if="object.is_active">
         <i class="play icon" />
-        {{ $t('components.manage.moderation.InstancePolicyCard.enabledStatus') }}
+        {{ $t('components.manage.moderation.InstancePolicyCard.status.enabled') }}
       </template>
       <template v-if="!object.is_active">
         <i class="pause icon" />
-        {{ $t('components.manage.moderation.InstancePolicyCard.pausedStatus') }}
+        {{ $t('components.manage.moderation.InstancePolicyCard.status.paused') }}
       </template>
     </p>
     <div>
-      <p><strong>{{ $t('components.manage.moderation.InstancePolicyCard.ruleHeader') }}</strong></p>
+      <p><strong>{{ $t('components.manage.moderation.InstancePolicyCard.header.rule') }}</strong></p>
       <p v-if="object.block_all">
         <i class="ban icon" />
-        {{ $t('components.manage.moderation.InstancePolicyCard.blockAllRule') }}
+        {{ $t('components.manage.moderation.InstancePolicyCard.label.blockAll') }}
       </p>
       <div
         v-else
@@ -48,7 +48,7 @@ const summary = useMarkdown(() => props.object.summary)
         >
           <i class="feed icon" />
           <div class="content">
-            {{ $t('components.manage.moderation.InstancePolicyCard.muteActivityRule') }}
+            {{ $t('components.manage.moderation.InstancePolicyCard.label.muteActivity') }}
           </div>
         </div>
         <div
@@ -57,7 +57,7 @@ const summary = useMarkdown(() => props.object.summary)
         >
           <i class="bell icon" />
           <div class="content">
-            {{ $t('components.manage.moderation.InstancePolicyCard.muteNotificationsRule') }}
+            {{ $t('components.manage.moderation.InstancePolicyCard.label.muteNotifications') }}
           </div>
         </div>
         <div
@@ -66,14 +66,14 @@ const summary = useMarkdown(() => props.object.summary)
         >
           <i class="file icon" />
           <div class="content">
-            {{ $t('components.manage.moderation.InstancePolicyCard.rejectMediaRule') }}
+            {{ $t('components.manage.moderation.InstancePolicyCard.label.rejectMedia') }}
           </div>
         </div>
       </div>
     </div>
     <div v-if="summary">
       <div class="ui hidden divider" />
-      <p><strong>{{ $t('components.manage.moderation.InstancePolicyCard.ruleReason') }}</strong></p>
+      <p><strong>{{ $t('components.manage.moderation.InstancePolicyCard.label.reason') }}</strong></p>
       <sanitized-html :html="summary" />
     </div>
     <div class="ui hidden divider" />
@@ -82,7 +82,7 @@ const summary = useMarkdown(() => props.object.summary)
       @click="emit('update')"
     >
       <i class="edit icon" />
-      {{ $t('components.manage.moderation.InstancePolicyCard.editButton') }}
+      {{ $t('components.manage.moderation.InstancePolicyCard.button.edit') }}
     </button>
   </div>
 </template>
diff --git a/front/src/components/manage/moderation/InstancePolicyForm.vue b/front/src/components/manage/moderation/InstancePolicyForm.vue
index 6a0cc47cd..0aaeb18d5 100644
--- a/front/src/components/manage/moderation/InstancePolicyForm.vue
+++ b/front/src/components/manage/moderation/InstancePolicyForm.vue
@@ -27,20 +27,20 @@ const props = withDefaults(defineProps<Props>(), {
 const { t } = useI18n()
 
 const labels = computed(() => ({
-  summaryHelp: t('components.manage.moderation.InstancePolicyForm.summaryHelp'),
-  isActiveHelp: t('components.manage.moderation.InstancePolicyForm.isActiveHelp'),
-  blockAllHelp: t('components.manage.moderation.InstancePolicyForm.blockAllHelp'),
+  summaryHelp: t('components.manage.moderation.InstancePolicyForm.tooltip.summary'),
+  isActiveHelp: t('components.manage.moderation.InstancePolicyForm.tooltip.isActive'),
+  blockAllHelp: t('components.manage.moderation.InstancePolicyForm.tooltip.blockAll'),
   silenceActivity: {
-    help: t('components.manage.moderation.InstancePolicyForm.silenceActivityHelp'),
-    label: t('components.manage.moderation.InstancePolicyForm.silenceActivityLabel')
+    help: t('components.manage.moderation.InstancePolicyForm.tooltip.silenceActivity'),
+    label: t('components.manage.moderation.InstancePolicyForm.label.silenceActivity')
   },
   silenceNotifications: {
-    help: t('components.manage.moderation.InstancePolicyForm.silenceNotificationsHelp'),
-    label: t('components.manage.moderation.InstancePolicyForm.silenceNotificationsLabel')
+    help: t('components.manage.moderation.InstancePolicyForm.tooltip.silenceNotifications'),
+    label: t('components.manage.moderation.InstancePolicyForm.label.silenceNotifications')
   },
   rejectMedia: {
-    help: t('components.manage.moderation.InstancePolicyForm.rejectMediaHelp'),
-    label: t('components.manage.moderation.InstancePolicyForm.rejectMediaLabel')
+    help: t('components.manage.moderation.InstancePolicyForm.tooltip.rejectMedia'),
+    label: t('components.manage.moderation.InstancePolicyForm.label.rejectMedia')
   }
 }))
 
@@ -125,12 +125,12 @@ const remove = async () => {
       <span
         v-if="object"
       >
-        {{ $t('components.manage.moderation.InstancePolicyForm.editRuleHeader') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.header.editRule') }}
       </span>
       <span
         v-else
       >
-        {{ $t('components.manage.moderation.InstancePolicyForm.addRuleHeader') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.header.addRule') }}
       </span>
     </h3>
     <div
@@ -139,7 +139,7 @@ const remove = async () => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.manage.moderation.InstancePolicyForm.createRuleFailureHeader') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.header.failure') }}
       </h4>
       <ul class="list">
         <li
@@ -164,17 +164,17 @@ const remove = async () => {
         <label for="policy-is-active">
           <span
             v-if="current.isActive"
-          >{{ $t('components.manage.moderation.InstancePolicyForm.policyEnabled') }}</span>
+          >{{ $t('components.manage.moderation.InstancePolicyForm.label.policyEnabled') }}</span>
           <span
             v-else
-          >{{ $t('components.manage.moderation.InstancePolicyForm.policyDisabled') }}</span>
+          >{{ $t('components.manage.moderation.InstancePolicyForm.label.policyDisabled') }}</span>
           <tooltip :content="labels.isActiveHelp" />
         </label>
       </div>
     </div>
     <div class="field">
       <label for="policy-summary">
-        {{ $t('components.manage.moderation.InstancePolicyForm.policyReasonLabel') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.label.policyReason') }}
         <tooltip :content="labels.summaryHelp" />
       </label>
       <textarea
@@ -192,13 +192,13 @@ const remove = async () => {
           type="checkbox"
         >
         <label for="policy-is-active">
-          {{ $t('components.manage.moderation.InstancePolicyForm.blockAllLabel') }}
+          {{ $t('components.manage.moderation.InstancePolicyForm.label.blockAll') }}
           <tooltip :content="labels.blockAllHelp" />
         </label>
       </div>
     </div>
     <div class="ui horizontal divider">
-      {{ $t('components.manage.moderation.InstancePolicyForm.customizeRuleMessage') }}
+      {{ $t('components.manage.moderation.InstancePolicyForm.label.customizeRule') }}
     </div>
     <div
       v-for="(config, key) in fieldConfig"
@@ -223,7 +223,7 @@ const remove = async () => {
       class="ui basic left floated button"
       @click.prevent="emit('cancel')"
     >
-      {{ $t('components.manage.moderation.InstancePolicyForm.cancelButton') }}
+      {{ $t('components.manage.moderation.InstancePolicyForm.button.cancel') }}
     </button>
     <button
       :class="['ui', 'right', 'floated', 'success', {'disabled loading': isLoading}, 'button']"
@@ -232,12 +232,12 @@ const remove = async () => {
       <span
         v-if="object"
       >
-        {{ $t('components.manage.moderation.InstancePolicyForm.updateButton') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.button.update') }}
       </span>
       <span
         v-else
       >
-        {{ $t('components.manage.moderation.InstancePolicyForm.createButton') }}
+        {{ $t('components.manage.moderation.InstancePolicyForm.button.create') }}
       </span>
     </button>
     <dangerous-button
@@ -245,20 +245,20 @@ const remove = async () => {
       class="ui right floated basic danger button"
       @confirm="remove"
     >
-      {{ $t('components.manage.moderation.InstancePolicyForm.deleteButton') }}
+      {{ $t('components.manage.moderation.InstancePolicyForm.button.delete') }}
       <template #modal-header>
         <p>
-          {{ $t('components.manage.moderation.InstancePolicyForm.deleteRuleModalHeader') }}
+          {{ $t('components.manage.moderation.InstancePolicyForm.modal.delete.header') }}
         </p>
       </template>
       <template #modal-content>
         <p>
-          {{ $t('components.manage.moderation.InstancePolicyForm.deleteRuleModalMessage') }}
+          {{ $t('components.manage.moderation.InstancePolicyForm.modal.delete.content.warning') }}
         </p>
       </template>
       <template #modal-confirm>
         <div>
-          {{ $t('components.manage.moderation.InstancePolicyForm.deleteRuleModalConfirm') }}
+          {{ $t('components.manage.moderation.InstancePolicyForm.button.confirm') }}
         </div>
       </template>
     </dangerous-button>
diff --git a/front/src/components/manage/moderation/InstancePolicyModal.vue b/front/src/components/manage/moderation/InstancePolicyModal.vue
index d5849bff0..c950ea424 100644
--- a/front/src/components/manage/moderation/InstancePolicyModal.vue
+++ b/front/src/components/manage/moderation/InstancePolicyModal.vue
@@ -62,14 +62,14 @@ const fetchData = async () => {
   >
     <i class="shield icon" />&nbsp;
     <slot>
-      {{ $t('components.manage.moderation.InstancePolicyModal.moderationRulesHeader') }}
+      {{ $t('components.manage.moderation.InstancePolicyModal.button.show') }}
     </slot>
     <semantic-modal
       v-model:show="show"
       @show="fetchData"
     >
       <h4 class="header">
-        {{ $t('components.manage.moderation.InstancePolicyModal.manageRulesHeader', {obj: target}) }}
+        {{ $t('components.manage.moderation.InstancePolicyModal.modal.manage.header', {obj: target}) }}
       </h4>
       <div class="content">
         <div class="description">
@@ -84,7 +84,7 @@ const fetchData = async () => {
           >
             <header class="ui header">
               <h3>
-                {{ $t('components.manage.moderation.InstancePolicyModal.manageRulesHeader', {obj: target}) }}
+                {{ $t('components.manage.moderation.InstancePolicyModal.modal.manage.content.warning', {obj: target}) }}
               </h3>
             </header>
           </instance-policy-card>
@@ -103,7 +103,7 @@ const fetchData = async () => {
       </div>
       <div class="actions">
         <button class="ui deny button">
-          {{ $t('components.manage.moderation.InstancePolicyModal.closeButton') }}
+          {{ $t('components.manage.moderation.InstancePolicyModal.button.close') }}
         </button>
       </div>
     </semantic-modal>
diff --git a/front/src/components/manage/moderation/NoteForm.vue b/front/src/components/manage/moderation/NoteForm.vue
index ed56a02ff..3b4469dba 100644
--- a/front/src/components/manage/moderation/NoteForm.vue
+++ b/front/src/components/manage/moderation/NoteForm.vue
@@ -18,7 +18,7 @@ const props = defineProps<Props>()
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  summaryPlaceholder: t('components.manage.moderation.NoteForm.summaryPlaceholder')
+  summaryPlaceholder: t('components.manage.moderation.NoteForm.placeholder.summary')
 }))
 
 const summary = ref('')
@@ -56,7 +56,7 @@ const submit = async () => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.manage.moderation.NoteForm.submissionFailureHeader') }}
+        {{ $t('components.manage.moderation.NoteForm.header.failure') }}
       </h4>
       <ul class="list">
         <li
@@ -81,7 +81,7 @@ const submit = async () => {
       type="submit"
       :disabled="isLoading"
     >
-      {{ $t('components.manage.moderation.NoteForm.addNoteButton') }}
+      {{ $t('components.manage.moderation.NoteForm.button.add') }}
     </button>
   </form>
 </template>
diff --git a/front/src/components/manage/moderation/NotesThread.vue b/front/src/components/manage/moderation/NotesThread.vue
index 8721b6b87..780c085e9 100644
--- a/front/src/components/manage/moderation/NotesThread.vue
+++ b/front/src/components/manage/moderation/NotesThread.vue
@@ -64,22 +64,22 @@ const remove = async (note: Note) => {
             @confirm="remove(note)"
           >
             <i class="trash icon" />
-            {{ $t('components.manage.moderation.NotesThread.deleteButton') }}
+            {{ $t('components.manage.moderation.NotesThread.button.delete') }}
             <template #modal-header>
               <p>
-                {{ $t('components.manage.moderation.NotesThread.deleteModalHeader') }}
+                {{ $t('components.manage.moderation.NotesThread.modal.delete.header') }}
               </p>
             </template>
             <template #modal-content>
               <div>
                 <p>
-                  {{ $t('components.manage.moderation.NotesThread.deleteModalMessage') }}
+                  {{ $t('components.manage.moderation.NotesThread.modal.delete.content.warning') }}
                 </p>
               </div>
             </template>
             <template #modal-confirm>
               <p>
-                {{ $t('components.manage.moderation.NotesThread.deleteButton') }}
+                {{ $t('components.manage.moderation.NotesThread.button.delete') }}
               </p>
             </template>
           </dangerous-button>
diff --git a/front/src/components/manage/moderation/ReportCard.vue b/front/src/components/manage/moderation/ReportCard.vue
index 72ea51248..bc47a2168 100644
--- a/front/src/components/manage/moderation/ReportCard.vue
+++ b/front/src/components/manage/moderation/ReportCard.vue
@@ -66,10 +66,10 @@ const actions = computed(() => {
   const deleteUrl = typeConfig.getDeleteUrl?.(target.value)
   return deleteUrl
     ? [{
-        label: t('components.manage.moderation.ReportCard.deleteLabel'),
-        modalHeader: t('components.manage.moderation.ReportCard.deleteModalHeader'),
-        modalContent: t('components.manage.moderation.ReportCard.deleteModalMessage'),
-        modalConfirmLabel: t('components.manage.moderation.ReportCard.deleteConfirmLabel'),
+        label: t('components.manage.moderation.ReportCard.button.delete'),
+        modalHeader: t('components.manage.moderation.ReportCard.modal.delete.header'),
+        modalContent: t('components.manage.moderation.ReportCard.modal.delete.content.warning'),
+        modalConfirmLabel: t('components.manage.moderation.ReportCard.button.confirmDelete'),
         icon: 'x',
         iconColor: 'danger',
         show: (obj: Report) => { return !!obj.target },
@@ -141,7 +141,7 @@ const handleRemovedNote = (uuid: string) => {
     <div class="content">
       <h4 class="header">
         <router-link :to="{name: 'manage.moderation.reports.detail', params: {id: obj.uuid}}">
-          {{ $t('components.manage.moderation.ReportCard.reportHeader', {id: obj.uuid.substring(0, 8)}) }}
+          {{ $t('components.manage.moderation.ReportCard.link.report', {id: obj.uuid.substring(0, 8)}) }}
         </router-link>
         <collapse-link
           v-model="isCollapsed"
@@ -156,7 +156,7 @@ const handleRemovedNote = (uuid: string) => {
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.submittedByLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.report.submittedBy') }}
                   </td>
                   <td>
                     <div v-if="obj.submitter">
@@ -172,7 +172,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.categoryLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.report.category') }}
                   </td>
                   <td>
                     <report-category-dropdown
@@ -186,7 +186,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.creationDateLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.report.creationDate') }}
                   </td>
                   <td>
                     <human-date
@@ -203,22 +203,22 @@ const handleRemovedNote = (uuid: string) => {
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.statusLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.status.status') }}
                   </td>
                   <td v-if="obj.is_handled">
                     <span v-if="obj.is_handled">
                       <i class="success check icon" />
-                      {{ $t('components.manage.moderation.ReportCard.resolvedStatus') }}
+                      {{ $t('components.manage.moderation.ReportCard.table.status.resolved') }}
                     </span>
                   </td>
                   <td v-else>
                     <i class="danger x icon" />
-                    {{ $t('components.manage.moderation.ReportCard.unresolvedStatus') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.status.unresolved') }}
                   </td>
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.assignedToLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.status.assignedTo') }}
                   </td>
                   <td>
                     <div v-if="obj.assigned_to">
@@ -236,7 +236,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.resolutionDateLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.status.resolutionDate') }}
                   </td>
                   <td>
                     <human-date
@@ -253,7 +253,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.ReportCard.internalNotesLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.status.internalNotes') }}
                   </td>
                   <td>
                     <i class="comment icon" />
@@ -273,7 +273,7 @@ const handleRemovedNote = (uuid: string) => {
       <div class="ui stackable two column grid">
         <div class="column">
           <h3>
-            {{ $t('components.manage.moderation.ReportCard.messageHeader') }}
+            {{ $t('components.manage.moderation.ReportCard.header.message') }}
           </h3>
           <expandable-div
             v-if="summary"
@@ -285,14 +285,14 @@ const handleRemovedNote = (uuid: string) => {
         </div>
         <aside class="column">
           <h3>
-            {{ $t('components.manage.moderation.ReportCard.reportedObjectHeader') }}
+            {{ $t('components.manage.moderation.ReportCard.header.reportedObject') }}
           </h3>
           <div
             v-if="!obj.target"
             role="alert"
             class="ui warning message"
           >
-            {{ $t('components.manage.moderation.ReportCard.objectDeletedWarning') }}
+            {{ $t('components.manage.moderation.ReportCard.warning.objectDeleted') }}
           </div>
           <router-link
             v-if="target && configs[target.type].urls.getDetail"
@@ -300,7 +300,7 @@ const handleRemovedNote = (uuid: string) => {
             :to="configs[target.type].urls.getDetail?.(obj.target_state) ?? '/'"
           >
             <i class="eye icon" />
-            {{ $t('components.manage.moderation.ReportCard.publicPageLink') }}
+            {{ $t('components.manage.moderation.ReportCard.link.publicPage') }}
           </router-link>
           <router-link
             v-if="target && configs[target.type].urls.getAdminDetail"
@@ -308,13 +308,13 @@ const handleRemovedNote = (uuid: string) => {
             :to="configs[target.type].urls.getAdminDetail?.(obj.target_state) ?? '/'"
           >
             <i class="wrench icon" />
-            {{ $t('components.manage.moderation.ReportCard.moderationLink') }}
+            {{ $t('components.manage.moderation.ReportCard.link.moderation') }}
           </router-link>
           <table class="ui very basic unstackable table">
             <tbody>
               <tr v-if="target">
                 <td>
-                  {{ $t('components.manage.moderation.ReportCard.objectTypeLabel') }}
+                  {{ $t('components.manage.moderation.ReportCard.table.object.type') }}
                 </td>
                 <td colspan="2">
                   <i :class="[configs[target.type].icon, 'icon']" />
@@ -323,7 +323,7 @@ const handleRemovedNote = (uuid: string) => {
               </tr>
               <tr v-if="obj.target_owner && (!target || target.type !== 'account')">
                 <td>
-                  {{ $t('components.manage.moderation.ReportCard.objectOwnerLabel') }}
+                  {{ $t('components.manage.moderation.ReportCard.table.object.owner') }}
                 </td>
                 <td>
                   <actor-link
@@ -342,7 +342,7 @@ const handleRemovedNote = (uuid: string) => {
               </tr>
               <tr v-if="target && target.type === 'account'">
                 <td>
-                  {{ $t('components.manage.moderation.ReportCard.accountLabel') }}
+                  {{ $t('components.manage.moderation.ReportCard.table.object.account') }}
                 </td>
                 <td>
                   <actor-link
@@ -361,17 +361,17 @@ const handleRemovedNote = (uuid: string) => {
               </tr>
               <tr v-if="obj.target_state.is_local">
                 <td>
-                  {{ $t('components.manage.moderation.ReportCard.domainLabel') }}
+                  {{ $t('components.manage.moderation.ReportCard.table.object.domain') }}
                 </td>
                 <td colspan="2">
                   <i class="home icon" />
-                  {{ $t('components.manage.moderation.ReportCard.localLabel') }}
+                  {{ $t('components.manage.moderation.ReportCard.table.object.local') }}
                 </td>
               </tr>
               <tr v-else-if="obj.target_state.domain">
                 <td>
                   <router-link :to="{name: 'manage.moderation.domains.detail', params: { id: obj.target_state.domain }}">
-                    {{ $t('components.manage.moderation.ReportCard.domainLabel') }}
+                    {{ $t('components.manage.moderation.ReportCard.table.object.domain') }}
                   </router-link>
                 </td>
                 <td>
@@ -410,7 +410,7 @@ const handleRemovedNote = (uuid: string) => {
       <div class="ui stackable two column grid">
         <div class="column">
           <h3>
-            {{ $t('components.manage.moderation.ReportCard.internalNotesLabel') }}
+            {{ $t('components.manage.moderation.ReportCard.header.notes') }}
           </h3>
           <notes-thread
             :notes="obj.notes"
@@ -423,7 +423,7 @@ const handleRemovedNote = (uuid: string) => {
         </div>
         <div class="column">
           <h3>
-            {{ $t('components.manage.moderation.ReportCard.actionsLabel') }}
+            {{ $t('components.manage.moderation.ReportCard.header.actions') }}
           </h3>
           <div class="ui labelled icon basic buttons">
             <button
@@ -432,7 +432,7 @@ const handleRemovedNote = (uuid: string) => {
               @click="resolveReport(true)"
             >
               <i class="success check icon" />&nbsp;
-              {{ $t('components.manage.moderation.ReportCard.resolveLabel') }}
+              {{ $t('components.manage.moderation.ReportCard.button.resolve') }}
             </button>
             <button
               v-if="obj.is_handled === true"
@@ -440,7 +440,7 @@ const handleRemovedNote = (uuid: string) => {
               @click="resolveReport(false)"
             >
               <i class="warning redo icon" />&nbsp;
-              {{ $t('components.manage.moderation.ReportCard.unresolveLabel') }}
+              {{ $t('components.manage.moderation.ReportCard.button.unresolve') }}
             </button>
             <template
               v-for="action in actions"
diff --git a/front/src/components/manage/moderation/UserRequestCard.vue b/front/src/components/manage/moderation/UserRequestCard.vue
index 2c204bd47..32441c05d 100644
--- a/front/src/components/manage/moderation/UserRequestCard.vue
+++ b/front/src/components/manage/moderation/UserRequestCard.vue
@@ -67,7 +67,7 @@ const handleRemovedNote = (uuid: string) => {
     <div class="content">
       <h4 class="header">
         <router-link :to="{name: 'manage.moderation.requests.detail', params: {id: obj.uuid}}">
-          {{ $t('components.manage.moderation.UserRequestCard.requestHeader', {id: obj.uuid.substring(0, 8)}) }}
+          {{ $t('components.manage.moderation.UserRequestCard.link.request', {id: obj.uuid.substring(0, 8)}) }}
         </router-link>
         <collapse-link
           v-model="isCollapsed"
@@ -82,7 +82,7 @@ const handleRemovedNote = (uuid: string) => {
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.submittedByLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.request.submittedBy') }}
                   </td>
                   <td>
                     <actor-link
@@ -93,7 +93,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.creationDateLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.request.creationDate') }}
                   </td>
                   <td>
                     <human-date
@@ -110,26 +110,26 @@ const handleRemovedNote = (uuid: string) => {
               <tbody>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.statusLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.status.status') }}
                   </td>
                   <td>
                     <template v-if="obj.status === 'pending'">
                       <i class="warning hourglass icon" />
-                      {{ $t('components.manage.moderation.UserRequestCard.pendingStatus') }}
+                      {{ $t('components.manage.moderation.UserRequestCard.table.status.pending') }}
                     </template>
                     <template v-else-if="obj.status === 'refused'">
                       <i class="danger x icon" />
-                      {{ $t('components.manage.moderation.UserRequestCard.refusedStatus') }}
+                      {{ $t('components.manage.moderation.UserRequestCard.table.status.refused') }}
                     </template>
                     <template v-else-if="obj.status === 'approved'">
                       <i class="success check icon" />
-                      {{ $t('components.manage.moderation.UserRequestCard.approvedStatus') }}
+                      {{ $t('components.manage.moderation.UserRequestCard.table.status.approved') }}
                     </template>
                   </td>
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.assignedToLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.status.assignedTo') }}
                   </td>
                   <td>
                     <div v-if="obj.assigned_to">
@@ -147,7 +147,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.resolutionDateLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.status.resolutionDate') }}
                   </td>
                   <td>
                     <human-date
@@ -164,7 +164,7 @@ const handleRemovedNote = (uuid: string) => {
                 </tr>
                 <tr>
                   <td>
-                    {{ $t('components.manage.moderation.UserRequestCard.internalNotesLabel') }}
+                    {{ $t('components.manage.moderation.UserRequestCard.table.status.internalNotes') }}
                   </td>
                   <td>
                     <i class="comment icon" />
@@ -184,10 +184,10 @@ const handleRemovedNote = (uuid: string) => {
       <div class="ui stackable two column grid">
         <div class="column">
           <h3>
-            {{ $t('components.manage.moderation.UserRequestCard.messageHeader') }}
+            {{ $t('components.manage.moderation.UserRequestCard.header.signup') }}
           </h3>
           <p>
-            {{ $t('components.manage.moderation.UserRequestCard.messageBody') }}
+            {{ $t('components.manage.moderation.UserRequestCard.message.signup') }}
           </p>
           <template v-if="obj.metadata">
             <div class="ui hidden divider" />
@@ -211,7 +211,7 @@ const handleRemovedNote = (uuid: string) => {
         <aside class="column">
           <div v-if="obj.status != 'approved'">
             <h3>
-              {{ $t('components.manage.moderation.UserRequestCard.actionsHeader') }}
+              {{ $t('components.manage.moderation.UserRequestCard.header.actions') }}
             </h3>
             <div class="ui labelled icon basic buttons">
               <button
@@ -220,7 +220,7 @@ const handleRemovedNote = (uuid: string) => {
                 @click="approve(true)"
               >
                 <i class="success check icon" />&nbsp;
-                {{ $t('components.manage.moderation.UserRequestCard.approveButton') }}
+                {{ $t('components.manage.moderation.UserRequestCard.button.approve') }}
               </button>
               <button
                 v-if="obj.status === 'pending'"
@@ -228,12 +228,12 @@ const handleRemovedNote = (uuid: string) => {
                 @click="approve(false)"
               >
                 <i class="danger x icon" />&nbsp;
-                {{ $t('components.manage.moderation.UserRequestCard.rejectButton') }}
+                {{ $t('components.manage.moderation.UserRequestCard.button.reject') }}
               </button>
             </div>
           </div>
           <h3>
-            {{ $t('components.manage.moderation.UserRequestCard.internalNotesLabel') }}
+            {{ $t('components.manage.moderation.UserRequestCard.header.notes') }}
           </h3>
           <notes-thread
             :notes="obj.notes"
diff --git a/front/src/components/manage/users/InvitationForm.vue b/front/src/components/manage/users/InvitationForm.vue
index cd40eb369..6140d3fc3 100644
--- a/front/src/components/manage/users/InvitationForm.vue
+++ b/front/src/components/manage/users/InvitationForm.vue
@@ -17,7 +17,7 @@ const router = useRouter()
 const store = useStore()
 
 const labels = computed(() => ({
-  placeholder: t('components.manage.users.InvitationForm.placeholder')
+  placeholder: t('components.manage.users.InvitationForm.placeholder.invitation')
 }))
 
 const invitations = reactive([] as Invitation[])
@@ -56,7 +56,7 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re
         class="ui negative message"
       >
         <h4 class="header">
-          {{ $t('components.manage.users.InvitationForm.inviteCreateFailureHeader') }}
+          {{ $t('components.manage.users.InvitationForm.header.failure') }}
         </h4>
         <ul class="list">
           <li
@@ -69,7 +69,7 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re
       </div>
       <div class="inline fields">
         <div class="ui field">
-          <label for="invitation-code">{{ $t('components.manage.users.InvitationForm.invitationCodeLabel') }}</label>
+          <label for="invitation-code">{{ $t('components.manage.users.InvitationForm.label.invite') }}</label>
           <input
             v-model="code"
             for="invitation-code"
@@ -84,7 +84,7 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re
             :disabled="isLoading"
             type="submit"
           >
-            {{ $t('components.manage.users.InvitationForm.newInviteCodeButton') }}
+            {{ $t('components.manage.users.InvitationForm.button.new') }}
           </button>
         </div>
       </div>
@@ -95,10 +95,10 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re
         <thead>
           <tr>
             <th>
-              {{ $t('components.manage.users.InvitationForm.codeLabel') }}
+              {{ $t('components.manage.users.InvitationForm.table.invitation.header.code') }}
             </th>
             <th>
-              {{ $t('components.manage.users.InvitationForm.shareLinkLabel') }}
+              {{ $t('components.manage.users.InvitationForm.table.invitation.header.link') }}
             </th>
           </tr>
         </thead>
@@ -121,7 +121,7 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re
         class="ui basic button"
         @click="invitations = []"
       >
-        {{ $t('components.manage.users.InvitationForm.clearButton') }}
+        {{ $t('components.manage.users.InvitationForm.button.clear') }}
       </button>
     </div>
   </div>
diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue
index 4ad48b50e..76b9d44df 100644
--- a/front/src/components/manage/users/InvitationsTable.vue
+++ b/front/src/components/manage/users/InvitationsTable.vue
@@ -48,7 +48,7 @@ const actionFilters = computed(() => ({ q: query.value, ...props.filters }))
 const actions = computed(() => [
   {
     name: 'delete',
-    label: t('components.manage.users.InvitationsTable.deleteLabel'),
+    label: t('components.manage.users.InvitationsTable.action.delete'),
     filterCheckable: (obj: { users: unknown[], expiration_date: Date }) => {
       return obj.users.length === 0 && moment().isBefore(obj.expiration_date)
     }
@@ -89,7 +89,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.users.InvitationsTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.users.InvitationsTable.placeholder.search')
 }))
 </script>
 
@@ -98,7 +98,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui field">
-          <label for="invitations-search">{{ $t('components.manage.users.InvitationsTable.searchLabel') }}</label>
+          <label for="invitations-search">{{ $t('components.manage.users.InvitationsTable.label.search') }}</label>
           <input
             id="invitations-search"
             v-model="query"
@@ -108,7 +108,7 @@ const labels = computed(() => ({
           >
         </div>
         <div class="field">
-          <label for="invitations-ordering">{{ $t('components.manage.users.InvitationsTable.orderingLabel') }}</label>
+          <label for="invitations-ordering">{{ $t('components.manage.users.InvitationsTable.ordering.label') }}</label>
           <select
             id="invitations-ordering"
             v-model="ordering"
@@ -124,20 +124,20 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="invitations-status">{{ $t('components.manage.users.InvitationsTable.statusLabel') }}</label>
+          <label for="invitations-status">{{ $t('components.manage.users.InvitationsTable.label.status') }}</label>
           <select
             id="invitations-status"
             v-model="isOpen"
             class="ui dropdown"
           >
             <option :value="null">
-              {{ $t('components.manage.users.InvitationsTable.allOption') }}
+              {{ $t('components.manage.users.InvitationsTable.option.all') }}
             </option>
             <option :value="true">
-              {{ $t('components.manage.users.InvitationsTable.openStatus') }}
+              {{ $t('components.manage.users.InvitationsTable.option.open') }}
             </option>
             <option :value="false">
-              {{ $t('components.manage.users.InvitationsTable.expiredStatus') }}
+              {{ $t('components.manage.users.InvitationsTable.option.expired') }}
             </option>
           </select>
         </div>
@@ -160,22 +160,22 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.ownerTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.owner') }}
           </th>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.userTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.user') }}
           </th>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.statusTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.status') }}
           </th>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.creationDateTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.creationDate') }}
           </th>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.expirationDateTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.expirationDate') }}
           </th>
           <th>
-            {{ $t('components.manage.users.InvitationsTable.codeTableHeader') }}
+            {{ $t('components.manage.users.InvitationsTable.table.invitation.header.code') }}
           </th>
         </template>
         <template
@@ -195,15 +195,15 @@ const labels = computed(() => ({
             <span
               v-if="scope.obj.users.length > 0"
               class="ui success basic label"
-            >{{ $t('components.manage.users.InvitationsTable.usedStatusLabel') }}</span>
+            >{{ $t('components.manage.users.InvitationsTable.label.used') }}</span>
             <span
               v-else-if="moment().isAfter(scope.obj.expiration_date)"
               class="ui danger basic label"
-            >{{ $t('components.manage.users.InvitationsTable.expiredStatusLabel') }}</span>
+            >{{ $t('components.manage.users.InvitationsTable.label.expired') }}</span>
             <span
               v-else
               class="ui basic label"
-            >{{ $t('components.manage.users.InvitationsTable.unusedStatusLabel') }}</span>
+            >{{ $t('components.manage.users.InvitationsTable.label.unused') }}</span>
           </td>
           <td>
             <human-date :date="scope.obj.creation_date" />
@@ -227,7 +227,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.users.InvitationsTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.users.InvitationsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/manage/users/UsersTable.vue b/front/src/components/manage/users/UsersTable.vue
index 369779e28..0e577692e 100644
--- a/front/src/components/manage/users/UsersTable.vue
+++ b/front/src/components/manage/users/UsersTable.vue
@@ -44,15 +44,15 @@ const orderingOptions: [OrderingField, keyof typeof sharedLabels.filters][] = [
 const permissions = computed(() => [
   {
     code: 'library',
-    label: t('components.manage.users.UsersTable.libraryLabel')
+    label: t('components.manage.users.UsersTable.permission.library')
   },
   {
     code: 'moderation',
-    label: t('components.manage.users.UsersTable.moderationLabel')
+    label: t('components.manage.users.UsersTable.permission.moderation')
   },
   {
     code: 'settings',
-    label: t('components.manage.users.UsersTable.settingsLabel')
+    label: t('components.manage.users.UsersTable.permission.settings')
   }
 ])
 
@@ -91,7 +91,7 @@ fetchData()
 
 const sharedLabels = useSharedLabels()
 const labels = computed(() => ({
-  searchPlaceholder: t('components.manage.users.UsersTable.searchPlaceholder')
+  searchPlaceholder: t('components.manage.users.UsersTable.placeholder.search')
 }))
 </script>
 
@@ -100,7 +100,7 @@ const labels = computed(() => ({
     <div class="ui inline form">
       <div class="fields">
         <div class="ui field">
-          <label for="users-search">{{ $t('components.manage.users.UsersTable.searchLabel') }}</label>
+          <label for="users-search">{{ $t('components.manage.users.UsersTable.label.search') }}</label>
           <input
             id="users-search"
             v-model="query"
@@ -110,7 +110,7 @@ const labels = computed(() => ({
           >
         </div>
         <div class="field">
-          <label for="users-ordering">{{ $t('components.manage.users.UsersTable.orderingLabel') }}</label>
+          <label for="users-ordering">{{ $t('components.manage.users.UsersTable.ordering.label') }}</label>
           <select
             id="users-ordering"
             v-model="ordering"
@@ -126,17 +126,17 @@ const labels = computed(() => ({
           </select>
         </div>
         <div class="field">
-          <label for="users-ordering-direction">{{ $t('components.manage.users.UsersTable.orderingDirectionLabel') }}</label>
+          <label for="users-ordering-direction">{{ $t('components.manage.users.UsersTable.ordering.direction.label') }}</label>
           <select
             id="users-ordering-direction"
             v-model="orderingDirection"
             class="ui dropdown"
           >
             <option value="+">
-              {{ $t('components.manage.users.UsersTable.ascendingOrdering') }}
+              {{ $t('components.manage.users.UsersTable.ordering.direction.ascending') }}
             </option>
             <option value="-">
-              {{ $t('components.manage.users.UsersTable.descendingOrdering') }}
+              {{ $t('components.manage.users.UsersTable.ordering.direction.descending') }}
             </option>
           </select>
         </div>
@@ -159,25 +159,25 @@ const labels = computed(() => ({
       >
         <template #header-cells>
           <th>
-            {{ $t('components.manage.users.UsersTable.usernameTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.username') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.emailTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.email') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.accountStatusTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.accountStatus') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.signupTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.signup') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.lastActivityTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.lastActivity') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.permissionsTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.permissions') }}
           </th>
           <th>
-            {{ $t('components.manage.users.UsersTable.statusTableHeader') }}
+            {{ $t('components.manage.users.UsersTable.table.user.header.status') }}
           </th>
         </template>
         <template
@@ -204,11 +204,11 @@ const labels = computed(() => ({
             <span
               v-if="scope.obj.is_active"
               class="ui basic success label"
-            >{{ $t('components.manage.users.UsersTable.activeStatus') }}</span>
+            >{{ $t('components.manage.users.UsersTable.table.user.accountStatus.active') }}</span>
             <span
               v-else
               class="ui basic label"
-            >{{ $t('components.manage.users.UsersTable.inactiveStatus') }}</span>
+            >{{ $t('components.manage.users.UsersTable.table.user.accountStatus.inactive') }}</span>
           </td>
           <td>
             <human-date :date="scope.obj.date_joined" />
@@ -237,15 +237,15 @@ const labels = computed(() => ({
             <span
               v-if="scope.obj.is_superuser"
               class="ui pink label"
-            >{{ $t('components.manage.users.UsersTable.adminPermission') }}</span>
+            >{{ $t('components.manage.users.UsersTable.table.user.status.admin') }}</span>
             <span
               v-else-if="scope.obj.is_staff"
               class="ui purple label"
-            >{{ $t('components.manage.users.UsersTable.staffPermission') }}</span>
+            >{{ $t('components.manage.users.UsersTable.table.user.status.staff') }}</span>
             <span
               v-else
               class="ui basic label"
-            >{{ $t('components.manage.users.UsersTable.regularPermission') }}</span>
+            >{{ $t('components.manage.users.UsersTable.table.user.status.regular') }}</span>
           </td>
         </template>
       </action-table>
@@ -260,7 +260,7 @@ const labels = computed(() => ({
       />
 
       <span v-if="result && result.results.length > 0">
-        {{ $t('components.manage.users.UsersTable.resultsDisplay', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
+        {{ $t('components.manage.users.UsersTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
       </span>
     </div>
   </div>
diff --git a/front/src/components/moderation/FilterModal.vue b/front/src/components/moderation/FilterModal.vue
index ae58f08e9..b79d398d4 100644
--- a/front/src/components/moderation/FilterModal.vue
+++ b/front/src/components/moderation/FilterModal.vue
@@ -45,7 +45,7 @@ const hide = async () => {
     store.state.moderation.lastUpdate = new Date()
     store.commit('moderation/contentFilter', response.data)
     store.commit('ui/addMessage', {
-      content: t('components.moderation.FilterModal.contentSuccessMessage'),
+      content: t('components.moderation.FilterModal.message.success'),
       date: new Date()
     })
   } catch (error) {
@@ -63,7 +63,7 @@ const hide = async () => {
       v-if="type === 'artist'"
       class="header"
     >
-      {{ $t('components.moderation.FilterModal.hideContentHeader', {name: target?.name}) }}
+      {{ $t('components.moderation.FilterModal.header.modal', {name: target?.name}) }}
     </h4>
     <div class="scrolling content">
       <div class="description">
@@ -73,7 +73,7 @@ const hide = async () => {
           class="ui negative message"
         >
           <h4 class="header">
-            {{ $t('components.moderation.FilterModal.filterCreateFailureHeader') }}
+            {{ $t('components.moderation.FilterModal.header.failure') }}
           </h4>
           <ul class="list">
             <li
@@ -86,37 +86,37 @@ const hide = async () => {
         </div>
         <template v-if="type === 'artist'">
           <p>
-            {{ $t('components.moderation.FilterModal.filterCreateWarning') }}
+            {{ $t('components.moderation.FilterModal.warning.createFilter.listIntro') }}
           </p>
           <ul>
             <li>
-              {{ $t('components.moderation.FilterModal.filterWarningList1') }}
+              {{ $t('components.moderation.FilterModal.warning.createFilter.listItem1') }}
             </li>
             <li>
-              {{ $t('components.moderation.FilterModal.filterWarningList2') }}
+              {{ $t('components.moderation.FilterModal.warning.createFilter.listItem2') }}
             </li>
             <li>
-              {{ $t('components.moderation.FilterModal.filterWarningList3') }}
+              {{ $t('components.moderation.FilterModal.warning.createFilter.listItem3') }}
             </li>
             <li>
-              {{ $t('components.moderation.FilterModal.filterWarningList4') }}
+              {{ $t('components.moderation.FilterModal.warning.createFilter.listItem4') }}
             </li>
           </ul>
           <p>
-            {{ $t('components.moderation.FilterModal.filterCreateHelp') }}
+            {{ $t('components.moderation.FilterModal.help.createFilter') }}
           </p>
         </template>
       </div>
     </div>
     <div class="actions">
       <button class="ui basic cancel button">
-        {{ $t('components.moderation.FilterModal.cancelButton') }}
+        {{ $t('components.moderation.FilterModal.button.cancel') }}
       </button>
       <button
         :class="['ui', 'success', {loading: isLoading}, 'button']"
         @click="hide"
       >
-        {{ $t('components.moderation.FilterModal.hideContentButton') }}
+        {{ $t('components.moderation.FilterModal.button.hide') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/moderation/ReportCategoryDropdown.vue b/front/src/components/moderation/ReportCategoryDropdown.vue
index 3bdf989f4..b36a8aa1d 100644
--- a/front/src/components/moderation/ReportCategoryDropdown.vue
+++ b/front/src/components/moderation/ReportCategoryDropdown.vue
@@ -35,7 +35,7 @@ const sharedChoices = sharedLabels.fields.report_type.choices
 const allCategories = computed(() => {
   const res = []
   if (props.all) {
-    res.push({ value: '', label: t('components.moderation.ReportCategoryDropdown.allOption') })
+    res.push({ value: '', label: t('components.moderation.ReportCategoryDropdown.option.all') })
   }
 
   const choices = props.restrictTo.length === 0
@@ -59,7 +59,7 @@ const allCategories = computed(() => {
 
 <template>
   <div>
-    <label v-if="label">{{ $t('components.moderation.ReportCategoryDropdown.categoryLabel') }}</label>
+    <label v-if="label">{{ $t('components.moderation.ReportCategoryDropdown.label.category') }}</label>
     <select
       v-model="value"
       class="ui dropdown"
diff --git a/front/src/components/moderation/ReportModal.vue b/front/src/components/moderation/ReportModal.vue
index 4cc0c4067..840f9d976 100644
--- a/front/src/components/moderation/ReportModal.vue
+++ b/front/src/components/moderation/ReportModal.vue
@@ -84,7 +84,7 @@ const submit = async () => {
 
     store.commit('moderation/contentFilter', response.data)
     store.commit('ui/addMessage', {
-      content: t('components.moderation.ReportModal.reportSubmitSuccessMessage'),
+      content: t('components.moderation.ReportModal.message.submissionSuccess'),
       date: new Date()
     })
 
@@ -110,7 +110,7 @@ watchEffect(async () => {
     reportTypes.value = response.data.metadata.reportTypes ?? []
   } catch (error) {
     store.commit('ui/addMessage', {
-      content: t('components.moderation.ReportModal.nodeinfoFetchFailure', { error: `${error}` }),
+      content: t('components.moderation.ReportModal.error.nodeinfoFetch', { error: `${error}` }),
       date: new Date()
     })
   }
@@ -125,7 +125,7 @@ watchEffect(async () => {
       v-if="target"
       class="ui header"
     >
-      {{ $t('components.moderation.ReportModal.reportModalHeader') }}
+      {{ $t('components.moderation.ReportModal.header.modal') }}
       <div class="ui sub header">
         {{ target.typeLabel }}
         <span class="middle hyphen symbol" />
@@ -140,7 +140,7 @@ watchEffect(async () => {
           class="ui negative message"
         >
           <h4 class="header">
-            {{ $t('components.moderation.ReportModal.submissionFailureHeader') }}
+            {{ $t('components.moderation.ReportModal.header.submissionFailure') }}
           </h4>
           <ul class="list">
             <li
@@ -153,7 +153,7 @@ watchEffect(async () => {
         </div>
       </div>
       <p>
-        {{ $t('components.moderation.ReportModal.reportModalDescription') }}
+        {{ $t('components.moderation.ReportModal.description.modal') }}
       </p>
       <form
         v-if="canSubmit"
@@ -175,7 +175,7 @@ watchEffect(async () => {
             class="ui eight wide required field"
           >
             <label for="report-submitter-email">
-              {{ $t('components.moderation.ReportModal.emailLabel') }}
+              {{ $t('components.moderation.ReportModal.label.email') }}
             </label>
             <input
               id="report-submitter-email"
@@ -185,16 +185,16 @@ watchEffect(async () => {
               required
             >
             <p>
-              {{ $t('components.moderation.ReportModal.emailDescription') }}
+              {{ $t('components.moderation.ReportModal.description.email') }}
             </p>
           </div>
         </div>
         <div class="ui field">
           <label for="report-summary">
-            {{ $t('components.moderation.ReportModal.messageLabel') }}
+            {{ $t('components.moderation.ReportModal.label.message') }}
           </label>
           <p>
-            {{ $t('components.moderation.ReportModal.messageDescription') }}
+            {{ $t('components.moderation.ReportModal.description.message') }}
           </p>
           <content-form
             v-model="summary"
@@ -214,10 +214,10 @@ watchEffect(async () => {
             >
             <label for="report-forward">
               <strong>
-                {{ $t('components.moderation.ReportModal.forwardToDomainLabel', {domain: targetDomain}) }}
+                {{ $t('components.moderation.ReportModal.label.forwardToDomain', {domain: targetDomain}) }}
               </strong>
               <p>
-                {{ $t('components.moderation.ReportModal.forwardToDomainDescription') }}
+                {{ $t('components.moderation.ReportModal.description.forwardToDomain') }}
               </p>
             </label>
           </div>
@@ -234,13 +234,13 @@ watchEffect(async () => {
         class="ui warning message"
       >
         <h4 class="header">
-          {{ $t('components.moderation.ReportModal.anonymousReportsDisabled') }}
+          {{ $t('components.moderation.ReportModal.header.disabled') }}
         </h4>
       </div>
     </div>
     <div class="actions">
       <button class="ui basic cancel button">
-        {{ $t('components.moderation.ReportModal.cancelButton') }}
+        {{ $t('components.moderation.ReportModal.button.cancel') }}
       </button>
       <button
         v-if="canSubmit"
@@ -248,7 +248,7 @@ watchEffect(async () => {
         type="submit"
         form="report-form"
       >
-        {{ $t('components.moderation.ReportModal.submitReportButton') }}
+        {{ $t('components.moderation.ReportModal.button.submit') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/notifications/NotificationRow.vue b/front/src/components/notifications/NotificationRow.vue
index 8669d2ea3..78e601dd8 100644
--- a/front/src/components/notifications/NotificationRow.vue
+++ b/front/src/components/notifications/NotificationRow.vue
@@ -17,8 +17,8 @@ const { t } = useI18n()
 const store = useStore()
 
 const labels = computed(() => ({
-  markRead: t('components.notifications.NotificationRow.markRead'),
-  markUnread: t('components.notifications.NotificationRow.markUnread')
+  markRead: t('components.notifications.NotificationRow.button.markRead'),
+  markUnread: t('components.notifications.NotificationRow.button.markUnread')
 }))
 
 const item = ref(props.initialItem)
@@ -35,30 +35,30 @@ const notificationData = computed(() => {
       if (activity.related_object?.approved === null) {
         return {
           detailUrl,
-          message: t('components.notifications.NotificationRow.libraryPendingFollowMessage', { username: username.value, library: activity.object.name }),
+          message: t('components.notifications.NotificationRow.message.libraryPendingFollow', { username: username.value, library: activity.object.name }),
           acceptFollow: {
             buttonClass: 'success',
             icon: 'check',
-            label: t('components.notifications.NotificationRow.approve'),
+            label: t('components.notifications.NotificationRow.button.approve'),
             handler: () => approveLibraryFollow(activity.related_object)
           },
           rejectFollow: {
             buttonClass: 'danger',
             icon: 'x',
-            label: t('components.notifications.NotificationRow.reject'),
+            label: t('components.notifications.NotificationRow.button.reject'),
             handler: () => rejectLibraryFollow(activity.related_object)
           }
         }
       } else if (activity.related_object?.approved) {
         return {
           detailUrl,
-          message: t('components.notifications.NotificationRow.libraryFollowMessage', { username: username.value, library: activity.object.name })
+          message: t('components.notifications.NotificationRow.message.libraryFollow', { username: username.value, library: activity.object.name })
         }
       }
 
       return {
         detailUrl,
-        message: t('components.notifications.NotificationRow.libraryRejectMessage', { username: username.value, library: activity.object.name })
+        message: t('components.notifications.NotificationRow.message.libraryReject', { username: username.value, library: activity.object.name })
       }
     }
   }
@@ -67,7 +67,7 @@ const notificationData = computed(() => {
     if (activity.object?.type === 'federation.LibraryFollow') {
       return {
         detailUrl: { name: 'content.remote.index' },
-        message: t('components.notifications.NotificationRow.libraryAcceptFollowMessage', { username: username.value, library: activity.related_object.name })
+        message: t('components.notifications.NotificationRow.message.libraryAcceptFollow', { username: username.value, library: activity.related_object.name })
       }
     }
   }
diff --git a/front/src/components/playlists/Card.vue b/front/src/components/playlists/Card.vue
index 988d8a178..f533b0003 100644
--- a/front/src/components/playlists/Card.vue
+++ b/front/src/components/playlists/Card.vue
@@ -61,7 +61,7 @@ const images = computed(() => {
       </div>
     </div>
     <div class="extra content">
-      {{ $t('components.playlists.Card.trackCount', {tracks_count: playlist.tracks_count}) }}
+      {{ $t('components.playlists.Card.meta.tracks', {tracks_count: playlist.tracks_count}) }}
       <play-button
         class="right floated basic icon"
         :dropdown-only="true"
diff --git a/front/src/components/playlists/Editor.vue b/front/src/components/playlists/Editor.vue
index 360b32b3b..84428fb7e 100644
--- a/front/src/components/playlists/Editor.vue
+++ b/front/src/components/playlists/Editor.vue
@@ -51,7 +51,7 @@ const tracks = computed({
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  copyTitle: t('components.playlists.Editor.copyTitle')
+  copyTitle: t('components.playlists.Editor.button.copy')
 }))
 
 const isLoading = ref(false)
@@ -167,16 +167,16 @@ const insertMany = async (insertedTracks: number[], allowDuplicates: boolean) =>
       :title="undefined"
     />
     <h3 class="ui top attached header">
-      {{ $t('components.playlists.Editor.editorHeader') }}
+      {{ $t('components.playlists.Editor.header.editor') }}
     </h3>
     <div class="ui attached segment">
       <template v-if="status === 'loading'">
         <div class="ui active tiny inline loader" />
-        {{ $t('components.playlists.Editor.syncingChangesMessage') }}
+        {{ $t('components.playlists.Editor.loading.sync') }}
       </template>
       <template v-else-if="status === 'errored'">
         <i class="dangerclose icon" />
-        {{ $t('components.playlists.Editor.syncingChangesFailureMessage') }}
+        {{ $t('components.playlists.Editor.error.sync') }}
         <div
           v-if="errors.length > 0"
           role="alert"
@@ -198,7 +198,7 @@ const insertMany = async (insertedTracks: number[], allowDuplicates: boolean) =>
         class="ui warning message"
       >
         <p>
-          {{ $t('components.playlists.Editor.tracksExistWarning') }}
+          {{ $t('components.playlists.Editor.warning.duplicate') }}
         </p>
         <ul class="ui relaxed divided list duplicate-tracks-list">
           <li
@@ -213,12 +213,12 @@ const insertMany = async (insertedTracks: number[], allowDuplicates: boolean) =>
           class="ui small success button"
           @click="insertMany(queueTracks, true)"
         >
-          {{ $t('components.playlists.Editor.addAnywayButton') }}
+          {{ $t('components.playlists.Editor.button.addDuplicate') }}
         </button>
       </div>
       <template v-else-if="status === 'saved'">
         <i class="success check icon" />
-        {{ $t('components.playlists.Editor.syncedStatus') }}
+        {{ $t('components.playlists.Editor.message.sync') }}
       </template>
     </div>
     <div class="ui bottom attached segment">
@@ -229,7 +229,7 @@ const insertMany = async (insertedTracks: number[], allowDuplicates: boolean) =>
         @click="insertMany(queueTracks, false)"
       >
         <i class="plus icon" />
-        {{ $t('components.playlists.Editor.insertCount', {count: queueTracks.length}) }}
+        {{ $t('components.playlists.Editor.button.insertFromQueue', {count: queueTracks.length}) }}
       </button>
 
       <dangerous-button
@@ -238,27 +238,27 @@ const insertMany = async (insertedTracks: number[], allowDuplicates: boolean) =>
         :action="clearPlaylist"
       >
         <i class="eraser icon" />
-        {{ $t('components.playlists.Editor.clearPlaylistButton') }}
+        {{ $t('components.playlists.Editor.button.clear') }}
         <template #modal-header>
           <p>
-            {{ $t('components.playlists.Editor.clearPlaylistModalHeader', {playlist: playlist?.name}) }}
+            {{ $t('components.playlists.Editor.modal.clearPlaylist.header', {playlist: playlist?.name}) }}
           </p>
         </template>
         <template #modal-content>
           <p>
-            {{ $t('components.playlists.Editor.clearPlaylistModalContent') }}
+            {{ $t('components.playlists.Editor.modal.clearPlaylist.content.warning') }}
           </p>
         </template>
         <template #modal-confirm>
           <div>
-            {{ $t('components.playlists.Editor.clearPlaylistButton') }}
+            {{ $t('components.playlists.Editor.button.clear') }}
           </div>
         </template>
       </dangerous-button>
       <div class="ui hidden divider" />
       <template v-if="tracks.length > 0">
         <p>
-          {{ $t('components.playlists.Editor.reorderTracks') }}
+          {{ $t('components.playlists.Editor.help.reorder') }}
         </p>
         <div class="table-wrapper">
           <table class="ui compact very basic unstackable table">
diff --git a/front/src/components/playlists/Form.vue b/front/src/components/playlists/Form.vue
index d1f8c60a1..b935b8a28 100644
--- a/front/src/components/playlists/Form.vue
+++ b/front/src/components/playlists/Form.vue
@@ -42,7 +42,7 @@ const privacyLevel = ref(playlist.value?.privacy_level ?? store.state.auth.profi
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  placeholder: t('components.playlists.Form.placeholder')
+  placeholder: t('components.playlists.Form.placeholder.name')
 }))
 
 const sharedLabels = useSharedLabels()
@@ -111,7 +111,7 @@ const submit = async () => {
       v-if="title"
       class="ui header"
     >
-      {{ $t('components.playlists.Form.createPlaylistHeader') }}
+      {{ $t('components.playlists.Form.header.createPlaylist') }}
     </h4>
     <div
       v-if="success"
@@ -119,10 +119,10 @@ const submit = async () => {
     >
       <h4 class="header">
         <template v-if="playlist">
-          {{ $t('components.playlists.Form.updateSuccessHeader') }}
+          {{ $t('components.playlists.Form.header.updateSuccess') }}
         </template>
         <template v-else>
-          {{ $t('components.playlists.Form.createSuccessHeader') }}
+          {{ $t('components.playlists.Form.header.createSuccess') }}
         </template>
       </h4>
     </div>
@@ -132,7 +132,7 @@ const submit = async () => {
       class="ui negative message"
     >
       <h4 class="header">
-        {{ $t('components.playlists.Form.createFailureHeader') }}
+        {{ $t('components.playlists.Form.header.createFailure') }}
       </h4>
       <ul class="list">
         <li
@@ -145,7 +145,7 @@ const submit = async () => {
     </div>
     <div class="three fields">
       <div class="field">
-        <label for="playlist-name">{{ $t('components.playlists.Form.playlistNameLabel') }}</label>
+        <label for="playlist-name">{{ $t('components.playlists.Form.label.name') }}</label>
         <input
           id="playlist-name"
           v-model="name"
@@ -156,7 +156,7 @@ const submit = async () => {
         >
       </div>
       <div class="field">
-        <label for="playlist-visibility">{{ $t('components.playlists.Form.playlistVisibilityLabel') }}</label>
+        <label for="playlist-visibility">{{ $t('components.playlists.Form.label.visibility') }}</label>
         <select
           id="playlist-visibility"
           v-model="privacyLevel"
@@ -178,10 +178,10 @@ const submit = async () => {
           type="submit"
         >
           <template v-if="playlist">
-            {{ $t('components.playlists.Form.updatePlaylistButton') }}
+            {{ $t('components.playlists.Form.button.update') }}
           </template>
           <template v-else>
-            {{ $t('components.playlists.Form.createPlaylistButton') }}
+            {{ $t('components.playlists.Form.button.create') }}
           </template>
         </button>
       </div>
diff --git a/front/src/components/playlists/PlaylistModal.vue b/front/src/components/playlists/PlaylistModal.vue
index 87b91682b..abb11b6c7 100644
--- a/front/src/components/playlists/PlaylistModal.vue
+++ b/front/src/components/playlists/PlaylistModal.vue
@@ -27,8 +27,8 @@ const track = computed(() => store.state.playlists.modalTrack)
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  addToPlaylist: t('components.playlists.PlaylistModal.addToPlaylist'),
-  filterPlaylistField: t('components.playlists.PlaylistModal.filterPlaylistField')
+  addToPlaylist: t('components.playlists.PlaylistModal.button.addToPlaylist'),
+  filterPlaylistField: t('components.playlists.PlaylistModal.placeholder.filterPlaylist')
 }))
 
 const playlistNameFilter = ref('')
@@ -85,18 +85,18 @@ store.dispatch('playlists/fetchOwn')
     <h4 class="header">
       <template v-if="track">
         <h2 class="ui header">
-          {{ $t('components.playlists.PlaylistModal.addToPlaylistHeader') }}
+          {{ $t('components.playlists.PlaylistModal.header.addToPlaylist') }}
           <div
             class="ui sub header"
           >
-            {{ $t('components.playlists.PlaylistModal.trackTitle', {artist: track.artist?.name, title: track.title}) }}
+            {{ $t('components.playlists.PlaylistModal.header.track', {artist: track.artist?.name, title: track.title}) }}
           </div>
         </h2>
       </template>
       <span
         v-else
       >
-        {{ $t('components.playlists.PlaylistModal.managePlaylistsHeader') }}
+        {{ $t('components.playlists.PlaylistModal.header.manage') }}
       </span>
     </h4>
     <div class="scrolling content">
@@ -112,19 +112,19 @@ store.dispatch('playlists/fetchOwn')
           class="ui warning message"
         >
           <p>
-            {{ $t('components.playlists.PlaylistModal.trackAlreadyInPlaylist', {track: track?.title, playlist: duplicateTrackAddInfo.playlist_name}) }}
+            {{ $t('components.playlists.PlaylistModal.warning.duplicate', {track: track?.title, playlist: duplicateTrackAddInfo.playlist_name}) }}
           </p>
           <button
             class="ui small basic cancel button"
             @click="showDuplicateTrackAddConfirmation = false"
           >
-            {{ $t('components.playlists.PlaylistModal.cancelButton') }}
+            {{ $t('components.playlists.PlaylistModal.button.cancel') }}
           </button>
           <button
             class="ui small success button"
             @click="addToPlaylist(lastSelectedPlaylist, true)"
           >
-            {{ $t('components.playlists.PlaylistModal.addAnywayButton') }}
+            {{ $t('components.playlists.PlaylistModal.button.addDuplicate') }}
           </button>
         </div>
         <div
@@ -133,7 +133,7 @@ store.dispatch('playlists/fetchOwn')
           class="ui negative message"
         >
           <h4 class="header">
-            {{ $t('components.playlists.PlaylistModal.trackAddFailureHeader') }}
+            {{ $t('components.playlists.PlaylistModal.header.addFailure') }}
           </h4>
           <ul class="list">
             <li
@@ -145,12 +145,12 @@ store.dispatch('playlists/fetchOwn')
           </ul>
         </div>
         <h4 class="ui header">
-          {{ $t('components.playlists.PlaylistModal.availablePlaylistsHeader') }}
+          {{ $t('components.playlists.PlaylistModal.header.available') }}
         </h4>
         <div class="ui form">
           <div class="fields">
             <div class="field">
-              <label for="playlist-name-filter">{{ $t('components.playlists.PlaylistModal.filterLabel') }}</label>
+              <label for="playlist-name-filter">{{ $t('components.playlists.PlaylistModal.label.filter') }}</label>
               <input
                 id="playlist-name-filter"
                 v-model="playlistNameFilter"
@@ -167,15 +167,15 @@ store.dispatch('playlists/fetchOwn')
         >
           <thead>
             <tr>
-              <th><span class="visually-hidden">{{ $t('components.playlists.PlaylistModal.editTableHeader') }}</span></th>
+              <th><span class="visually-hidden">{{ $t('components.playlists.PlaylistModal.table.edit.header.edit') }}</span></th>
               <th>
-                {{ $t('components.playlists.PlaylistModal.nameTableHeader') }}
+                {{ $t('components.playlists.PlaylistModal.table.edit.header.name') }}
               </th>
               <th class="sorted descending">
-                {{ $t('components.playlists.PlaylistModal.lastModificationTableHeader') }}
+                {{ $t('components.playlists.PlaylistModal.table.edit.header.lastModification') }}
               </th>
               <th>
-                {{ $t('components.playlists.PlaylistModal.tracksTableHeader') }}
+                {{ $t('components.playlists.PlaylistModal.table.edit.header.tracks') }}
               </th>
             </tr>
           </thead>
@@ -190,7 +190,7 @@ store.dispatch('playlists/fetchOwn')
                   :to="{name: 'library.playlists.detail', params: {id: playlist.id }, query: {mode: 'edit'}}"
                 >
                   <i class="ui pencil icon" />
-                  <span class="visually-hidden">{{ $t('components.playlists.PlaylistModal.editTableHeader') }}</span>
+                  <span class="visually-hidden">{{ $t('components.playlists.PlaylistModal.button.edit') }}</span>
                 </router-link>
               </td>
               <td>
@@ -211,7 +211,7 @@ store.dispatch('playlists/fetchOwn')
                   @click.prevent="addToPlaylist(playlist.id, false)"
                 >
                   <i class="plus icon" />
-                  {{ $t('components.playlists.PlaylistModal.addTrackButton') }}
+                  {{ $t('components.playlists.PlaylistModal.button.addTrack') }}
                 </button>
               </td>
             </tr>
@@ -220,7 +220,7 @@ store.dispatch('playlists/fetchOwn')
         <template v-else>
           <div class="ui small placeholder segment component-placeholder">
             <h4 class="ui header">
-              {{ $t('components.playlists.PlaylistModal.emptyStateMessage') }}
+              {{ $t('components.playlists.PlaylistModal.header.noResults') }}
             </h4>
           </div>
         </template>
@@ -231,13 +231,13 @@ store.dispatch('playlists/fetchOwn')
       >
         <div class="ui icon header">
           <i class="list icon" />
-          {{ $t('components.playlists.PlaylistModal.noPlaylistsMessage') }}
+          {{ $t('components.playlists.PlaylistModal.empty.noPlaylists') }}
         </div>
       </div>
     </div>
     <div class="actions">
       <button class="ui basic cancel button">
-        {{ $t('components.playlists.PlaylistModal.cancelButton') }}
+        {{ $t('components.playlists.PlaylistModal.button.cancel') }}
       </button>
     </div>
   </semantic-modal>
diff --git a/front/src/components/playlists/TrackPlaylistIcon.vue b/front/src/components/playlists/TrackPlaylistIcon.vue
index f5b77d2ef..374af2aa8 100644
--- a/front/src/components/playlists/TrackPlaylistIcon.vue
+++ b/front/src/components/playlists/TrackPlaylistIcon.vue
@@ -20,7 +20,7 @@ withDefaults(defineProps<Props>(), {
 const { t } = useI18n()
 
 const labels = computed(() => ({
-  addToPlaylist: t('components.playlists.TrackPlaylistIcon.addToPlaylist')
+  addToPlaylist: t('components.playlists.TrackPlaylistIcon.button.add')
 }))
 </script>
 
@@ -31,7 +31,7 @@ const labels = computed(() => ({
     @click.stop="$store.commit('playlists/chooseTrack', track)"
   >
     <i class="list icon" />
-    {{ $t('components.playlists.TrackPlaylistIcon.addToPlaylist') }}
+    {{ $t('components.playlists.TrackPlaylistIcon.button.add') }}
   </button>
   <button
     v-else
diff --git a/front/src/components/playlists/Widget.vue b/front/src/components/playlists/Widget.vue
index 3329cb816..46b69f5e5 100644
--- a/front/src/components/playlists/Widget.vue
+++ b/front/src/components/playlists/Widget.vue
@@ -78,7 +78,7 @@ watch(
     >
       <div class="ui icon header">
         <i class="list icon" />
-        {{ $t('components.playlists.Widget.noPlaylistsMessage') }}
+        {{ $t('components.playlists.Widget.placeholder.noPlaylists') }}
       </div>
       <button
         v-if="$store.state.auth.authenticated"
@@ -86,7 +86,7 @@ watch(
         @click="$store.commit('playlists/chooseTrack', null)"
       >
         <i class="list icon" />
-        {{ $t('components.playlists.Widget.createPlaylistButton') }}
+        {{ $t('components.playlists.Widget.button.create') }}
       </button>
     </div>
     <template v-if="nextPage">
@@ -96,7 +96,7 @@ watch(
         :class="['ui', 'basic', 'button']"
         @click="fetchData(nextPage)"
       >
-        {{ $t('components.playlists.Widget.showMore') }}
+        {{ $t('components.playlists.Widget.button.more') }}
       </button>
     </template>
   </div>
diff --git a/front/src/components/radios/Card.vue b/front/src/components/radios/Card.vue
index b2ca509ac..7fb9aa068 100644
--- a/front/src/components/radios/Card.vue
+++ b/front/src/components/radios/Card.vue
@@ -70,7 +70,7 @@ const customRadioId = computed(() => props.customRadio?.id ?? null)
         class="ui success button right floated"
         :to="{name: 'library.radios.edit', params: {id: customRadioId }}"
       >
-        {{ $t('components.radios.Card.editButton') }}
+        {{ $t('components.radios.Card.button.edit') }}
       </router-link>
     </div>
   </div>
diff --git a/front/src/components/tags/List.vue b/front/src/components/tags/List.vue
index 1d3186e57..240b42936 100644
--- a/front/src/components/tags/List.vue
+++ b/front/src/components/tags/List.vue
@@ -47,7 +47,7 @@ const tags = computed(() => {
       class="ui circular inverted accent label"
       @click.prevent="honorLimit = false"
     >
-      {{ $t('components.tags.List.showMoreTags', {count: props.tags.length - tags.length}) }}
+      {{ $t('components.tags.List.button.more', {count: props.tags.length - tags.length}) }}
     </div>
   </div>
 </template>
diff --git a/front/src/components/vui/Pagination.vue b/front/src/components/vui/Pagination.vue
index 40b4dc672..23737323a 100644
--- a/front/src/components/vui/Pagination.vue
+++ b/front/src/components/vui/Pagination.vue
@@ -63,9 +63,9 @@ const setPage = (page: number) => {
 
 const { t } = useI18n()
 const labels = computed(() => ({
-  pagination: t('components.vui.Pagination.pagination'),
-  previousPage: t('components.vui.Pagination.previousPage'),
-  nextPage: t('components.vui.Pagination.nextPage')
+  pagination: t('components.vui.Pagination.label'),
+  previousPage: t('components.vui.Pagination.previous'),
+  nextPage: t('components.vui.Pagination.next')
 }))
 </script>
 
diff --git a/front/src/locales/en.json b/front/src/locales/en.json
index 689e33b46..d1f40f6f7 100644
--- a/front/src/locales/en.json
+++ b/front/src/locales/en.json
@@ -182,7 +182,7 @@
                 "clear": "Clear",
                 "stopRadio": "Stop radio"
             },
-            "display": {
+            "meta": {
                 "queuePosition":"Track {index} of {length}"
             }
         },
@@ -410,7 +410,7 @@
                 "legend": {
                     "purpose": "What will this channel be used for?"
                 },
-                "message": {
+                "loader": {
                     "loading": "Loading"
                 }
             },
@@ -516,7 +516,7 @@
                     "artists": "Artists",
                     "albums": "Albums"
                 },
-                "message": {
+                "empty": {
                     "noArtists": "No artist matched your query",
                     "noAlbums": "No album matched your query"
                 },
@@ -525,836 +525,1460 @@
                 }
             },
             "SearchBar": {
-                "placeHolderLabel": "Search for artists, albums, tracks…",
-                "searchContentLabel": "Search for content",
-                "artistLabel": "Artist",
-                "albumLabel": "Album",
-                "trackLabel": "Track",
-                "tagLabel": "Tag",
-                "federationCategory": "Federation",
-                "podcastsCategory": "Podcasts",
-                "noResultsHeader": "No matches found",
-                "noResultsMessage": "Sorry, there are no results for this search",
-                "fediverseSearchLabel": "Search on the fediverse",
-                "rssSearchLabel": "Subscribe to podcast via RSS",
-                "moreResultsLabel": "More results 🡒"
+                "placeholder": {
+                    "search": "Search for artists, albums, tracks…"
+                },
+                "label": {
+                    "search": "Search for content",
+                    "artist": "Artist",
+                    "album": "Album",
+                    "track": "Track",
+                    "tag": "Tag",
+                    "category": {
+                        "federation": "Federation",
+                        "podcasts": "Podcasts"
+                    }
+                },
+                "link": {
+                    "rss": "Subscribe to podcast via RSS",
+                    "fediverse": "Search on the fediverse",
+                    "more": "More results 🡒"
+                },
+                "header": {
+                    "noResults": "No matches found"
+                },
+                "empty": {
+                    "noResults": "Sorry, there are no results for this search"
+                }
             },
             "VolumeControl": {
-                "unmuteLabel": "Unmute",
-                "muteLabel": "Mute",
-                "sliderLabel": "Adjust volume"
+                "button": {
+                    "mute": "Mute",
+                    "unmute": "Unmute"
+                },
+                "label": {
+                    "slider": "Adjust volume"
+                }
             },
             "album": {
                 "Card": {
-                    "trackCount": "No tracks | {tracks_count} track | {tracks_count} tracks"
+                    "meta": {
+                        "tracks": "No tracks | {tracks_count} track | {tracks_count} tracks"
+                    }
                 },
                 "Widget": {
-                    "showMore": "Show more"
+                    "button": {
+                        "more": "Show more"
+                    }
                 }
             },
             "artist": {
                 "Card": {
-                    "trackCount": "No tracks | {tracks_count} track | {tracks_count} tracks",
-                    "episodeCount": "No episodes | {episode_count} episode | {episode_count} episodes"
+                    "meta": {
+                        "tracks": "No tracks | {tracks_count} track | {tracks_count} tracks",
+                        "episodes": "No episodes | {episode_count} episode | {episode_count} episodes"
+                    }
                 },
                 "Widget": {
-                    "showMore":"Show more"
+                    "button": {
+                        "more":"Show more"
+                    }
                 }
             },
             "podcast": {
                 "MobileRow": {
-                    "actionsButtonlabel": "Show track actions"
+                    "button": {
+                        "actions": "Show track actions"
+                    }
                 },
                 "Modal": {
-                    "addToFavorites": "Add to favorites",
-                    "removeFromFavorites": "Remove from favorites",
-                    "episodeDetails": "Episode details",
-                    "trackDetails": "Track details",
-                    "seriesDetails": "View series",
-                    "albumDetails": "View album",
-                    "channelDetails": "View channel",
-                    "artistDetails": "View artist",
-                    "startRadio": "Play radio",
-                    "playNow": "Play now",
-                    "addToQueue": "Add to queue",
-                    "playNext": "Play next",
-                    "addToPlaylist": "Add to playlist"
+                    "button": {
+                        "addToFavorites": "Add to favorites",
+                        "removeFromFavorites": "Remove from favorites",
+                        "episodeDetails": "Episode details",
+                        "trackDetails": "Track details",
+                        "seriesDetails": "View series",
+                        "albumDetails": "View album",
+                        "channelDetails": "View channel",
+                        "artistDetails": "View artist",
+                        "startRadio": "Play radio",
+                        "playNow": "Play now",
+                        "addToQueue": "Add to queue",
+                        "playNext": "Play next",
+                        "addToPlaylist": "Add to playlist"
+                    }
                 }
             },
             "track": {
                 "MobileRow": {
-                    "actionsButtonlabel": "Show track actions"
+                    "button": {
+                        "actions": "Show track actions"
+                    }
                 },
                 "Modal": {
-                    "addToFavorites": "Add to favorites",
-                    "removeFromFavorites": "Remove from favorites",
-                    "episodeDetails": "Episode details",
-                    "trackDetails": "Track details",
-                    "seriesDetails": "View series",
-                    "albumDetails": "View album",
-                    "channelDetails": "View channel",
-                    "artistDetails": "View artist",
-                    "startRadio": "Play radio",
-                    "playNow": "Play now",
-                    "addToQueue": "Add to queue",
-                    "playNext": "Play next",
-                    "addToPlaylist": "Add to playlist"
+                    "button": {
+                        "addToFavorites": "Add to favorites",
+                        "removeFromFavorites": "Remove from favorites",
+                        "episodeDetails": "Episode details",
+                        "trackDetails": "Track details",
+                        "seriesDetails": "View series",
+                        "albumDetails": "View album",
+                        "channelDetails": "View channel",
+                        "artistDetails": "View artist",
+                        "startRadio": "Play radio",
+                        "playNow": "Play now",
+                        "addToQueue": "Add to queue",
+                        "playNext": "Play next",
+                        "addToPlaylist": "Add to playlist"
+                    }
                 },
                 "Table": {
-                    "titleLabel": "Title",
-                    "albumLabel": "Album",
-                    "artistLabel": "Artist"
+                    "table": {
+                        "header": {
+                            "title": "Title",
+                            "album": "Album",
+                            "artist": "Artist"
+                        }
+                    }
                 },
                 "Widget": {
-                    "noResultsMessage": "Nothing found",
-                    "showMore":"Show more"
+                    "button": {
+                        "more": "Show more"
+                    },
+                    "empty": {
+                        "noResults": "Nothing found"
+                    }
                 }
             }
         },
         "auth": {
             "ApplicationEdit": {
-                "editApplicationLabel": "Edit application",
-                "backToSettingsLink": "Back to settings",
-                "appDetailsHeader": "Application Details",
-                "appDetailsDescription": "Application ID and secret are really sensitive values and must be treated like passwords. Do not share those with anyone else.",
-                "appIdLabel": "Application ID",
-                "appSecretLabel": "Application secret",
-                "accessTokenLabel": "Access token",
-                "regenerateTokenLink": "Regenerate token",
-                "editAppHeader": "Edit application"
+                "title": "Edit application",
+                "link": {
+                    "settings": "Back to settings"
+                },
+                "header": {
+                    "appDetails": "Application Details",
+                    "editApp": "Edit application"
+                },
+                "help": {
+                    "appDetails": "Application ID and secret are really sensitive values and must be treated like passwords. Do not share those with anyone else."
+                },
+                "label": {
+                    "appId": "Application ID",
+                    "appSecret": "Application secret",
+                    "accessToken": "Access token"
+                },
+                "button": {
+                    "regenerateToken": "Regenerate token"
+                }
             },
             "ApplicationForm": {
-                "readScopeLabel": "Read",
-                "readScopeDescription": "Read-only access to user data",
-                "writeScopeLabel": "Write",
-                "writeScopeDescription": "Write-only access to user data",
-                "saveFailureMessage": "We cannot save your changes",
-                "applicationNameLabel": "Name",
-                "redirectUrisLabel": "Redirect URI",
-                "redirectUrisHelp": "Use \"urn:ietf:wg:oauth:2.0:oob\" as a redirect URI if your application is not served on the web.",
-                "scopesLabel": "Scopes",
-                "scopesDescription": "Checking the parent \"Read\" or \"Write\" scopes implies access to all the corresponding children scopes.",
-                "updateButtonLabel": "Update application",
-                "createButtonLabel": "Create application"
+                "header": {
+                    "failure": "We cannot save your changes"
+                },
+                "label": {
+                    "name": "Name",
+                    "redirectUri": "Redirect URI",
+                    "scopes": {
+                        "label": "Scopes",
+                        "description": "Checking the parent \"Read\" or \"Write\" scopes implies access to all the corresponding children scopes.",
+                        "read": {
+                            "label": "Read",
+                            "description": "Read-only access to user data"
+                        },
+                        "write": {
+                            "label": "Write",
+                            "description": "Write-only access to user data"
+                        }
+                    }
+                },
+                "button": {
+                    "update": "Update application",
+                    "create": "Create application"
+                },
+                "help": {
+                    "redirectUri": "Use \"urn:ietf:wg:oauth:2.0:oob\" as a redirect URI if your application is not served on the web."
+                }
             },
             "ApplicationNew": {
                 "title": "Create a new application",
-                "backToSettingsLink": "Back to settings"
+                "link": {
+                    "settings": "Back to settings"
+                }
             },
             "Authorize": {
                 "title": "Allow application",
-                "authorizeThirdPartyAppHeader": "Authorize third-party app",
-                "authorizeFailureMessage": "Error while authorizing application",
-                "fetchDataFailureMessage": "Error while fetching application data",
-                "appAccessHeader": "{app_name} wants to access your Funkwhale acount",
-                "writeOnlyScopeHeader": "Write-only",
-                "readOnlyScopeHeader": "Read-only",
-                "allScopesHeader": "Full access",
-                "unknownPermissionsMessage": "The application is also requesting the following unknown permissions:",
-                "authorizeAppButton": "Authorize {app}",
-                "copyCodeHelp": "You will be shown a code to copy-past in the application",
-                "redirectHelp": "You will be redirected to <strong>{url}</strong>",
-                "copyCodeDescription": "Copy-paste the following code in the application:"
+                "header": {
+                    "authorize": "Authorize third-party app",
+                    "authorizeFailure": "Error while fetching application data",
+                    "fetchFailure": "Error while fetching application data",
+                    "access": "{app_name} wants to access your Funkwhale account",
+                    "writeOnly": "Write-only",
+                    "readOnly": "Read-only",
+                    "allScopes": "Full access"
+                },
+                "message": {
+                    "unknownPermissions": "The application is also requesting the following unknown permissions:"
+                },
+                "button": {
+                    "authorize":"Authorize {app}"
+                },
+                "help": {
+                    "copyCode": "You will be shown a code to copy-past in the application",
+                    "redirect": "You will be redirected to <strong>{url}</strong>",
+                    "pasteCode": "Copy-paste the following code in the application:"
+                }
             },
             "LoginForm": {
-                "usernamePlaceholder": "Enter your username or e-mail address",
-                "loginFailureHeader": "We cannot log you in",
-                "approvalRequiredHelp": "If you signed-up recently, you may need to wait before our moderation team review your account, or verify your e-mail address.",
-                "invalidCredentialsHelp": "Please double-check that your username and password combination is correct and make sure you verified your e-mail address.",
-                "usernameFieldLabel": "Username or e-mail address",
-                "createAccountLink": "Create an account",
-                "passwordFieldLabel": "Password |",
-                "resetPasswordLink": "Reset your password",
-                "redirectMessage": "You will be redirected to {domain} to authenticate",
-                "loginButton": "Login"
+                "placeholder": {
+                    "username": "Enter your username or e-mail address"
+                },
+                "header": {
+                    "loginFailure": "We cannot log you in"
+                },
+                "help": {
+                    "approvalRequired": "If you signed-up recently, you may need to wait before our moderation team review your account, or verify your e-mail address.",
+                    "invalidCredentials": "Please double-check that your username and password combination is correct and make sure you verified your e-mail address."
+                },
+                "label": {
+                    "username": "Username or e-mail address",
+                    "password": "Password"
+                },
+                "button": {
+                    "login": "Login"
+                },
+                "link": {
+                    "resetPassword": "Reset your password",
+                    "createAccount": "Create an account"
+                },
+                "message": {
+                    "redirect": "You will be redirected to {domain} to authenticate"
+                }
             },
             "Logout": {
                 "title": "Log out",
-                "confirmHeader": "Are you sure you want to log out?",
-                "loggedInUsername": "You are currently logged in as {username}",
-                "confirmLogoutButton": "Yes, log me out!",
-                "loggedOutHeader": "You aren't currently logged in",
-                "logInLink": "Log in!"
+                "header": {
+                    "confirm": "Are you sure you want to log out?",
+                    "unauthenticated": "You aren't currently logged in"
+                },
+                "button": {
+                    "logout": "Yes, log me out!"
+                },
+                "link": {
+                    "login": "Log in!"
+                },
+                "message": {
+                    "loggedIn": "You are currently logged in as {username}"
+                }
             },
             "Plugin": {
-                "documentationLink": "Documentation",
-                "saveFailureHeader": "Error while saving plugin",
-                "pluginEnabledLabel": "Enabled",
-                "libraryLabel": "Library",
-                "libraryDescription": "Library where files should be imported.",
-                "saveButton": "Save",
-                "scanButton": "Scan"
+                "header": {
+                    "failure": "Error while saving plugin"
+                },
+                "link": {
+                    "documentation": "Documentation"
+                },
+                "button": {
+                    "save": "Save",
+                    "scan": "Scan"
+                },
+                "label": {
+                    "library": "Library",
+                    "pluginEnabled": "Enabled"
+                },
+                "description": {
+                    "library": "Library where files should be imported."
+                }
             },
             "Settings": {
                 "title": "Account Settings",
-                "deletionRequest": "Your deletion request was submitted, your account and content will be deleted shortly",
-                "accountSettingsHeader": "Account settings",
-                "settingsUpdatedHeader": "Settings updated",
-                "settingsUpdateFailureHeader": "Your settings can't be updated",
-                "updateSettingsButton": "Update settings",
-                "avatarHeader": "Avatar",
-                "avatarSaveFailureHeader": "Your avatar cannot be saved",
-                "avatarInputLabel": "Avatar",
-                "changePasswordHeader": "Change my password",
-                "changePasswordMessage": "Changing your password will also change your Subsonic API password if you have requested one.",
-                "changePasswordMessageContinued": "You will have to update your password on your clients that use this password.",
-                "changePasswordFailureMessage": "Your password cannot be changed",
-                "changePasswordHelp": "Please double-check your password is correct",
-                "currentPasswordLabel": "Current password",
-                "newPasswordLabel": "New password",
-                "changePasswordButton": "Change password",
-                "changePasswordModalHeader": "Change your password?",
-                "changePasswordWarning": "Changing your password will have the following consequences",
-                "changePasswordLogout": "You will be logged out from this session and have to log in with the new one",
-                "changePasswordSubsonic": "Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password",
-                "disableSubsonicMessage": "Disable access",
-                "contentFiltersHeader": "Content filters",
-                "contentFiltersDescription": "Content filters help you hide content you don't want to see on the service.",
-                "refreshButton": "Refresh",
-                "hiddenArtistsHeader": "Hidden artists",
-                "artistNameTableHeader": "Name",
-                "filterCreationDateTableHeader": "Creation date",
-                "filterDeleteButton": "Delete",
-                "authorizedAppsHeader": "Authorized apps",
-                "authorizedAppsDescription": "This is the list of applications that have access to your account data.",
-                "appNameTableHeader": "Application",
-                "appPermissionsTableHeader": "Permissions",
-                "permissionDeleteButton": "Revoke",
-                "revokePermissionModalMessage": "Revoke access for application {app}?",
-                "revokePermissionModalWarning": "This will prevent this application from accessing the service on your behalf.",
-                "revokeAccessButton": "Revoke access",
-                "emptyAppMessage": "You don't have any application connected with your account.",
-                "emptyAppHelp": "If you authorize third-party applications to access your data, those applications will be listed here.",
-                "personalAppsHeader": "Your applications",
-                "personalAppsDescription": "This is the list of applications that you have registered.",
-                "newAppLink": "Register a new application",
-                "personalAppNameTableHeader": "Application",
-                "personalAppScopesTableHeader": "Scopes",
-                "personalAppCreationDateTableHeader": "Creation date",
-                "personalAppEditLink": "Edit",
-                "personalAppDeleteLink": "Remove",
-                "deletePersonalAppModalMessage": "Remove application {app}?",
-                "deletePersonalAppModalWarning": "This will permanently remove the application and all the associated tokens.",
-                "deletePersonalAppButton": "Remove application",
-                "emptyPersonalAppMessage": "You don't have registered any application yet.",
-                "emptyPersonalAppHelp": "Register one to integrate Funkwhale with third-party applications.",
-                "pluginsHeader": "Plugins",
-                "pluginsDescription": "Use plugins to extend Funkwhale and get additional features.",
-                "managePluginsLink": "Manage plugins",
-                "changeEmailHeader": "Change my e-mail address",
-                "changeEmailDescription": "Change the e-mail address associated with your account. We will send a confirmation to the new address.",
-                "currentEmailLabel": "Your current e-mail address is {email}",
-                "changeEmailFailureMessage": "We cannot change your e-mail address",
-                "newEmailLabel": "New e-mail address",
-                "updateEmailButton": "Update",
-                "deleteAccountHeader": "Delete my account",
-                "deleteAccountDescription": "You can permanently and irreversibly delete your account and all the associated data using the form below. You will be asked for confirmation.",
-                "deleteAccountWarning": "Your account will be deleted from our servers within a few minutes. We will also notify other servers who may have a copy of some of your data so they can proceed to deletion. Please note that some of these servers may be offline or unwilling to comply though.",
-                "deleteAccountFailureMessage": "We cannot delete your account",
-                "deleteAccountButton": "Delete my account…",
-                "deleteAccountConfirmationMessage": "Do you want to delete your acount?",
-                "deleteAccountConfirmationWarning": "This is irreversible and will permanently remove your data from our servers. You will we immediatly logged out.",
-                "deleteAccountConfirmButton": "Delete my account"
+                "message": {
+                    "confirmDelete": "Your deletion request was submitted, your account and content will be deleted shortly",
+                    "currentEmail": "Your current e-mail address is {email}"
+                },
+                "header": {
+                    "accountSettings": "Account settings",
+                    "settingsUpdated": "Settings updated",
+                    "updateFailure": "Your settings can't be updated",
+                    "avatar": "Avatar",
+                    "avatarFailure": "Your avatar cannot be saved",
+                    "changePassword": "Change my password",
+                    "passwordFailure": "Your password cannot be changed",
+                    "contentFilters": "Content filters",
+                    "hiddenArtists": "Hidden artists",
+                    "authorizedApps": "Authorized apps",
+                    "noApps": "You don't have any application connected with your account.",
+                    "yourApps": "Your applications",
+                    "noPersonalApps": "You don't have registered any application yet.",
+                    "plugins": "Plugins",
+                    "changeEmail": "Change my e-mail address",
+                    "emailFailure": "We cannot change your e-mail address",
+                    "deleteAccount": "Delete my account",
+                    "accountFailure": "We cannot delete your account"
+                },
+                "description": {
+                    "changePassword": {
+                        "paragraph1": "Changing your password will also change your Subsonic API password if you have requested one.",
+                        "paragraph2": "You will have to update your password on your clients that use this password."
+                    },
+                    "contentFilters": "Content filters help you hide content you don't want to see on the service.",
+                    "authorizedApps": "This is the list of applications that have access to your account data.",
+                    "yourApps": "This is the list of applications that you have registered.",
+                    "plugins": "Use plugins to extend Funkwhale and get additional features.",
+                    "changeEmail": "Change the e-mail address associated with your account. We will send a confirmation to the new address.",
+                    "deleteAccount": "You can permanently and irreversibly delete your account and all the associated data using the form below. You will be asked for confirmation."
+                },
+                "button": {
+                    "update": "Update",
+                    "updateSettings": "Update settings",
+                    "password": "Change password",
+                    "disableSubsonic": "Disable access",
+                    "refresh": "Refresh",
+                    "delete": "Delete",
+                    "revoke": "Revoke",
+                    "revokeAccess": "Revoke access",
+                    "edit": "Edit",
+                    "remove": "Remove",
+                    "removeApp": "Remove application",
+                    "deleteAccount": "Delete my account…",
+                    "deleteAccountConfirm": "Delete my account"
+                },
+                "help": {
+                    "changePassword": "Please double-check your password is correct",
+                    "noApps": "If you authorize third-party applications to access your data, those applications will be listed here.",
+                    "noPersonalApps": "Register one to integrate Funkwhale with third-party applications."
+                },
+                "warning": {
+                    "deleteAccount": "Your account will be deleted from our servers within a few minutes. We will also notify other servers who may have a copy of some of your data so they can proceed to deletion. Please note that some of these servers may be offline or unwilling to comply though."
+                },
+                "link": {
+                    "newApp": "Register a new application",
+                    "managePlugins": "Manage plugins"
+                },
+                "label": {
+                    "avatar": "Avatar",
+                    "password": "Password",
+                    "currentPassword": "Current password",
+                    "newPassword": "New password",
+                    "newEmail": "New e-mail address"
+                },
+                "modal": {
+                    "changePassword": {
+                        "header": "Change your password?",
+                        "content": {
+                            "warning": "Changing your password will have the following consequences",
+                            "logout": "You will be logged out from this session and have to log in with the new one",
+                            "subsonic": "Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password"
+                        }
+                    },
+                    "revokeApp": {
+                        "header": "Revoke access for application {app}?",
+                        "content": {
+                            "warning": "This will prevent this application from accessing the service on your behalf."
+                        }
+                    },
+                    "deleteApp": {
+                        "header": "Remove application {app}?",
+                        "content": {
+                            "warning": "This will permanently remove the application and all the associated tokens."
+                        }
+                    },
+                    "deleteAccount": {
+                        "header": "Do you want to delete your account?",
+                        "content": {
+                            "warning": "This is irreversible and will permanently remove your data from our servers. You will we immediatly logged out."
+                        }
+                    }
+                },
+                "table": {
+                    "artists": {
+                        "header": {
+                            "name": "Name",
+                            "creationDate": "Creation date"
+                        }
+                    },
+                    "authorizedApps": {
+                        "header": {
+                            "application": "Application",
+                            "permissions": "Permissions"
+                        }
+                    },
+                    "yourApps": {
+                        "header": {
+                            "application": "Application",
+                            "scopes": "Scopes",
+                            "creationDate": "Creation date"
+                        }
+                    }
+                }
             },
             "SignupForm": {
-                "invitationCodePlaceholder": "Enter your invitation code (case insensitive)",
-                "usernamePlaceholder": "Enter your username",
-                "emailPlaceholder": "Enter your e-mail address",
-                "awaitingReviewMessage": "Your account request was successfully submitted. You will be notified by e-mail when our moderation team has reviewed your request.",
-                "accountCreationSuccessMessage": "Your account was successfully created. Please verify your e-mail address before trying to login.",
-                "loginHeader": "Log in to your Funkwhale account",
-                "registrationClosedMessage": "Public registrations are not possible on this instance. You will need an invitation code to sign up.",
-                "requiresReviewMessage": "Registrations on this pod are open, but reviewed by moderators before approval.",
-                "signupFailureMessage": "Your account cannot be created.",
-                "usernameFieldLabel": "Username",
-                "emailFieldLabel": "E-mail address",
-                "passwordFieldLabel": "Password",
-                "invitationCodeFieldLabel": "Invitation code",
-                "createAccountButton": "Create my account"
+                "placeholder": {
+                    "invitation": "Enter your invitation code (case insensitive)",
+                    "username": "Enter your username",
+                    "email": "Enter your e-mail address"
+                },
+                "message": {
+                    "awaitingReview": "Your account request was successfully submitted. You will be notified by e-mail when our moderation team has reviewed your request.",
+                    "accountCreated": "Your account was successfully created. Please verify your e-mail address before trying to login.",
+                    "registrationClosed": "Public registrations are not possible on this instance. You will need an invitation code to sign up.",
+                    "requiresReview": "Registrations on this pod are open, but reviewed by moderators before approval."
+                },
+                "header": {
+                    "login": "Log in to your Funkwhale account",
+                    "signupFailure": "Your account cannot be created."
+                },
+                "label": {
+                    "username": "Username",
+                    "email": "E-mail address",
+                    "password": "Password",
+                    "invitation": "Invitation code"
+                },
+                "button": {
+                    "create": "Create my account"
+                }
             },
             "SubsonicTokenForm": {
-                "subsonicFieldLabel": "Your subsonic API password",
-                "successMessage": "Password updated",
-                "disabledMessage": "Access disabled",
-                "subsonicHeader": "Subsonic API password",
-                "unavailableMessage": "The Subsonic API is not available on this Funkwhale instance.",
-                "subsonicApiDescription": "Funkwhale is compatible with other music players that support the Subsonic API.",
-                "subsonicApiDescriptionContinued": "You can use those to enjoy your playlist and music in offline mode, on your smartphone or tablet, for instance.",
-                "subsonicPasswordInfo": "However, accessing Funkwhale from those clients requires a separate password you can set below.",
-                "appsLink": "Discover how to use Funkwhale from other apps",
-                "errorHeader": "Error",
-                "requestNewTokenButton": "Request a new password",
-                "requestNewTokenModalHeader": "Request a new Subsonic API password?",
-                "requestNewTokenWarning": "This will log you out from existing devices that use the current password.",
-                "requestTokenButton": "Request a password",
-                "disableSubsonicAccessButton": "Disable Subsonic access",
-                "disableSubsonicAccessModalHeader": "Disable Subsonic API access?",
-                "disableSubsonicAccessWarning": "This will completely disable access to the Subsonic API using from account.",
-                "disableSubsonicAccessConfirm": "Disable access"
+                "label": {
+                    "subsonicField": "Your subsonic API password"
+                },
+                "message": {
+                    "passwordUpdated": "Password updated",
+                    "accessDisabled": "Access disabled",
+                    "unavailable": "The Subsonic API is not available on this Funkwhale instance."
+                },
+                "header": {
+                    "subsonic": "Subsonic API password",
+                    "error": "Error"
+                },
+                "description": {
+                    "subsonic": {
+                        "paragraph1": "Funkwhale is compatible with other music players that support the Subsonic API.",
+                        "paragraph2": "You can use those to enjoy your playlist and music in offline mode, on your smartphone or tablet, for instance.",
+                        "paragraph3": "However, accessing Funkwhale from those clients requires a separate password you can set below."
+                    }
+                },
+                "link": {
+                    "apps": "Discover how to use Funkwhale from other apps"
+                },
+                "button": {
+                    "newPassword": "Request a new password",
+                    "confirmNewPassword": "Request a password",
+                    "disable": "Disable Subsonic access",
+                    "confirmDisable": "Disable access"
+                },
+                "modal": {
+                    "newPassword": {
+                        "header": "Request a new Subsonic API password?",
+                        "content": {
+                            "warning": "This will log you out from existing devices that use the current password."
+                        }
+                    },
+                    "disableSubsonic": {
+                        "header": "Disable Subsonic API access?",
+                        "content": {
+                            "warning": "This will completely disable access to the Subsonic API using from account."
+                        }
+                    }
+                }
             }
         },
         "channels": {
             "AlbumForm": {
-                "errorHeader": "Error while creating",
-                "titleLabel": "Title"
+                "header": {
+                    "error": "Error while creating"
+                },
+                "label": {
+                    "albumTitle": "Title"
+                }
             },
             "AlbumModal": {
-                "newSeriesHeader": "New series",
-                "newAlbumHeader": "New album",
-                "cancelButton": "Cancel",
-                "createButton": "Create"
+                "header": {
+                    "newSeries": "New series",
+                    "newAlbum": "New album"
+                },
+                "button": {
+                    "cancel": "Cancel",
+                    "create": "Create"
+                }
             },
             "AlbumSelect": {
-                "seriesLabel": "Series",
-                "albumLabel": "Album",
-                "noneLabel": "None",
-                "trackCount":"(No tracks | {tracks_count} track | {tracks_count} tracks)"
+                "label": {
+                    "series": "Series",
+                    "album": "Album"
+                },
+                "option": {
+                    "none": "None"
+                },
+                "meta": {
+                    "tracks": "(No tracks | {tracks_count} track | {tracks_count} tracks)"
+                }
             },
             "LicenseSelect": {
-                "licenseLabel": "License",
-                "noneLabel": "None",
-                "licenseInfo": "About this license"
+                "label": {
+                    "license": "Licence"
+                },
+                "option": {
+                    "none": "None"
+                },
+                "link": {
+                    "license": "About this license"
+                }
             },
             "SubscribeButton": {
-                "unsubscribeLabel": "Unsubscribe",
-                "subscribeLabel": "Subscribe",
-                "authMessage": "You need to be logged in to subscribe to this channel"
+                "title": {
+                    "unsubscribe": "Unsubscribe",
+                    "subscribe": "Subscribe"
+                },
+                "help": {
+                    "auth": "You need to be logged in to subscribe to this channel"
+                }
             },
             "UploadForm": {
-                "editTitle": "Edit",
-                "failureHeader": "Error while publishing",
-                "channelLabel": "Channel",
-                "licenseTip": "Add a license to your upload to ensure some freedoms to your public.",
-                "noSpaceWarning": "You don't have any space left to upload your files. Please contact the moderators.",
-                "pendingDraftsMessage": "You have some draft uploads pending publication.",
-                "ignoreButton": "Ignore",
-                "resumeButton": "Resume",
-                "uploadingStatus": "Uploading",
-                "erroredStatus": "Errored",
-                "pendingStatus": "Pending",
-                "removeUpload": "Remove",
-                "retryUpload": "Retry",
-                "supportedExtensions": "Supported extensions {extensions}",
-                "dragAndDrop": "Drag and drop your files here or open the browser to upload your files",
-                "openFileBrowser": "Browse…"
+                "header": {
+                    "error": "Error while publishing"
+                },
+                "label": {
+                    "channel": "Channel",
+                    "openBrowser": "Browse…"
+                },
+                "message": {
+                    "pending": "You have some draft uploads pending publication.",
+                    "dragAndDrop": "Drag and drop your files here or open the browser to upload your files"
+                },
+                "button": {
+                    "edit": "Edit",
+                    "ignore": "Ignore",
+                    "resume": "Resume",
+                    "remove": "Remove",
+                    "retry": "Retry"
+                },
+                "help": {
+                    "license": "Add a license to your upload to ensure some freedoms to your public."
+                },
+                "warning": {
+                    "quota": "You don't have any space left to upload your files. Please contact the moderators."
+                },
+                "status": {
+                    "uploading": "Uploading",
+                    "errored": "Errored",
+                    "pending": "Pending"
+                },
+                "description": {
+                    "extensions": "Supported extensions {extensions}"
+                }
             },
             "UploadMetadataForm": {
-                "titleLabel": "Title",
-                "trackImage": "Track Picture",
-                "tagsLabel": "Tags",
-                "uploadPosition": "Position",
-                "descriptionLabel": "Description"
+                "label": {
+                    "title": "Title",
+                    "tags": "Tags",
+                    "image": "Track Picture",
+                    "description": "Description",
+                    "position": "Position"
+                }
             },
             "UploadModal": {
-                "fileCount": "no files | {count} file | {count} files",
-                "publishStep": "Publish audio",
-                "uploadStep": "Files to upload",
-                "uploadDetails": "Upload details",
-                "processingUploads": "Processing uploads",
-                "remainingSpace": "Remaining storage space: {space}",
-                "cancelButton": "Cancel",
-                "previousButton": "Previous step",
-                "updateButton": "Update",
-                "nextButton": "Next",
-                "publishButton": "Publish",
-                "finishLaterButton": "Finish later",
-                "closeButton": "Close"
+                "meta": {
+                    "files": "no files | {count} file | {count} files",
+                    "quota": "Remaining storage space: {space}"
+                },
+                "header": {
+                    "publish": "Publish audio",
+                    "uploadFiles": "Files to upload",
+                    "uploadDetails": "Upload details",
+                    "processing": "Processing uploads"
+                },
+                "button": {
+                    "cancel": "Cancel",
+                    "previous": "Previous step",
+                    "update": "Update",
+                    "next": "Next",
+                    "publish": "Publish",
+                    "finishLater": "Finish later",
+                    "close": "Close"
+                }
             }
         },
         "common": {
             "ActionTable": {
-                "refreshLabel": "Refresh table content",
-                "selectAllLabel": "Select all items",
-                "performActionLabel": "Perform actions",
-                "selectItemLabel": "Select",
-                "contentUpdatedMessage": "Content has been updated, click refresh to see up-to-date content",
-                "actionsLabel": "Actions",
-                "performActionButton": "Go",
-                "performActionConfirmation": "Do you want to launch {action} on {count} element? | Do you want to launch {action} on {count} elements?",
-                "performActionWarning": "This may affect a lot of elements or have irreversible consequences, please double check this is really what you want.",
-                "launchActionButton": "Launch",
-                "allElementsSelectedMessage": "No elements selected | {count} element selected | All {count} elements selected",
-                "elementsSelectedMessage": "{count} on {total} selected",
-                "selectElementsMessage": "Select one element | Select all {total} elements",
-                "selectCurrentPage": "Select only current page",
-                "actionErrorMessage": "Error while applying action",
-                "actionSuccessMessage": "Action {action} was launched successfully on {count} element | Action {action} was launched successfully on {count} elements"
+                "header": {
+                    "error": "Error while applying action"
+                },
+                "message": {
+                    "needsRefresh": "Content has been updated, click refresh to see up-to-date content",
+                    "success": "Action {action} was launched successfully on {count} element | Action {action} was launched successfully on {count} elements"
+                },
+                "button": {
+                    "refresh": "Refresh table content",
+                    "go": "Go",
+                    "launch": "Launch",
+                    "select": "Select",
+                    "selected": "{count} on {total} selected",
+                    "selectAll": "Select all items",
+                    "allSelected": "No elements selected | {count} element selected | All {count} elements selected",
+                    "selectElement": "Select one element | Select all {total} elements",
+                    "selectCurrentPage": "Select only current page"
+                },
+                "label": {
+                    "actions": "Actions",
+                    "performAction": "Perform actions"
+                },
+                "modal": {
+                    "performAction": { 
+                        "header": "Do you want to launch {action} on {count} element? | Do you want to launch {action} on {count} elements?",
+                        "content": {
+                            "warning": "This may affect a lot of elements or have irreversible consequences, please double check this is really what you want."
+                        }
+                    }
+                }
             },
             "AttachmentInput": {
-                "saveFailureMessage": "Your attachment cannot be saved",
-                "uploadLabel": "Upload New Picture…",
-                "uploadHelp": "PNG or JPG. Dimensions should be between 1400x1400px and 3000x3000px. Maximum file size allowed is 5MB.",
-                "removeButton": "Remove",
-                "uploadingMessage": "Uploading file…"
+                "header": {
+                    "failure": "Your attachment cannot be saved"
+                },
+                "label": {
+                    "upload": "Upload New Picture…"
+                },
+                "help": {
+                    "upload": "PNG or JPG. Dimensions should be between 1400x1400px and 3000x3000px. Maximum file size allowed is 5MB."
+                },
+                "button": {
+                    "remove": "Remove"
+                },
+                "loader": {
+                    "uploading": "Uploading file…"
+                }
             },
             "CollapseLink": {
-                "expandLabel": "Expand",
-                "collapseLabel": "Collapse"
+                "button": {
+                    "expand": "Expand",
+                    "collapse": "Collapse"
+                }
             },
             "ContentForm": {
-                "placeHolderLabel": "Write a few words here…",
-                "writeButton": "Write",
-                "previewButton": "Preview",
-                "noContentMessage": "Nothing to preview",
-                "markdownMessage": "Markdown syntax is supported."
+                "placeholder": {
+                    "input": "Write a few words here…"
+                },
+                "button": {
+                    "write": "Write",
+                    "preview": "Preview"
+                },
+                "empty": {
+                    "noContent": "Nothing to preview"
+                },
+                "help": {
+                    "markdown": "Markdown syntax is supported"
+                }
             },
             "CopyInput": {
-                "copySuccessMessage": "Text copied to clipboard!",
-                "copyButton": "Copy"
+                "button": {
+                    "copy": "Copy"
+                },
+                "message": {
+                    "success": "Text copied to clipboard!"
+                }
             },
             "DangerousButton": {
-                "confirmAction": "Do you want to confirm this action?",
-                "cancelButton": "Cancel",
-                "confirmButton": "Confirm"
+                "header": {
+                    "confirm": "Do you want to confirm this action?"
+                },
+                "button": {
+                    "cancel": "Cancel",
+                    "confirm": "Confirm"
+                }
             },
             "Duration": {
-                "hoursFormat": "{hours} h {minutes} min",
-                "minutesFormat": "{minutes} min"
+                "meta": {
+                    "hours": "{hours} h {minutes} min",
+                    "minutes": "{minutes} min"
+                }
             },
             "EmptyState": {
-                "emptyState": "No results were found.",
-                "refreshButton": "Refresh"
+                "button": {
+                    "refresh": "Refresh"
+                },
+                "header": {
+                    "noResults": "No results were found."
+                }
             },
             "ExpandableDiv": {
-                "showLess": "Show less",
-                "showMore": "Show more"
+                "button": {
+                    "less": "Show less",
+                    "more": "Show more"
+                }
             },
             "InlineSearchBar": {
-                "searchPlaceholder": "Search…",
-                "clearLabel": "Clear",
-                "searchLabel": "Search"
+                "placeholder": {
+                    "search": "Search…"
+                },
+                "label": {
+                    "search": "Search"
+                },
+                "button": {
+                    "clear": "Clear"
+                }
             },
             "LoginModal": {
-                "header": "Unauthenticated",
-                "loginLabel": "Log in",
-                "signupLabel": "Sign up",
-                "noAccessDescription": "You don't have access"
+                "header": {
+                    "unauthenticated": "Unauthenticated"
+                },
+                "link": {
+                    "login": "Log in",
+                    "signup": "Sign up"
+                },
+                "description": {
+                    "noAccess": "You don't have access"
+                }
             },
             "RenderedDescription": {
-                "showMore": "Show more",
-                "showLess": "Show less",
-                "noDescription": "No description available",
-                "editButton": "Edit",
-                "updateFailureHeader": "Error while updating description",
-                "cancelButton": "Cancel",
-                "updateButton": "Update description"
+                "button": {
+                    "more": "Show more",
+                    "less": "Show less",
+                    "edit": "Edit",
+                    "cancel": "Cancel",
+                    "update": "Update description"
+                },
+                "header": {
+                    "failure": "Error while updating description"
+                },
+                "empty": {
+                    "noDescription": "No description available"
+                }
             },
             "UserLink": {
-                "username": "{'@'}{username}"
+                "link": {
+                    "username": "{'@'}{username}"
+                }
             },
             "UserMenu": {
-                "profileLabel": "Profile",
-                "settingsLabel": "Settings",
-                "logoutLabel": "Log out",
-                "aboutLabel": "About",
-                "shortcutsLabel": "Keyboard shortcuts",
-                "supportLabel": "Help",
-                "forumLabel": "Forum",
-                "docsLabel": "Documentation",
-                "languageLabel": "Change language",
-                "themeLabel": "Change theme",
-                "chatLabel": "Chat room",
-                "gitLabel": "Issue tracker",
-                "loginLabel": "Log in",
-                "signupLabel": "Sign up",
-                "notificationsLabel": "Notifications"
+                "label": {
+                    "language": "Change language",
+                    "theme": "Change theme",
+                    "shortcuts": "Keyboard shortcuts"
+                },
+                "link": {
+                    "profile": "Profile",
+                    "settings": "Settings",
+                    "logout": "Log out",
+                    "about": "About",
+                    "support": "Help",
+                    "forum": "Forum",
+                    "docs": "Documentation",
+                    "chat": "Chat room",
+                    "git": "Issue tracker",
+                    "login": "Log in",
+                    "signup": "Sign up",
+                    "notifications": "Notifications"
+                }
             },
             "UserModal": {
-                "optionsLabel": "Options",
-                "profileLabel": "Profile",
-                "settingsLabel": "Settings",
-                "logoutLabel": "Log out",
-                "aboutLabel": "About",
-                "shortcutsLabel": "Keyboard shortcuts",
-                "supportLabel": "Help",
-                "forumLabel": "Forum",
-                "docsLabel": "Documentation",
-                "languageLabel": "Change language",
-                "themeLabel": "Change theme",
-                "chatLabel": "Chat room",
-                "gitLabel": "Issue tracker",
-                "loginLabel": "Log in",
-                "signupLabel": "Sign up",
-                "notificationsLabel": "Notifications",
-                "useOtherInstanceLabel": "Use another instance"
+                "header": {
+                    "options": "Options"
+                },
+                "button": {
+                    "switchInstance": "Use another instance"
+                },
+                "label": {
+                    "language": "Change language",
+                    "theme": "Change theme",
+                    "shortcuts": "Keyboard shortcuts"
+                },
+                "link": {
+                    "options": "Options",
+                    "profile": "Profile",
+                    "settings": "Settings",
+                    "logout": "Log out",
+                    "about": "About",
+                    "shortcuts": "Keyboard shortcuts",
+                    "support": "Help",
+                    "forum": "Forum",
+                    "docs": "Documentation",
+                    "chat": "Chat room",
+                    "git": "Issue tracker",
+                    "login": "Log in",
+                    "signup": "Sign up",
+                    "notifications": "Notifications"
+                }
             }
         },
         "favorites": {
             "List": {
                 "title": "Your favorites",
-                "loadingMessage": "Loading your favorites…",
-                "favoritesCount": "No favorites | {count} favorite | {count} favorites",
-                "favoritesOrderingLabel": "Ordering",
-                "favoritesOrderingDirectionLabel": "Order",
-                "orderingDirectionAscending": "Ascending",
-                "orderingDirectionDescending": "Descending",
-                "favoritesResultsPerPageLabel": "Results per page",
-                "emptyState": "No tracks have been added to your favorites yet",
-                "libraryLink": "Browse the library"
+                "header": {
+                    "favorites": "No favorites | {count} favorite | {count} favorites"
+                },
+                "empty": {
+                    "noFavorites": "No tracks have been added to your favorites yet" 
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Order",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "pagination": {
+                    "results": "Results per page"
+                },
+                "link": {
+                    "library": "Browse the library"
+                },
+                "loader": {
+                    "loading": "Loading your favorites…"
+                }
             },
             "TrackFavoriteIcon": {
-                "removeFromFavorites": "Remove from favorites",
-                "addToFavorites": "Add to favorites",
-                "isFavorited": "In favorites"
+                "button": {
+                    "remove": "Remove from favorites",
+                    "add": "Add to favorites"
+                },
+                "label": {
+                    "inFavorites": "In favorites"
+                }
             }
         },
         "federation": {
             "FetchButton": {
-                "remoteRefreshHeader": "Refreshing object from remote server…",
-                "refreshSkippedHeader": "Refresh was skipped",
-                "unsupportedDataMessage": "The remote server answered, but returned data was unsupported by Funkwhale.",
-                "refreshSuccessHeader": "Refresh successful",
-                "refreshSuccessMessage": "Data was refreshed successfully from remote server.",
-                "refreshFailureHeader": "Refresh error",
-                "refreshFailureMessage": "An error occurred while trying to refresh data:",
-                "errorTypeTableHeader": "Error type",
-                "errorDetailTableRow": "Error detail",
-                "httpStatusMessage": "The remote server answered with HTTP {status}",
-                "httpErrorMessage": "An HTTP error occurred while contacting the remote server",
-                "timeoutErrorMessage": "The remote server didn't respond quickly enough",
-                "connectionErrorMessage": "Impossible to connect to the remote server",
-                "invalidJsonErrorMessage": "The remote server returned invalid JSON or JSON-LD data",
-                "invalidAttributesErrorMessage": "Data returned by the remote server had invalid or missing attributes",
-                "unknownErrorMessage": "Unknown error",
-                "fetchRequestLoader": "Requesting a fetch…",
-                "awaitingResultLoader": "Waiting for result…",
-                "loadingFailureMessage": "Error while saving settings",
-                "pendingRefreshHeader": "Refresh pending",
-                "pendingRefreshMessage": "The refresh request hasn't been processed in time by our server. It will be processed later.",
-                "closeButton": "Close",
-                "reloadButton": "Close and reload page"
+                "header": {
+                    "refresh": "Refreshing object from remote server…",
+                    "skipped": "Refresh was skipped",
+                    "success": "Refresh successful",
+                    "failure": "Refresh error",
+                    "pending": "Refresh pending",
+                    "saveFailure": "Error while saving settings"
+                },
+                "description": {
+                    "skipped": "The remote server answered, but returned data was unsupported by Funkwhale.",
+                    "success": "Data was refreshed successfully from remote server.",
+                    "failure": "An error occurred while trying to refresh data:",
+                    "pending": "The refresh request hasn't been processed in time by our server. It will be processed later."
+                },
+                "button": {
+                    "close": "Close",
+                    "reload": "Close and reload page"
+                },
+                "loader": {
+                    "fetchRequest": "Requesting a fetch…",
+                    "awaitingResult": "Waiting for result…"
+                },
+                "table": {
+                    "error": {
+                        "label": {
+                            "type": "Error type",
+                            "detail": "Error detail"
+                        },
+                        "value": {
+                            "httpStatus": "The remote server answered with HTTP {status}",
+                            "httpError": "An HTTP error occurred while contacting the remote server",
+                            "timeoutError": "The remote server didn't respond quickly enough",
+                            "connectionError": "Impossible to connect to the remote server",
+                            "invalidJsonError": "The remote server returned invalid JSON or JSON-LD data",
+                            "invalidAttributesError": "Data returned by the remote server had invalid or missing attributes",
+                            "unknownError": "Unknown error"
+                        }
+                    }
+                }
             },
             "LibraryWidget": {
-                "noMatchMessage": "No matching library.",
-                "showMoreButton": "Show more"
-            },
+                "button": {
+                    "showMore": "Show more"
+                },
+                "empty": {
+                    "noMatch": "No matching library."
+                }
+            }
+        },
+        "forms": {
             "PasswordInput": {
                 "title": "Show/hide password",
-                "copyLabel": "Copy",
-                "copySuccessMessage": "Text copied to clipboard!"
+                "button": {
+                    "copy": "Copy"
+                },
+                "message": {
+                    "copy": "Text copied to clipboard!"
+                }
             }
         },
         "library": {
             "AlbumBase": {
                 "title": "Album",
-                "trackCount": "(No tracks | {tracks_count} track | {tracks_count} tracks)",
-                "episodeCount": "No episodes | {episode_count} episode | {episode_count} episodes",
-                "addDescription": "Add a description…"
+                "meta": {
+                    "tracks": "(No tracks | {tracks_count} track | {tracks_count} tracks)",
+                    "episodes": "No episodes | {episode_count} episode | {episode_count} episodes"
+                },
+                "link": {
+                    "addDescription": "Add a description…"
+                }
             },
             "AlbumDetail": {
-                "episodesHeader": "Episodes",
-                "tracksHeader": "Tracks",
-                "volumeNumber": "Volume {number}",
-                "userLibraryHeader": "User libraries",
-                "userLibraryDescription": "This album is present in the following libraries:"
+                "header": {
+                    "episodes": "Episodes",
+                    "tracks": "Tracks",
+                    "libraries": "User libraries"
+                },
+                "description": {
+                    "libraries": "This album is present in the following libraries:"
+                },
+                "meta": {
+                    "volume": "Volume {number}"
+                }
             },
             "AlbumDropdown": {
-                "moreLabel": "More…",
-                "embedModalHeader": "Embed this album on your website",
-                "cancelButton": "Cancel",
-                "domainViewLink": "View on {domain}",
-                "embedButton": "Embed",
-                "musicbrainzLink": "View on MusicBrainz",
-                "discogsLink": "Search on Discogs",
-                "editButton": "Edit",
-                "deleteButton": "Delete",
-                "deleteModalHeader": "Delete this album?",
-                "deleteModalMessage": "The album will be deleted, as well as any related files and data. This action is irreversible.",
-                "moderationLink": "Open in moderation interface",
-                "djangoLink": "View in Django's admin"
+                "button": {
+                    "more": "More…",
+                    "cancel": "Cancel",
+                    "embed": "Embed",
+                    "edit": "Edit",
+                    "delete": "Delete"
+                },
+                "modal": {
+                    "embed": {
+                        "header": "Embed this album on your website"
+                    },
+                    "delete": {
+                        "header": "Delete this album?",
+                        "content": {
+                            "warning": "The album will be deleted, as well as any related files and data. This action is irreversible."
+                        }
+                    }
+                },
+                "link": {
+                    "domain": "View on {domain}",
+                    "musicbrainz": "View on MusicBrainz",
+                    "discogs": "Search on Discogs",
+                    "moderation": "Open in moderation interface",
+                    "django": "View in Django's admin"
+                }
             },
             "AlbumEdit": {
-                "editAlbumHeader": "Edit this album",
-                "suggestEditHeader": "Suggest an edit on this album",
-                "remoteObjectWarning": "This object is managed by another server, you cannot edit it."
+                "header": {
+                    "edit": "Edit this album",
+                    "suggest": "Suggest an edit on this album"
+                },
+                "message": {
+                    "remote": "This object is managed by another server, you cannot edit it."
+                }
             },
             "Albums": {
-                "searchPlaceholder": "Enter album title…",
                 "title": "Albums",
-                "albumBrowseHeader": "Browsing albums",
-                "searchLabel": "Search",
-                "tagsLabel": "Tags",
-                "orderingLabel": "Ordering",
-                "orderingDirectionLabel": "Ordering direction",
-                "ascendingOrdering": "Ascending",
-                "descendingOrdering": "Descending",
-                "resultsPerPageLabel": "Results per page",
-                "emptyStateMessage": "No results matching your query",
-                "addMusicLink": "Add some music"
+                "placeholder": {
+                    "search": "Enter album title…"
+                },
+                "header": {
+                    "browse": "Browsing albums"
+                },
+                "button": {
+                    "search": "Search"
+                },
+                "label": {
+                    "search": "Search",
+                    "tags": "Tags"
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Ordering direction",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "pagination": {
+                    "results": "Results per page"
+                },
+                "empty": {
+                    "noResults": "No results matching your query"
+                },
+                "link": {
+                    "addMusic": "Add some music"
+                }
             },
             "ArtistBase": {
                 "title": "Artist",
-                "tracksCount": "{count} track in {albums} albums | {count} tracks in {albums} albums",
-                "playAllButton": "Play all albums",
-                "embedModalHeader": "Embed this artist work on your website",
-                "cancelButton": "Cancel",
-                "moreButton": "More…",
-                "domainViewLink": "View on {domain}",
-                "embedButton": "Embed",
-                "wikipediaLink": "Search on Wikipedia",
-                "musicbrainzLink": "View on MusicBrainz",
-                "discogsLink": "Search on Discogs",
-                "editButton": "Edit",
-                "moderationLink": "Open in moderation interface",
-                "djangoLink": "View in Django's admin"
+                "meta": {
+                    "tracks": "{count} track in {albums} albums | {count} tracks in {albums} albums"
+                },
+                "button": {
+                    "play": "Play all albums",
+                    "edit": "Edit",
+                    "cancel": "Cancel",
+                    "embed": "Embed",
+                    "more": "More…"
+                },
+                "link": {
+                    "django": "View in Django's admin",
+                    "musicbrainz": "View on MusicBrainz",
+                    "wikipedia": "Search on Wikipedia",
+                    "domain": "View on {domain}",
+                    "discogs": "Search on Discogs",
+                    "moderation": "Open in moderation interface"
+                },
+                "modal": {
+                    "embed": {
+                        "header": "Embed this artist work on your website"
+                    }
+                }
             },
             "ArtistDetail": {
-                "hiddenContentMessage": "You are currently hiding content related to this artist.",
-                "reviewFiltersLink": "Review my filters",
-                "removeFilterButton": "Remove filter",
-                "artistAlbumsHeader": "Albums by this artist",
-                "loadMoreButton": "Load more…",
-                "newTracksHeader": "New tracks by this artist",
-                "userLibraryHeader": "User libraries",
-                "userLibraryDescription":"This artist is present in the following libraries:"
+                "header": {
+                    "album": "Albums by this artist",
+                    "track": "New tracks by this artist",
+                    "library": "User libraries"
+                },
+                "description": {
+                    "library": "This artist is present in the following libraries:"
+                },
+                "button": {
+                    "more": "Load more…",
+                    "filter": "Remove filter"
+                },
+                "message": {
+                    "filter": "You are currently hiding content related to this artist." 
+                },
+                "link": {
+                    "filter": "Review my filters"
+                }
             },
             "ArtistEdit": {
-                "editArtistHeader": "Edit this artist",
-                "suggestEditHeader": "Suggest an edit on this artist",
-                "remoteObjectWarning":"This object is managed by another server, you cannot edit it."
+                "header": {
+                    "edit": "Edit this artist",
+                    "suggest": "Suggest an edit on this artist"
+                },
+                "message": {
+                    "remote":"This object is managed by another server, you cannot edit it."
+                }
             },
             "Artists": {
                 "title": "Artists",
-                "searchPlaceholder": "Search…",
-                "searchButton": "Search",
-                "artistBrowseHeader": "Browsing artists",
-                "searchLabel": "Artist name",
-                "tagsLabel": "Tags",
-                "orderingLabel": "Ordering",
-                "orderingDirectionLabel": "Ordering direction",
-                "ascendingOrdering": "Ascending",
-                "descendingOrdering": "Descending",
-                "resultsPerPageLabel": "Results per page",
-                "excludeCompilationArtistsLabel": "Exclude Compilation Artists",
-                "emptyStateMessage": "No results matching your query",
-                "addMusicLink": "Add some music"
+                "placeholder": {
+                    "search": "Search…"
+                },
+                "header": {
+                    "browse": "Browsing artists"
+                },
+                "label": {
+                    "search": "Artist name",
+                    "tags": "Tags",
+                    "excludeCompilation": "Exclude Compilation Artists"
+                },
+                "button": {
+                    "search": "Search",
+                    "upload": "Add some music"
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Ordering direction",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "pagination": {
+                    "results":"Results per page"
+                },
+                "empty": {
+                    "noResults": "No results matching your query"
+                }
             },
             "EditCard": {
-                "modificationHeader": "Modification {id}",
-                "trackLink": "Track #{id} - {name}",
-                "appliedStatus": "Approved and applied",
-                "approvedStatus": "Approved",
-                "pendingReviewStatus": "Pending review",
-                "rejectedStatus": "Rejected",
-                "fieldTableHeader": "Field",
-                "oldValueTableHeader": "Old value",
-                "newValueTableHeader": "New value",
-                "notApplicable": "N/A",
-                "approveButton": "Approve",
-                "rejectButton": "Reject",
-                "deleteButton": "Delete",
-                "deleteSuggestionModalHeader": "Delete this suggestion?",
-                "deleteSuggestionModalMessage": "The suggestion will be completely removed, this action is irreversible."
+                "header": {
+                    "modification": "Modification {id}"
+                },
+                "link": {
+                    "track": "Track #{id} - {name}"
+                },
+                "status": {
+                    "applied": "Approved and applied",
+                    "approved": "Approved",
+                    "pending": "Pending",
+                    "rejected": "Rejected"
+                },
+                "table": {
+                    "update": {
+                        "header": {
+                            "field": "Field",
+                            "oldValue": "Old value",
+                            "newValue": "New value"
+                        },
+                        "notApplicable": "N/A"
+                    }
+                },
+                "button": {
+                    "approve": "Approve",
+                    "reject": "Reject",
+                    "delete": "Delete"
+                },
+                "modal": {
+                    "delete": {
+                        "header": "Delete this suggestion?"
+                    },
+                    "content": {
+                        "warning": "The suggestion will be completely removed, this action is irreversible."
+                    }
+                }
             },
             "EditForm": {
-                "summaryPlaceholder": "A short summary describing your changes.",
-                "submissionSuccessHeader": "Your edit was successfully submitted.",
-                "newEditButton": "Submit another edit",
-                "editsAwaitingReview": "Recent edits awaiting review",
-                "showEditsButton": "Show all edits",
-                "recentEdits": "Recent edits",
-                "onlyUnreviewed": "Restrict to unreviewed edits",
-                "emptyStateMessage": "Suggest a change using the form below.",
-                "submissionFailureHeader": "Error while submitting edit",
-                "noPermissionWarning": "You don't have the permission to edit this object, but you can suggest changes. Once submitted, suggestions will be reviewed before approval.",
                 "notApplicable": "N/A",
-                "clearButton": "Clear",
-                "resetButton": "Reset to initial value",
-                "summaryLabel": "Summary (optional)",
-                "cancelButton": "Cancel",
-                "submitEditButton": "Submit and apply edit",
-                "submitSuggestionButton": "Submit suggestion"
+                "placeholder": {
+                    "summary": "A short summary describing your changes."
+                },
+                "header": {
+                    "success": "Your edit was successfully submitted.",
+                    "failure": "Error while submitting edit",
+                    "recentEdits": "Recent edits",
+                    "unreviewed": "Restrict to unreviewed edits"
+                },
+                "button": {
+                    "showAll": "Show all edits",
+                    "showUnreviewed": "Restrict to unreviewed edits",
+                    "new": "Submit another edit",
+                    "clear": "Clear",
+                    "reset": "Reset to initial value",
+                    "submit": "Submit and apply edit",
+                    "cancel": "Cancel",
+                    "suggest": "Submit suggestion"
+                },
+                "empty": {
+                    "suggestEdit": "Suggest a change using the form below"
+                },
+                "label": {
+                    "summary": "Summary (optional)"
+                },
+                "message": {
+                    "noPermission": "You don't have the permission to edit this object, but you can suggest changes. Once submitted, suggestions will be reviewed before approval."
+                }
             },
             "FileUpload": {
-                "deniedTooltip": "Upload denied, ensure the file is not too big and that you have not reached your quota",
-                "serverTooltip": "Cannot upload this file, ensure it is not too big",
-                "networkTooltip": "A network error occurred while uploading this file",
-                "timeoutTooltip": "Upload timeout, please try again",
-                "retryTooltip": "Retry",
-                "extensionTooltip": "Invalid file type, ensure you are uploading an audio file. Supported file extensions are {extensions}",
-                "eventListenerMessage": "This page is asking you to confirm that you want to leave - data you have entered may not be saved.",
-                "uploadingStatus": "Uploading",
-                "processingStatus": "Processing",
-                "noActionableFiles": "0",
-                "storageSpaceLabel": "Remaining storage space",
-                "localUploadHeader": "Upload music from '~/your local storage",
-                "localUploadMessage": "You are about to upload music to your library. Before proceeding, please ensure that:",
-                "localUploadCopyright": "You are not uploading copyrighted content in a public library, otherwise you may be infringing the law",
-                "localUploadTag": "The music files you are uploading are tagged properly.",
-                "localUploadPicardLink": "We recommend using Picard for that purpose.",
-                "localUploadSupportedFormats": "The music files you are uploading are in OGG, Flac, MP3 or AIFF format",
-                "uploadWidgetLabel": "Click to select files to upload or drag and drop files or directories",
-                "fileUploadSupportedFormats": "Supported extensions: {extensions}",
-                "filenameTableHeader": "Filename",
-                "sizeTableHeader": "Size",
-                "statusTableHeader": "Status",
-                "actionsTableHeader": "Actions",
-                "retryButton": "Retry failed uploads",
-                "uploadedStatusLabel": "Uploaded",
-                "uploadingStatusLabel": "Uploading…",
-                "uploadingProgress": "{percent}%",
-                "pendingStatusLabel": "Pending",
-                "serverUploadHeader": "Import music from your server",
-                "uploadFailureHeader": "Error while launching import",
-                "importStatusHeader": "Import status",
-                "previousImportStatusMessage": "Results of your previous import:",
-                "currentImportStatusMessage": "Results of your import:",
-                "cancelButton": "Cancel"
+                "tooltip": {
+                    "denied": "Upload denied, ensure the file is not too big and that you have not reached your quota",
+                    "size": "Cannot upload this file, ensure it is not too big",
+                    "network": "A network error occurred while uploading this file",
+                    "timeout": "Upload timeout, please try again",
+                    "retry": "Retry",
+                    "extension": "Invalid file type, ensure you are uploading an audio file. Supported file extensions are {extensions}"
+                },
+                "message": {
+                    "listener": "This page is asking you to confirm that you want to leave - data you have entered may not be saved.",
+                    "local": {
+                        "message": "You are about to upload music to your library. Before proceeding, please ensure that:",
+                        "copyright": "You are not uploading copyrighted content in a public library, otherwise you may be infringing the law",
+                        "tag": "The music files you are uploading are tagged properly.",
+                        "format": "The music files you are uploading are in OGG, Flac, MP3 or AIFF format"
+                    }
+                },
+                "link": {
+                    "uploading": "Uploading",
+                    "processing": "Processing",
+                    "picard": "We recommend using Picard for that purpose."
+                },
+                "empty": {
+                    "noFiles": "0"
+                },
+                "label": {
+                    "remainingSpace": "Remaining storage space",
+                    "uploadWidget": "Click to select files to upload or drag and drop files or directories",
+                    "extensions": "Supported extensions: {extensions}"
+                },
+                "header": {
+                    "local": "Upload music from '~/your local storage",
+                    "server": "Import music from your server",
+                    "failure": "Error while launching import",
+                    "status": "Import status"
+                },
+                "table": {
+                    "upload": {
+                        "header": {
+                            "filename": "Filename",
+                            "size": "Size",
+                            "status": "Status",
+                            "actions": "Actions"
+                        },
+                        "status": {
+                            "uploaded": "Uploaded",
+                            "uploading": "Uploading…",
+                            "pending": "Pending"
+                        },
+                        "progress": "{percent}%"
+                    }
+                },
+                "button": {
+                    "retry": "Retry failed uploads",
+                    "cancel": "Cancel"
+                },
+                "description": {
+                    "import": "Import status",
+                    "previousImport": "Results of your previous import:"
+                }
             },
             "FsBrowser": {
-                "importButton": "Import"
+                "button": {
+                    "import": "Import"
+                }
             },
             "FsLogs": {
-                "emptyStateMessage": "Import hasn't started yet"
+                "empty": {
+                    "notStarted": "Import hasn't started yet"
+                }
             },
             "Home": {
                 "title": "Library",
-                "recentlyListenedLabel": "Recently listened",
-                "recentlyFavoritedLabel": "Recently favorited",
-                "playlistsLabel": "Playlists",
-                "recentlyAddedLabel": "Recently added",
-                "newChannelsLabel": "New channels"
+                "header": {
+                    "recentlyListened": "Recently listened",
+                    "recentlyFavorited": "Recently favorited",
+                    "playlists": "Playlists",
+                    "recentlyAdded": "Recently added",
+                    "newChannels": "New channels"
+                }
             },
             "ImportStatusModal": {
-                "invalidMetadataLabel": "Invalid metadata",
-                "invalidMetadataMessage": "The metadata included in the file is invalid or some mandatory fields are missing.",
-                "unknownErrorLabel": "Unknown error",
-                "unknownErrorMessage": "An unknown error occurred",
-                "importDetailHeader": "Import detail",
-                "importDetailMessage": "Upload is still pending and will soon be processed by the server.",
-                "importSuccessMessage": "Upload was successfully processed by the server.",
-                "importSkippedWarning": "Upload was skipped because a similar one is already available in one of your libraries.",
-                "importFailureMessage": "An error occurred during upload processing. You will find more information below.",
-                "errorType": "Error type",
-                "errorDetail": "Error detail",
-                "gettingHelp": "Getting help",
-                "documentationLink": "Read our documentation for this error",
-                "supportLink": "Open a support thread (include the debug information below in your message)",
-                "debugInformation": "Debug information",
-                "closeButton": "Close"
+                "error": {
+                    "invalidMetadata": {
+                        "label": "Invalid metadata",
+                        "message": "The metadata included in the file is invalid or some mandatory fields are missing."
+                    },
+                    "unknownError": {
+                        "label": "Unknown error",
+                        "message": "An unknown error occurred"
+                    },
+                    "importFailure": "An error occurred during upload processing. You will find more information below."
+                },
+                "header": {
+                    "importDetail": "Import detail"
+                },
+                "message": {
+                    "importDetail": "Upload is still pending and will soon be processed by the server.",
+                    "importSuccess": "Upload was successfully processed by the server."
+                },
+                "warning": {
+                    "importSkipped": "Upload was skipped because a similar one is already available in one of your libraries."
+                },
+                "table": {
+                    "error": {
+                        "errorType": "Error type",
+                        "errorDetail": "Error detail",
+                        "help": "Getting help",
+                        "debug": "Debug information"
+                    }
+                },
+                "link": {
+                    "documentation": "Read our documentation for this error",
+                    "support": "Open a support thread (include the debug information below in your message)"
+                },
+                "button": {
+                    "close": "Close"
+                }
             },
             "Podcasts": {
-                "searchPlaceholder": "Search…",
                 "title": "Podcasts",
-                "podcastBrowseHeader": "Browsing podcasts",
-                "searchLabel": "Podcast title",
-                "searchButton": "Search",
-                "tagsLabel": "Tags",
-                "orderingLabel": "Ordering",
-                "orderingDirectionLabel": "Ordering direction",
-                "ascendingOrdering": "Ascending",
-                "descendingOrdering": "Descending",
-                "resultsPerPageLabel": "Results per page",
-                "excludeCompilationArtistsLabel": "Exclude Compilation Artists",
-                "emptyStateMessage": "No results matching your query",
-                "addChannelLink": "Create a Channel",
-                "subscribeLink": "Subscribe to feed",
-                "subscriptionModalHeader": "Subscription",
-                "cancelButton": "Cancel",
-                "subscribeButton": "Subscribe"
+                "placeholder": {
+                    "search": "Search…"
+                },
+                "header": {
+                    "browse": "Browsing podcasts"
+                },
+                "label": {
+                    "search": "Podcast title",
+                    "tags": "Tags",
+                    "excludeCompilation": "Exclude Compilation Artists"
+                },
+                "button": {
+                    "search": "Search",
+                    "cancel": "Cancel",
+                    "subscribe": "Subscribe",
+                    "channel": "Create a Channel",
+                    "feed": "Subscribe to feed"
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Ordering direction",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "pagination": {
+                    "results": "Results per page"
+                },
+                "empty": {
+                    "noResults": "No results matching your query"
+                },
+                "modal": {
+                    "subscription": {
+                        "header": "Subscription"
+                    }
+                }
             },
             "Radios": {
-                "searchPlaceholder": "Enter a radio name…",
                 "title": "Radios",
-                "radioBrowseHeader": "Browsing radios",
-                "instanceRadioHeader": "Instance radios",
-                "userRadioHeader": "User radios",
-                "createRadioLink": "Create your own radio",
-                "searchLabel": "Search",
-                "searchButton": "Search",
-                "tagsLabel": "Tags",
-                "orderingLabel": "Ordering",
-                "orderingDirectionLabel": "Order",
-                "ascendingOrdering": "Ascending",
-                "descendingOrdering": "Descending",
-                "resultsPerPageLabel": "Results per page",
-                "excludeCompilationArtistsLabel": "Exclude Compilation Artists",
-                "emptyStateMessage": "No results matching your query",
-                "addRadioLink": "Create a radio",
-                "subscribeLink": "Subscribe to feed",
-                "subscriptionModalHeader": "Subscription",
-                "cancelButton": "Cancel",
-                "subscribeButton": "Subscribe"
+                "placeholder": {
+                    "search": "Enter a radio name…"
+                },
+                "header": {
+                    "browse": "Browsing radios",
+                    "instance": "Instance radios",
+                    "user": "User radios"
+                },
+                "link": {
+
+                },
+                "label": {
+                    "search": "Search",
+                    "tags": "Tags"
+                },
+                "button": {
+                    "search": "Search",
+                    "create": "Create your own radio",
+                    "add": "Create a radio"
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Order",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "pagination": {
+                    "results": "Results per page"
+                },
+                "empty": {
+                    "noResults": "No results matching your query"
+                }
             },
             "TagDetail": {
-                "moderationLink": "Open in moderation interface",
-                "artistsLabel": "Artists",
-                "channelsLabel": "Channels",
-                "albumsLabel": "Albums",
-                "tracksLabel": "Tracks"
+                "link": {
+                    "moderation": "Open in moderation interface",
+                    "artists": "Artists",
+                    "albums": "Albums"
+                },
+                "header": {
+                    "channels": "Channels",
+                    "tracks": "Tracks"
+                }
             },
             "TagSelector": {
-                "searchPlaceholder": "Search…"
+                "placeholder": {
+                    "search": "Search…"
+                }
             },
             "TrackBase": {
                 "title": "Track",
-                "downloadLabel": "Download",
-                "moreLabel": "More…",
-                "playButton": "Play",
-                "embedModalHeader": "Embed this track on your website",
-                "cancelButton": "Cancel",
-                "domainViewLink":"View on {domain}",
-                "embedButton": "Embed",
-                "wikipediaLink":"Search on Wikipedia",
-                "discogsLink":"Search on Discogs",
-                "musicbrainzLink":"View on MusicBrainz",
-                "editButton": "Edit",
-                "deleteButton": "Delete",
-                "deleteModalHeader": "Delete this track?",
-                "deleteModalMessage": "The track will be deleted, as well as any related files and data. This action is irreversible.",
-                "moderationLink": "Open in moderation interface",
-                "djangoLink": "View in Django's admin"
+                "button": {
+                    "download": "Download",
+                    "more": "More…",
+                    "play": "Play",
+                    "cancel": "Cancel",
+                    "embed": "Embed",
+                    "edit": "Edit",
+                    "delete": "Delete"
+                },
+                "link": {
+                    "domain":"View on {domain}",
+                    "wikipedia":"Search on Wikipedia",
+                    "discogs":"Search on Discogs",
+                    "musicbrainz":"View on MusicBrainz",
+                    "moderation": "Open in moderation interface",
+                    "django": "View in Django's admin"
+                },
+                "modal": {
+                    "embed": {
+                        "header": "Embed this track on your website"
+                    },
+                    "delete": {
+                        "header": "Delete this track?",
+                        "content": {
+                            "warning": "The track will be deleted, as well as any related files and data. This action is irreversible."
+                        }
+                    }
+                }
             },
             "TrackDetail": {
-                "trackDetails": "Track details",
-                "episodeDetails": "Episode details",
-                "durationTableHeader": "Duration",
                 "notApplicable": "N/A",
-                "sizeTableLabel": "Size",
-                "codecTableLabel": "Codec",
-                "bitrateTableLabel": "Bitrate",
-                "uploadBitrateTableLabel": "{bitrate}/s",
-                "downloadsTableLabel": "Downloads",
-                "copyrightTableLabel": "Copyright",
-                "yearTableLabel": "Year",
-                "licenseTableLabel": "License",
-                "urlTableLabel": "URL",
-                "releaseDetailsHeader": "Release Details",
-                "artistTableLabel": "Artist",
-                "albumTableLabel": "Album",
-                "seriesTableLabel": "Serie",
-                "musicbrainzLink": "View on MusicBrainz",
-                "relatedPlaylistsHeader": "Related Playlists",
-                "userLibraryHeader": "Related libraries",
-                "userLibraryDescription": "This track is present in the following libraries:"
+                "header": {
+                    "track": "Track details",
+                    "episode": "Episode details",
+                    "release": "Release Details",
+                    "playlists": "Related Playlists",
+                    "library": "Related libraries"
+                },
+                "description": {
+                    "library": "This track is present in the following libraries:"
+                },
+                "link": {
+                    "musicbrainz": "View on MusicBrainz"
+                },
+                "table": {
+                    "track": {
+                        "duration": "Duration",
+                        "size": "Size",
+                        "codec": "Codec",
+                        "bitrate": {
+                            "label": "Bitrate",
+                            "value": "{bitrate}/s"
+                        },
+                        "downloads": "Downloads"
+                    },
+                    "release": {
+                        "copyright": "Copyright",
+                        "year": "Year",
+                        "license": "License",
+                        "url": "URL",
+                        "artist": "Artist",
+                        "album": "Album",
+                        "series": "Serie"
+                    }
+                }
             },
             "TrackEdit": {
-                "editTrackHeader": "Edit this track",
-                "suggestEditHeader": "Suggest an edit on this track",
-                "remoteObjectWarning":"This object is managed by another server, you cannot edit it."
+                "header": {
+                    "edit": "Edit this track",
+                    "suggest": "Suggest an edit on this track"
+                },
+                "message": {
+                    "remote":" This object is managed by another server, you cannot edit it."
+                }
             },
             "radios": {
                 "Builder": {
                     "title": "Radio Builder",
-                    "descriptionPlaceholder": "My awesome description",
-                    "namePlaceholder": "My awesome radio",
-                    "builderHeader": "Builder",
-                    "builderDescription": "You can use this interface to build your own custom radio, which will play tracks according to your criteria.",
-                    "radioUpdateSuccess": "Radio updated",
-                    "radioCreateSuccess": "Radio created",
-                    "radioNameLabel": "Radio name",
-                    "radioDescriptionLabel": "Description",
-                    "publicLabel": "Display publicly",
-                    "saveButton": "Save",
-                    "addFiltersLabel": "Add filters to customize your radio",
-                    "selectFilterLabel": "Select a filter",
-                    "addFilterButton": "Add filter",
-                    "filterNameTableHeader": "Filter name",
-                    "excludeTableHeader": "Exclude",
-                    "configTableHeader": "Config",
-                    "candidatesTableHeader": "Candidates",
-                    "actionsTableHeader": "Actions",
-                    "matchingTracks": "{count} track matching combined filters | {count} tracks matching combined filters"
+                    "placeholder": {
+                        "name": "My awesome radio",
+                        "description": "My awesome description"
+                    },
+                    "header": {
+                        "builder": "Builder",
+                        "updated": "Radio updated",
+                        "created": "Radio created",
+                        "matches": "{count} track matching combined filters | {count} tracks matching combined filters"
+                    },
+                    "description": {
+                        "builder": "You can use this interface to build your own custom radio, which will play tracks according to your criteria."
+                    },
+                    "label": {
+                        "name": "Radio name",
+                        "description": "Description",
+                        "public": "Display publicly",
+                        "filter": "Add filters to customize your radio"
+                    },
+                    "button": {
+                        "save": "Save",
+                        "filter": "Add filter"
+                    },
+                    "option": {
+                        "filter": "Select a filter"
+                    },
+                    "table": {
+                        "filter": {
+                            "header": {
+                                "name": "Filter name",
+                                "exclude": "Exclude",
+                                "config": "Config",
+                                "candidates": "Candidates",
+                                "actions": "Actions"
+                            }
+                        }
+                    }
                 },
                 "Filter": {
                     "excludeLabel": "Exclude",
@@ -1367,469 +1991,914 @@
         },
         "manage": {
             "ChannelsTable": {
-                "searchPlaceholder": "Search by domain, name, account…",
-                "openModeration": "Open in moderation interface",
-                "searchLabel": "Search",
-                "categoryLabel": "Category",
-                "allOption": "All",
-                "orderingLabel": "Ordering",
-                "orderingDirectionLabel": "Ordering direction",
-                "ascendingOrdering": "Ascending",
-                "descendingOrdering": "Descending",
-                "nameTableHeader": "Name",
-                "accountTableHeader": "Account",
-                "domainTableHeader": "Domain",
-                "albumsTableHeader": "Albums",
-                "tracksTableHeader": "Tracks",
-                "creationDateTableHeader": "Creation date",
-                "localLink": "Local",
-                "resultsDisplay": "Showing results {start}-{end} on {total}"
+                "placeholder": {
+                    "search": "Search by domain, name, account…"
+                },
+                "link": {
+                    "moderation": "Open in moderation interface",
+                    "local": "Local"
+                },
+                "label": {
+                    "search": "Search",
+                    "category": "Category"
+                },
+                "option": {
+                    "all": "All"
+                },
+                "ordering": {
+                    "label": "Ordering",
+                    "direction": {
+                        "label": "Ordering direction",
+                        "ascending": "Ascending",
+                        "descending": "Descending"
+                    }
+                },
+                "table": {
+                    "channel": {
+                        "header": {
+                            "name": "Name",
+                            "account": "Account",
+                            "domain": "Domain",
+                            "albums": "Albums",
+                            "tracks": "Tracks",
+                            "creationDate": "Creation date"
+                        }
+                    }
+                },
+                "pagination": {
+                    "results": "Showing results {start}-{end} on {total}"
+                }
             },
             "library": {
                 "AlbumsTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected albums will be removed, as well as associated tracks, uploads, favorites and listening history. This action is irreversible.",
-                    "searchPlaceholder": "Search by domain, title, artist, MusicBrainz ID…",
-                    "openModeration": "Open in moderation interface",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "artistTableHeader": "Artist",
-                    "domainTableHeader": "Domain",
-                    "tracksTableHeader": "Tracks",
-                    "releaseDateTableHeader": "Release date",
-                    "creationDateTableHeader": "Creation date",
-                    "localLink": "Local",
                     "notApplicable": "N/A",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by domain, title, artist, MusicBrainz ID…"
+                    },
+                    "link": {
+                        "moderation": "Open in moderation interface",
+                        "local": "Local"
+                    },
+                    "label": {
+                        "search": "Search"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected albums will be removed, as well as associated tracks, uploads, favorites and listening history. This action is irreversible."
+                        }
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "table": {
+                        "album": {
+                            "header": {
+                                "name": "Name",
+                                "artist": "Artist",
+                                "domain": "Domain",
+                                "tracks": "Tracks",
+                                "releaseDate": "Release date",
+                                "creationDate": "Creation date"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "ArtistsTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected artist will be removed, as well as associated tracks, uploads, favorites and listening history. This action is irreversible.",
-                    "searchPlaceholder": "Search by domain, name, MusicBrainz ID…",
-                    "searchLabel": "Search",
-                    "categoryLabel": "Category",
-                    "allOption": "All",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "domainTableHeader": "Domain",
-                    "albumsTableHeader": "Albums",
-                    "tracksTableHeader": "Tracks",
-                    "creationDateTableHeader": "Creation date",
-                    "localLink": "Local",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by domain, name, MusicBrainz ID…"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected artist will be removed, as well as associated tracks, uploads, favorites and listening history. This action is irreversible."
+                        }
+                    },
+                    "label": {
+                        "search": "Search",
+                        "category": "Category"
+                    },
+                    "option": {
+                        "all": "All"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "table": {
+                        "artist": {
+                            "header": {
+                                "name": "Name",
+                                "domain": "Domain",
+                                "albums": "Albums",
+                                "tracks": "Tracks",
+                                "creationDate": "Creation date"
+                            }
+                        }
+                    },
+                    "link": {
+                        "local": "Local"
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "EditsCardList": {
-                    "searchPlaceholder": "Search by account, summar, domain…",
-                    "searchLabel": "Search",
-                    "statusLabel": "Status",
-                    "allOption": "All",
-                    "pendingReviewLabel": "Pending review",
-                    "approvedLabel": "Approved",
-                    "rejectedLabel": "Rejected",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Order",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by account, summary, domain…"
+                    },
+                    "label": {
+                        "search": "Search",
+                        "status": "Status"
+                    },
+                    "option": {
+                        "all": "All",
+                        "pending": "Pending review",
+                        "approved": "Approved",
+                        "rejected": "Rejected"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Order",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "LibrariesTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected library will be removed, as well as associated uploads and follows. This action is irreversible.",
-                    "searchPlaceholder": "Search by domain, actor, name, description…",
-                    "searchLabel": "Search",
-                    "visibilityLabel": "Visibility",
-                    "allOption": "All",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "accountTableHeader": "Account",
-                    "domainTableHeader": "Domain",
-                    "visibilityTableHeader": "Visibility",
-                    "uploadsTableHeader": "Uploads",
-                    "followersTableHeader": "Followers",
-                    "creationDateTableHeader": "Creation date",
-                    "localLink": "Local",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by domain, actor, name, description…"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected library will be removed, as well as associated uploads and follows. This action is irreversible."
+                        }
+                    },
+                    "label": {
+                        "search": "Search",
+                        "visibility": "Visibility"
+                    },
+                    "option": {
+                        "all": "All"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "link": {
+                        "local": "Local"
+                    },
+                    "table": {
+                        "library": {
+                            "header": {
+                                "name": "Name",
+                                "account": "Account",
+                                "domain": "Domain",
+                                "visibility": "Visibility",
+                                "uploads": "Uploads",
+                                "followers": "Followers",
+                                "creationDate": "Creation date"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "TagsTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected tag will be removed and unlinked with existing content, if any. This action is irreversible.",
-                    "searchPlaceholder": "Search by name",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "artistsTableHeader": "Artists",
-                    "albumsTableHeader": "Albums",
-                    "tracksTableHeader": "Tracks",
-                    "creationDateTableHeader": "Creation date",
-                    "localLink": "Local",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by name"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected tag will be removed and unlinked with existing content, if any. This action is irreversible."
+                        }
+                    },
+                    "label": {
+                        "search": "Search"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "link": {
+                        "local": "Local"
+                    },
+                    "table": {
+                        "tag": {
+                            "header": {
+                                "name": "Name",
+                                "artists": "Artists",
+                                "albums": "Albums",
+                                "tracks": "Tracks",
+                                "creationDate": "Creation date"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "TracksTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected tracks will be removed, as well as associated uploads, favorites and listening history. This action is irreversible.",
-                    "searchPlaceholder": "Search by domain, title, artist, album, MusicBrainz ID…",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "titleTableHeader": "Title",
-                    "albumTableHeader": "Album",
-                    "artistTableHeader": "Artist",
-                    "domainTableHeader": "Domain",
-                    "licenseTableHeader": "License",
-                    "creationDateTableHeader": "Creation date",
-                    "localLink": "Local",
-                    "notApplicable": "N/A",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by domain, title, artist, album, MusicBrainz ID…"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected tracks will be removed, as well as associated uploads, favorites and listening history. This action is irreversible."
+                        }
+                    },
+                    "label": {
+                        "search": "Search"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "link": {
+                        "local": "Local"
+                    },
+                    "table": {
+                        "track": {
+                            "header": {
+                                "title": "Title",
+                                "album": "Album",
+                                "artist": "Artist",
+                                "domain": "Domain",
+                                "license": "License",
+                                "creationDate": "Creation date"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    },
+                    "notApplicable": "N/A"
                 },
                 "UploadsTable": {
-                    "deleteActionLabel": "Delete",
-                    "deleteActionConfirmation": "The selected upload will be removed. This action is irreversible.",
-                    "searchPlaceholder": "Search by domain, actor, name, reference, source…",
-                    "searchLabel": "Search",
-                    "visibilityLabel": "Visibility",
-                    "importStatusLabel": "Import status",
-                    "allOption": "All",
-                    "pendingStatus": "Pending",
-                    "skippedStatus": "Skipped",
-                    "failedStatus": "Failed",
-                    "finishedStatus": "Finished",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "libraryTableHeader": "Library",
-                    "accountTableHeader": "Account",
-                    "domainTableHeader": "Domain",
-                    "visibilityTableHeader": "Visibility",
-                    "importStatusTableHeader": "Import status",
-                    "sizeTableHeader": "Size",
-                    "creationDateTableHeader": "Creation date",
-                    "accessedDateTableHeader": "Accessed date",
-                    "localLink": "Local",
-                    "notApplicable": "N/A",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "placeholder": {
+                        "search": "Search by domain, actor, name, reference, source…"
+                    },
+                    "action": {
+                        "delete": {
+                            "label": "Delete",
+                            "warning": "The selected upload will be removed. This action is irreversible."
+                        }
+                    },
+                    "label": {
+                        "search": "Search",
+                        "visibility": "Visibility",
+                        "status": "Import status"
+                    },
+                    "option": {
+                        "all": "All",
+                        "pending": "Pending",
+                        "skipped": "Skipped",
+                        "failed": "Failed",
+                        "finished": "Finished"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "link": {
+                        "local": "Local"
+                    },
+                    "table": {
+                        "upload": {
+                            "header": {
+                                "name": "Name",
+                                "library": "Library",
+                                "account": "Account",
+                                "domain": "Domain",
+                                "visibility": "Visibility",
+                                "importStatus": "Import status",
+                                "size": "Size",
+                                "creationDate": "Creation date",
+                                "accessedDate": "Accessed date"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    },
+                    "notApplicable": "N/A"
                 }
             },
             "moderation": {
                 "AccountsTable": {
-                    "purgeLabel": "Purge",
-                    "searchPlaceholder": "Search by domain, username, bio…",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "domainTableHeader": "Domain",
-                    "uploadsTableHeader": "Uploads",
-                    "firstSeenTableHeader": "First seen",
-                    "lastSeenTableHeader": "Last seen",
-                    "moderationRuleTableHeader": "Under moderation rule",
-                    "localLink": "Local account",
-                    "moderationRuleStatus": "Yes",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "action": {
+                        "purge": {
+                            "label": "Purge"
+                        }
+                    },
+                    "placeholder": {
+                        "search": "Search by domain, username, bio…"
+                    },
+                    "label": {
+                        "search": "Search"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "link": {
+                        "local": "Local account"
+                    },
+                    "table": {
+                        "account": {
+                            "header": {
+                                "name": "Name",
+                                "domain": "Domain",
+                                "uploads": "Uploads",
+                                "firstSeen": "First seen",
+                                "lastSeen": "Last seen",
+                                "moderationRule": "Under moderation rule"
+                            },
+                            "moderationRule": "Yes"
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "DomainsTable": {
-                    "purgeLabel": "Purge",
-                    "allowListAddLabel": "Add to allow-list",
-                    "allowListRemoveLabel": "Remove from allow-list",
-                    "searchPlaceholder": "Search by name…",
-                    "allowListTitle": "This domain is present in your allow-list",
-                    "searchLabel": "Search",
-                    "inAllowListLabel": "Is present on allow-list",
-                    "allOption": "All",
-                    "positiveOption": "Yes",
-                    "negativeOption": "No",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Ordering direction",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "nameTableHeader": "Name",
-                    "usersTableHeader": "Users",
-                    "receivedMessagesTableHeader": "Received messages",
-                    "firstSeenTableHeader": "First seen",
-                    "moderationRuleTableHeader": "Under moderation rule",
-                    "moderationRuleStatus": "Yes",
-                    "emptyState": "No other pods found",
-                    "resultsDisplay": "Showing results {start}-{end} on {total}"
+                    "action": {
+                        "purge": {
+                            "label": "Purge"
+                        },
+                        "add": {
+                            "label": "Add to allow-list"
+                        },
+                        "remove": {
+                            "label": "Remove from allow-list"
+                        }
+                    },
+                    "placeholder": {
+                        "search": "Search by name…"
+                    },
+                    "link": {
+                        "list": "This domain is present in your allow-list"
+                    },
+                    "label": {
+                        "search": "Search",
+                        "inList": "Is present on allow-list"
+                    },
+                    "option": {
+                        "all": "All",
+                        "yes": "Yes",
+                        "no": "No"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "table": {
+                        "domain": {
+                            "header": {
+                                "name": "Name",
+                                "users": "Users",
+                                "receivedMessages": "Received messages",
+                                "firstSeen": "First seen",
+                                "moderationRule": "Under moderation rule"
+                            },
+                            "moderationRule": "Yes"
+                        }
+                    },
+                    "empty": {
+                        "noPods": "No other pods found"
+                    },
+                    "pagination": {
+                        "results": "Showing results {start}-{end} on {total}"
+                    }
                 },
                 "InstancePolicyCard": {
-                    "enabledStatus": "Enabled",
-                    "pausedStatus": "Paused",
-                    "ruleHeader": "Rule",
-                    "blockAllRule": "Block everything",
-                    "muteActivityRule": "Mute activity",
-                    "muteNotificationsRule": "Mute notifications",
-                    "rejectMediaRule": "Reject media",
-                    "ruleReason": "Reason",
-                    "editButton": "Edit"
+                    "status": {
+                        "enabled": "Enabled",
+                        "paused": "Paused"
+                    },
+                    "button": {
+                        "edit": "Edit"
+                    },
+                    "header": {
+                        "rule": "Rule"
+                    },
+                    "label": {
+                        "blockAll": "Block everything",
+                        "muteActivity": "Mute activity",
+                        "muteNotifications": "Mute notifications",
+                        "rejectMedia": "Reject media",
+                        "reason": "Reason"
+                    }
                 },
                 "InstancePolicyForm": {
-                    "summaryHelp": "Explain why you're applying this policy: this will help you remember why you added this rule. Depending on your pod configuration, this may be displayed publicly to help users understand the moderation rules in place.",
-                    "isActiveHelp": "Use this setting to temporarily enable/disable the policy without completely removing it.",
-                    "blockAllHelp": "Block everything from this account or domain. This will prevent any interaction with the entity, and purge related content (uploads, libraries, follows, etc.",
-                    "silenceActivityLabel": "Mute activity",
-                    "silenceActivityHelp": "Hide account or domain content, except from followers.",
-                    "silenceNotificationsLabel": "Mute notifications",
-                    "silenceNotificationsHelp": "Prevent account or domain from triggering notifications, except from followers.",
-                    "rejectMediaLabel": "Reject media",
-                    "rejectMediaHelp": "Hide account or domain content, except from followers.",
-                    "editRuleHeader": "Edit moderation rule",
-                    "addRuleHeader": "Add a new moderation rule",
-                    "createRuleFailureHeader": "Error while creating rule",
-                    "policyEnabled": "Enabled",
-                    "policyDisabled": "Disabled",
-                    "policyReasonLabel": "Reason",
-                    "blockAllLabel": "Block everything",
-                    "customizeRuleMessage": "Or customize your rule",
-                    "cancelButton": "Cancel",
-                    "updateButton": "Update",
-                    "createButton": "Create",
-                    "deleteButton": "Delete",
-                    "deleteRuleModalHeader": "Delete this moderation rule?",
-                    "deleteRuleModalMessage": "This action is irreversible",
-                    "deleteRuleModalConfirm": "Delete moderation rule"
+                    "tooltip": {
+                        "summary": "Explain why you're applying this policy: this will help you remember why you added this rule. Depending on your pod configuration, this may be displayed publicly to help users understand the moderation rules in place.",
+                        "isActive": "Use this setting to temporarily enable/disable the policy without completely removing it.",
+                        "blockAll": "Block everything from this account or domain. This will prevent any interaction with the entity, and purge related content (uploads, libraries, follows, etc.",
+                        "silenceActivity": "Hide account or domain content, except from followers.",
+                        "silenceNotifications": "Prevent account or domain from triggering notifications, except from followers.",
+                        "rejectMedia": "Hide account or domain content, except from followers."
+                    },
+                    "label": {
+                        "silenceActivity": "Mute activity",
+                        "silenceNotifications": "Mute notifications",
+                        "rejectMedia": "Reject media",
+                        "policyEnabled": "Enabled",
+                        "policyDisabled": "Disabled",
+                        "policyReason": "Reason",
+                        "blockAll": "Block everything",
+                        "customizeRule": "Or customize your rule"
+                    },
+                    "header": {
+                        "editRule": "Edit moderation rule",
+                        "addRule": "Add a new moderation rule",
+                        "failure": "Error while creating rule"
+                    },
+                    "button": {
+                        "cancel": "Cancel",
+                        "update": "Update",
+                        "create": "Create",
+                        "delete": "Delete",
+                        "confirm": "Delete moderation rule"
+                    },
+                    "modal": {
+                        "delete": {
+                            "header": "Delete this moderation rule?",
+                            "content": {
+                                "warning": "This action is irreversible"
+                            }
+                        }
+                    }
                 },
                 "InstancePolicyModal": {
-                    "moderationRulesHeader": "Moderation rules…",
-                    "manageRulesHeader": "Manage moderation rules for {obj}",
-                    "entityRulesHeader": "This entity is subject to specific moderation rules",
-                    "closeButton": "Close"
+                    "button": {
+                        "show": "Moderation rules…",
+                        "close": "Close"
+                    },
+                    "modal": {
+                        "manage": {
+                            "header": "Manage moderation rules for {obj}",
+                            "content": {
+                                "warning": "This entity is subject to specific moderation rules"
+                            }
+                        }
+                    }
                 },
                 "NoteForm": {
-                    "summaryPlaceholder": "Describe what actions have been taken, or any other related updates…",
-                    "submissionFailureHeader": "Error while submitting note",
-                    "addNoteButton": "Add note"
+                    "placeholder": {
+                        "summary": "Describe what actions have been taken, or any other related updates…"
+                    },
+                    "header": {
+                        "failure": "Error while submitting note"
+                    },
+                    "button": {
+                        "add": "Add note"
+                    }
                 },
                 "NotesThread": {
-                    "deleteButton": "Delete",
-                    "deleteModalHeader": "Delete this note?",
-                    "deleteModalMessage": "The note will be deleted. This action is irreversible."
+                    "button": {
+                        "delete": "Delete"
+                    },
+                    "modal": {
+                        "delete": {
+                            "header": "Delete this note?",
+                            "content": {
+                                "warning": "The note will be deleted. This action is irreversible."
+                            }
+                        }
+                    }
                 },
                 "ReportCard": {
-                    "deleteLabel": "Delete reported object",
-                    "deleteModalHeader": "Delete reported object?",
-                    "deleteModalMessage": "This will delete the object associated with this report and mark the report as resolved. The deletion is irreversible.",
-                    "deleteConfirmLabel": "Delete",
-                    "reportHeader": "Report {id}",
-                    "submittedByLabel": "Submitted by",
-                    "categoryLabel": "Category",
-                    "creationDateLabel": "Creation date",
-                    "statusLabel": "Status",
-                    "resolvedStatus": "Resolved",
-                    "unresolvedStatus": "Unresolved",
-                    "assignedToLabel": "Assigned to",
-                    "notApplicable": "N/A",
-                    "resolutionDateLabel": "Resolution date",
-                    "internalNotesLabel": "Internal notes",
-                    "messageHeader": "Message",
-                    "reportedObjectHeader": "Reported object",
-                    "objectDeletedWarning": "The object associated with this report was deleted.",
-                    "publicPageLink": "View public page",
-                    "moderationLink": "Open in moderation interface",
-                    "objectTypeLabel": "Type",
-                    "objectOwnerLabel": "Owner",
-                    "accountLabel": "Account",
-                    "domainLabel": "Domain",
-                    "localLabel": "Local",
-                    "actionsLabel": "Actions",
-                    "resolveLabel": "Resolve",
-                    "unresolveLabel": "Unresolve"
+                    "modal": {
+                        "delete": {
+                            "header": "Delete reported object?",
+                            "content": {
+                                "warning": "This will delete the object associated with this report and mark the report as resolved. The deletion is irreversible."
+                            }
+                        }
+                    },
+                    "button": {
+                        "delete": "Delete reported object",
+                        "resolve": "Resolve",
+                        "unresolve": "Unresolve",
+                        "confirmDelete": "Delete"
+                    },
+                    "link": {
+                        "report": "Report {id}",
+                        "publicPage": "View public page",
+                        "moderation": "Open in moderation interface"
+                    },
+                    "table": {
+                        "report": {
+                            "submittedBy": "Submitted by",
+                            "category": "Category",
+                            "creationDate": "Creation date"
+                        },
+                        "status": {
+                            "status": "Status",
+                            "resolved": "Resolved",
+                            "unresolved": "Unresolved",
+                            "assignedTo": "Assigned to",
+                            "resolutionDate": "Resolution date",
+                            "internalNotes": "Internal notes"
+                        },
+                        "object": {
+                            "type": "Type",
+                            "owner": "Owner",
+                            "account": "Account",
+                            "domain": "Domain",
+                            "local": "Local"
+                        }
+                    },
+                    "header": {
+                        "message": "Message",
+                        "reportedObject": "Reported object",
+                        "notes": "Internal notes",
+                        "actions": "Actions"
+                    },
+                    "warning": {
+                        "objectDeleted": "The object associated with this report was deleted."
+                    },
+                    "notApplicable": "N/A"
                 },
                 "UserRequestCard": {
-                    "requestHeader": "Request {id}",
-                    "submittedByLabel": "Submitted by",
-                    "creationDateLabel": "Creation date",
-                    "statusLabel": "Status",
-                    "pendingStatus": "Pending",
-                    "refusedStatus": "Refused",
-                    "approvedStatus": "Approved",
-                    "assignedToLabel": "Assigned to",
+                    "link": {
+                        "request": "Request {id}"
+                    },
+                    "table": {
+                        "request": {
+                            "submittedBy": "Submitted by",
+                            "creationDate": "Creation date"
+                        },
+                        "status": {
+                            "status": "Status",
+                            "pending": "Pending",
+                            "refused": "Refused",
+                            "approved": "Approved",
+                            "assignedTo": "Assigned to",
+                            "resolutionDate":"Resolution date",
+                            "internalNotes": "Internal notes"
+                        }
+                    },
                     "notApplicable": "N/A",
-                    "resolutionDateLabel":"Resolution date",
-                    "internalNotesLabel": "Internal notes",
-                    "messageHeader": "Message",
-                    "messageBody": "This user wants to sign-up on your pod.",
-                    "actionsHeader": "Actions",
-                    "approveButton": "Approve",
-                    "rejectButton": "Refuse"
+                    "header": {
+                        "signup": "Message",
+                        "actions": "Actions",
+                        "notes": "Internal notes"
+                    },
+                    "message": {
+                        "signup": "This user wants to sign-up on your pod."
+                    },
+                    "button": {
+                        "approve": "Approve",
+                        "reject": "Refuse"
+                    }
                 }
             },
             "users": {
                 "InvitationForm": {
-                    "placeholder": "Leave empty for a random code",
-                    "inviteCreateFailureHeader": "Error while creating invitation",
-                    "invitationCodeLabel": "Invitation code",
-                    "newInviteCodeButton": "Get a new invitation",
-                    "codeLabel": "Code",
-                    "shareLinkLabel": "Share link",
-                    "clearButton": "Clear"
+                    "placeholder": {
+                        "invitation": "Leave empty for a random code"
+                    },
+                    "header": {
+                        "failure": "Error while creating invitation"
+                    },
+                    "button": {
+                        "clear": "Clear",
+                        "new": "Get a new invitation"
+                    },
+                    "label": {
+                        "invite": "Invitation code"
+                    },
+                    "table": {
+                        "invitation": {
+                            "header": {
+                                "code": "Code",
+                                "link": "Share link"
+                            }
+                        }
+                    }
                 },
                 "InvitationsTable": {
-                    "deleteLabel": "Delete",
-                    "searchPlaceholder": "Search by username, e-mail address, code…",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "statusLabel": "Status",
-                    "allOption": "All",
-                    "openStatus": "Open",
-                    "expiredStatus": "Expired/used",
-                    "ownerTableHeader": "Owner",
-                    "statusTableHeader": "Status",
-                    "creationDateTableHeader":"Creation date",
-                    "expirationDateTableHeader": "Expiration date",
-                    "codeTableHeader": "Code",
-                    "usedStatusLabel": "Used",
-                    "expiredStatusLabel": "Expired",
-                    "unusedStatusLabel": "Not used",
-                    "resultsDisplay": "Showing one result | Showing results {start} to {end} from {total}"
+                    "action": {
+                        "delete": "Delete"
+                    },
+                    "placeholder": {
+                        "search": "Search by username, e-mail address, code…"
+                    },
+                    "label": {
+                        "search": "Search",
+                        "status": "Status",
+                        "used": "Used",
+                        "expired": "Expired",
+                        "unused": "Not used"
+                    },
+                    "ordering": {
+                        "label": "Ordering"
+                    },
+                    "option": {
+                        "all": "All",
+                        "open": "Open",
+                        "expired": "Expired/used"
+                    },
+                    "table": {
+                        "invitation": {
+                            "header": {
+                                "owner": "Owner",
+                                "status": "Status",
+                                "creationDate":"Creation date",
+                                "expirationDate": "Expiration date",
+                                "code": "Code"
+                            }
+                        }
+                    },
+                    "pagination": {
+                        "results": "Showing one result | Showing results {start} to {end} from {total}"
+                    }
                 },
                 "UsersTable": {
-                    "libraryLabel": "Library",
-                    "moderationLabel": "Moderation",
-                    "settingsLabel": "Settings",
-                    "searchPlaceholder": "Search by username, e-mail address, name…",
-                    "searchLabel": "Search",
-                    "orderingLabel": "Ordering",
-                    "orderingDirectionLabel": "Order",
-                    "ascendingOrdering": "Ascending",
-                    "descendingOrdering": "Descending",
-                    "usernameTableHeader": "Username",
-                    "emailTableHeader": "Email",
-                    "accountStatusTableHeader": "Account status",
-                    "signupTableHeader": "Sign-up",
-                    "lastActivityTableHeader": "Last activity",
-                    "permissionsTableHeader": "Permissions",
-                    "statusTableHeader": "Status",
-                    "activeStatus": "Active",
-                    "inactiveStatus": "Inactive",
+                    "permission": {
+                        "library": "Library",
+                        "moderation": "Moderation",
+                        "settings": "Settings"
+                    },
+                    "placeholder": {
+                        "search": "Search by username, e-mail address, name…"
+                    },
+                    "label": {
+                        "search": "Search"
+                    },
+                    "ordering": {
+                        "label": "Ordering",
+                        "direction": {
+                            "label": "Ordering direction",
+                            "ascending": "Ascending",
+                            "descending": "Descending"
+                        }
+                    },
+                    "table": {
+                        "user": {
+                            "header": {
+                                "username": "Username",
+                                "email": "Email",
+                                "accountStatus": "Account status",
+                                "signup": "Sign-up",
+                                "lastActivity": "Last activity",
+                                "permissions": "Permissions",
+                                "status": "Status"
+                            },
+                            "accountStatus": {
+                                "active": "Active",
+                                "inactive": "Inactive"
+                            },
+                            "status": {
+                                "admin": "Admin",
+                                "staff": "Staff member",
+                                "regular": "Regular user"
+                            }
+                        }
+                    },
                     "notApplicable": "N/A",
-                    "adminPermission": "Admin",
-                    "staffPermission": "Staff member",
-                    "regularPermission": "Regular user",
-                    "resultsDisplay": "Showing one result | Showing results {start} to {end} from {total}"
+                    "pagination": {
+                        "results": "Showing one result | Showing results {start} to {end} from {total}"
+                    }
                 }
             }
         },
         "moderation": {
             "FilterModal": {
-                "contentSuccessMessage": "Content filter successfully added",
-                "hideContentHeader": "Do you want to hide content from artist \"{name}\"?",
-                "filterCreateFailureHeader": "Error while creating filter",
-                "filterCreateWarning": "You will not see tracks, albums and user activity linked to this artist any more:",
-                "filterWarningList1": "In other users favorites and listening history",
-                "filterWarningList2": "In \"Recently added\" widget",
-                "filterWarningList3": "In artists and album listings",
-                "filterWarningList4": "In radio suggestions",
-                "filterCreateHelp": "You can manage your filters any time from your account settings.",
-                "cancelButton": "Cancel",
-                "hideContentButton": "Hide content"
+                "message": {
+                    "success": "Content filter successfully added"
+                },
+                "header": {
+                    "modal": "Do you want to hide content from artist \"{name}\"?",
+                    "failure": "Error while creating filter"
+                },
+                "warning": {
+                    "createFilter": {
+                        "listIntro": "You will not see tracks, albums and user activity linked to this artist any more:",
+                        "listItem1": "In other users favorites and listening history",
+                        "listItem2": "In \"Recently added\" widget",
+                        "listItem3": "In artists and album listings",
+                        "listItem4": "In radio suggestions"
+                    }
+                },
+                "help": {
+                    "createFilter": "You can manage your filters any time from your account settings."
+                },
+                "button": {
+                    "cancel": "Cancel",
+                    "hide": "Hide content"
+                }
             },
             "ReportCategoryDropdown": {
-                "allOption": "All",
-                "categoryLabel": "Category"
+                "label": {
+                    "category": "Category"
+                },
+                "option": {
+                    "all": "All"
+                }
             },
             "ReportModal": {
-                "reportSubmitSuccessMessage": "Report successfully submitted, thank you",
-                "nodeinfoFetchFailure": "Cannot fetch Node Info: {error}",
-                "reportModalHeader": "Do you want to report this object?",
-                "submissionFailureHeader": "Error while submitting report",
-                "reportModalDescription": "Use this form to submit a report to our moderation team",
-                "emailLabel": "Email",
-                "emailDescription": "We'll use this e-mail address if we need to contact you regarding this report.",
-                "messageLabel": "Message",
-                "messageDescription": "Use this field to provide additional context to the moderator that will handle your report.",
-                "forwardToDomainLabel": "Forward to {domain}",
-                "forwardToDomainDescription": "Forward an anonymized copy of your report to the server hosting this element.",
-                "anonymousReportsDisabled": "Anonymous reports are disabled, please sign-in to submit a report.",
-                "cancelButton": "Cancel",
-                "submitReportButton": "Submit report"
+                "message": {
+                    "submissionSuccess": "Report successfully submitted, thank you"
+                },
+                "error": {
+                    "nodeinfoFetch": "Cannot fetch Node Info: {error}"
+                },
+                "header": {
+                    "modal": "Do you want to report this object?",
+                    "submissionFailure": "Error while submitting report",
+                    "disabled": "Anonymous reports are disabled, please sign-in to submit a report."
+                },
+                "description": {
+                    "modal": "Use this form to submit a report to our moderation team",
+                    "email": "We'll use this e-mail address if we need to contact you regarding this report.",
+                    "message": "Use this field to provide additional context to the moderator that will handle your report.",
+                    "forwardToDomain": "Forward an anonymized copy of your report to the server hosting this element."
+                },
+                "label": {
+                    "email": "Email",
+                    "message": "Message",
+                    "forwardToDomain": "Forward to {domain}"
+                },
+                "button": {
+                    "cancel": "Cancel",
+                    "submit": "Submit report"
+                }
             }
         },
         "notifications": {
             "NotificationRow": {
-                "libraryFollowMessage": "{username} followed your library \"{library}\"",
-                "libraryAcceptFollowMessage": "{username} accepted your follow on library \"{library}\"",
-                "libraryRejectMessage": "You rejected {username}'s request to follow \"{library}\"",
-                "libraryPendingFollowMessage": "{username} wants to follow your library \"{library}\"",
-                "markRead": "Mark as read",
-                "markUnread": "Mark as unread",
-                "reject": "Reject",
-                "approve": "Approve"
+                "button": {
+                    "markRead": "Mark as read",
+                    "markUnread": "Mark as unread",
+                    "reject": "Reject",
+                    "approve": "Approve"
+                },
+                "message": {
+                    "libraryFollow": "{username} followed your library \"{library}\"",
+                    "libraryAcceptFollow": "{username} accepted your follow on library \"{library}\"",
+                    "libraryReject": "You rejected {username}'s request to follow \"{library}\"",
+                    "libraryPendingFollow": "{username} wants to follow your library \"{library}\""
+                }
             }
         },
         "playlists": {
             "Card": {
-                "trackCount":"No tracks | {tracks_count} track | {tracks_count} tracks"
+                "meta": {
+                    "tracks":"No tracks | {tracks_count} track | {tracks_count} tracks"
+                }
             },
             "Editor": {
-                "copyTitle": "Copy the current queue to this playlist",
-                "editorHeader": "Playlist editor",
-                "syncingChangesMessage": "Syncing changes to server…",
-                "syncingChangesFailureMessage": "An error occurred while saving your changes",
-                "tracksExistWarning": "Some tracks in your queue are already in this playlist:",
-                "addAnywayButton": "Add anyways",
-                "syncedStatus": "Changes synced with server",
-                "insertCount": "Insert from queue ({count} track) | Insert from queue ({count} tracks)",
-                "clearPlaylistButton": "Clear playlist",
-                "clearPlaylistModalHeader": "Do you want to clear the playlist \"{playlist}\"?",
-                "clearPlaylistModalContent": "This will remove all tracks from this playlist and cannot be undone.",
-                "reorderTracks": "Drag and drop rows to reorder tracks in the playlist"
+                "button": {
+                    "copy": "Copy the current queue to this playlist",
+                    "addDuplicate": "Add anyways",
+                    "clear": "Clear playlist",
+                    "insertFromQueue": "Insert from queue ({count} track) | Insert from queue ({count} tracks)"
+                },
+                "header": {
+                    "editor": "Playlist editor"
+                },
+                "loading": {
+                    "sync": "Syncing changes to server…"
+                },
+                "error": {
+                    "sync": "An error occurred while saving your changes"
+                },
+                "warning": {
+                    "duplicate": "Some tracks in your queue are already in this playlist:"
+                },
+                "message": {
+                    "sync": "Changes synced with server"
+                },
+                "help": {
+                    "reorder": "Drag and drop rows to reorder tracks in the playlist"
+                },
+                "modal": {
+                    "clearPlaylist": {
+                        "header": "Do you want to clear the playlist \"{playlist}\"?",
+                        "content": {
+                            "warning": "This will remove all tracks from this playlist and cannot be undone."
+                        }
+                    }
+                }
             },
             "Form": {
-                "placeholder": "My awesome playlist",
-                "createPlaylistHeader": "Create a new playlist",
-                "updateSuccessHeader": "Playlist updated",
-                "createSuccessHeader": "Playlist created",
-                "createFailureHeader": "The playlist could not be created",
-                "playlistNameLabel": "Playlist name",
-                "playlistVisibilityLabel": "Playlist visiblity",
-                "updatePlaylistButton": "Update playlist",
-                "createPlaylistButton": "Create playlist"
+                "placeholder": {
+                    "name": "My awesome playlist"
+                },
+                "header": {
+                    "createPlaylist": "Create a new playlist",
+                    "updateSuccess": "Playlist updated",
+                    "createSuccess": "Playlist created",
+                    "createFailure": "The playlist could not be created"
+                },
+                "label": {
+                    "name": "Playlist name",
+                    "visibility": "Playlist visiblity"
+                },
+                "button": {
+                    "update": "Update playlist",
+                    "create": "Create playlist"
+                }
             },
             "PlaylistModal": {
-                "addToPlaylist": "Add to this playlist",
-                "filterPlaylistField": "Enter playlist name",
-                "addToPlaylistHeader": "Add to playlist",
-                "trackTitle": "{title}, by {artist}",
-                "managePlaylistsHeader": "Manage playlists",
-                "trackAlreadyInPlaylist": "<strong>{track}</strong> is already in <strong>{playlist}</strong>.",
-                "cancelButton": "Cancel",
-                "addAnywayButton": "Add anyways",
-                "trackAddFailureHeader": "The track can't be added to a playlist",
-                "availablePlaylistsHeader": "Available playlists",
-                "filterLabel": "Filter",
-                "editTableHeader": "Edit",
-                "nameTableHeader": "Name",
-                "lastModificationTableHeader": "Last modification",
-                "tracksTableHeader": "Tracks",
-                "addTrackButton": "Add track",
-                "emptyStateMessage": "No results matching your filter",
-                "noPlaylistsMessage": "No playlists have been created yet"
+                "placeholder": {
+                    "filterPlaylist": "Enter playlist name"
+                },
+                "button": {
+                    "addToPlaylist": "Add to this playlist",
+                    "addTrack": "Add track",
+                    "cancel": "Cancel",
+                    "addDuplicate": "Add anyways",
+                    "edit": "Edit"
+                },
+                "header": {
+                    "addToPlaylist":"Add to playlist",
+                    "track": "{title}, by {artist}",
+                    "manage": "Manage playlists",
+                    "addFailure": "The track can't be added to a playlist",
+                    "available": "Available playlists",
+                    "noResults": "No results matching your filter"
+                },
+                "warning": {
+                    "duplicate": "<strong>{track}</strong> is already in <strong>{playlist}</strong>."
+                },
+                "table": {
+                    "edit": {
+                        "header": {
+                            "edit": "Edit",
+                            "name": "Name",
+                            "lastModification": "Last modification",
+                            "tracks": "Tracks"
+                        }
+                    }
+                },
+                "label": {
+                    "filter": "Filter"
+                },
+                "empty": {
+                    "noPlaylists": "No playlists have been created yet"
+                }
             },
             "TrackPlaylistIcon": {
-                "addToPlaylist": "Add to playlist…"
+                "button": {
+                    "add": "Add to playlist…"
+                }
             },
             "Widget": {
-                "noPlaylistsMessage": "No playlists have been created yet",
-                "createPlaylistButton": "Create playlist",
-                "showMore": "Show more"
+                "placeholder": {
+                    "noPlaylists": "No playlists have been created yet"
+                },
+                "button": {
+                    "create": "Create playlist",
+                    "more": "Show more"
+                }
             }
         },
         "radios": {
@@ -1842,19 +2911,23 @@
                 "startRadio": "Play radio"
             },
             "Card": {
-                "editButton": "Edit"
+                "button": {
+                    "edit": "Edit"
+                }
             }
         },
         "tags": {
             "List": {
-                "showMoreTags": "Show 1 more tag | Show {count} more tags"
+                "button": {
+                    "more": "Show 1 more tag | Show {count} more tags"
+                }
             }
         },
         "vui": {
             "Pagination": {
-                "pagination": "Pagination",
-                "previousPage": "Previous Page",
-                "nextPage": "Next Page"
+                "label": "Pagination",
+                "previous": "Previous Page",
+                "next": "Next Page"
             }
         }
     },
@@ -2127,13 +3200,15 @@
     },
     "embed": {
         "EmbedFrame": {
-            "badResource": "idget improperly configured (bad resource type {type}).",
-            "missingResourceId": "Widget improperly configured (missing resource id).",
-            "trackNotFound": "Track not found.",
-            "unauthenticated": "You need to login to access this resource.",
-            "unknownServerError": "An unknown error occurred while loading track data from server.",
-            "trackUnavailable": "This track is unavailable.",
-            "unknownTrackError": "An unknown error occurred while loading track data."
+            "error": {
+                "badResource": "Widget improperly configured (bad resource type {type}).",
+                "missingResourceId": "Widget improperly configured (missing resource id).",
+                "trackNotFound": "Track not found.",
+                "unauthenticated": "You need to login to access this resource.",
+                "unknownServer": "An unknown error occurred while loading track data from server.",
+                "trackUnavailable": "This track is unavailable.",
+                "unknownTrack": "An unknown error occurred while loading track data."
+            }
         }
     },
     "init": {
diff --git a/front/src/style/globals/_utils.scss b/front/src/style/globals/_utils.scss
index d40dec459..693ce82b8 100644
--- a/front/src/style/globals/_utils.scss
+++ b/front/src/style/globals/_utils.scss
@@ -184,7 +184,7 @@ span.diff.removed {
     &.middle::after {
       padding: 0.25em;
       content: "·";
-    },
+    }
 
     &.nospace::after {
       content: "·";