4 files changed, 756 insertions, 664 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 9b9714dfe..64f7d9c11 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -64,49 +64,49 @@
         <source>««</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">7</context>
+          <context context-type="linenumber">2</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.first-aria" datatype="html">
-        <source>First</source>
+      </trans-unit><trans-unit id="ngb.pagination.previous" datatype="html">
+        <source>«</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">3</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.previous" datatype="html">
-        <source>«</source>
+      </trans-unit><trans-unit id="ngb.pagination.next" datatype="html">
+        <source>»</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">4</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.previous-aria" datatype="html">
-        <source>Previous</source>
+      </trans-unit><trans-unit id="ngb.pagination.last" datatype="html">
+        <source>»»</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">5</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.next" datatype="html">
-        <source>»</source>
+      </trans-unit><trans-unit id="ngb.pagination.first-aria" datatype="html">
+        <source>First</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">14</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.next-aria" datatype="html">
-        <source>Next</source>
+      </trans-unit><trans-unit id="ngb.pagination.previous-aria" datatype="html">
+        <source>Previous</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">23</context>
         </context-group>
-      </trans-unit><trans-unit id="ngb.pagination.last" datatype="html">
-        <source>»»</source>
+      </trans-unit><trans-unit id="ngb.pagination.next-aria" datatype="html">
+        <source>Next</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.pagination.last-aria" datatype="html">
         <source>Last</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.progressbar.value" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/&gt;%</source>
@@ -136,67 +136,67 @@
         <source>Decrement hours</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.increment-minutes" datatype="html">
         <source>Increment minutes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.MM" datatype="html">
         <source>MM</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.minutes" datatype="html">
         <source>Minutes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.decrement-minutes" datatype="html">
         <source>Decrement minutes</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.increment-seconds" datatype="html">
         <source>Increment seconds</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.SS" datatype="html">
         <source>SS</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.seconds" datatype="html">
         <source>Seconds</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.decrement-seconds" datatype="html">
         <source>Decrement seconds</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.PM" datatype="html">
         <source>PM</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit><trans-unit id="ngb.timepicker.AM" datatype="html">
         <source>AM</source>
         <context-group purpose="location">
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">69</context>
         </context-group>
       </trans-unit><trans-unit id="1d19634967b06f93fd7f20c0663742f8254e6d46" datatype="html">
         <source>(extensions: &lt;x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/&gt;, max size: &lt;x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/&gt;)</source>
@@ -258,6 +258,18 @@
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
           <context context-type="linenumber">31</context>
         </context-group>
+      </trans-unit><trans-unit id="3442afd9696d6abcd9210b2cb3cdfb969667ca01" datatype="html">
+        <source>
+        &lt;x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon&gt;"/&gt;&lt;x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon&gt;"/&gt;
+
+        &lt;x id="START_TAG_DIV" ctype="x-div" equiv-text="&lt;div&gt;"/&gt;
+          The recently added video &lt;x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/&gt;&lt;x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/&gt;&lt;x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/&gt; has been &lt;x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a&gt;"/&gt;auto-blacklisted&lt;x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/&gt;
+        &lt;x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="&lt;/div&gt;"/&gt;
+      </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
       </trans-unit><trans-unit id="dfb1edb72e1fa8ae9a87f58a57d8fe488e337715" datatype="html">
         <source>
         &lt;x id="TAG_IMG" ctype="image" equiv-text="&lt;img/&gt;"/&gt;
@@ -268,7 +280,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">39</context>
+          <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit><trans-unit id="b74d4c335377af0c83a08987d0d5b28ce11b091b" datatype="html">
         <source>
@@ -280,7 +292,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">47</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit><trans-unit id="d5f838030f3fc0b2e5f14945c255ba3249371085" datatype="html">
         <source>
@@ -292,7 +304,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit><trans-unit id="9ac080afb0f7eab1d8a7ea61795ee9b84bd97082" datatype="html">
         <source>
@@ -304,7 +316,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit><trans-unit id="cbdd98aa82d989bf2cc839b04dda4109126da50d" datatype="html">
         <source>
@@ -316,7 +328,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">79</context>
         </context-group>
       </trans-unit><trans-unit id="2657af71bacee515160dcbdb1481cf1fbf7398d2" datatype="html">
         <source>
@@ -331,7 +343,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit><trans-unit id="ebdf8d0e51333447680d6ac8b6a3166066a852d1" datatype="html">
         <source>
@@ -343,7 +355,7 @@
       </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit><trans-unit id="4b3963c6d0863118fe9e9e33447d12be3c2db081" datatype="html">
         <source>Unlisted</source>
@@ -351,18 +363,140 @@
           <context context-type="sourcefile">app/shared/video/video-miniature.component.html</context>
           <context context-type="linenumber">10</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-group>
       </trans-unit><trans-unit id="ddd8a4986d2d1717a274a5a0fbed04988a819e69" datatype="html">
         <source>Private</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/video-miniature.component.html</context>
           <context context-type="linenumber">11</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-group>
       </trans-unit><trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/video-miniature.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
+      </trans-unit><trans-unit id="99dea2d567d6e6d610d97608c3850ddb76df9a9a" datatype="html">
+        <source>{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {&lt;x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/&gt; videos} }</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-miniature.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit><trans-unit id="48e17205f8f7cd86078a1a6c7c5279b24b15f16e" datatype="html">
+        <source>
+        &lt;x id="INTERPOLATION" equiv-text="{{ playlist.videoChannelBy }}"/&gt;
+      </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-miniature.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit><trans-unit id="a3550f6ce98d90d2947fe062530629dc2d3923b4" datatype="html">
+        <source>Updated &lt;x id="INTERPOLATION" equiv-text="{{ playlist.updatedAt | myFromNow }}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-miniature.component.html</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit><trans-unit id="b2b638f4333842009c258a23e59dbe4160d1e566" datatype="html">
+        <source>Save to</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit><trans-unit id="24813b8a3e45f0b57136c18d003027262cfe2d1f" datatype="html">
+        <source>Options</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit><trans-unit id="85e5d1de15d23cde43c530e3740a2a61aed24c2d" datatype="html">
+        <source>Start at</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit><trans-unit id="4d20563f7e338a1d09eb756054564ccf7c6a30ef" datatype="html">
+        <source>Stop at</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit><trans-unit id="bc155f9fc3be3f32083f19b2c77d4ad3b696d9b9" datatype="html">
+        <source>Display name</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">63</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit><trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
+        <source>Create</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-add-to-playlist.component.html</context>
+          <context context-type="linenumber">73</context>
+        </context-group>
+      </trans-unit><trans-unit id="2edccfda908b57c073dc0811eaa58818de2be2dc" datatype="html">
+        <source>Edit starts/stops at</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit><trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
+        <source>Save</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">115</context>
+        </context-group>
+      </trans-unit><trans-unit id="b9dee3108a18796bd69c6be316c8fb985b58fb8e" datatype="html">
+        <source>Delete from &lt;x id="INTERPOLATION" equiv-text="{{ playlist?.displayName }}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
+          <context context-type="linenumber">69</context>
+        </context-group>
       </trans-unit><trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
         <source>Delete</source>
         <context-group purpose="location">
@@ -371,7 +505,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
@@ -379,7 +513,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">150</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.html</context>
@@ -491,11 +625,17 @@
           <context context-type="sourcefile">app/shared/user-subscription/remote-subscribe.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
+      </trans-unit><trans-unit id="2350869d835dfca2643c32e0ef1f5e35dc64f64b" datatype="html">
+        <source>Default NSFW/sensitive videos policy (can be redefined by the users)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/instance/instance-features-table.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
       </trans-unit><trans-unit id="15f046007e4fca2e8477966745e2ec4e3e81bc3b" datatype="html">
         <source>Video quota</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">5</context>
+          <context context-type="linenumber">19</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
@@ -515,7 +655,7 @@
         </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit><trans-unit id="6a323f80f9d90a32db8ce52cc82075938c3c36f0" datatype="html">
         <source>Ban</source>
@@ -683,7 +823,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit><trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681" datatype="html">
         <source>Forgot your password</source>
@@ -816,12 +956,8 @@
           <context context-type="linenumber">63</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">26</context>
-        </context-group>
-        <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit><trans-unit id="fa48c3ddc2ef8e40e5c317e68bc05ae62c93b0c1" datatype="html">
         <source>Features found on this instance</source>
@@ -880,7 +1016,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">102</context>
         </context-group>
       </trans-unit><trans-unit id="1c98d728375e7bd5b166d1aeb29485ef8b5d6e28" datatype="html">
         <source>
@@ -890,40 +1026,32 @@
           <context context-type="sourcefile">app/menu/language-chooser.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
-      </trans-unit><trans-unit id="8c654f49714163eb2991b264e9fd4858e72c04c6" datatype="html">
-        <source>
-             My public profile
-            </source>
+      </trans-unit><trans-unit id="20f3ffdc9938528fe27db4444ee54a561670075a" datatype="html">
+        <source>My public profile</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
         </context-group>
-      </trans-unit><trans-unit id="01d7a5f4ca6470b564031481bc16485b53a8d4fb" datatype="html">
-        <source>
-              My account
-            </source>
+      </trans-unit><trans-unit id="e4825b5d86d89ae0f4c797ba256f66fd8abd4ee6" datatype="html">
+        <source>My account</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">21</context>
         </context-group>
-      </trans-unit><trans-unit id="fa9f3da5641dbd73d83395a0bde61bb6d5cefb10" datatype="html">
-        <source>
-              My videos
-            </source>
+      </trans-unit><trans-unit id="3fdc751b264ca9998e1542fcf5794e274cd56344" datatype="html">
+        <source>Log out</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
-      </trans-unit><trans-unit id="b795a1acb4a57ee68e6c5114daa280bf6e0f70e1" datatype="html">
-        <source>
-              Log out
-            </source>
+      </trans-unit><trans-unit id="d207cc1965ec0c29e594e0e9917f39bfc276ed87" datatype="html">
+        <source>Create an account</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">33</context>
         </context-group>
-      </trans-unit><trans-unit id="d207cc1965ec0c29e594e0e9917f39bfc276ed87" datatype="html">
-        <source>Create an account</source>
+      </trans-unit><trans-unit id="4ef4f031c147fb9ee0168bc6eacb78de180d7432" datatype="html">
+        <source>My library</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">37</context>
@@ -935,6 +1063,10 @@
           <context context-type="linenumber">41</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
           <context context-type="linenumber">29</context>
         </context-group>
@@ -942,53 +1074,65 @@
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
+      </trans-unit><trans-unit id="47546e45bbb476baaaad38244db444c427ddc502" datatype="html">
+        <source>Playlists</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
       </trans-unit><trans-unit id="357064ca9d9ac859eb618e28e8126fa32be049e2" datatype="html">
         <source>Subscriptions</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit><trans-unit id="efac3af0b32e953279c25b6519cae256811e0fe8" datatype="html">
+        <source>History</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
+          <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit><trans-unit id="e95ae009d0bdb45fcc656e8b65248cf7396080d5" datatype="html">
         <source>Overview</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit><trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807" datatype="html">
         <source>Trending</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit><trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1" datatype="html">
         <source>Recently added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">60</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit><trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d" datatype="html">
         <source>Local</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">81</context>
         </context-group>
       </trans-unit><trans-unit id="ac0f81713a84217c9bd1d9bb460245d8190b073f" datatype="html">
         <source>More</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit><trans-unit id="b7648e7aced164498aa843b5c4e8f2f1c36a7919" datatype="html">
         <source>Administration</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit><trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a" datatype="html">
         <source>About</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">79</context>
+          <context context-type="linenumber">95</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
@@ -996,19 +1140,19 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
-          <context context-type="linenumber">25</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit><trans-unit id="4752e5e33da1c3396d3248eb8fef59bca5d00cb3" datatype="html">
         <source>Show keyboard shortcuts</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">89</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit><trans-unit id="cf75021ac8cb9efd4f95e8880cf52c9acd265768" datatype="html">
         <source>Toggle dark interface</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">108</context>
         </context-group>
       </trans-unit><trans-unit id="2dc8a0a3763cd5c456c84630fc335398c9b86771" datatype="html">
         <source>View your notifications</source>
@@ -1020,7 +1164,7 @@
         <source>Notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/avatar-notification.component.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">13</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
@@ -1030,13 +1174,13 @@
         <source>Update your notification preferences</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/avatar-notification.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="3d1b5c9cd76948c04fdb7bb3fe51b6c1242c1bd5" datatype="html">
         <source>See all your notifications</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/avatar-notification.component.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit><trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599" datatype="html">
         <source>Search...</source>
@@ -1116,7 +1260,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">170</context>
+          <context context-type="linenumber">215</context>
         </context-group>
       </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
         <source>Licence</source>
@@ -1130,7 +1274,7 @@
         </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">224</context>
         </context-group>
       </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
         <source>Language</source>
@@ -1148,7 +1292,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">188</context>
+          <context context-type="linenumber">233</context>
         </context-group>
       </trans-unit><trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8" datatype="html">
         <source>All of these tags</source>
@@ -1221,6 +1365,10 @@
           <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -1313,6 +1461,14 @@
           <context context-type="linenumber">38</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
@@ -1358,7 +1514,7 @@
         <source>Description</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">16</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+accounts/account-about/account-about.component.html</context>
@@ -1377,6 +1533,14 @@
           <context context-type="linenumber">39</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
@@ -1392,42 +1556,12 @@
         <source>Terms</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">22</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">39</context>
         </context-group>
-      </trans-unit><trans-unit id="9c6e6db693ab265457c6578df179c65694141d27" datatype="html">
-        <source>User registration is allowed and</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit><trans-unit id="7a0a7b5a5bc9ee7b7e415f87ecc404145fb51dff" datatype="html">
-        <source>
-          this instance provides a baseline quota of &lt;x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/&gt; space for the videos of its users.
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit><trans-unit id="7bee5dd41c0007820f150ee33b8257dc1aac281b" datatype="html">
-        <source>
-          this instance provides unlimited space for the videos of its users.
-        </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit><trans-unit id="b6e2ede24a2ee0f6ba2f1924ede2ae408ffc2574" datatype="html">
-        <source>
-        User registration is currently not allowed.
-      </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
       </trans-unit><trans-unit id="a11e3ba2c5aea841de67a3c85892bb61295e94dc" datatype="html">
         <source>
   About PeerTube
@@ -1732,47 +1866,60 @@
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
+      </trans-unit><trans-unit id="8ae5153c547e445a293ee6ef9adfbf4107aa0772" datatype="html">
+        <source>Dedicated to sensitive or NSFW content</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit><trans-unit id="c9a1f510f6a1365c5bc5615661f8505792889347" datatype="html">
+        <source>Enabling it will allow other administrators to know that you are mainly federating sensitive content.&lt;br /&gt;&lt;br /&gt;
+              Moreover, the NSFW checkbox on video upload will be automatically checked by default.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">51</context>
+        </context-group>
       </trans-unit><trans-unit id="554488d11165f38b27b8fe230aba8a2e30d57003" datatype="html">
         <source>Default client route</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit><trans-unit id="3fae5a310387c065757fde11f22689b45a7b6f2d" datatype="html">
         <source>Videos Overview</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit><trans-unit id="1cbeb1eb589bfbe5efce94184cacd3095ca26948" datatype="html">
         <source>Videos Trending</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">52</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit><trans-unit id="1861c96217213992e02dcb77e15ea69e718c9883" datatype="html">
         <source>Videos Recently Added</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit><trans-unit id="b6307f83d9f43bff8d5129a7888e89964ddc3f7f" datatype="html">
         <source>Local videos</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit><trans-unit id="8551afadb69b3fef89e191f507e8ac84e624e8b9" datatype="html">
         <source>Policy on videos containing sensitive content</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit><trans-unit id="aa3ef567a1ea22c1e4d0acfdc8f80bc636bf12df" datatype="html">
         <source>With &lt;strong&gt;Do not list&lt;/strong&gt; or &lt;strong&gt;Blur thumbnails&lt;/strong&gt;, a confirmation will be requested to watch the video.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">73</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
@@ -1782,7 +1929,7 @@
         <source>Do not list</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">69</context>
+          <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
@@ -1792,7 +1939,7 @@
         <source>Blur thumbnails</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">79</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
@@ -1802,7 +1949,7 @@
         <source>Display</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">71</context>
+          <context context-type="linenumber">80</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
@@ -1812,43 +1959,43 @@
         <source>Signup enabled</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit><trans-unit id="90f449b1f4787e6c9731198a96d35399c1b340a7" datatype="html">
         <source>Signup requires email verification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">100</context>
         </context-group>
       </trans-unit><trans-unit id="68bda70e0dd4f7f91549462e55f1b2a1602d8402" datatype="html">
         <source>Signup limit</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">96</context>
+          <context context-type="linenumber">105</context>
         </context-group>
       </trans-unit><trans-unit id="4d13a9cd5ed3dcee0eab22cb25198d43886942be" datatype="html">
         <source>Users</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">105</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit><trans-unit id="31b3275d999af45fe64c6824e6e017d2e2704f09" datatype="html">
         <source>User default video quota</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">118</context>
         </context-group>
       </trans-unit><trans-unit id="f5528147716c4d3286c89defbe63ee0b75da5ffe" datatype="html">
         <source>User default daily upload limit</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">121</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit><trans-unit id="a059709f71aa4c0ac219e160e78a738682ca6a36" datatype="html">
         <source>Import</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">142</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
@@ -1862,31 +2009,43 @@
         <source>Video import with HTTP URL (i.e. YouTube) enabled</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">141</context>
+          <context context-type="linenumber">150</context>
         </context-group>
       </trans-unit><trans-unit id="05fdf7b5be1c3a7126e3c06d81da3134981b0a9e" datatype="html">
         <source>Video import with a torrent file or a magnet URI enabled</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">148</context>
+          <context context-type="linenumber">157</context>
+        </context-group>
+      </trans-unit><trans-unit id="51ee3dafebdb4c05d300b18bb4a997c10b1d7891" datatype="html">
+        <source>Auto-blacklist</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">164</context>
+        </context-group>
+      </trans-unit><trans-unit id="b78d9ff04931504a241a6c6fc394d677c7a0946c" datatype="html">
+        <source>New videos of users automatically blacklisted enabled</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">173</context>
         </context-group>
       </trans-unit><trans-unit id="ca2283fc765b9f44b69f0175d685dc2443da6011" datatype="html">
         <source>Administrator</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">155</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit><trans-unit id="55a0f51e38679d3141841e8333da5779d349c587" datatype="html">
         <source>Admin email</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="linenumber">184</context>
         </context-group>
       </trans-unit><trans-unit id="f9bda6652199995a4bd4424f2e35b748eb0bda8a" datatype="html">
         <source>Enable contact form</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">169</context>
+          <context context-type="linenumber">195</context>
         </context-group>
       </trans-unit><trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5" datatype="html">
         <source>Basic configuration</source>
@@ -1898,25 +2057,25 @@
         <source>Twitter</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">178</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit><trans-unit id="7fdb41bbf2ee042ec5f68725a1c16a1c97f3e524" datatype="html">
         <source>Your Twitter username</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">210</context>
         </context-group>
       </trans-unit><trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c" datatype="html">
         <source>Indicates the Twitter account for the website or platform on which the content was published.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">213</context>
         </context-group>
       </trans-unit><trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605" datatype="html">
         <source>Instance whitelisted by Twitter</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">199</context>
+          <context context-type="linenumber">225</context>
         </context-group>
       </trans-unit><trans-unit id="f1276a50033dfc7a71290086d0f57d89e3438e6b" datatype="html">
         <source>If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.&lt;br /&gt;
@@ -1924,55 +2083,55 @@
         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on &lt;a target=&apos;_blank&apos; rel=&apos;noopener noreferrer&apos; href=&apos;https://cards-dev.twitter.com/validator&apos;&gt;https://cards-dev.twitter.com/validator&lt;/a&gt; to see if you instance is whitelisted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">226</context>
         </context-group>
       </trans-unit><trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5" datatype="html">
         <source>Services</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">176</context>
+          <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit><trans-unit id="fe22d2c0020e913ee4b75ec22a3abc8814810490" datatype="html">
         <source>Transcoding</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">215</context>
+          <context context-type="linenumber">241</context>
         </context-group>
       </trans-unit><trans-unit id="fca29003c4ea1226ff8cbee89481758aab0e2be9" datatype="html">
         <source>Transcoding enabled</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">221</context>
+          <context context-type="linenumber">247</context>
         </context-group>
       </trans-unit><trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f" datatype="html">
         <source>If you disable transcoding, many videos from your users will not work!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">222</context>
+          <context context-type="linenumber">248</context>
         </context-group>
       </trans-unit><trans-unit id="0050a55afb9c565df1f9b3f750c2d4adb697698f" datatype="html">
         <source>Allow additional extensions</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">231</context>
+          <context context-type="linenumber">257</context>
         </context-group>
       </trans-unit><trans-unit id="9b82c3a407ee5a98c92483fbd987be8db8384c33" datatype="html">
         <source>Allow your users to upload .mkv, .mov, .avi, .flv videos</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">232</context>
+          <context context-type="linenumber">258</context>
         </context-group>
       </trans-unit><trans-unit id="a33feadefbb776217c2db96100736314f8b765c2" datatype="html">
         <source>Transcoding threads</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">237</context>
+          <context context-type="linenumber">263</context>
         </context-group>
       </trans-unit><trans-unit id="5afc7e831e59c325e8fb3e208ec108ff53fb3500" datatype="html">
         <source>Resolution &lt;x id="INTERPOLATION" equiv-text="{{resolution}}"/&gt; enabled</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">252</context>
+          <context context-type="linenumber">278</context>
         </context-group>
       </trans-unit><trans-unit id="e9fb2d7685ae280026fe6463731170b067e419d5" datatype="html">
         <source>
@@ -1982,81 +2141,81 @@
         </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">260</context>
+          <context context-type="linenumber">286</context>
         </context-group>
       </trans-unit><trans-unit id="d5bf7bea37daff4e018fd11a1b552512e5cb54c0" datatype="html">
         <source>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">265</context>
+          <context context-type="linenumber">291</context>
         </context-group>
       </trans-unit><trans-unit id="d00f6c2dcb426440a0a8cd8eec12d094fbfaf6f7" datatype="html">
         <source>Previews cache size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">271</context>
+          <context context-type="linenumber">297</context>
         </context-group>
       </trans-unit><trans-unit id="98970cd72e776308a37dc4e84bebbedffc787607" datatype="html">
         <source>Video captions cache size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">280</context>
+          <context context-type="linenumber">306</context>
         </context-group>
       </trans-unit><trans-unit id="e3a65df2560e99864bbde695da3a7bdf743a184c" datatype="html">
         <source>Customizations</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">289</context>
+          <context context-type="linenumber">315</context>
         </context-group>
       </trans-unit><trans-unit id="0da9752916950ce6890d897b835c923a71ad9c5c" datatype="html">
         <source>JavaScript</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">294</context>
+          <context context-type="linenumber">320</context>
         </context-group>
       </trans-unit><trans-unit id="fda2339a6e6ba017ee43b560caf660ed4022333c" datatype="html">
         <source>Write directly JavaScript code.&lt;br /&gt;Example: &lt;pre&gt;console.log(&apos;my instance is amazing&apos;);&lt;/pre&gt;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">297</context>
+          <context context-type="linenumber">323</context>
         </context-group>
-      </trans-unit><trans-unit id="d7caa08cd9b3119881bbaec3f5a3c5707f573dde" datatype="html">
+      </trans-unit><trans-unit id="d90e081933221a99c87e2ad9769afb6be6ff6fc4" datatype="html">
         <source>
-                    Write directly CSS code. Example:&lt;br /&gt;
+                    Write directly CSS code. Example:&lt;br /&gt;&lt;br /&gt;
                     &lt;pre&gt;
-          body &lt;x id="INTERPOLATION" equiv-text="{{ &apos;{&apos; }}"/&gt;
-            background-color: red;
-          &lt;x id="INTERPOLATION_1" equiv-text="{{ &apos;}&apos; }}"/&gt;
+  #custom-css &lt;x id="INTERPOLATION" equiv-text="{{ &apos;{&apos; }}"/&gt;
+    color: red;
+  &lt;x id="INTERPOLATION_1" equiv-text="{{ &apos;}&apos; }}"/&gt;
                     &lt;/pre&gt;
 
-                    Prepend with &lt;em&gt;#custom-css&lt;/em&gt; to override styles. Example:
+                    Prepend with &lt;em&gt;#custom-css&lt;/em&gt; to override styles. Example:&lt;br /&gt;&lt;br /&gt;
                     &lt;pre&gt;
-          #custom-css .logged-in-email &lt;x id="INTERPOLATION" equiv-text="{{ &apos;{&apos; }}"/&gt;
-            color: red;
-          &lt;x id="INTERPOLATION_1" equiv-text="{{ &apos;}&apos; }}"/&gt;
+  #custom-css .logged-in-email &lt;x id="INTERPOLATION" equiv-text="{{ &apos;{&apos; }}"/&gt;
+    color: red;
+  &lt;x id="INTERPOLATION_1" equiv-text="{{ &apos;}&apos; }}"/&gt;
                     &lt;/pre&gt;
                   </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">311</context>
+          <context context-type="linenumber">337</context>
         </context-group>
       </trans-unit><trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab" datatype="html">
         <source>Advanced configuration</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">212</context>
+          <context context-type="linenumber">238</context>
         </context-group>
       </trans-unit><trans-unit id="dad5a5283e4c853c011a0f03d5a52310338bbff8" datatype="html">
         <source>Update configuration</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">340</context>
+          <context context-type="linenumber">366</context>
         </context-group>
       </trans-unit><trans-unit id="3e459b5c3861d8c80084d21d233b7c8e2edd3cca" datatype="html">
         <source>It seems the configuration is invalid. Please search potential errors in the different tabs.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">341</context>
+          <context context-type="linenumber">367</context>
         </context-group>
       </trans-unit><trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c" datatype="html">
         <source>
@@ -2445,7 +2604,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">179</context>
         </context-group>
       </trans-unit><trans-unit id="02ba1a65db92d1d0ab4ba380086e9be61891aaa5" datatype="html">
         <source>User&apos;s email must be verified to login</source>
@@ -2587,6 +2746,32 @@
           <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">43</context>
         </context-group>
+      </trans-unit><trans-unit id="b99370ff3526f3ae466a0031d45c24a9d218af5e" datatype="html">
+        <source>Privacy: </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit><trans-unit id="5370dc99a95cd0c6d3c939e19b88d774fd5387ee" datatype="html">
+        <source>Sensitive: </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit><trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff" datatype="html">
+        <source>Unblacklist</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">146</context>
+        </context-group>
       </trans-unit><trans-unit id="90868353e7e6f5994109ee1011131cefa992116c" datatype="html">
         <source>Moderation</source>
         <context-group purpose="location">
@@ -2599,17 +2784,23 @@
           <context context-type="sourcefile">app/+admin/moderation/moderation.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
-      </trans-unit><trans-unit id="00ecde6001106fe7406a34cc3459cc5b88e4aec1" datatype="html">
-        <source>Blacklisted videos</source>
+      </trans-unit><trans-unit id="6053443ad364f974301570cfadfa86ee0b43f1a9" datatype="html">
+        <source>&lt;x id="INTERPOLATION" equiv-text="{{ autoBlacklistVideosEnabled ? &apos;Manually blacklisted videos&apos; : &apos;Blacklisted videos&apos; }}"/&gt;</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/moderation.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
+      </trans-unit><trans-unit id="6106bd52908f3f323ed1d6bdcd53230d55401d45" datatype="html">
+        <source>Auto-blacklisted videos</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/moderation.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
       </trans-unit><trans-unit id="b1ff109b26ae8f08650415454b9098c43eba2e2c" datatype="html">
         <source>Muted accounts</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/moderation.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">11</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-blocklist/my-account-blocklist.component.html</context>
@@ -2619,7 +2810,7 @@
         <source>Muted servers</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/moderation.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="29881a45dafbe5aa05cd9d0441a4c0c2fb06df92" datatype="html">
         <source>Account</source>
@@ -2699,7 +2890,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit><trans-unit id="046c4fa30411e6b1aa46dc51bf82d07b1adf14d4" datatype="html">
         <source>Select the next owner</source>
@@ -2727,24 +2918,16 @@
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="4a806761798181e907e28ed1af053d466526800d" datatype="html">
         <source>Blacklisted</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
-          <context context-type="linenumber">22</context>
-        </context-group>
-      </trans-unit><trans-unit id="17a9d3860d9ad593dd09a9f934e03999d9e76a7a" datatype="html">
-        <source>
-            Cancel
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">16</context>
         </context-group>
-      </trans-unit><trans-unit id="73c1cefc348a6f361497210dea1ed79499fd1260" datatype="html">
-        <source>Create another video channel</source>
+      </trans-unit><trans-unit id="16f3de2dba2a3461d7f7a36157d22e6898bb3244" datatype="html">
+        <source>Create a new video channel</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
           <context context-type="linenumber">4</context>
@@ -2779,20 +2962,6 @@
           <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
-      </trans-unit><trans-unit id="bc155f9fc3be3f32083f19b2c77d4ad3b696d9b9" datatype="html">
-        <source>Display name</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
       </trans-unit><trans-unit id="74728de5289ea2ff3f553bc2b48f1811680b931a" datatype="html">
         <source>Short text to tell people how they can support your channel (membership platform...).&lt;br /&gt;&lt;br /&gt;
 When you will upload a video in this channel, the video support field will be automatically filled by this text.</source>
@@ -2899,17 +3068,20 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/+my-account/my-account-history/my-account-history.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
-      </trans-unit><trans-unit id="0f1fd6758625c6a39d796378d362cdcc2b092123" datatype="html">
-        <source>Delete history</source>
+      </trans-unit><trans-unit id="29c45bf49891748f930ef78b2e09857498b15131" datatype="html">
+        <source>
+    &lt;x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon&gt;"/&gt;&lt;x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon&gt;"/&gt;
+    Delete history
+  </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-history/my-account-history.component.html</context>
-          <context context-type="linenumber">8</context>
+          <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="6b4dc5732f1f2211833d4b5e76deb5985f3749af" datatype="html">
         <source>You don&apos;t have videos history yet.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-history/my-account-history.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit><trans-unit id="6aec8cb024acc333218d72f279caa8ea623bb628" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
@@ -2935,6 +3107,96 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/+my-account/my-account-notifications/my-account-notifications.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
+      </trans-unit><trans-unit id="be746a6e47e3388c7cf793aef8d7b44b86cc94f2" datatype="html">
+        <source>Create a new playlist</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427" datatype="html">
+        <source>Privacy</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">90</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">205</context>
+        </context-group>
+      </trans-unit><trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071" datatype="html">
+        <source>Channel</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
+      </trans-unit><trans-unit id="1dd793abd1cb8d16a7a2cb71ca5549a7111ee513" datatype="html">
+        <source>Upload thumbnail</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">192</context>
+        </context-group>
+      </trans-unit><trans-unit id="188014887f7188d90b39e41d9606b91c77c17861" datatype="html">
+        <source>No videos in this playlist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
       </trans-unit><trans-unit id="739516c2ca75843d5aec9cf0e6b3e4335c4227b9" datatype="html">
         <source>Change password</source>
         <context-group purpose="location">
@@ -2981,12 +3243,6 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">28</context>
         </context-group>
-      </trans-unit><trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
-        <source>Save</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
-          <context context-type="linenumber">32</context>
-        </context-group>
       </trans-unit><trans-unit id="d2fa66a905b6b7f691c83be681d18188cbe4a8ba" datatype="html">
         <source>Update my profile</source>
         <context-group purpose="location">
@@ -3085,6 +3341,12 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
+      </trans-unit><trans-unit id="b207b668dc1d056cd7557ffa3b41f1fd0865f93d" datatype="html">
+        <source>Video playlists</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
       </trans-unit><trans-unit id="1380539d91f77f565de6e21ce210da891e6644b8" datatype="html">
         <source>Support this channel</source>
         <context-group purpose="location">
@@ -3097,6 +3359,20 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
+      </trans-unit><trans-unit id="c286611c692d1442f8536ae6e62becbd28413d0e" datatype="html">
+        <source>
+  Created &lt;x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/&gt; playlists
+</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+video-channels/video-channel-playlists/video-channel-playlists.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="fbbe62dee434f0521e0dfb8e3957d92fc5fcd76f" datatype="html">
+        <source>This channel does not have playlists.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+video-channels/video-channel-playlists/video-channel-playlists.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
       </trans-unit><trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6" datatype="html">
         <source>URL</source>
         <context-group purpose="location">
@@ -3105,7 +3381,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/modal/video-share.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="bfe7f34fbd4c3afa5f84a5580e0fae942cad2333" datatype="html">
         <source>You can import any URL &lt;a href=&apos;https://rg3.github.io/youtube-dl/supportedsites.html&apos; target=&apos;_blank&apos; rel=&apos;noopener noreferrer&apos;&gt;supported by youtube-dl&lt;/a&gt; or URL that points to a raw MP4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance.</source>
@@ -3113,46 +3389,6 @@ 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-add-components/video-import-url.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
-      </trans-unit><trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071" datatype="html">
-        <source>Channel</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
-          <context context-type="linenumber">24</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
-          <context context-type="linenumber">39</context>
-        </context-group>
-      </trans-unit><trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427" datatype="html">
-        <source>Privacy</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
-          <context context-type="linenumber">33</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
-          <context context-type="linenumber">90</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">160</context>
-        </context-group>
       </trans-unit><trans-unit id="385811ab5a5c3e96e0db46c9ce1fc3147d8cd4c7" datatype="html">
         <source>Sorry, but something went wrong</source>
         <context-group purpose="location">
@@ -3191,7 +3427,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">93</context>
+          <context context-type="linenumber">138</context>
         </context-group>
       </trans-unit><trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9" datatype="html">
         <source>Select the file to upload</source>
@@ -3327,7 +3563,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">197</context>
+          <context context-type="linenumber">242</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>
@@ -3445,12 +3681,6 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">135</context>
         </context-group>
-      </trans-unit><trans-unit id="1dd793abd1cb8d16a7a2cb71ca5549a7111ee513" datatype="html">
-        <source>Upload thumbnail</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
-          <context context-type="linenumber">192</context>
-        </context-group>
       </trans-unit><trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639" datatype="html">
         <source>Upload preview</source>
         <context-group purpose="location">
@@ -3469,7 +3699,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">70</context>
+          <context context-type="linenumber">101</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>
@@ -3559,7 +3789,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">85</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit><trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b" datatype="html">
         <source>Report video</source>
@@ -3584,19 +3814,19 @@ 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">75</context>
+          <context context-type="linenumber">106</context>
         </context-group>
       </trans-unit><trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f" datatype="html">
         <source>QR-Code</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">29</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit><trans-unit id="d3b15c3bf4a7ea38d6002d2d2c4781642d30e79c" datatype="html">
         <source>Embed</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="linenumber">42</context>
         </context-group>
       </trans-unit><trans-unit id="90e0a0a3da80b46e550c1395ff4e97c27259bef8" datatype="html">
         <source>
@@ -3604,13 +3834,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/modal/video-share.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">53</context>
         </context-group>
       </trans-unit><trans-unit id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8" datatype="html">
         <source>Close</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit><trans-unit id="f672385c803647b063687d3c912e2ce5738b51c8" datatype="html">
         <source>Blacklist video</source>
@@ -3624,13 +3854,19 @@ 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-blacklist.component.html</context>
           <context context-type="linenumber">21</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="7584313e33a66811eb10646627914a01fff0347d" 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">11</context>
+          <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit><trans-unit id="9ed65ae88f6c982bc44d6fed2796e55f47dbf304" datatype="html">
         <source>
@@ -3638,7 +3874,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">15</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit><trans-unit id="c89a08fd2a05d1013fed8478024f5ba37ac3d308" datatype="html">
         <source>
@@ -3646,131 +3882,133 @@ 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">19</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit><trans-unit id="3835314f553aa264dfd07147fe9db63bb8059c0f" 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">51</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">24</context>
+          <context context-type="linenumber">56</context>
         </context-group>
-      </trans-unit><trans-unit id="3da5360f8314aa95973aa52629c9f635363c5a36" datatype="html">
+      </trans-unit><trans-unit id="99686034581579c92a971f4eeebd2c072c812e2d" datatype="html">
         <source>
-                Published &lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views
-              </source>
+              Published &lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views
+            </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">67</context>
         </context-group>
-      </trans-unit><trans-unit id="07087373dbf99b5e8b2b2f962fd53baa97d9ab95" datatype="html">
+      </trans-unit><trans-unit id="3da5360f8314aa95973aa52629c9f635363c5a36" datatype="html">
         <source>
-                  Published &lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views
-                </source>
+                Published &lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views
+              </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="linenumber">76</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">55</context>
+          <context context-type="linenumber">86</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">63</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit><trans-unit id="144fff5c40b85414d59e644d8dee7cfefba925a2" datatype="html">
         <source>Download the video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit><trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a" datatype="html">
         <source>Report</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">89</context>
+          <context context-type="linenumber">134</context>
         </context-group>
       </trans-unit><trans-unit id="2f4894617d9c44010f87473e583bd4604b7d6ecf" datatype="html">
         <source>Report 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">133</context>
         </context-group>
       </trans-unit><trans-unit id="cd27f761b923a5bdb16ba9844da632edd878f1b1" datatype="html">
         <source>Update this video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit><trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61" datatype="html">
         <source>Blacklist</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">142</context>
         </context-group>
       </trans-unit><trans-unit id="803c6317abd2dbafcc93226c4e273c62932e3037" datatype="html">
         <source>Blacklist 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-group>
-      </trans-unit><trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff" datatype="html">
-        <source>Unblacklist</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit><trans-unit id="61021f5011bc24f69cfc3f6dbbbd8f1948328b25" datatype="html">
         <source>Unblacklist this video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit><trans-unit id="3dbfdc68f83d91cb360172eb65578cae94e7cbe5" datatype="html">
         <source>Delete this video</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="linenumber">149</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">124</context>
+          <context context-type="linenumber">169</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">135</context>
+          <context context-type="linenumber">180</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">147</context>
+          <context context-type="linenumber">192</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">153</context>
+          <context context-type="linenumber">198</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">165</context>
+          <context context-type="linenumber">210</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">214</context>
+          <context context-type="linenumber">258</context>
         </context-group>
       </trans-unit><trans-unit id="9e66f7507eb263abdbab7abafd825f1dc8bc880b" datatype="html">
         <source>
@@ -3778,19 +4016,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">215</context>
+          <context context-type="linenumber">259</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">218</context>
+          <context context-type="linenumber">262</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">218</context>
+          <context context-type="linenumber">262</context>
         </context-group>
       </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>
@@ -3798,7 +4036,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">221</context>
+          <context context-type="linenumber">265</context>
         </context-group>
       </trans-unit><trans-unit id="abf2b0f7b6405fa2841ca39c827e86089a95cc27" datatype="html">
         <source>
@@ -4245,6 +4483,20 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="36e4cdb23056253e5ef0c62b7d4bbeb3f759f611" datatype="html">
+        <source>Video &lt;x id="INTERPOLATION" equiv-text="{{name}}"/&gt; removed from blacklist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3d651e314544825348900b3120e2cd5ff38c7fa5" datatype="html">
+        <source>&lt;x id="INTERPOLATION" equiv-text="{{num}}"/&gt; videos removed from blacklist.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="0594812d4c50c2adbd1a892a3497c4e5c19e4b32" datatype="html">
         <source>yes</source>
         <context-group purpose="location">
@@ -4537,8 +4789,15 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="0a9650640ddd1dfadfe456891d6d4f6093ad428e" datatype="html">
-        <source>New video abuse on local video</source>
+      <trans-unit id="f536b58345161afa5cd859cce5a0b66a39327ad8" datatype="html">
+        <source>New video abuse</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="051dd48c3e6254785c6f366656aaee58f8b46c47" datatype="html">
+        <source>Video auto-blacklisted waiting review</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -4632,17 +4891,17 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795" datatype="html">
-        <source>Create</source>
+      <trans-unit id="98ab64f0af924a60a48b40835c1b655bd17c6559" datatype="html">
+        <source>Video channel &lt;x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/&gt; updated.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts</context>
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="98ab64f0af924a60a48b40835c1b655bd17c6559" datatype="html">
-        <source>Video channel &lt;x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/&gt; updated.</source>
+      <trans-unit id="4e613272923d6f1976e3c73e8b857ac45c37b791" datatype="html">
+        <source>Do you really want to delete &lt;x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/&gt;? It will delete all videos uploaded in this channel, and you will not be able to create another channel with the same name (&lt;x id="INTERPOLATION_1" equiv-text="{{channelName}}"/&gt;)!</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -4660,6 +4919,34 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="c7e4d8688bd06d723e512ab063c0c4fdf4a9804d" datatype="html">
+        <source>Playlist &lt;x id="INTERPOLATION" equiv-text="{{playlistName}}"/&gt; created.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3222e26b41803055328d893a73df485ec8a0328d" datatype="html">
+        <source>Playlist &lt;x id="INTERPOLATION" equiv-text="{{videoPlaylistName}}"/&gt; updated.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="082d28149b07cd5178cad0fdaf2cd8963833b783" datatype="html">
+        <source>Do you really want to delete &lt;x id="INTERPOLATION" equiv-text="{{playlistDisplayName}}"/&gt;?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d6c948062aa2a0482332d4f7de420a39ac253a86" datatype="html">
+        <source>Playlist &lt;x id="INTERPOLATION" equiv-text="{{playlistDisplayName}}"/&gt; deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="d02888c485d3aeab6de628508f4a00312a722894" datatype="html">
         <source>My videos</source>
         <context-group purpose="location">
@@ -4745,15 +5032,15 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4ef4f031c147fb9ee0168bc6eacb78de180d7432" datatype="html">
-        <source>My library</source>
+      <trans-unit id="8dd18d9047c4b2dc9786550dfd8fa99f3b14e17f" datatype="html">
+        <source>My channels</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8dd18d9047c4b2dc9786550dfd8fa99f3b14e17f" datatype="html">
-        <source>My channels</source>
+      <trans-unit id="1d3408919f4d08414721cc22c4be39d93d6691d2" datatype="html">
+        <source>My playlists</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -5376,6 +5663,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="085b2d6f79819a72a2b56cada4ef5085ba51d90c" datatype="html">
         <source>Display name must be at least 1 character long.</source>
@@ -5387,6 +5678,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="5a920575b8e1067f5b11c66a4a36d3ced87756f1" datatype="html">
         <source>Display name cannot be more than 50 characters long.</source>
@@ -5409,6 +5704,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="a4179e366d4aa335f1ddd0a13e9109c71a9338d0" datatype="html">
         <source>Description cannot be more than 1000 characters long.</source>
@@ -5420,6 +5719,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="4a3ebc6ddb6b6677aed7b04eb503f9ddd0cfe561" datatype="html">
         <source>You must to agree with the instance terms in order to registering on it.</source>
@@ -5596,6 +5899,27 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="e81bda510399d52f26a44a15c3dbf4d6205d90a9" datatype="html">
+        <source>Display name cannot be more than 120 characters long.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e8c50a2e0b9a6eec54a983a3284839d81739f18c" datatype="html">
+        <source>Privacy is required.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3499ad3f4da49c7373332c5052d543929b94dc9c" datatype="html">
+        <source>The channel is required when the playlist is public.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-playlist-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="cdc51eaeab88683610a28af8645cf91d136b39e1" datatype="html">
         <source>Video name is required.</source>
         <context-group purpose="location">
@@ -6060,6 +6384,34 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <note priority="1" from="description">Date format in this locale.</note>
       </trans-unit>
+      <trans-unit id="c09a68321f26f058b547021e6e2c167ae22c6e24" datatype="html">
+        <source>Hidden</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="75cc14815746a90d424157080fc7efd3e2631654" datatype="html">
+        <source>Blurred with confirmation request</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1e89bd0d46ef7d90b5f98b24f83afc312c6ef105" datatype="html">
+        <source>Displayed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="87ca23d62c168409ed040dae83dd8717cae3f08c" datatype="html">
+        <source>User registration allowed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="a0fdb831d4557925dbaa4f8aff7e5035f7506411" datatype="html">
         <source>Transcode your videos in multiple resolutions</source>
         <context-group purpose="location">
@@ -6445,6 +6797,63 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5034e84fab7cd3d662d2483753e33caea0774b78" datatype="html">
+        <source>Video removed from &lt;x id="INTERPOLATION" equiv-text="{{name}}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5cbf881bedb548fda270e2b745c8cbe332a5e4de" datatype="html">
+        <source>Video added in &lt;x id="INTERPOLATION" equiv-text="{{n}}"/&gt; at timestamps &lt;x id="INTERPOLATION_1" equiv-text="{{t}}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f69a06eee4963406efdbff8c3d9765832c30482f" datatype="html">
+        <source>Video added in &lt;x id="INTERPOLATION" equiv-text="{{n}}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="986f17319b16d01d0047e2e2cd728bf4dbac4fe8" datatype="html">
+        <source>Timestamps updated</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28d23ed47149ffd34c2ebd58bfeb4601649c784f" datatype="html">
+        <source>Starts at </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1e40e4317900075588705bc4084fda4b2ddb3372" datatype="html">
+        <source>Stops at </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1b8201c470a1635cc9beab9adb90eabd19fc9691" datatype="html">
+        <source> and stops at </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="d4195053fd38eacf6dee1fc507296928978cc8fb" datatype="html">
         <source>Only I can see this video</source>
         <context-group purpose="location">
@@ -6561,6 +6970,20 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="f18ffad7896788364e69a9ac6a376c84f54c58f7" datatype="html">
+        <source> The deletion will be sent to remote instances so they remove the comment too.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8d850ce30ecdacf4755d85cce1fe44cb0d1fc38d" datatype="html">
+        <source> It is a remote comment, so the deletion will only be effective on your instance.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="73c33d602da89a33d353d686f36c2fff39f0aee3" datatype="html">
         <source>Video blacklisted.</source>
         <context-group purpose="location">
@@ -6586,13 +7009,6 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="aca77c42f255d4bc6e95c12c5d656070726c6c2f" datatype="html">
-        <source>Start at &lt;x id="INTERPOLATION" equiv-text="{{timestamp}}"/&gt;</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="0e65067fdcc9d8725a41896cb1e229d1415a45f6" datatype="html">
         <source>Like the video</source>
         <context-group purpose="location">
@@ -6642,8 +7058,8 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8c429645223c24afe30218fc45bb07e352bb1938" datatype="html">
-        <source>Trending videos are those totalizing the greatest number of views during the last 24 hours.</source>
+      <trans-unit id="6e9cb0b3b38312870471954abec8690170429a4e" datatype="html">
+        <source>Trending videos are those totalizing the greatest number of views during the last 24 hours</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -6656,8 +7072,8 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="98b98154eca3533e16b81c5b08611d19949e8661" datatype="html">
-        <source>Trending videos are those totalizing the greatest number of views during the last &lt;x id="INTERPOLATION" equiv-text="{{days}}"/&gt; days.</source>
+      <trans-unit id="caa0a70f34df9b60a71ed0ad6c82de7b07c0c509" datatype="html">
+        <source>Trending videos are those totalizing the greatest number of views during the last &lt;x id="INTERPOLATION" equiv-text="{{days}}"/&gt; days</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
           <context context-type="linenumber">1</context>
diff --git a/client/src/locale/source/iso639_en_US.xml b/client/src/locale/source/iso639_en_US.xml
index 905e6181e..fa3d7c010 100644
--- a/client/src/locale/source/iso639_en_US.xml
+++ b/client/src/locale/source/iso639_en_US.xml
@@ -3,771 +3,579 @@
     <body>
       <trans-unit id="Afar">
         <source>Afar</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Abkhazian">
         <source>Abkhazian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Afrikaans">
         <source>Afrikaans</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Akan">
         <source>Akan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Amharic">
         <source>Amharic</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Arabic">
         <source>Arabic</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Aragonese">
         <source>Aragonese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="American Sign Language">
         <source>American Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Assamese">
         <source>Assamese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Avaric">
         <source>Avaric</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kotava">
         <source>Kotava</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Aymara">
         <source>Aymara</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Azerbaijani">
         <source>Azerbaijani</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bashkir">
         <source>Bashkir</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bambara">
         <source>Bambara</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Belarusian">
         <source>Belarusian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bengali">
         <source>Bengali</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="British Sign Language">
         <source>British Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bislama">
         <source>Bislama</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tibetan">
         <source>Tibetan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bosnian">
         <source>Bosnian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Breton">
         <source>Breton</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Bulgarian">
         <source>Bulgarian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Brazilian Sign Language">
         <source>Brazilian Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Catalan">
         <source>Catalan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Czech">
         <source>Czech</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chamorro">
         <source>Chamorro</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chechen">
         <source>Chechen</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chuvash">
         <source>Chuvash</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Cornish">
         <source>Cornish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Corsican">
         <source>Corsican</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Cree">
         <source>Cree</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Czech Sign Language">
         <source>Czech Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chinese Sign Language">
         <source>Chinese Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Welsh">
         <source>Welsh</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Danish">
         <source>Danish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="German">
         <source>German</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Dhivehi">
         <source>Dhivehi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Danish Sign Language">
         <source>Danish Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Dzongkha">
         <source>Dzongkha</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Modern Greek (1453-)">
         <source>Modern Greek (1453-)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="English">
         <source>English</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Esperanto">
         <source>Esperanto</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Estonian">
         <source>Estonian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Basque">
         <source>Basque</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ewe">
         <source>Ewe</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Faroese">
         <source>Faroese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Persian">
         <source>Persian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Fijian">
         <source>Fijian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Finnish">
         <source>Finnish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="French">
         <source>French</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Western Frisian">
         <source>Western Frisian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="French Sign Language">
         <source>French Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Fulah">
         <source>Fulah</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Scottish Gaelic">
         <source>Scottish Gaelic</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Irish">
         <source>Irish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Galician">
         <source>Galician</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Manx">
         <source>Manx</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Guarani">
         <source>Guarani</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="German Sign Language">
         <source>German Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Gujarati">
         <source>Gujarati</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Haitian">
         <source>Haitian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Hausa">
         <source>Hausa</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Serbo-Croatian">
         <source>Serbo-Croatian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Hebrew">
         <source>Hebrew</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Herero">
         <source>Herero</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Hindi">
         <source>Hindi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Hiri Motu">
         <source>Hiri Motu</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Croatian">
         <source>Croatian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Hungarian">
         <source>Hungarian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Armenian">
         <source>Armenian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Igbo">
         <source>Igbo</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sichuan Yi">
         <source>Sichuan Yi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Inuktitut">
         <source>Inuktitut</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Indonesian">
         <source>Indonesian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Inupiaq">
         <source>Inupiaq</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Icelandic">
         <source>Icelandic</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Italian">
         <source>Italian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Javanese">
         <source>Javanese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Lojban">
         <source>Lojban</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Japanese">
         <source>Japanese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Japanese Sign Language">
         <source>Japanese Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kalaallisut">
         <source>Kalaallisut</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kannada">
         <source>Kannada</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kashmiri">
         <source>Kashmiri</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Georgian">
         <source>Georgian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kanuri">
         <source>Kanuri</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kazakh">
         <source>Kazakh</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Khmer">
         <source>Khmer</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kikuyu">
         <source>Kikuyu</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kinyarwanda">
         <source>Kinyarwanda</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kirghiz">
         <source>Kirghiz</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Komi">
         <source>Komi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kongo">
         <source>Kongo</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Korean">
         <source>Korean</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kuanyama">
         <source>Kuanyama</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kurdish">
         <source>Kurdish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Lao">
         <source>Lao</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Latvian">
         <source>Latvian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Limburgan">
         <source>Limburgan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Lingala">
         <source>Lingala</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Lithuanian">
         <source>Lithuanian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Luxembourgish">
         <source>Luxembourgish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Luba-Katanga">
         <source>Luba-Katanga</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ganda">
         <source>Ganda</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Marshallese">
         <source>Marshallese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Malayalam">
         <source>Malayalam</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Marathi">
         <source>Marathi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Macedonian">
         <source>Macedonian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Malagasy">
         <source>Malagasy</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Maltese">
         <source>Maltese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Mongolian">
         <source>Mongolian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Maori">
         <source>Maori</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Malay (macrolanguage)">
         <source>Malay (macrolanguage)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Burmese">
         <source>Burmese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Nauru">
         <source>Nauru</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Navajo">
         <source>Navajo</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="South Ndebele">
         <source>South Ndebele</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="North Ndebele">
         <source>North Ndebele</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ndonga">
         <source>Ndonga</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Nepali (macrolanguage)">
         <source>Nepali (macrolanguage)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Dutch">
         <source>Dutch</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Norwegian Nynorsk">
         <source>Norwegian Nynorsk</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Norwegian Bokmål">
         <source>Norwegian Bokmål</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Norwegian">
         <source>Norwegian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Nyanja">
         <source>Nyanja</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Occitan">
         <source>Occitan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ojibwa">
         <source>Ojibwa</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Oriya (macrolanguage)">
         <source>Oriya (macrolanguage)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Oromo">
         <source>Oromo</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ossetian">
         <source>Ossetian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Panjabi">
         <source>Panjabi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Pakistan Sign Language">
         <source>Pakistan Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Polish">
         <source>Polish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Portuguese">
         <source>Portuguese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Pushto">
         <source>Pushto</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Quechua">
         <source>Quechua</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Romansh">
         <source>Romansh</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Romanian">
         <source>Romanian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Russian Sign Language">
         <source>Russian Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Rundi">
         <source>Rundi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Russian">
         <source>Russian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sango">
         <source>Sango</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Saudi Arabian Sign Language">
         <source>Saudi Arabian Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="South African Sign Language">
         <source>South African Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sinhala">
         <source>Sinhala</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Slovak">
         <source>Slovak</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Slovenian">
         <source>Slovenian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Northern Sami">
         <source>Northern Sami</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Samoan">
         <source>Samoan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Shona">
         <source>Shona</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sindhi">
         <source>Sindhi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Somali">
         <source>Somali</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Southern Sotho">
         <source>Southern Sotho</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Spanish">
         <source>Spanish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Albanian">
         <source>Albanian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sardinian">
         <source>Sardinian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Serbian">
         <source>Serbian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Swati">
         <source>Swati</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sundanese">
         <source>Sundanese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Swahili (macrolanguage)">
         <source>Swahili (macrolanguage)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Swedish">
         <source>Swedish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Swedish Sign Language">
         <source>Swedish Sign Language</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tahitian">
         <source>Tahitian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tamil">
         <source>Tamil</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tatar">
         <source>Tatar</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Telugu">
         <source>Telugu</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tajik">
         <source>Tajik</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tagalog">
         <source>Tagalog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Thai">
         <source>Thai</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tigrinya">
         <source>Tigrinya</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Klingon">
         <source>Klingon</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tonga (Tonga Islands)">
         <source>Tonga (Tonga Islands)</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tswana">
         <source>Tswana</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Tsonga">
         <source>Tsonga</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Turkmen">
         <source>Turkmen</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Turkish">
         <source>Turkish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Twi">
         <source>Twi</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Uighur">
         <source>Uighur</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Ukrainian">
         <source>Ukrainian</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Urdu">
         <source>Urdu</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Uzbek">
         <source>Uzbek</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Venda">
         <source>Venda</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Vietnamese">
         <source>Vietnamese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Walloon">
         <source>Walloon</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Wolof">
         <source>Wolof</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Xhosa">
         <source>Xhosa</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Yiddish">
         <source>Yiddish</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Yoruba">
         <source>Yoruba</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Zhuang">
         <source>Zhuang</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chinese">
         <source>Chinese</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Zulu">
         <source>Zulu</source>
-        <target>undefined</target>
       </trans-unit>
     </body>
   </file>
diff --git a/client/src/locale/source/player_en_US.xml b/client/src/locale/source/player_en_US.xml
index 5a411e10a..cf6fc7b7b 100644
--- a/client/src/locale/source/player_en_US.xml
+++ b/client/src/locale/source/player_en_US.xml
@@ -3,395 +3,297 @@
     <body>
       <trans-unit id="Audio Player">
         <source>Audio Player</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Video Player">
         <source>Video Player</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Play">
         <source>Play</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Pause">
         <source>Pause</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Replay">
         <source>Replay</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Current Time">
         <source>Current Time</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Duration">
         <source>Duration</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Remaining Time">
         <source>Remaining Time</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Stream Type">
         <source>Stream Type</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="LIVE">
         <source>LIVE</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Loaded">
         <source>Loaded</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Progress">
         <source>Progress</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Progress Bar">
         <source>Progress Bar</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="progress bar timing: currentTime={1} duration={2}">
         <source>{1} of {2}</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Fullscreen">
         <source>Fullscreen</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Non-Fullscreen">
         <source>Non-Fullscreen</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Mute">
         <source>Mute</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Unmute">
         <source>Unmute</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Playback Rate">
         <source>Playback Rate</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Subtitles">
         <source>Subtitles</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="subtitles off">
         <source>subtitles off</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Captions">
         <source>Captions</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="captions off">
         <source>captions off</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Chapters">
         <source>Chapters</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Descriptions">
         <source>Descriptions</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="descriptions off">
         <source>descriptions off</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Audio Track">
         <source>Audio Track</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Volume Level">
         <source>Volume Level</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="You aborted the media playback">
         <source>You aborted the media playback</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="A network error caused the media download to fail part-way.">
         <source>A network error caused the media download to fail part-way.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="The media could not be loaded, either because the server or network failed or because the format is not supported.">
         <source>The media could not be loaded, either because the server or network failed or because the format is not supported.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="The media playback was aborted due to a corruption problem or because the media used features your browser did not support.">
         <source>The media playback was aborted due to a corruption problem or because the media used features your browser did not support.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="No compatible source was found for this media.">
         <source>No compatible source was found for this media.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="The media is encrypted and we do not have the keys to decrypt it.">
         <source>The media is encrypted and we do not have the keys to decrypt it.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Play Video">
         <source>Play Video</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Close">
         <source>Close</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Close Modal Dialog">
         <source>Close Modal Dialog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Modal Window">
         <source>Modal Window</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="This is a modal window">
         <source>This is a modal window</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="This modal can be closed by pressing the Escape key or activating the close button.">
         <source>This modal can be closed by pressing the Escape key or activating the close button.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id=", opens captions settings dialog">
         <source>, opens captions settings dialog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id=", opens subtitles settings dialog">
         <source>, opens subtitles settings dialog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id=", opens descriptions settings dialog">
         <source>, opens descriptions settings dialog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id=", selected">
         <source>, selected</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="captions settings">
         <source>captions settings</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="subtitles settings">
         <source>subititles settings</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="descriptions settings">
         <source>descriptions settings</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Text">
         <source>Text</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="White">
         <source>White</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Black">
         <source>Black</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Red">
         <source>Red</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Green">
         <source>Green</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Blue">
         <source>Blue</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Yellow">
         <source>Yellow</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Magenta">
         <source>Magenta</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Cyan">
         <source>Cyan</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Background">
         <source>Background</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Window">
         <source>Window</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Transparent">
         <source>Transparent</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Semi-Transparent">
         <source>Semi-Transparent</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Opaque">
         <source>Opaque</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Font Size">
         <source>Font Size</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Text Edge Style">
         <source>Text Edge Style</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="None">
         <source>None</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Raised">
         <source>Raised</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Depressed">
         <source>Depressed</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Uniform">
         <source>Uniform</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Dropshadow">
         <source>Dropshadow</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Font Family">
         <source>Font Family</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Proportional Sans-Serif">
         <source>Proportional Sans-Serif</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Monospace Sans-Serif">
         <source>Monospace Sans-Serif</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Proportional Serif">
         <source>Proportional Serif</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Monospace Serif">
         <source>Monospace Serif</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Casual">
         <source>Casual</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Script">
         <source>Script</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Small Caps">
         <source>Small Caps</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Reset">
         <source>Reset</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="restore all settings to the default values">
         <source>restore all settings to the default values</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Done">
         <source>Done</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Caption Settings Dialog">
         <source>Caption Settings Dialog</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Beginning of dialog window. Escape will cancel and close the window.">
         <source>Beginning of dialog window. Escape will cancel and close the window.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="End of dialog window.">
         <source>End of dialog window.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="{1} is loading.">
         <source>{1} is loading.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Quality">
         <source>Quality</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Auto">
         <source>Auto</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Speed">
         <source>Speed</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Subtitles/CC">
         <source>Subtitles/CC</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="peers">
         <source>peers</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="peer">
         <source>peer</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Go to the video page">
         <source>Go to the video page</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Settings">
         <source>Settings</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Uses P2P, others may know you are watching this video.">
         <source>Uses P2P, others may know you are watching this video.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Copy the video URL">
         <source>Copy the video URL</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Copy the video URL at the current time">
         <source>Copy the video URL at the current time</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Copy embed code">
         <source>Copy embed code</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Copy magnet URI">
         <source>Copy magnet URI</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Total downloaded: ">
         <source>Total downloaded: </source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Total uploaded: ">
         <source>Total uploaded: </source>
-        <target>undefined</target>
       </trans-unit>
     </body>
   </file>
diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml
index f5e125549..9405ac01e 100644
--- a/client/src/locale/source/server_en_US.xml
+++ b/client/src/locale/source/server_en_US.xml
@@ -3,163 +3,129 @@
     <body>
       <trans-unit id="Music">
         <source>Music</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Films">
         <source>Films</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Vehicles">
         <source>Vehicles</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Art">
         <source>Art</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sports">
         <source>Sports</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Travels">
         <source>Travels</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Gaming">
         <source>Gaming</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="People">
         <source>People</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Comedy">
         <source>Comedy</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Entertainment">
         <source>Entertainment</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="News &amp; Politics">
         <source>News &amp; Politics</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="How To">
         <source>How To</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Education">
         <source>Education</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Activism">
         <source>Activism</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Science &amp; Technology">
         <source>Science &amp; Technology</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Animals">
         <source>Animals</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Kids">
         <source>Kids</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Food">
         <source>Food</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution">
         <source>Attribution</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution - Share Alike">
         <source>Attribution - Share Alike</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution - No Derivatives">
         <source>Attribution - No Derivatives</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution - Non Commercial">
         <source>Attribution - Non Commercial</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution - Non Commercial - Share Alike">
         <source>Attribution - Non Commercial - Share Alike</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Attribution - Non Commercial - No Derivatives">
         <source>Attribution - Non Commercial - No Derivatives</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Public Domain Dedication">
         <source>Public Domain Dedication</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Public">
         <source>Public</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Unlisted">
         <source>Unlisted</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Private">
         <source>Private</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Published">
         <source>Published</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="To transcode">
         <source>To transcode</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="To import">
         <source>To import</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Pending">
         <source>Pending</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Success">
         <source>Success</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Failed">
         <source>Failed</source>
-        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Regular">
+        <source>Regular</source>
+      </trans-unit>
+      <trans-unit id="Watch later">
+        <source>Watch later</source>
       </trans-unit>
       <trans-unit id="This video does not exist.">
         <source>This video does not exist.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="We cannot fetch the video. Please try again later.">
         <source>We cannot fetch the video. Please try again later.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Sorry">
         <source>Sorry</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="This video is not available because the remote instance is not responding.">
         <source>This video is not available because the remote instance is not responding.</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Misc">
         <source>Misc</source>
-        <target>undefined</target>
       </trans-unit>
       <trans-unit id="Unknown">
         <source>Unknown</source>
-        <target>undefined</target>
       </trans-unit>
     </body>
   </file>