diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 7da74b57e..2e39b9c6b 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -28,10 +28,6 @@
       This video will be published on {{ video.scheduledUpdate.updateAt | date: 'full' }}.
     </div>
 
-    <div i18n class="col-md-12 alert alert-info" *ngIf="noPlaylistVideos">
-      This playlist does not have videos.
-    </div>
-
     <div class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted">
       <div class="blacklisted-label" i18n>This video is blacklisted.</div>
       {{ video.blacklistedReason }}
@@ -219,6 +215,7 @@
       OK
     </div>
   </div>
+</div>
 
 <ng-template [ngIf]="video !== null">
   <my-video-support #videoSupportModal [video]="video"></my-video-support>
diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 7fb8161b6..88e55a497 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -570,8 +570,8 @@
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch-playlist.component.html</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="ddd8a4986d2d1717a274a5a0fbed04988a819e69" datatype="html">
         <source>Private</source>
@@ -580,8 +580,8 @@
           <context context-type="linenumber">13</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch-playlist.component.html</context>
+          <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="6aec8cb024acc333218d72f279caa8ea623bb628" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
@@ -641,7 +641,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit><trans-unit id="b9dee3108a18796bd69c6be316c8fb985b58fb8e" datatype="html">
         <source>Delete from &lt;x id="INTERPOLATION" equiv-text="{{ playlist?.displayName }}"/&gt;</source>
@@ -1422,7 +1422,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">189</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
         <source>Licence</source>
@@ -1436,7 +1436,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">198</context>
+          <context context-type="linenumber">173</context>
         </context-group>
       </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
         <source>Language</source>
@@ -1454,7 +1454,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">207</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit><trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8" datatype="html">
         <source>All of these tags</source>
@@ -2704,7 +2704,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">128</context>
         </context-group>
       </trans-unit><trans-unit id="02ba1a65db92d1d0ab4ba380086e9be61891aaa5" datatype="html">
         <source>User&apos;s email must be verified to login</source>
@@ -3263,7 +3263,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">179</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit><trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071" datatype="html">
         <source>Channel</source>
@@ -3673,7 +3673,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">191</context>
         </context-group>
       </trans-unit><trans-unit id="457b1cff4d8d7fad0c8742f69c413ecf5e443851" datatype="html">
         <source>Tags could be used to suggest relevant recommendations.&lt;/br&gt;Press Enter to add a new tag.</source>
@@ -3809,7 +3809,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">78</context>
         </context-group>
       </trans-unit><trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0" datatype="html">
         <source>Short text to tell people how they can support you (membership platform...).</source>
@@ -3855,6 +3855,12 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-edit/video-update.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
+      </trans-unit><trans-unit id="3c4c080864b313cfdff5fdea6aae5da276246d99" datatype="html">
+        <source>Public</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch-playlist.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
       </trans-unit><trans-unit id="0bd8b27f60a1f098a53e06328426d818e3508ff9" datatype="html">
         <source>Share</source>
         <context-group purpose="location">
@@ -3863,7 +3869,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">108</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit><trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f" datatype="html">
         <source>QR-Code</source>
@@ -3891,19 +3897,13 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">59</context>
         </context-group>
-      </trans-unit><trans-unit id="3c4c080864b313cfdff5fdea6aae5da276246d99" datatype="html">
-        <source>Public</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
       </trans-unit><trans-unit id="38e66e2d779d6d819cd7703ab73ab1bab75f8614" datatype="html">
         <source>
       The video is being imported, it will be available when the import is finished.
     </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="d2a8e8e4e5345201c07ba03a7fafe8b663230246" datatype="html">
         <source>
@@ -3911,7 +3911,7 @@ When you will upload a video in this channel, the video support field will be au
     </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="2dd4add38e83d8ec58e37735e76090e9738c974a" datatype="html">
         <source>
@@ -3919,21 +3919,13 @@ When you will upload a video in this channel, the video support field will be au
     </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
-      </trans-unit><trans-unit id="f52722430ddd59507177f005a357bfd335ffa7fd" datatype="html">
-        <source>
-      This playlist does not have videos.
-    </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="bd7055d3e38beff538463e75d508d1c75c683710" datatype="html">
         <source>This video is blacklisted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit><trans-unit id="99686034581579c92a971f4eeebd2c072c812e2d" datatype="html">
         <source>
@@ -3941,7 +3933,7 @@ When you will upload a video in this channel, the video support field will be au
             </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">69</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit><trans-unit id="3da5360f8314aa95973aa52629c9f635363c5a36" datatype="html">
         <source>
@@ -3949,55 +3941,55 @@ When you will upload a video in this channel, the video support field will be au
               </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">53</context>
         </context-group>
       </trans-unit><trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced" datatype="html">
         <source>Like this video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit><trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509" datatype="html">
         <source>Dislike this video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">96</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit><trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33" datatype="html">
         <source>Go the channel page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">118</context>
         </context-group>
       </trans-unit><trans-unit id="0b7f242da10ece3f2995095c455b9a92ebcdd3b4" datatype="html">
         <source>By &lt;x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/&gt;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit><trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b" datatype="html">
         <source>Show more</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">166</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit><trans-unit id="5403a767248e304199592271bba3366d2ca3f903" datatype="html">
         <source>Show less</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">172</context>
+          <context context-type="linenumber">147</context>
         </context-group>
       </trans-unit><trans-unit id="284b55e2ae9f6e5bc78c92a18ef26da02f380079" datatype="html">
         <source>Originally published</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit><trans-unit id="4c0ba3cde3b3c58b855ffb4beaa5804a2fc3826b" datatype="html">
         <source>Friendly Reminder: </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">232</context>
+          <context context-type="linenumber">207</context>
         </context-group>
       </trans-unit><trans-unit id="9e66f7507eb263abdbab7abafd825f1dc8bc880b" datatype="html">
         <source>
@@ -4005,19 +3997,19 @@ When you will upload a video in this channel, the video support field will be au
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">233</context>
+          <context context-type="linenumber">208</context>
         </context-group>
       </trans-unit><trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e" datatype="html">
         <source>More information</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">236</context>
+          <context context-type="linenumber">211</context>
         </context-group>
       </trans-unit><trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318" datatype="html">
         <source>Get more information</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">236</context>
+          <context context-type="linenumber">211</context>
         </context-group>
       </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>
@@ -4025,7 +4017,7 @@ When you will upload a video in this channel, the video support field will be au
     </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">239</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit><trans-unit id="abf2b0f7b6405fa2841ca39c827e86089a95cc27" datatype="html">
         <source>
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
index b0668436d..e616f715b 100755
--- a/scripts/i18n/pull-hook.sh
+++ b/scripts/i18n/pull-hook.sh
@@ -2,12 +2,13 @@
 
 set -eu
 
-# Zanata does not support inner elements in <source>, so we hack these special elements
-# This regex translate the converted elements to initial Angular elements
-
 for i in 1 2 3; do
+    # Zanata does not support inner elements in <source>, so we hack these special elements
+    # This regex translate the converted elements to initial Angular elements
     perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
-    perl -0pi -e 's|<source>(.+?)</source>\s*<context-group |<source>\1</source><target>\1</target><context-group |g' client/src/locale/target/angular_*.xml
+
+    # Angular does not like when there is not target element, so we create it with the same content than the source element
+    perl -0pi -e 's#<source>(.+?)</source>\s*<context-group #<source>\1</source><target>\1</target><context-group #g' client/src/locale/target/angular_*.xml
 done
 
 npm run i18n:xliff2json