From 55fec09e1be8a4da0c9993da25f35d396df8766c Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 15:37:28 +0100
Subject: [PATCH 01/16] Added context strings

---
 front/src/components/playlists/Card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/components/playlists/Card.vue b/front/src/components/playlists/Card.vue
index 344eb5fbf..70ac34097 100644
--- a/front/src/components/playlists/Card.vue
+++ b/front/src/components/playlists/Card.vue
@@ -16,7 +16,7 @@
         <duration :seconds="playlist.duration" />
          |
         <i class="sound icon"></i>
-        <translate
+        <translate :translate-context="'Content/*/Card/List item'"
           translate-plural="%{ count } tracks"
           :translate-n="playlist.tracks_count"
           :translate-params="{count: playlist.tracks_count}">

From c04da22518bcb78c167f508f682e392723ee503b Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 15:42:58 +0100
Subject: [PATCH 02/16] Added translation context

---
 front/src/components/playlists/Editor.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/front/src/components/playlists/Editor.vue b/front/src/components/playlists/Editor.vue
index 5b5311f14..fee9ef6b0 100644
--- a/front/src/components/playlists/Editor.vue
+++ b/front/src/components/playlists/Editor.vue
@@ -2,16 +2,16 @@
   <div class="ui text container">
     <playlist-form @updated="$emit('playlist-updated', $event)" :title="false" :playlist="playlist"></playlist-form>
     <h3 class="ui top attached header">
-      <translate>Playlist editor</translate>
+      <translate :translate-context="'Content/Playlist/Title'">Playlist editor</translate>
     </h3>
     <div class="ui attached segment">
       <template v-if="status === 'loading'">
         <div class="ui active tiny inline loader"></div>
-        <translate>Syncing changes to server…</translate>
+        <translate :translate-context="'Content/Playlist/Paragraph'">Syncing changes to server…</translate>
       </template>
       <template v-else-if="status === 'errored'">
         <i class="red close icon"></i>
-        <translate>An error occured while saving your changes</translate>
+        <translate :translate-context="'Content/Playlist/Error message.Title'">An error occured while saving your changes</translate>
         <div v-if="errors.length > 0" class="ui negative message">
           <ul class="list">
             <li v-for="error in errors">{{ error }}</li>
@@ -19,7 +19,7 @@
         </div>
       </template>
       <template v-else-if="status === 'saved'">
-        <i class="green check icon"></i> <translate>Changes synced with server</translate>
+        <i class="green check icon"></i> <translate :translate-context="'Content/Playlist/Paragraph'">Changes synced with server</translate>
       </template>
     </div>
     <div class="ui bottom attached segment">
@@ -29,7 +29,7 @@
         :class="['ui', {disabled: queueTracks.length === 0}, 'labeled', 'icon', 'button']"
         :title="labels.copyTitle">
           <i class="plus icon"></i>
-          <translate
+          <translate :translate-context="'Content/Playlist/Button.Label/Verb'"
             translate-plural="Insert from queue (%{ count } tracks)"
             :translate-n="queueTracks.length"
             :translate-params="{count: queueTracks.length}">
@@ -38,16 +38,16 @@
         </div>
 
       <dangerous-button :disabled="plts.length === 0" class="labeled right floated icon" color='yellow' :action="clearPlaylist">
-        <i class="eraser icon"></i> <translate>Clear playlist</translate>
+        <i class="eraser icon"></i> <translate :translate-context="'Content/Playlist/Button.Label/Verb'">Clear playlist</translate>
         <p slot="modal-header">
-          <translate :translate-params="{playlist: playlist.name}">Do you want to clear the playlist "%{ playlist }"?</translate>
+          <translate :translate-context="'Popup/Playlist/Title'" :translate-params="{playlist: playlist.name}">Do you want to clear the playlist "%{ playlist }"?</translate>
         </p>
-        <p slot="modal-content"><translate>This will remove all tracks from this playlist and cannot be undone.</translate></p>
-        <p slot="modal-confirm"><translate>Clear playlist</translate></p>
+        <p slot="modal-content"><translate :translate-context="'Popup/Playlist/Paragraph'">This will remove all tracks from this playlist and cannot be undone.</translate></p>
+        <p slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label'">Clear playlist</translate></p>
       </dangerous-button>
       <div class="ui hidden divider"></div>
       <template v-if="plts.length > 0">
-        <p><translate>Drag and drop rows to reorder tracks in the playlist</translate></p>
+        <p><translate :translate-context="'Content/Playlist/Paragraph/Call to action'">Drag and drop rows to reorder tracks in the playlist</translate></p>
         <table class="ui compact very basic fixed single line unstackable table">
           <draggable v-model="plts" element="tbody" @update="reorder">
             <tr v-for="(plt, index) in plts" :key="plt.id">
@@ -160,7 +160,7 @@ export default {
     }),
     labels () {
       return {
-        copyTitle: this.$gettext('Copy queued tracks to playlist')
+        copyTitle: this.$pgettext('Content/Playlist/Button.Tooltip/Verb', 'Copy queued tracks to playlist')
       }
     },
     status () {

From 279c941ee129da6497d2c58117f93715a925002b Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 15:47:41 +0100
Subject: [PATCH 03/16] Added context strings Minor rewording

---
 front/src/components/playlists/Form.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/front/src/components/playlists/Form.vue b/front/src/components/playlists/Form.vue
index 1fe974065..058a6fd11 100644
--- a/front/src/components/playlists/Form.vue
+++ b/front/src/components/playlists/Form.vue
@@ -1,29 +1,29 @@
 <template>
   <form class="ui form" @submit.prevent="submit()">
-    <h4 v-if="title" class="ui header"><translate>Create a new playlist</translate></h4>
+    <h4 v-if="title" class="ui header"><translate :translate-context="'Popup/Playlist/Title/Verb'">Create a new playlist</translate></h4>
     <div v-if="success" class="ui positive message">
       <div class="header">
         <template v-if="playlist">
-          <translate>Playlist updated</translate>
+          <translate :translate-context="'Content/Playlist/Message'">Playlist updated</translate>
         </template>
         <template v-else>
-          <translate>Playlist created</translate>
+          <translate :translate-context="'Content/Playlist/Message'">Playlist created</translate>
         </template>
       </div>
     </div>
     <div v-if="errors.length > 0" class="ui negative message">
-      <div class="header"><translate>We cannot create the playlist</translate></div>
+      <div class="header"><translate :translate-context="'Content/Playlist/Error message.Title'">The playlist could not be created</translate></div>
       <ul class="list">
         <li v-for="error in errors">{{ error }}</li>
       </ul>
     </div>
     <div class="three fields">
       <div class="field">
-        <label><translate>Playlist name</translate></label>
+        <label><translate :translate-context="'Content/Playlist/Input.Label'">Playlist name</translate></label>
         <input name="name" v-model="name" required type="text" :placeholder="labels.placeholder" />
       </div>
       <div class="field">
-        <label><translate>Playlist visibility</translate></label>
+        <label><translate :translate-context="'Content/Playlist/Dropdown.Label'">Playlist visibility</translate></label>
         <select class="ui dropdown" v-model="privacyLevel">
           <option :value="c.value" v-for="c in privacyLevelChoices">{{ c.label }}</option>
         </select>
@@ -31,8 +31,8 @@
       <div class="field">
         <label>&nbsp;</label>
         <button :class="['ui', 'fluid', {'loading': isLoading}, 'button']" type="submit">
-          <template v-if="playlist"><translate>Update playlist</translate></template>
-          <template v-else><translate>Create playlist</translate></template>
+          <template v-if="playlist"><translate :translate-context="'Content/Playlist/Button.Label/Verb'">Update playlist</translate></template>
+          <template v-else><translate :translate-context="'Content/Playlist/Button.Label/Verb'">Create playlist</translate></template>
         </button>
       </div>
     </div>
@@ -71,22 +71,22 @@ export default {
   computed: {
     labels () {
       return {
-        placeholder: this.$gettext('My awesome playlist')
+        placeholder: this.$pgettext('Content/Playlist/Input.Placeholder', 'My awesome playlist')
       }
     },
     privacyLevelChoices: function () {
       return [
         {
           value: 'me',
-          label: this.$gettext('Nobody except me')
+          label: this.$pgettext('Content/Playlist/Dropdown', 'Nobody except me')
         },
         {
           value: 'instance',
-          label: this.$gettext('Everyone on this instance')
+          label: this.$pgettext('Content/Playlist/Dropdown', 'Everyone on this instance')
         },
         {
           value: 'everyone',
-          label: this.$gettext('Everyone')
+          label: this.$pgettext('Content/Playlist/Dropdown', 'Everyone')
         }
       ]
     }

From 3ac2feca236ab17c9365a3aa212903519e9e52ab Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 15:54:37 +0100
Subject: [PATCH 04/16] Added context strings

---
 .../components/playlists/PlaylistModal.vue    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/front/src/components/playlists/PlaylistModal.vue b/front/src/components/playlists/PlaylistModal.vue
index 3065631af..3707e3d2c 100644
--- a/front/src/components/playlists/PlaylistModal.vue
+++ b/front/src/components/playlists/PlaylistModal.vue
@@ -1,13 +1,13 @@
 <template>
   <modal @update:show="update" :show="$store.state.playlists.showModal">
     <div class="header">
-      <translate>Manage playlists</translate>
+      <translate :translate-context="'Popup/Playlist/Title/Verb'">Manage playlists</translate>
     </div>
     <div class="scrolling content">
       <div class="description">
         <template v-if="track">
-          <h4 class="ui header"><translate>Current track</translate></h4>
-          <translate
+          <h4 class="ui header"><translate :translate-context="'Popup/Playlist/Title'">Current track</translate></h4>
+          <translate :translate-context="'Popup/Playlist/Paragraph'"
             v-translate="{artist: track.artist.name, title: track.title}"
             :translate-params="{artist: track.artist.name, title: track.title}">
             "%{ title }", by %{ artist }
@@ -18,20 +18,20 @@
         <playlist-form :key="formKey"></playlist-form>
         <div class="ui divider"></div>
         <div v-if="errors.length > 0" class="ui negative message">
-          <div class="header"><translate>We cannot add the track to a playlist</translate></div>
+          <div class="header"><translate :translate-context="'Popup/Playlist/Error message.Title'">The track can't be added to a playlist</translate></div>
           <ul class="list">
             <li v-for="error in errors">{{ error }}</li>
           </ul>
         </div>
         </div>
-        <h4 class="ui header"><translate>Available playlists</translate></h4>
+        <h4 class="ui header"><translate :translate-context="'Popup/Playlist/Title'">Available playlists</translate></h4>
         <table class="ui unstackable very basic table">
           <thead>
             <tr>
               <th></th>
-              <th><translate>Name</translate></th>
-              <th class="sorted descending"><translate>Last modification</translate></th>
-              <th><translate>Tracks</translate></th>
+              <th><translate :translate-context="'*/*/Table.Label'">Name</translate></th>
+              <th class="sorted descending"><translate :translate-context="'Popup/Playlist/Table.Label/Short'">Last modification</translate></th>
+              <th><translate :translate-context="'*/*/Table.Label'">Tracks</translate></th>
               <th></th>
             </tr>
           </thead>
@@ -52,7 +52,7 @@
                   class="ui green icon basic small right floated button"
                   :title="labels.addToPlaylist"
                   @click="addToPlaylist(playlist.id)">
-                  <i class="plus icon"></i> <translate>Add track</translate>
+                  <i class="plus icon"></i> <translate :translate-context="'Popup/Playlist/Table.Button.Label/Verb'">Add track</translate>
                 </div>
               </td>
             </tr>
@@ -61,7 +61,7 @@
       </div>
     </div>
     <div class="actions">
-      <div class="ui cancel button"><translate>Cancel</translate></div>
+      <div class="ui cancel button"><translate :translate-context="'Popup/Playlist/Button.Label'">Cancel</translate></div>
     </div>
   </modal>
 </template>
@@ -113,7 +113,7 @@ export default {
     }),
     labels () {
       return {
-        addToPlaylist: this.$gettext('Add to this playlist')
+        addToPlaylist: this.$pgettext('Popup/Playlist/Table.Button.Tooltip/Verb', 'Add to this playlist')
       }
     },
     sortedPlaylists () {

From 1e21f13ab92f38c4e52ca5181a75aac6a3cdae61 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 15:58:41 +0100
Subject: [PATCH 05/16] Added context strings

---
 front/src/components/playlists/TrackPlaylistIcon.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/components/playlists/TrackPlaylistIcon.vue b/front/src/components/playlists/TrackPlaylistIcon.vue
index 8487e6777..3777318f1 100644
--- a/front/src/components/playlists/TrackPlaylistIcon.vue
+++ b/front/src/components/playlists/TrackPlaylistIcon.vue
@@ -4,7 +4,7 @@
     v-if="button"
     :class="['ui', 'button']">
     <i class="list icon"></i>
-    <translate>Add to playlist…</translate>
+    <translate :translate-context="'Sidebar/Player/Icon.Tooltip/Verb'">Add to playlist…</translate>
   </button>
   <button
     v-else
@@ -31,7 +31,7 @@ export default {
   computed: {
     labels () {
       return {
-        addToPlaylist: this.$gettext('Add to playlist…')
+        addToPlaylist: this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', 'Add to playlist…')
       }
     }
   }

From 51514944a3e49a4e80dabcd492afb8be04a034c1 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:01:13 +0100
Subject: [PATCH 06/16] Added context strings

---
 front/src/views/radios/Detail.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/views/radios/Detail.vue b/front/src/views/radios/Detail.vue
index 0c46385a6..88c5e892f 100644
--- a/front/src/views/radios/Detail.vue
+++ b/front/src/views/radios/Detail.vue
@@ -24,15 +24,15 @@
           </router-link>
           <dangerous-button class="labeled icon" :action="deleteRadio">
             <i class="trash icon"></i> Delete
-            <p slot="modal-header"><translate :translate-params="{radio: radio.name}">Do you want to delete the radio "%{ radio }"?</translate></p>
-            <p slot="modal-content"><translate>This will completely delete this radio and cannot be undone.</translate></p>
-            <p slot="modal-confirm"><translate>Delete radio</translate></p>
+            <p slot="modal-header"><translate :translate-context="'Popup/Radio/Title'" :translate-params="{radio: radio.name}">Do you want to delete the radio "%{ radio }"?</translate></p>
+            <p slot="modal-content"><translate :translate-context="'Popup/Radio/Paragraph'">This will completely delete this radio and cannot be undone.</translate></p>
+            <p slot="modal-confirm"><translate :translate-context="'Popup/Radio/Button.Label/Verb'">Delete radio</translate></p>
           </dangerous-button>
         </template>
       </div>
     </section>
     <section class="ui vertical stripe segment">
-      <h2><translate>Tracks</translate></h2>
+      <h2><translate :translate-context="'Content/*/*'">Tracks</translate></h2>
       <track-table :tracks="tracks"></track-table>
       <div class="ui center aligned basic segment">
         <pagination
@@ -77,7 +77,7 @@ export default {
   computed: {
     labels() {
       return {
-        title: this.$gettext("Radio")
+        title: this.$pgettext('Head/Radio/Title', "Radio")
       }
     }
   },

From 7534670e309f40d7b46534dc733fa645cad9ddf2 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:10:30 +0100
Subject: [PATCH 07/16] Added context strings

---
 front/src/components/audio/EmbedWizard.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/front/src/components/audio/EmbedWizard.vue b/front/src/components/audio/EmbedWizard.vue
index 7a50ffa54..f919ec5cd 100644
--- a/front/src/components/audio/EmbedWizard.vue
+++ b/front/src/components/audio/EmbedWizard.vue
@@ -4,22 +4,22 @@
       <div class="two fields">
         <div class="field">
           <div class="field">
-            <label for="embed-width"><translate>Widget width</translate></label>
-            <p><translate>Leave empty for a responsive widget</translate></p>
+            <label for="embed-width"><translate :translate-context="'Popup/Embed/Input.Label'">Widget width</translate></label>
+            <p><translate :translate-context="'Popup/Embed/Paragraph'">Leave empty for a responsive widget</translate></p>
             <input id="embed-width" type="number" v-model.number="width" min="0" step="10" />
           </div>
           <template v-if="type != 'track'">
             <br>
             <div class="field">
-              <label for="embed-height"><translate>Widget height</translate></label>
+              <label for="embed-height"><translate :translate-context="'Popup/Embed/Input.Label'">Widget height</translate></label>
               <input id="embed-height" type="number" v-model="height" :min="minHeight" max="1000" step="10" />
             </div>
           </template>
         </div>
         <div class="field">
-          <button @click="copy" class="ui right floated button"><translate>Copy</translate></button>
-          <label for="embed-width"><translate>Embed code</translate></label>
-          <p><translate>Copy/paste this code in your website HTML</translate></p>
+          <button @click="copy" class="ui right floated button"><translate :translate-context="'Popup/*/Button.Label/Verb'">Copy</translate></button>
+          <label for="embed-width"><translate :translate-context="'Popup/Embed/Input.Label/Noun'">Embed code</translate></label>
+          <p><translate :translate-context="'Popup/Embed/Paragraph'">Copy/paste this code in your website HTML</translate></p>
           <div class="ui hidden divider"></div>
           <textarea ref="textarea":value="embedCode" rows="3" readonly>
           </textarea>
@@ -27,7 +27,7 @@
       </div>
     </div>
     <div class="preview">
-      <h3><translate>Preview</translate></h3>
+      <h3><translate :translate-context="'Popup/Embed/Title/Noun'">Preview</translate></h3>
       <iframe :width="frameWidth" :height="height" scrolling="no" frameborder="no" :src="iframeSrc"></iframe>
     </div>
   </div>

From d2ddda3f1d2f1577321b01cccbaaecf729dec00c Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:18:44 +0100
Subject: [PATCH 08/16] Replaced :v-context by :translate-context, as to follow
 the doc.

@eliotberriot: Is there a reason why you used :v-context instead of
:translate-context?
---
 front/src/components/audio/PlayButton.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue
index 425d0a1d7..a84ee67d5 100644
--- a/front/src/components/audio/PlayButton.vue
+++ b/front/src/components/audio/PlayButton.vue
@@ -7,22 +7,22 @@
       :disabled="!playable"
       :class="buttonClasses.concat(['ui', {loading: isLoading}, {'mini': discrete}, {disabled: !playable}])">
       <i :class="[playIconClass, 'icon']"></i>
-      <template v-if="!discrete && !iconOnly"><slot><translate :v-context="'*/Queue/Button/Label/Short, Verb'">Play</translate></slot></template>
+      <template v-if="!discrete && !iconOnly"><slot><translate :translate-context="'*/Queue/Button/Label/Short, Verb'">Play</translate></slot></template>
     </button>
     <div v-if="!discrete && !iconOnly" :class="['ui', {disabled: !playable}, 'floating', 'dropdown', {'icon': !dropdownOnly}, {'button': !dropdownOnly}]">
       <i :class="dropdownIconClasses.concat(['icon'])"></i>
       <div class="menu">
         <button class="item basic" ref="add" data-ref="add" :disabled="!playable" @click.stop.prevent="add" :title="labels.addToQueue">
-          <i class="plus icon"></i><translate :v-context="'*/Queue/Dropdown/Button/Label/Short'">Add to queue</translate>
+          <i class="plus icon"></i><translate :translate-context="'*/Queue/Dropdown/Button/Label/Short'">Add to queue</translate>
         </button>
         <button class="item basic" ref="addNext" data-ref="addNext" :disabled="!playable" @click.stop.prevent="addNext()" :title="labels.playNext">
-          <i class="step forward icon"></i><translate :v-context="'*/Queue/Dropdown/Button/Label/Short'">Play next</translate>
+          <i class="step forward icon"></i><translate :translate-context="'*/Queue/Dropdown/Button/Label/Short'">Play next</translate>
         </button>
         <button class="item basic" ref="playNow" data-ref="playNow" :disabled="!playable" @click.stop.prevent="addNext(true)" :title="labels.playNow">
-          <i class="play icon"></i><translate :v-context="'*/Queue/Dropdown/Button/Label/Short'">Play now</translate>
+          <i class="play icon"></i><translate :translate-context="'*/Queue/Dropdown/Button/Label/Short'">Play now</translate>
         </button>
         <button v-if="track" class="item basic" :disabled="!playable" @click.stop.prevent="$store.dispatch('radios/start', {type: 'similar', objectId: track.id})" :title="labels.startRadio">
-          <i class="feed icon"></i><translate :v-context="'*/Queue/Dropdown/Button/Label/Short'">Start radio</translate>
+          <i class="feed icon"></i><translate :translate-context="'*/Queue/Dropdown/Button/Label/Short'">Start radio</translate>
         </button>
       </div>
     </div>

From bec267dc589cb6ff534881d0f422f3f7f5c358c0 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:26:51 +0100
Subject: [PATCH 09/16] Added context strings

Minor rewording
---
 front/src/components/audio/Player.vue | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 575f68736..5df3248bf 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -62,14 +62,14 @@
       </div>
       <div class="ui small warning message" v-if="currentTrack && errored">
         <div class="header">
-          <translate>We cannot load this track</translate>
+          <translate :translate-context="'Sidebar/Player/Error message.Title'">The track cannot be loaded</translate>
         </div>
         <p v-if="hasNext && playing && $store.state.player.errorCount < $store.state.player.maxConsecutiveErrors">
-          <translate>The next track will play automatically in a few seconds…</translate>
+          <translate :translate-context="'Sidebar/Player/Error message.Paragraph'">The next track will play automatically in a few seconds…</translate>
           <i class="loading spinner icon"></i>
         </p>
         <p>
-          <translate>You may have a connectivity issue.</translate>
+          <translate :translate-context="'Sidebar/Player/Error message.Paragraph'">You may have a connectivity issue.</translate>
         </p>
       </div>
       <div class="two wide column controls ui grid">
@@ -280,7 +280,7 @@ export default {
         return
       }
       let self = this
-      let msg = this.$gettext("Queue shuffled!")
+      let msg = this.$pgettext('Content/Queue/Message', "Queue shuffled!")
       this.isShuffling = true
       setTimeout(() => {
         self.$store.dispatch("queue/shuffle", () => {
@@ -346,24 +346,24 @@ export default {
       progress: "player/progress"
     }),
     labels() {
-      let audioPlayer = this.$gettext("Media player")
-      let previousTrack = this.$gettext("Previous track")
-      let play = this.$gettext("Play track")
-      let pause = this.$gettext("Pause track")
-      let next = this.$gettext("Next track")
-      let unmute = this.$gettext("Unmute")
-      let mute = this.$gettext("Mute")
-      let loopingDisabled = this.$gettext(
+      let audioPlayer = this.$pgettext('Sidebar/Player/Hidden text', "Media player")
+      let previousTrack = this.$pgettext('Sidebar/Player/Icon.Tooltip', "Previous track")
+      let play = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Play track")
+      let pause = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Pause track")
+      let next = this.$pgettext('Sidebar/Player/Icon.Tooltip', "Next track")
+      let unmute = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Unmute")
+      let mute = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Mute")
+      let loopingDisabled = this.$pgettext('Sidebar/Player/Icon.Tooltip', 
         "Looping disabled. Click to switch to single-track looping."
       )
-      let loopingSingle = this.$gettext(
+      let loopingSingle = this.$pgettext('Sidebar/Player/Icon.Tooltip', 
         "Looping on a single track. Click to switch to whole queue looping."
       )
-      let loopingWhole = this.$gettext(
+      let loopingWhole = this.$pgettext('Sidebar/Player/Icon.Tooltip', 
         "Looping on whole queue. Click to disable looping."
       )
-      let shuffle = this.$gettext("Shuffle your queue")
-      let clear = this.$gettext("Clear your queue")
+      let shuffle = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Shuffle your queue")
+      let clear = this.$pgettext('Sidebar/Player/Icon.Tooltip/Verb', "Clear your queue")
       return {
         audioPlayer,
         previousTrack,

From 3573ae6cc6cd61db022c5f326516f3992c70deb8 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:29:24 +0100
Subject: [PATCH 10/16] Added context strings

---
 front/src/components/audio/SearchBar.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/components/audio/SearchBar.vue b/front/src/components/audio/SearchBar.vue
index 534ac0ac4..c1190f474 100644
--- a/front/src/components/audio/SearchBar.vue
+++ b/front/src/components/audio/SearchBar.vue
@@ -17,14 +17,14 @@ export default {
   computed: {
     labels () {
       return {
-        placeholder: this.$gettext('Search for artists, albums, tracks…')
+        placeholder: this.$pgettext('Sidebar/Search/Input.Placeholder', 'Search for artists, albums, tracks…')
       }
     }
   },
   mounted () {
-    let artistLabel = this.$gettext('Artist')
-    let albumLabel = this.$gettext('Album')
-    let trackLabel = this.$gettext('Track')
+    let artistLabel = this.$pgettext('Sidebar/Search/Title', 'Artist')
+    let albumLabel = this.$pgettext('Sidebar/Search/Title', 'Album')
+    let trackLabel = this.$pgettext('Sidebar/Search/Title', 'Track')
     let self = this
     jQuery(this.$el).search({
       type: 'category',

From 5f9be0b330819bfff7d81baca4b3f5f61c96d735 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:30:10 +0100
Subject: [PATCH 11/16] Added 2 feature part in the doc for string
 contextualisation

---
 CONTRIBUTING.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2a1f46e0a..4de854cb5 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -442,6 +442,7 @@ This hierarchical structure is made of several parts:
     - ``Admin``
     - ``Album``
     - ``Artist``
+    - ``Embed``
     - ``Home``
     - ``Login``
     - ``Moderation``
@@ -450,6 +451,7 @@ This hierarchical structure is made of several parts:
     - ``Favorites``
     - ``Notifications``
     - ``Radio``
+    - ``Search``
     - ``Settings``
     - ``Signup``
     - ``Track``

From 7d19392d625dd88ffe9654b89f160366a071494b Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:35:31 +0100
Subject: [PATCH 12/16] Added context strings

---
 front/src/components/audio/Search.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/front/src/components/audio/Search.vue b/front/src/components/audio/Search.vue
index dd250ca09..7c3c540ca 100644
--- a/front/src/components/audio/Search.vue
+++ b/front/src/components/audio/Search.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h2><translate>Search for some music</translate></h2>
+    <h2><translate :translate-context="'Content/Search/Title'">Search for some music</translate></h2>
     <div :class="['ui', {'loading': isLoading }, 'search']">
       <div class="ui icon big input">
         <i class="search icon"></i>
@@ -8,22 +8,22 @@
       </div>
     </div>
     <template v-if="query.length > 0">
-      <h3 class="ui title"><translate>Artists</translate></h3>
+      <h3 class="ui title"><translate :translate-context="'Content/Search/Title'">Artists</translate></h3>
       <div v-if="results.artists.length > 0" class="ui stackable three column grid">
         <div class="column" :key="artist.id" v-for="artist in results.artists">
           <artist-card class="fluid" :artist="artist" ></artist-card>
         </div>
       </div>
-      <p v-else><translate>No artist matched your query</translate></p>
+      <p v-else><translate :translate-context="'Content/Search/Paragraph'">No artist matched your query</translate></p>
     </template>
     <template v-if="query.length > 0">
-      <h3 class="ui title"><translate>Albums</translate></h3>
+      <h3 class="ui title"><translate :translate-context="'Content/Search/Title'">Albums</translate></h3>
       <div v-if="results.albums.length > 0" class="ui stackable three column grid">
         <div class="column" :key="album.id" v-for="album in results.albums">
           <album-card class="fluid" :album="album" ></album-card>
         </div>
       </div>
-      <p v-else><translate>No album matched your query</translate></p>
+      <p v-else><translate :translate-context="'Content/Search/Paragraph'">No album matched your query</translate></p>
     </template>
   </div>
 </template>
@@ -62,7 +62,7 @@ export default {
   computed: {
     labels () {
       return {
-        searchPlaceholder: this.$gettext('Artist, album, track…')
+        searchPlaceholder: this.$pgettext('*/Search/Input.Placeholder', 'Artist, album, track…')
       }
     }
   },

From d79e729e2994ddf201d91e306c60a6eccdafb9f8 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:41:24 +0100
Subject: [PATCH 13/16] Added context strings

---
 front/src/components/audio/album/Card.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/components/audio/album/Card.vue b/front/src/components/audio/album/Card.vue
index 2f19d7fbb..75505d6f9 100644
--- a/front/src/components/audio/album/Card.vue
+++ b/front/src/components/audio/album/Card.vue
@@ -11,7 +11,7 @@
         <div class="meta">
           <span>
             <router-link tag="span" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
-              <translate :translate-params="{artist: album.artist.name}">By %{ artist }</translate>
+              <translate :translate-context="'Content/Album/Card'" :translate-params="{artist: album.artist.name}">By %{ artist }</translate>
             </router-link>
           </span><span class="time" v-if="album.release_date">– {{ album.release_date | year }}</span>
         </div>
@@ -36,21 +36,21 @@
           </table>
           <div class="center aligned segment" v-if="album.tracks.length > initialTracks">
             <em v-if="!showAllTracks" @click="showAllTracks = true" class="expand">
-              <translate :translate-params="{count: album.tracks.length - initialTracks}" :translate-n="album.tracks.length - initialTracks" translate-plural="Show %{ count } more tracks">Show %{ count } more track</translate>
+              <translate :translate-context="'Content/Album/Card.Link/Verb'" :translate-params="{count: album.tracks.length - initialTracks}" :translate-n="album.tracks.length - initialTracks" translate-plural="Show %{ count } more tracks">Show %{ count } more track</translate>
             </em>
             <em v-else @click="showAllTracks = false" class="expand">
-              <translate>Collapse</translate>
+              <translate :translate-context="'Content/Album/Card.Link/Verb'">Collapse</translate>
             </em>
           </div>
         </div>
       </div>
       <div class="extra content">
         <play-button class="mini basic orange right floated" :tracks="album.tracks">
-          <translate>Play all</translate>
+          <translate :translate-context="'Content/Queue/Card.Button.Label/Short, Verb'">Play all</translate>
         </play-button>
         <span>
           <i class="music icon"></i>
-          <translate :translate-params="{count: album.tracks.length}" :translate-n="album.tracks.length" translate-plural="%{ count } tracks">%{ count } track</translate>
+          <translate :translate-context="'Content/Album/Card'" :translate-params="{count: album.tracks.length}" :translate-n="album.tracks.length" translate-plural="%{ count } tracks">%{ count } track</translate>
         </span>
       </div>
     </div>

From 6388e2fb7421eab1be63c3df070043bc1ab5b47e Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:47:56 +0100
Subject: [PATCH 14/16] Added context strings

---
 front/src/components/audio/artist/Card.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/components/audio/artist/Card.vue b/front/src/components/audio/artist/Card.vue
index 1876c42c0..82af12524 100644
--- a/front/src/components/audio/artist/Card.vue
+++ b/front/src/components/audio/artist/Card.vue
@@ -28,10 +28,10 @@
           </table>
           <div class="center aligned segment" v-if="artist.albums.length > initialAlbums">
             <em v-if="!showAllAlbums" @click="showAllAlbums = true" class="expand">
-              <translate :translate-params="{count: artist.albums.length - initialAlbums}" :translate-n="artist.albums.length - initialAlbums" translate-plural="Show %{ count } more albums">Show 1 more album</translate>
+              <translate :translate-context="'Content/Artist/Card.Link'" :translate-params="{count: artist.albums.length - initialAlbums}" :translate-n="artist.albums.length - initialAlbums" translate-plural="Show %{ count } more albums">Show 1 more album</translate>
             </em>
             <em v-else @click="showAllAlbums = false" class="expand">
-              <translate>Collapse</translate>
+              <translate :translate-context="'Content/Artist/Card.Link'">Collapse</translate>
             </em>
           </div>
         </div>
@@ -39,10 +39,10 @@
     <div class="extra content">
         <span>
           <i class="sound icon"></i>
-            <translate :translate-params="{count: artist.albums.length}" :translate-n="artist.albums.length" translate-plural="%{ count } albums">1 album</translate>
+            <translate :translate-context="'Content/Artist/Card'" :translate-params="{count: artist.albums.length}" :translate-n="artist.albums.length" translate-plural="%{ count } albums">1 album</translate>
         </span>
         <play-button :is-playable="isPlayable" class="mini basic orange right floated" :artist="artist.id">
-          <translate>Play all</translate>
+          <translate :translate-context="'Content/Queue/Button.Label/Short, Verb'">Play all</translate>
         </play-button>
       </div>
     </div>

From 7d8ff59be7e274ec5f0d7de11914d072e6a2a7f1 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:48:31 +0100
Subject: [PATCH 15/16] Added context strings

---
 front/src/components/audio/track/Row.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/components/audio/track/Row.vue b/front/src/components/audio/track/Row.vue
index d3b7dc734..e3005c388 100644
--- a/front/src/components/audio/track/Row.vue
+++ b/front/src/components/audio/track/Row.vue
@@ -38,7 +38,7 @@
       {{ time.parse(track.uploads[0].duration) }}
     </td>
     <td colspan="4" v-else>
-      <translate>N/A</translate>
+      <translate :translate-context="'*/*/*'">N/A</translate>
     </td>
     <td colspan="2">
       <track-favorite-icon class="favorite-icon" :track="track"></track-favorite-icon>

From 196504b5cfec1db22cc159b29eb3f31f230604e6 Mon Sep 17 00:00:00 2001
From: Jo Vuit <jo.vuitton@gmail.com>
Date: Mon, 11 Feb 2019 16:49:40 +0100
Subject: [PATCH 16/16] Added context strings

---
 front/src/components/audio/track/Table.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/components/audio/track/Table.vue b/front/src/components/audio/track/Table.vue
index 937025807..1134e88a8 100644
--- a/front/src/components/audio/track/Table.vue
+++ b/front/src/components/audio/track/Table.vue
@@ -4,10 +4,10 @@
       <tr>
         <th></th>
         <th></th>
-        <th colspan="6"><translate>Title</translate></th>
-        <th colspan="4"><translate>Artist</translate></th>
-        <th colspan="4"><translate>Album</translate></th>
-        <th colspan="4"><translate>Duration</translate></th>
+        <th colspan="6"><translate :translate-context="'Content/Track/Table.Label'">Title</translate></th>
+        <th colspan="4"><translate :translate-context="'Content/Track/Table.Label'">Artist</translate></th>
+        <th colspan="4"><translate :translate-context="'Content/Track/Table.Label'">Album</translate></th>
+        <th colspan="4"><translate :translate-context="'Content/Track/Table.Label'">Duration</translate></th>
         <th colspan="2"></th>
       </tr>
     </thead>