Update translations

1 files changed, 2587 insertions, 3840 deletions

diff --git a/client/src/locale/angular.gl-ES.xlf b/client/src/locale/angular.gl-ES.xlf
index dcc368d9a..716eb1b1d 100644
--- a/client/src/locale/angular.gl-ES.xlf
+++ b/client/src/locale/angular.gl-ES.xlf
@@ -254,6 +254,18 @@
           <context context-type="linenumber">8</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts</context><context context-type="linenumber">8</context></context-group>
+      </trans-unit><trans-unit id="f50983ee112befc1afddea5c570283db67e20fed" datatype="html">
+        <source>Channel avatar</source><target state="new">Channel avatar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit><trans-unit id="879fef27271d8247d791381cf1f9bb0eb8974166" datatype="html">
+        <source>Account avatar</source><target state="new">Account avatar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="f3e63578c50546530daf6050d2ba6f8226040f2c">
         <source>You don't have notifications.</source>
@@ -261,83 +273,86 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1cff8e38c81055fa0ae7dbc80a7a0c5c39bbc263" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ notification.video.channel.displayName }}"/> published a new video: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated"><x id="INTERPOLATION" equiv-text="{{ notification.video.channel.displayName }}"/> publicou un novo vídeo: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
       <trans-unit id="5f61f85f3c9e196f7044fec4dfe165b081e14a3f" datatype="html">
         <source>The notification concerns a video now unavailable</source>
         <target state="translated">A notificación refírese a un vídeo non dispoñible</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit><trans-unit id="03ccba66e74e25303828fc37062dda862ec272dc" datatype="html">
+        <source>
+          Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been unblocked
+        </source><target state="new">
+          Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been unblocked
+        </target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">23</context>
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit><trans-unit id="b1393385d75d42dfb7e893e3e99290bcc697e791" datatype="html">
+        <source>
+          Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been blocked
+        </source><target state="new">
+          Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been blocked
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="cd1df1f67905a0fc5c598a95f450ab6cfd6ca3c6" datatype="html">
-        <source>Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been unblacklisted </source>
-        <target state="translated">O vídeo <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> foi sacado da lista de bloqueo </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">32</context></context-group>
-      </trans-unit>
-      <trans-unit id="066903c4bc7d397c799979d64ce8c450792eb664" datatype="html">
-        <source>Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been blacklisted </source>
-        <target state="translated">O vídeo <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> meteuse na lista negra </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
+      
+      
       <trans-unit id="b5e2152dd5b4222093fcec9c8289f12308a598e7" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new video abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been created on video <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoAbuse.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Unha denuncia de abuso<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> creouse para o vídeo <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoAbuse.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
-      <trans-unit id="8b6534c6f0dab443bd67f7d6b51f5347b115b9af" datatype="html">
-        <source>The recently added video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>auto-blacklisted<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
-        <target state="translated">O vídeo recentemente engadido <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> foi <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>posto na lista negra<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">56</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit><trans-unit id="9daaf09c3048f62f102989d1c6f3fe2f3770062f" datatype="html">
+        <source>
+          The recently added video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>automatically blocked<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
+        </source><target state="new">
+          The recently added video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.videoBlacklist.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>automatically blocked<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">56</context>
+        </context-group>
       </trans-unit>
+      
       <trans-unit id="bb62d9c0e9059be1f08d6a03a946bdae8623e04a" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> commented your video <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> comentou o teu vídeo <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">69</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">69</context></context-group></trans-unit>
       <trans-unit id="4d2311a5156bd322cc7e2ebafcf6063ba8232e63" datatype="html">
         <source>The notification concerns a comment now unavailable</source>
         <target state="translated">A notificación atingue a un comentario non dispoñible</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">77</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">77</context></context-group></trans-unit>
       <trans-unit id="b187dd5f406f4195b326ab01fa81f823025821b9" datatype="html">
         <source>Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been published </source>
         <target state="translated">O teu vídeo <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> está publicado </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">86</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">86</context></context-group></trans-unit>
       <trans-unit id="78dea99c581be394bf509426e114c9cda9f5825d" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> succeeded </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>O vídeo foi importado<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> correctamente </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">94</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">94</context></context-group></trans-unit>
       <trans-unit id="dc586a7c70baa9217d98f58f4701fc3a29cd9d4d" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Your video import<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> failed </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A proceso de importar o video<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> fallou </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">102</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">102</context></context-group></trans-unit>
       <trans-unit id="55c81d14a4e11004f0bcda5a47575f316e85e43e" datatype="html">
         <source>User <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.account.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> registered on your instance </source>
         <target state="translated">A usuaria <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.account.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> rexistrouse na túa instancia </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">110</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">110</context></context-group></trans-unit>
       <trans-unit id="0f146c0a4152eb93ec2ad119e1dec613864d64c6" datatype="html">
         <source>
           <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.follower.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> is following
@@ -346,50 +361,50 @@
           <x id="START_TAG_NG-CONTAINER_1" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>your account<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>
         </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.follower.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> está a seguir <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>a túa canle <x id="INTERPOLATION_1" equiv-text="{{ notification.actorFollow.following.displayName }}"/><x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/> <x id="START_TAG_NG-CONTAINER_1" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>a túa conta<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">120</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">120</context></context-group></trans-unit>
       <trans-unit id="dde6b6ff4de622914ba78a2b584d070852eb710d" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> mentioned you on <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>video <x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.comment.account.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> mencionoute no <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>vídeo <x id="INTERPOLATION_1" equiv-text="{{ notification.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">133</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">133</context></context-group></trans-unit>
       <trans-unit id="790986a06ed0bbab17b7e91c166ea4dfd96e7d3d" datatype="html">
         <source>
           Your instance has <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>a new follower<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> (<x id="INTERPOLATION" equiv-text="{{ notification.actorFollow?.follower.host }}"/>)
           <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> awaiting your approval<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>
         </source>
         <target state="translated">A túa instancia ten <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>unha nova seguidora<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> (<x id="INTERPOLATION" equiv-text="{{ notification.actorFollow?.follower.host }}"/>) <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> agardando aprobación<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">141</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">141</context></context-group></trans-unit>
       <trans-unit id="b5a16cb819b18286a1a85e2a311045b920bfd559" datatype="html">
         <source>Your instance automatically followed <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.following.host }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated">A túa instancia seguiu automáticamente a <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.actorFollow.following.host }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context><context context-type="linenumber">150</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">150</context></context-group></trans-unit>
       <trans-unit id="f61b49d5729bbd138f2a083fbaee2920811d31c5" datatype="html">
         <source>The notification points to a content now unavailable</source>
         <target state="translated">A notificacións refírese a un contido non dispoñible</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">158</context></context-group></trans-unit><trans-unit id="3fb9a5f7268114445d8c109a8f48102e93471f5a" datatype="html">
+        <source>Change your avatar</source><target state="new">Change your avatar</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user-notifications.component.html</context>
-          <context context-type="linenumber">158</context>
+          <context context-type="sourcefile">src/app/shared/shared-main/account/actor-avatar-info.component.html</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f9fdeb0495dd96319d13df9d9536760d0a98d9b5" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ action.label }}"/></source>
         <target state="translated"><x id="INTERPOLATION" equiv-text="{{ action.label }}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/buttons/action-dropdown.component.html</context>
-          <context context-type="linenumber">22</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/buttons/action-dropdown.component.html</context><context context-type="linenumber">22</context></context-group></trans-unit>
       <trans-unit id="b2b638f4333842009c258a23e59dbe4160d1e566">
         <source>Save to</source>
         <target>Gardar en</target>
         <context-group name="null">
           <context context-type="linenumber">4</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">4</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="24813b8a3e45f0b57136c18d003027262cfe2d1f">
         <source>Options</source>
         <target>Opcións</target>
@@ -398,123 +413,130 @@
         </context-group>
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">9</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">9</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit>
       <trans-unit id="85e5d1de15d23cde43c530e3740a2a61aed24c2d">
         <source>Start at</source>
         <target>Iniciar en</target>
         <context-group name="null">
           <context context-type="linenumber">61</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">17</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">57</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">75</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context><context context-type="linenumber">44</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">17</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">75</context></context-group></trans-unit>
       <trans-unit id="4d20563f7e338a1d09eb756054564ccf7c6a30ef">
         <source>Stop at</source>
         <target>Parar en</target>
         <context-group name="null">
           <context context-type="linenumber">112</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">31</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">71</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">106</context></context-group>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context><context context-type="linenumber">59</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">71</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">106</context></context-group></trans-unit><trans-unit id="020d5da7c3f4726e3623587a05a11f00e1d40409" datatype="html">
+        <source>
+          Your report will be sent to moderators of <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> and will be forwarded to the video origin (<x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/>) too<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>.
+        </source><target state="new">
+          Your report will be sent to moderators of <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> and will be forwarded to the video origin (<x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/>) too<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>.
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+      </trans-unit><trans-unit id="04f47b9519b96ac834a111c0e113d18c77d177de" datatype="html">
+        <source>Please describe the issue...</source><target state="new">Please describe the issue...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="8efba03f22550a671ee2c2c6dfd1ff03ea047700" datatype="html">
         <source>Search playlists</source>
         <target state="translated">Buscar listas</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context>
-          <context context-type="linenumber">45</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">45</context></context-group></trans-unit>
       <trans-unit id="19fc45e7e0cab63a8c4422ea7158bf5c6228cee4" datatype="html">
         <source>Create a private playlist</source>
         <target state="translated">Crear lista privada</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">65</context></context-group></trans-unit>
       <trans-unit id="bc155f9fc3be3f32083f19b2c77d4ad3b696d9b9">
         <source>Display name</source>
         <target>Mostrar nome</target>
         <context-group name="null">
           <context context-type="linenumber">4</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">70</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">6</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/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">src/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">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">53</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">53</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">4</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">70</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">6</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/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">src/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">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">53</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">53</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="70a67e04629f6d412db0a12d51820b480788d795">
         <source>Create</source>
         <target>Crear</target>
         <context-group name="null">
           <context context-type="linenumber">74</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">80</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">8</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-add-to-playlist.component.html</context><context context-type="linenumber">80</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">8</context></context-group></trans-unit>
       <trans-unit id="e53246788ffa2660a170aa859691a55576df2e6c" datatype="html">
         <source>video</source>
         <target state="translated">vídeo</target>
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">12</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">47</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="7cdda05962b3123483985a6fe7da45a7a564ecf9" datatype="html">
         <source>subtitles</source>
         <target state="translated">subtítulos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="7722a92a1fc887570b4f4d8a7bb916f067f32028" datatype="html">
         <source>Format</source>
         <target state="translated">Formato</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">45</context></context-group></trans-unit>
       <trans-unit id="be745b3dc0df310871766eb6c8f78c3ce652a2b4" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ item.value.label }}"/></source>
         <target state="translated"><x id="INTERPOLATION" equiv-text="{{ item.value.label }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">49</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">61</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">73</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">49</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">61</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">73</context></context-group></trans-unit>
       <trans-unit id="01504bc3847894e0816ec486648854d3835f91b0" datatype="html">
         <source>Video stream</source>
         <target state="translated">Fluxo de vídeo</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">57</context></context-group></trans-unit>
       <trans-unit id="697b93fd14fd3c85be79056c6d7f459da204eff1" datatype="html">
         <source>Audio stream</source>
         <target state="translated">Fluxo de audio</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">69</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">69</context></context-group></trans-unit>
       <trans-unit id="8d6a41c2703bed3edfc76e1df0b1ca203404c17c">
         <source>Direct download</source>
         <target>Descarga directa</target>
         <context-group name="null">
           <context context-type="linenumber">27</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">87</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
       <trans-unit id="ac3a02ecd20f41278f1ef7c03f45c1117b4b796d">
         <source>Torrent (.torrent file)</source>
         <target>Torrent (ficheiro .torrent)</target>
         <context-group name="null">
           <context context-type="linenumber">32</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">92</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">92</context></context-group></trans-unit>
       <trans-unit id="da44efc7b658c318651866454d258bbbe57ff21c">
         <source>Cancel</source>
         <target>
@@ -523,43 +545,29 @@
         <context-group name="null">
           <context context-type="linenumber">47</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
         <source>Download</source>
         <target>Descargar</target>
         <context-group name="null">
           <context context-type="linenumber">43</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">4</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">104</context></context-group>
-      </trans-unit>
-      <trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b">
-        <source>Report video</source>
-        <target>Informar sobre vídeo</target>
-        <context-group name="null">
-          <context context-type="linenumber">3</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-report.component.html</context><context context-type="linenumber">3</context></context-group>
-      </trans-unit>
-      <trans-unit id="9430cb2c6ceed0b2addc7112a40317985e4193e1" datatype="html">
-        <source>Your report will be sent to moderators of <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> and will be forwarded to the video origin (<x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/>) too<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>. </source>
-        <target state="translated">O informe será enviado á moderación <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> e tamén reenviado á orixe do vídeo (<x id="INTERPOLATION_1" equiv-text="{{ originHost }}"/>) <x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-report.component.html</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">104</context></context-group></trans-unit>
+      
+      
       <trans-unit id="bb44873ad8d4c5dbad0ac2a6a50e0ceee9119125">
         <source>Reason...</source>
         <target>Razón...</target>
         <context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-report.component.html</context><context context-type="linenumber">16</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">12</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">12</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="fb8aad312b72bbb7e5a1e2cc0b55fae8962bf0fb">
         <source>Cancel</source>
         <target>
@@ -568,70 +576,74 @@
         <context-group name="null">
           <context context-type="linenumber">47</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/videos-selection.component.html</context><context context-type="linenumber">15</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/videos-selection.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="71c77bb8cecdf11ec3eead24dd1ba506573fa9cd">
         <source>Submit</source>
         <target>Enviar</target>
         <context-group name="null">
           <context context-type="linenumber">52</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-report.component.html</context><context context-type="linenumber">31</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">38</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html</context><context context-type="linenumber">30</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/contact-admin-modal.component.html</context><context context-type="linenumber">53</context></context-group>
-      </trans-unit>
-      <trans-unit id="f672385c803647b063687d3c912e2ce5738b51c8">
-        <source>Blacklist video</source>
-        <target>Video a lista negra</target>
-        <context-group name="null">
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context><context context-type="linenumber">38</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context><context context-type="linenumber">92</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html</context><context context-type="linenumber">30</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/contact-admin-modal.component.html</context><context context-type="linenumber">53</context></context-group></trans-unit><trans-unit id="448d436df053141260523149173073ccbb0259f9" datatype="html">
+        <source>Report video "<x id="INTERPOLATION" equiv-text="{{ video.name }}"/>"</source><target state="new">Report video "<x id="INTERPOLATION" equiv-text="{{ video.name }}"/>"</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">3</context></context-group>
+      </trans-unit><trans-unit id="97916f2928694b8d574b6f052b93e54565ed9823" datatype="html">
+        <source>What is the issue?</source><target state="new">What is the issue?</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
       </trans-unit>
+      
       <trans-unit id="297603f796b0d287ac02b80d5aca6156c91a8fea" datatype="html">
         <source>This will ask remote instances to delete it</source>
         <target state="translated">Esto solicitará a eliminación nas instancias remotas</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="0cd0f27936731dabfd8d89277b781d5dd664bc89" datatype="html">
         <source>Unfederate the video</source>
         <target state="translated">Desfederar o vídeo</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="4b3963c6d0863118fe9e9e33447d12be3c2db081">
         <source>Unlisted</source>
         <target>Non listado</target>
         <context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">6</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">6</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">6</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="ddd8a4986d2d1717a274a5a0fbed04988a819e69">
         <source>Private</source>
         <target>Privado</target>
         <context-group name="null">
           <context context-type="linenumber">7</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">7</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">33</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">7</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">33</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">7</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="f73a82bb90c6c856cc0d2e3b2f5c109460074912" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {1 view} other {<x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views} }</source>
         <target state="translated">{VAR_PLURAL, plural, =1 {1 visualización} other {<x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> visualizacións} }</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
-      <trans-unit id="4a806761798181e907e28ed1af053d466526800d">
-        <source>Blacklisted</source>
-        <target>Na lista negra</target>
-        <context-group name="null">
-          <context context-type="linenumber">42</context>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit><trans-unit id="1d3781d7296d4b4e04e7f023aec1052fb2955c4d" datatype="html">
+        <source>Blocked</source><target state="new">Blocked</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context>
+          <context context-type="linenumber">49</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">41</context></context-group>
       </trans-unit>
+      
       <trans-unit id="fb8ccb136ab0ad1ff1dfbce739198be16a814f87">
         <source>Sensitive</source>
         <target>
@@ -640,16 +652,16 @@
         <context-group name="null">
           <context context-type="linenumber">46</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">53</context></context-group></trans-unit>
       <trans-unit id="99dea2d567d6e6d610d97608c3850ddb76df9a9a">
         <source>{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> videos} }</source>
         <target>{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> videos} }</target>
         <context-group name="null">
           <context context-type="linenumber">9</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">9</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="4999ffd919bb9af482aa4c53badd6cd654468582">
         <source><x id="INTERPOLATION" equiv-text="{{ playlist.videoChannelBy }}"/> </source>
         <target>
@@ -658,74 +670,71 @@
         <context-group name="null">
           <context context-type="linenumber">22</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">22</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">22</context></context-group></trans-unit>
       <trans-unit id="a3550f6ce98d90d2947fe062530629dc2d3923b4">
         <source>Updated <x id="INTERPOLATION" equiv-text="{{ playlist.updatedAt | myFromNow }}"/></source>
         <target>Actualizado <x id="INTERPOLATION" equiv-text="{{ playlist.updatedAt | myFromNow }}"/></target>
         <context-group name="null">
           <context context-type="linenumber">29</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-miniature.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit>
       <trans-unit id="15c02cb6b6c3be53477e502d3e1ee26955b23af0" datatype="html">
         <source>Unavailable</source>
         <target state="translated">Non dispoñible</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context>
-          <context context-type="linenumber">32</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="28df1b02fd88d2deb0212bc5d7ff34cf9492fa54" datatype="html">
         <source>Deleted</source>
         <target state="translated">Eliminado</target>
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">34</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">55</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">100</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">100</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">34</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">55</context></context-group></trans-unit>
       <trans-unit id="2edccfda908b57c073dc0811eaa58818de2be2dc">
         <source>Edit starts/stops at</source>
         <target>A edición inicia/para en</target>
         <context-group name="null">
           <context context-type="linenumber">48</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">50</context></context-group></trans-unit>
       <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
         <source>Save</source>
         <target>Gardar</target>
         <context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">82</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">74</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html</context><context context-type="linenumber">16</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.html</context><context context-type="linenumber">16</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">74</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">82</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">27</context></context-group></trans-unit>
       <trans-unit id="b9dee3108a18796bd69c6be316c8fb985b58fb8e">
         <source>Delete from <x id="INTERPOLATION" equiv-text="{{ playlist?.displayName }}"/></source>
         <target>Eliminar de <x id="INTERPOLATION" equiv-text="{{ playlist?.displayName }}"/></target>
         <context-group name="null">
           <context context-type="linenumber">85</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">88</context></context-group></trans-unit>
       <trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e">
         <source>No results.</source>
         <target>Sin resultados.</target>
         <context-group name="null">
           <context context-type="linenumber">20</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/videos-selection.component.html</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/video-list/video-overview.component.html</context><context context-type="linenumber">3</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/videos-selection.component.html</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/overview/video-overview.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7">
         <source>Delete</source>
         <target>Eliminar</target>
@@ -736,106 +745,100 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/buttons/delete-button.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">186</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">45</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/buttons/delete-button.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">186</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">45</context></context-group></trans-unit>
       <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
         <source>Edit</source>
         <target>Editar</target>
         <context-group name="null">
           <context context-type="linenumber">63</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/buttons/edit-button.component.html</context><context context-type="linenumber">5</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/buttons/edit-button.component.html</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">226</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">40</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">87</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">87</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/buttons/edit-button.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/buttons/edit-button.component.html</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">87</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">87</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">226</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
       <trans-unit id="961a134583d6256df39fbc520d020ebc48e3128d">
         <source>Truncated preview</source>
         <target>Vista previa recortada</target>
         <context-group name="null">
           <context context-type="linenumber">9</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/forms/markdown-textarea.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/markdown-textarea.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="f82f53a2544638939a8ba93c0fb1b0a4419c3196">
         <source>Complete preview</source>
         <target>Vista previa completa</target>
         <context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/forms/markdown-textarea.component.html</context><context context-type="linenumber">19</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/markdown-textarea.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="9c71feb04c2beab559f79c41c6127815fb9c1a6f">
         <source>Get help</source>
         <target>Obter axuda</target>
         <context-group name="null">
           <context context-type="linenumber">29</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.html</context><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit>
       <trans-unit id="98ae65ebba6c43c5cda8bdbd6f03e1daa0595af1" datatype="html">
         <source>Recommended</source>
         <target state="translated">Recomendado</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/peertube-checkbox.component.html</context>
-          <context context-type="linenumber">33</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/peertube-checkbox.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="9b3287f52c239cad05ec98391553e5052ba1aa66">
         <source>Using an ActivityPub account</source>
         <target>Utilizando unha conta ActivityPub</target>
         <context-group name="null">
           <context context-type="linenumber">36</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">50</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">50</context></context-group></trans-unit>
       <trans-unit id="c7e2b4c04a0459ebc4d2e54e419abb679bc713f2" datatype="html">
         <source>Subscribe with an account on this instance</source>
         <target state="translated">Susbcríbete cunha conta desta instancia</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">53</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">53</context></context-group></trans-unit>
       <trans-unit id="e7adf422424a61b71465d183f9d44bf956482ef0">
         <source>Subscribe with your local account</source>
         <target>Subscribir coa súa conta local</target>
         <context-group name="null">
           <context context-type="linenumber">40</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="5047522cc670b1f4a288bce07f9b1c5061e913ed">
         <source>Subscribe with a Mastodon account:</source>
         <target>Subscribir con conta Mastodon:</target>
         <context-group name="null">
           <context context-type="linenumber">43</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">57</context></context-group></trans-unit>
       <trans-unit id="d8758664cadd6452256ca25ca0c7259074f427c1">
         <source>Using a syndication feed</source>
         <target>Utilizando unha fonte sindicada</target>
         <context-group name="null">
           <context context-type="linenumber">48</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">62</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">62</context></context-group></trans-unit>
       <trans-unit id="d5e5bc7d213694fc0414a76f0ff3085bae44268a">
         <source>Subscribe via RSS</source>
         <target>Subscribir mediante RSS</target>
         <context-group name="null">
           <context context-type="linenumber">49</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">63</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit>
       <trans-unit id="4913054c95f5ba14c351ab1b787f7abac97bfdd3">
         <source>
     <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>Remote subscribe<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
@@ -848,88 +851,73 @@
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/remote-subscribe.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/remote-subscribe.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="01cf713559c39a17cf5c8fbcd33b004a77ce0963" datatype="html">
         <source>
         You can subscribe to the channel via any ActivityPub-capable fediverse instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
         For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there.
       </source>
         <target state="translated">Podes subscribirte ao canal a través dunha conta ActivityPub no fediverso.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Por exemplo con Mastodon ou Pleroma podes escribir o URL do canal na caixa de busca e susbscribirte desde alí. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/remote-subscribe.component.html</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/remote-subscribe.component.html</context><context context-type="linenumber">17</context></context-group></trans-unit>
       <trans-unit id="c590f63488a5179f20a46930cf5e673f8136673d" datatype="html">
         <source>
         You can interact with this via any ActivityPub-capable fediverse instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
         For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there.
       </source>
         <target state="translated">Podes interactuar con este vídeo desde unha conta ActivityPub no fediverso.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Por exemplo cunha conta Mastodon ou Pleroma podes escribir o URL do vídeo na caixa de busca e interactuar con el desde alí. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/remote-subscribe.component.html</context>
-          <context context-type="linenumber">26</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/remote-subscribe.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="6513f65441f986d9204122e01b4ab1df1d63d18e" datatype="html">
         <source>PeerTube version</source>
         <target state="translated">Versión PeerTube</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="083e95bdf6f64257d2ddd399ecf9f48ab88e279f" datatype="html">
         <source>
         <x id="START_TAG_DIV" ctype="x-div" equiv-text="&lt;div>"/>Default NSFW/sensitive videos policy<x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="&lt;/div>"/>
         <x id="START_TAG_DIV_1" ctype="x-div" equiv-text="&lt;div>"/>can be redefined by the users<x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="&lt;/div>"/>
       </source>
         <target state="translated"><x id="START_TAG_DIV" ctype="x-div" equiv-text="&lt;div>"/>A política por omisión para vídeos NSFW/sensibles<x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="&lt;/div>"/> <x id="START_TAG_DIV_1" ctype="x-div" equiv-text="&lt;div>"/>pode ser redefinida polas usuarias<x id="CLOSE_TAG_DIV" ctype="x-div" equiv-text="&lt;/div>"/> </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="87ca23d62c168409ed040dae83dd8717cae3f08c" datatype="html">
         <source>User registration allowed</source>
         <target state="translated">Rexistro de usuarias permitido</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="62c8c98c3957946709b49d0a5e309e53e660b9e2" datatype="html">
         <source>Video uploads</source>
         <target state="translated">Subidas de vídeo</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">38</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit>
       <trans-unit id="ba774dce7a0cbbc29d7086b8557939c7e8d9883d" datatype="html">
         <source>Transcoding in multiple resolutions</source>
         <target state="translated">Transcodificando a múltiples resolucións</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="7deebcf3491b27625e9b308179a6635b48368dcb" datatype="html">
         <source>Requires manual validation by moderators</source>
         <target state="translated">Require intervención manual dos moderadores</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">41</context></context-group></trans-unit>
       <trans-unit id="f1155367f44b4e3d2286db687d324a9b0cc1a7cb" datatype="html">
         <source>Automatically published</source>
         <target state="translated">Publicado automáticamente</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">41</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="15f046007e4fca2e8477966745e2ec4e3e81bc3b">
         <source>Video quota</source>
         <target>Cota de vídeo</target>
         <context-group name="null">
           <context context-type="linenumber">57</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">46</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">139</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">139</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">47</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">139</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">139</context></context-group></trans-unit>
       <trans-unit id="9270dfd4606fb45a991fe7716e640b6efa28ba85">
         <source>Unlimited <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>(<x id="INTERPOLATION" equiv-text="{{ dailyUserVideoQuota | bytes: 0 }}"/> per day)<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/> </source>
         <target>
@@ -938,135 +926,102 @@
         <context-group name="null">
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">60</context></context-group></trans-unit>
       <trans-unit id="a059709f71aa4c0ac219e160e78a738682ca6a36">
         <source>Import</source>
         <target>Importar</target>
         <context-group name="null">
           <context context-type="linenumber">286</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">66</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">40</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">67</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">45</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
       <trans-unit id="590fc27fcbd7dd680da2bb2da644a183338f6bd1" datatype="html">
         <source>HTTP import (YouTube, Vimeo, direct URL...)</source>
         <target state="translated">Importar HTTP (YouTube, Vimeo, URL directo...)</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">70</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">71</context></context-group></trans-unit>
       <trans-unit id="4e231a74ad4739e7b0606e8e66d5a656f5855a5a" datatype="html">
         <source>Torrent import</source>
         <target state="translated">Importar torrent</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">77</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">78</context></context-group></trans-unit>
       <trans-unit id="59bdc3dfa4075f92c734588899485db702c8f120" datatype="html">
         <source>Player</source>
         <target state="translated">Reprodutor</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">86</context></context-group></trans-unit>
       <trans-unit id="af80f4182e09341958e8706bd2b47ece61233eb5" datatype="html">
         <source>P2P enabled</source>
         <target state="translated">P2P activado</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit>
       <trans-unit id="b8b6a001cca6fa2ba15600ca3a78dfeebf685d60" datatype="html">
         <source>Loading instance statistics...</source>
         <target state="translated">Cargando estatísticas da instancia...</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d">
         <source>Local</source>
         <target>Local</target>
         <context-group name="null">
           <context context-type="linenumber">86</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context><context context-type="linenumber">4</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">131</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">131</context></context-group></trans-unit>
       <trans-unit id="7c7f4be7b726e61c577e63842a58d9e435f7c597" datatype="html">
         <source>users</source>
         <target state="translated">usuarias</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="5bc509bb72973f9895241127d5556e9e31051137" datatype="html">
         <source>videos</source>
         <target state="translated">vídeos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">21</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">21</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">65</context></context-group></trans-unit>
       <trans-unit id="bd21b1e6b5674003187e5cbec0e7e2854f9d8388" datatype="html">
         <source>video views</source>
         <target state="translated">visualizacións</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="d11fe88f08e43bfe4dec7d16fe469aa65d1e3d84" datatype="html">
         <source>video comments</source>
         <target state="translated">comentarios</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">41</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">75</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">41</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">75</context></context-group></trans-unit>
       <trans-unit id="0bedca44bfc0ef579be6053ffe0e8cdee9aba07d" datatype="html">
         <source>of hosted video</source>
         <target state="translated">de vídeo hospedado</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">51</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">51</context></context-group></trans-unit>
       <trans-unit id="de7d61497b3dc7df0f83c57f333458a7064ac4e7" datatype="html">
         <source>Federation</source>
         <target state="translated">Federación</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">58</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">58</context></context-group></trans-unit>
       <trans-unit id="8de9d3173fafc2c7a94352dec3de899b6cedf9c5" datatype="html">
         <source>followers</source>
         <target state="translated">seguidoras</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">85</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">85</context></context-group></trans-unit>
       <trans-unit id="1ec99ffe83830affef834fd7beeda8ee313203fe" datatype="html">
         <source>following</source>
         <target state="translated">seguindo</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-statistics.component.html</context>
-          <context context-type="linenumber">95</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-statistics.component.html</context><context context-type="linenumber">95</context></context-group></trans-unit>
       <trans-unit id="6a323f80f9d90a32db8ce52cc82075938c3c36f0">
         <source>Ban</source>
         <target>Vetar</target>
         <context-group name="null">
           <context context-type="linenumber">3</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">3</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="f21428bd564d1cacdbc737f87a8def2e2ad42251">
         <source>A banned user will no longer be able to login.</source>
         <target>
@@ -1075,35 +1030,47 @@
         <context-group name="null">
           <context context-type="linenumber">18</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="d7b35c384aecd25a516200d6921836374613dfe7">
         <source>Cancel</source>
         <target>Cancelar</target>
         <context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.html</context><context context-type="linenumber">99</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-report.component.html</context><context context-type="linenumber">26</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.html</context><context context-type="linenumber">33</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">26</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/confirm/confirm.component.html</context><context context-type="linenumber">20</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">105</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">37</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">47</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-modal.component.html</context><context context-type="linenumber">31</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html</context><context context-type="linenumber">26</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html</context><context context-type="linenumber">25</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/contact-admin-modal.component.html</context><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/confirm.component.html</context><context context-type="linenumber">20</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context><context context-type="linenumber">33</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.html</context><context context-type="linenumber">89</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/batch-domains-modal.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.html</context><context context-type="linenumber">99</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-accept-ownership/my-account-accept-ownership.component.html</context><context context-type="linenumber">25</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/contact-admin-modal.component.html</context><context context-type="linenumber">48</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">105</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">37</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">47</context></context-group></trans-unit>
       <trans-unit id="35fdca47605de8113a0db7f587f7c099abec8020">
         <source>Ban this user</source>
         <target>Vetar esta usuaria</target>
         <context-group name="null">
           <context context-type="linenumber">26</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">31</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit><trans-unit id="dbabcb47dc77c29275d0f836280ef1dcd924fdb9" datatype="html">
+        <source>Block video "<x id="INTERPOLATION" equiv-text="{{ video.name }}"/>"</source><target state="new">Block video "<x id="INTERPOLATION" equiv-text="{{ video.name }}"/>"</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit><trans-unit id="dc3bdad5421d0ee7ddd76ae62b699d72dd9f61b4" datatype="html">
+        <source>Please describe the reason...</source><target state="new">Please describe the reason...</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.html</context>
+          <context context-type="linenumber">12</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="c078d4901a5fac169665947cc7a6108b94dd80c7">
         <source><x id="INTERPOLATION" equiv-text="{{ menuEntry.label }}"/></source>
@@ -1111,9 +1078,9 @@
         <context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/menu/top-menu-dropdown.component.html</context><context context-type="linenumber">12</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/menu/top-menu-dropdown.component.html</context><context context-type="linenumber">21</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/top-menu-dropdown.component.html</context><context context-type="linenumber">12</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/top-menu-dropdown.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea">
         <source>Login</source>
         <target>
@@ -1122,24 +1089,18 @@
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">2</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit>
       <trans-unit id="6b6240483bee515c1e20c0c21fc6096e8cdd08e9" datatype="html">
         <source>Sorry but there was an issue with the external login process. Please <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>contact an administrator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </source>
         <target state="translated">Lamentámolo, pero algo pasou co proceso de conexión desde o exterior. Por favor <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>contacta coa administración<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="17f43ee2fb343f8b60568527d105777b99ae8414" datatype="html">
         <source>If you are looking for an account…</source>
         <target state="translated">Se buscas unha conta…</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="8b339f3b4ba60cd2f880c7c19e8b375e7892f4c1" datatype="html">
         <source>
         Currently this instance doesn't allow for user registration, but you can find an instance
@@ -1150,126 +1111,135 @@
         Find yours among multiple instances at <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
       </source>
         <target state="translated">Esta instancia actualmente non permite o rexistro, pero podes atopar unha instancia que che permita abrir unha conta e subir alí os teus vídeos. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Atopa a túa instancia en <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="ae3cb52bf2dee3101ee654812b5d16e8665a9453">
         <source>Request new verification email.</source>
         <target>Solicitar novo correo de validación.</target>
         <context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.html</context><context context-type="linenumber">16</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">27</context></context-group></trans-unit>
       <trans-unit id="e08a77594f3d89311cdf6da5090044270909c194">
         <source>User</source>
         <target>Usuaria</target>
         <context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">35</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="51ef29329faccb28d94369897068897d1b3d0478">
         <source>Username or email address</source>
         <target>Nome de usuaria ou enderezo de correo</target>
         <context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">37</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">37</context></context-group></trans-unit>
       <trans-unit id="9fed9d6f57dafb967ffaaf3c63f54ad976cab926" datatype="html">
         <source>or create an account</source>
         <target state="translated">ou crea unha conta</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
       <trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407">
         <source>Password</source>
         <target>Contrasinal</target>
         <context-group name="null">
           <context context-type="linenumber">54</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">51</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">54</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">10</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">106</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">106</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">52</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">106</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">106</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">54</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">10</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">51</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="48ff0628dcbb4d37e9687302df3023b8427b48f2" datatype="html">
         <source>Click here to reset your password</source>
         <target state="translated">Preme aquí e restablece o contrasinal</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">57</context></context-group></trans-unit>
       <trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9">
         <source>Login</source>
         <target>Conectar</target>
         <context-group name="null">
           <context context-type="linenumber">32</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">64</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">77</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">77</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">64</context></context-group></trans-unit>
       <trans-unit id="f5d783c0613d323fdd20074ffbc519ee715a4f2b" datatype="html">
         <source>Or sign in with</source>
         <target state="translated">Ou conéctate con</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">68</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">68</context></context-group></trans-unit>
       <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
         <source>Forgot your password</source>
         <target>Esqueceu o contrasinal</target>
         <context-group name="null">
           <context context-type="linenumber">58</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">83</context></context-group></trans-unit>
       <trans-unit id="8f7dd0009f7dc9e4e3f1d9f43f944a3aa7cf737a" datatype="html">
         <source>We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.</source>
         <target state="translated">Lamentámolo, non podes recuperar o contrasinal porque a administración da instancia non configurou o sistema de email de PeerTube.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit>
       <trans-unit id="244aae9346da82b0922506c2d2581373a15641cc">
         <source>Email</source>
         <target>Correo electrónico</target>
         <context-group name="null">
           <context context-type="linenumber">43</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">95</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">94</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">94</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">46</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html</context><context context-type="linenumber">4</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">41</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">94</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">94</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">46</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">41</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">43</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">95</context></context-group></trans-unit>
       <trans-unit id="69b6ac577a19acc39fc0c22342092f327fff2529">
         <source>Email address</source>
         <target>Enderezo de correo electrónico</target>
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">97</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">10</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">97</context></context-group></trans-unit>
       <trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55">
         <source>Send me an email to reset my password</source>
         <target>Envíenme un correo para restablecer o contrasinal</target>
         <context-group name="null">
           <context context-type="linenumber">82</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">110</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.html</context><context context-type="linenumber">110</context></context-group></trans-unit><trans-unit id="406b08e859ab668ff07056881dcc4390109d4e1d" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> <x id="ICU" equiv-text="{pagination.totalItems, plural, =1 {...} other {...}}"/> </source><target state="new"><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> <x id="ICU" equiv-text="{pagination.totalItems, plural, =1 {...} other {...}}"/> </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit><trans-unit id="26b0b148ff87e083300fa9ca213f8ada7fa6211d" datatype="html">
+        <source>on this instance</source><target state="new">on this instance</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit><trans-unit id="cdc5b877341ff8e6009282a299f2f2d6987dbdbe" datatype="html">
+        <source>on the vidiverse</source><target state="new">on the vidiverse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa">
         <source>Reset my password</source>
@@ -1279,40 +1249,33 @@
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">2</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit>
       <trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8">
         <source>Confirm password</source>
         <target>Confirmar contrasinal</target>
         <context-group name="null">
           <context context-type="linenumber">19</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">19</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="3652e5c6e33165264d5271d06cc04ab7123b6df1">
         <source>Confirmed password</source>
         <target>Contrasinal confirmado</target>
         <context-group name="null">
           <context context-type="linenumber">21</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">21</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="8bdf8db5eeeaef83184b489b80c1557b516fb3c3">
         <source>Reset my password</source>
         <target>Restablecer contrasinal</target>
         <context-group name="null">
           <context context-type="linenumber">29</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/reset-password/reset-password.component.html</context><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
-      <trans-unit id="3c2c6b17d0326ab344e194b17abbee201d58dbea" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> <x id="ICU" equiv-text="{pagination.totalItems, plural, =1 {...} other {...}}"/></source>
-        <target state="translated"><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> <x id="ICU" equiv-text="{pagination.totalItems, plural, =1 {...} other {...}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit>
+      
       <trans-unit id="4c3960fb1d9b07d1db3b5bda3ee40019211830dc">
         <source>for <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ currentSearch }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/> </source>
         <target>
@@ -1321,8 +1284,8 @@
         <context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">6</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="7c603b9ed878097782e2b8908f662e2344b46061">
         <source>
           Filters
@@ -1335,8 +1298,8 @@
         <context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="e2dbf0426cbb0b573faf49dffeb7d5bdf16eda5d">
         <source>No results found</source>
         <target>
@@ -1345,16 +1308,16 @@
         <context-group name="null">
           <context context-type="linenumber">28</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">28</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="10341623e991a4185990a0c3c76ac2bc3543cc4a">
         <source><x id="INTERPOLATION" equiv-text="{{ result.followersCount }}"/> subscribers</source>
         <target><x id="INTERPOLATION" equiv-text="{{ result.followersCount }}"/> subscritoras</target>
         <context-group name="null">
           <context context-type="linenumber">44</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">44</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit>
       <trans-unit id="5cf92a1d527e65908c75633e8484cdd3b6d16b9b" datatype="html">
         <source>Welcome to PeerTube, dear administrator!</source>
         <target state="translated">Benvida administradora de PeerTube!</target>
@@ -1417,35 +1380,23 @@
       <trans-unit id="6b705cdf0d567cf608b9891a1d912daebac3523e" datatype="html">
         <source>Useful links</source>
         <target state="translated">Ligazóns útiles</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">41</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit>
       <trans-unit id="908ccbd854d79d50723e7a651b2a0f4dd0557c60" datatype="html">
         <source>Official PeerTube website (news, support, contribute...): <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/></source>
         <target state="translated">Sitio web oficial de PeerTube (novas, axuda, colaboración...) <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="53f7ce6aef94fd128d0058de1cd63da90d062ee6" datatype="html">
         <source>Put your instance on the public PeerTube index: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://instances.joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </source>
         <target state="translated">Sube a túa instancia ao índice público de PeerTube: <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://instances.joinpeertube.org/instances<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">47</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">45</context></context-group></trans-unit>
       <trans-unit id="351af1021b0298109bfb72c7aa9a27999d110859" datatype="html">
         <source>It's time to configure your instance!</source>
         <target state="translated">Agora configura a túa instancia!</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">59</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">55</context></context-group></trans-unit>
       <trans-unit id="cde76f438c580e464940e141584e44ab21809cb6" datatype="html">
         <source>
           Choosing your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>instance name<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>setting up a description<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, specifying <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>who you are<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>,
@@ -1453,11 +1404,8 @@
           is very important for visitors to understand on what type of instance they are.
         </source>
         <target state="translated">Escollendo o <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>nome da instancia<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>escribindo unha descrición<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, explicando <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>quen es<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, por que <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>creaches a instancia<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> e <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>canto tempo<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> tes planeado <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>mantela <x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> é moi importante para as persoas que a visitan saiban o tipo de instancia na que se atopan. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">61</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">57</context></context-group></trans-unit>
       <trans-unit id="bd6c91a86a18f512ade62e216efcfb5d2520711c" datatype="html">
         <source>
           If you want to open registrations, please decide what are <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>your moderation rules<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, fill your <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>instance
@@ -1467,21 +1415,18 @@
           PeerTube instance.
         </source>
         <target state="translated">Se queres permitir o rexistro, decide cales son <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>as túas normas de moderación<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, completa os <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>termos da instancia<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> e indica as categorías e idiomas que falas. Deste xeito axudarás as usuarias para que se rexistren <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>na instancia PeerTube axeitada<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>. </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context>
-          <context context-type="linenumber">67</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit>
       <trans-unit id="650b8c3e81746bc33ff276f2ef30bf89fa2d74dd" datatype="html">
         <source>Remind me later</source>
         <target state="translated">Lémbramo máis tarde</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">76</context></context-group></trans-unit>
       <trans-unit id="b310fa17f1bbfc4dd61b80c1cfc4116a81a9c76c" datatype="html">
         <source>Configure my instance</source>
         <target state="translated">Configurar a miña instancia</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">86</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">82</context></context-group></trans-unit>
       <trans-unit id="a9af18b4f210f5a19bb2503407923d3f25c57f98" datatype="html">
         <source>Configuration warning!</source>
         <target state="translated">Aviso da configuración!</target>
@@ -1489,15 +1434,14 @@
           <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="120796abeaabea4067c1cd739194cb6c86252155" datatype="html">
-        <source>Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:</source>
-        <target state="translated">Ola administradora. Activaches o rexistro na túa instancia pero non configuraches os seguintes campos:</target>
+      </trans-unit><trans-unit id="e30fd615e98eb6ebc28346024a89f00192a98396" datatype="html">
+        <source>You enabled user registration on your instance but did not configure the following fields:</source><target state="new">You enabled user registration on your instance but did not configure the following fields:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="ab7e3d0be94cc55ce997a5f38c679956e66f3936" datatype="html">
         <source>Instance name</source>
         <target state="translated">Nome da instancia</target>
@@ -1567,26 +1511,26 @@
         </context-group>
       </trans-unit>
       
-      <trans-unit id="c8e491ab57fa4f6a0d6d09b296299b6c034244ec" datatype="html">
-        <source>Configure these fields</source>
-        <target state="new">Configure these fields</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
-          <context context-type="linenumber">30</context>
-        </context-group>
-      </trans-unit>
+      
       <trans-unit id="7d438f72f9985c4d06ed4fe80c90afc2e1df34d2" datatype="html">
         <source>Don't show me this warning anymore</source>
         <target state="new">Don't show me this warning anymore</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="f4e529ae5ffd73001d1ff4bbdeeb0a72e342e5c8" datatype="html">
         <source>Close</source>
         <target state="new">Close</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context><context context-type="linenumber">44</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context><context context-type="linenumber">38</context></context-group></trans-unit><trans-unit id="c2fe7580753ac7c1442df31eb97f8acc6fa250e6" datatype="html">
+        <source>
+       Configure
+    </source><target state="new">
+       Configure
+    </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
         <source>Change the language</source>
@@ -1690,19 +1634,15 @@
         <source>Shortcuts</source>
         <target state="new">Shortcuts</target>
         <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">165</context></context-group>
+      </trans-unit><trans-unit id="f8e6eaa974acec3b80e5c77ec0dc4ff80939964d" datatype="html">
+        <source>powered by PeerTube</source><target state="new">powered by PeerTube</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/menu/menu.component.html</context>
+          <context context-type="linenumber">171</context>
+        </context-group>
       </trans-unit>
-      <trans-unit id="5c195f8d79bd19e8520c890a2513fe635529b7a7" datatype="html">
-        <source>powered by PeerTube</source>
-        <target state="new">
-              powered by PeerTube
-            </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
-      <trans-unit id="018843afca0913de849c80fdf962a6a42f5190b4" datatype="html">
-        <source>PeerTube website</source>
-        <target state="new">PeerTube website</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
+      
+      
       <trans-unit id="900ca8b77fca5b6232cf1d526830ccc29569a984" datatype="html">
         <source>powered by PeerTube - CopyLeft 2015-2020</source>
         <target state="new">powered by PeerTube - CopyLeft 2015-2020</target>
@@ -1762,32 +1702,29 @@
         <context-group name="null">
           <context context-type="linenumber">51</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">96</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">96</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="efac3af0b32e953279c25b6519cae256811e0fe8">
         <source>History</source>
         <target>Historial</target>
         <context-group name="null">
           <context context-type="linenumber">56</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">101</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">101</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="165035acb08983753bcecc3e8b6b18c7caf26d35" datatype="html">
         <source>VIDEOS</source>
         <target state="new">VIDEOS</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/menu/menu.component.html</context>
-          <context context-type="linenumber">107</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">107</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">402</context></context-group></trans-unit>
       <trans-unit id="411ca58f59b00246e15b161e07409df55b5eb6db">
         <source>Discover</source>
         <target>Descubrir</target>
         <context-group name="null">
           <context context-type="linenumber">66</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">111</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">111</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/overview/video-overview.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807">
         <source>Trending</source>
         <target>En voga</target>
@@ -1823,8 +1760,8 @@
         <context-group name="null">
           <context context-type="linenumber">26</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">148</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">148</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="34746fb1c7f3d2194d99652bdff89e6e14c9c4f4" datatype="html">
         <source>Contact</source>
         <target state="new">Contact</target>
@@ -1844,14 +1781,14 @@
         <context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/avatar-notification.component.html</context><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/avatar-notification.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1da23f4068fd3796fbcb24d0c42bb62f92c96829" datatype="html">
         <source>Mark all as read</source>
         <target state="new">Mark all as read</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/avatar-notification.component.html</context><context context-type="linenumber">18</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/avatar-notification.component.html</context><context context-type="linenumber">18</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="341e026e3f317aa3164916cc63a059c961a78b81">
         <source>Update your notification preferences</source>
         <target>Actualizar preferencias notificacións</target>
@@ -1877,48 +1814,63 @@
         <source>GLOBAL SEARCH</source>
         <target state="new">GLOBAL SEARCH</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">17</context></context-group></trans-unit>
-      <trans-unit id="7ef9c50b8735e25780026b93da26cfcab1546653" datatype="html">
-        <source>using <x id="INTERPOLATION" equiv-text="{{ serverConfig.followings.instance.autoFollowIndex.indexUrl }}"/></source>
-        <target state="new">using <x id="INTERPOLATION" equiv-text="{{ serverConfig.followings.instance.autoFollowIndex.indexUrl }}"/></target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit><trans-unit id="b2f3e08a790518414d240fbe2c3c116c6f83c275" datatype="html">
+        <source>using <x id="INTERPOLATION" equiv-text="{{ serverConfig.search.searchIndex.url }}"/></source><target state="new">using <x id="INTERPOLATION" equiv-text="{{ serverConfig.search.searchIndex.url }}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/search-typeahead.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      
       <trans-unit id="44f26a1c56d73d4763225ba2e6d5091e0cad1b7c" datatype="html">
         <source>Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</source>
         <target state="new">Results will be augmented with those of a third-party index. Only data necessary to make the query will be sent.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit>
       <trans-unit id="ee697ded3eb6909ca0e619ab5cc9647cbd849da5" datatype="html">
         <source>ADVANCED SEARCH</source>
         <target state="new">ADVANCED SEARCH</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="8e799fee4b3df7ea53786f096380f81c78a77efd" datatype="html">
         <source>any instance</source>
         <target state="new">any instance</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">38</context></context-group></trans-unit>
       <trans-unit id="36a1080014918cc9c4ef8c0d3d5f4d3ae88176bd" datatype="html">
         <source>only followed instances</source>
         <target state="new">only followed instances</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">34</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit>
       <trans-unit id="e5a60e5f83aad776726b8b9e7ff1b69f047a8416" datatype="html">
         <source>Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.</source>
         <target state="new">Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
-      <trans-unit id="c9af5a8f7fae61166a0cc135063ff16d76deef55" datatype="html">
-        <source>channel</source>
-        <target state="new">channel</target>
-        
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">41</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">44</context></context-group></trans-unit>
-      <trans-unit id="1dde6766dd298aa1e1b12afe67ad23dfbca88d2e" datatype="html">
-        <source>Any other text will return matching video or channel names.</source>
-        <target state="new">Any other text will return matching video or channel names.</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">50</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/search-typeahead.component.html</context><context context-type="linenumber">37</context></context-group></trans-unit><trans-unit id="648ca3b1ac41763033a412ead17c4a3dd71545be" datatype="html">
+        <source>will list the matching channel</source><target state="new">will list the matching channel</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/search-typeahead.component.html</context>
+          <context context-type="linenumber">46</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/search-typeahead.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+      </trans-unit><trans-unit id="48d27fa96b882d9c5c2a779376328790d80378eb" datatype="html">
+        <source>will list the matching video</source><target state="new">will list the matching video</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/search-typeahead.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit><trans-unit id="25d438ce4c6d14835921c34bda6cc88f4fe5b1b4" datatype="html">
+        <source>Any other input will return matching video or channel names.</source><target state="new">Any other input will return matching video or channel names.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/search-typeahead.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      
+      
       <trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599">
         <source>Search...</source>
         <target>Buscar...</target>
@@ -1935,229 +1887,221 @@
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/header/header.component.html</context><context context-type="linenumber">5</context></context-group>
       </trans-unit>
-      <trans-unit id="2f8adf9966f3c287b193683af9e1eaba4f526d68" datatype="html">
-        <source>In this channel</source>
-        <target state="new">In this channel</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/header/suggestion.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-      </trans-unit>
+      
       <trans-unit id="2fb6c7364664174a205180f7173c4128b350c5ec" datatype="html">
         <source>In this instance</source>
         <target state="new">In this instance</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/header/suggestion.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/suggestion.component.html</context><context context-type="linenumber">14</context></context-group></trans-unit>
       <trans-unit id="9848e55d7c95eddc1c4a044a63ed0e88e8cb6f5c" datatype="html">
         <source>In the vidiverse</source>
         <target state="new">In the vidiverse</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/header/suggestion.component.html</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="17ebc377c617be81cff7c2f2edbb7d405595d73a" datatype="html">
-        <source>
-    Jump to channel
-    <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>↵<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
-  </source>
-        <target state="new">
-    Jump to channel
-    <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>↵<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
-  </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/header/suggestion.component.html</context>
-          <context context-type="linenumber">18</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/header/suggestion.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
+      
       <trans-unit id="5d43539fc358c3a548b9d487be821db73e2702ff">
         <source>Sort</source>
         <target>Ordenar</target>
         <context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">7</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="a57adbb9bc3ecbc397157af25f96fc2123c9c383" datatype="html">
         <source>Reset</source>
         <target state="new">
             Reset
           </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">8</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">36</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">68</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">8</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">41</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">55</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit>
       <trans-unit id="98acac685fc4b2d35e5d0cf3cd224d247a756c3e">
         <source>Published date</source>
         <target>Data de publicación</target>
         <context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">21</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
       <trans-unit id="31523e672b9f39a621e5d9e2a22b24bbf9aa8d4d">
         <source>Original publication year</source>
         <target>Ano orixinal da publicación</target>
         <context-group name="null">
           <context context-type="linenumber">24</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">35</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="e9866754251f6f45c42710a3de01da5d79c6ae91">
         <source>After...</source>
         <target>Despois...</target>
         <context-group name="null">
           <context context-type="linenumber">30</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">66</context></context-group></trans-unit>
       <trans-unit id="46c36269a23f9105124bbdd58f8c91833b92e565">
         <source>Before...</source>
         <target>Antes...</target>
         <context-group name="null">
           <context context-type="linenumber">37</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">76</context></context-group></trans-unit>
       <trans-unit id="a02ea1d4e7424ca989929da5e598f379940fdbf2">
         <source>Duration</source>
         <target>Duración</target>
         <context-group name="null">
           <context context-type="linenumber">45</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">67</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">237</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">89</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">237</context></context-group></trans-unit>
       <trans-unit id="dc67060f94f0f2b58549f54a5c07925dffd20238">
         <source>Display sensitive content</source>
         <target>Mostrar contido sensible</target>
         <context-group name="null">
           <context context-type="linenumber">54</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="4f20f2d5a6882190892e58b85f6ccbedfa737952">
         <source>Yes</source>
         <target>Si</target>
         <context-group name="null">
           <context context-type="linenumber">58</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">89</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">29</context></context-group></trans-unit>
       <trans-unit id="3d3ae7deebc5949b0c1c78b9847886a94321d9fd">
         <source>No</source>
         <target>Non</target>
         <context-group name="null">
           <context context-type="linenumber">63</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">94</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">34</context></context-group></trans-unit>
       <trans-unit id="607de17c2a755f65775881c19e276e7c933bcf94">
         <source>Category</source>
         <target>Categoría</target>
         <context-group name="null">
           <context context-type="linenumber">164</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">102</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">68</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">202</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">102</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">68</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">202</context></context-group></trans-unit>
       <trans-unit id="265ee68edfe57e510270da31ec99f67d94346009" datatype="html">
         <source>Reset</source>
         <target state="new">
           Reset
         </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">103</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">116</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">129</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">144</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">157</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">103</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">116</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">129</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">144</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">157</context></context-group></trans-unit>
       <trans-unit id="75706466a5cffa6f6bf0d6c94a8345a001ce8cea" datatype="html">
         <source>Display all categories</source>
         <target state="new">Display all categories</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">108</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">108</context></context-group></trans-unit>
       <trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c">
         <source>Licence</source>
         <target>Licenza</target>
         <context-group name="null">
           <context context-type="linenumber">173</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">115</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">82</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">211</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">115</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">82</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">211</context></context-group></trans-unit>
       <trans-unit id="e19d80c6277747a68f3da8cfe1318303d2b5c952" datatype="html">
         <source>Display all licenses</source>
         <target state="new">Display all licenses</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">121</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">121</context></context-group></trans-unit>
       <trans-unit id="fe46ccaae902ce974e2441abe752399288298619">
         <source>Language</source>
         <target>Idioma</target>
         <context-group name="null">
           <context context-type="linenumber">182</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">128</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">10</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">96</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">220</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">128</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">10</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">96</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">220</context></context-group></trans-unit>
       <trans-unit id="dcc3173a99661496cd1f836283993cc3e6576b26" datatype="html">
         <source>Display all languages</source>
         <target state="new">Display all languages</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">134</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">134</context></context-group></trans-unit>
       <trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8">
         <source>All of these tags</source>
         <target>Todas estas etiquetas</target>
         <context-group name="null">
           <context context-type="linenumber">103</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">143</context></context-group></trans-unit>
       <trans-unit id="492d2bd18db0cba03f6d9e3b0c42b8639fbe51ab">
         <source>One of these tags</source>
         <target>Unha de estas etiquetas</target>
         <context-group name="null">
           <context context-type="linenumber">108</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">156</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">156</context></context-group></trans-unit><trans-unit id="118bedbb308a28f06d1c0c84645a35c9bf93cbf3" datatype="html">
+        <source>Search target</source><target state="new">Search target</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search-filters.component.html</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
+      </trans-unit><trans-unit id="cdfec9a92a3081018d34e82d74e85e4e9f63a95f" datatype="html">
+        <source>Vidiverse</source><target state="new">Vidiverse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search-filters.component.html</context>
+          <context context-type="linenumber">180</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="ca72d574353a355b8fadbc1ceda174a0bd1bf7cd" datatype="html">
         <source>Reset</source>
         <target state="new">
       Reset
     </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">187</context></context-group></trans-unit>
       <trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22">
         <source>Filter</source>
         <target>Filtro</target>
         <context-group name="null">
           <context context-type="linenumber">115</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">175</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">191</context></context-group></trans-unit>
       <trans-unit id="41ed53a3f1d4dfc57011d0aba13b8b074e8b41b6">
         <source>Display unlisted and private videos</source>
         <target>Mostrar vídeos non listados e privados</target>
         <context-group name="null">
           <context context-type="linenumber">14</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/abstract-video-list.html</context><context context-type="linenumber">22</context></context-group></trans-unit><trans-unit id="6f5a458f827503ac7b8697688ecf3e0490818ee8" datatype="html">
+        <source>Video channels</source><target state="new">Video channels</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="40fa23fe45af4ee2e72cdd3cc6bf6013f180aab0">
         <source>Add caption</source>
@@ -2165,16 +2109,16 @@
         <context-group name="null">
           <context context-type="linenumber">5</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="6bad752cfcac8f3572bdf2c619daec683d56d1a8">
         <source>Select the caption file</source>
         <target>Escoller ficheiro de subtítulos</target>
         <context-group name="null">
           <context context-type="linenumber">24</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">24</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">24</context></context-group></trans-unit>
       <trans-unit id="c34c61401151c29fb3679638a7d0b95258145ec3">
         <source>This will replace an existing caption!</source>
         <target>
@@ -2183,33 +2127,33 @@
         <context-group name="null">
           <context context-type="linenumber">29</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">30</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
       <trans-unit id="39702b643cfe3d5b96a4587c1b44a29fa665406c">
         <source>Add this caption</source>
         <target>Engadir este subtítulo</target>
         <context-group name="null">
           <context context-type="linenumber">40</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
         <source>Title</source>
         <target>Título</target>
         <context-group name="null">
           <context context-type="linenumber">9</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b">
         <source>Tags</source>
         <target>Etiquetas</target>
         <context-group name="null">
           <context context-type="linenumber">191</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">19</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">229</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">19</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">229</context></context-group></trans-unit>
       <trans-unit id="19f59c3f026a162a78af887faff8d9b2b11a4e27" datatype="html">
         <source>
                     Tags could be used to suggest relevant recommendations. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -2221,82 +2165,82 @@
                     There is a maximum of 5 tags. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                     Press Enter to add a new tag.
                   </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="9bdd535a2817bf0b843a124bf65e4992625e7ecf">
         <source>+ Tag</source>
         <target>+ Etiqueta</target>
         <context-group name="null">
           <context context-type="linenumber">30</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">150</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">163</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">150</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">163</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="e5a71671bcec89845f208e90c3bf508aafc8f931" datatype="html">
         <source>Enter a tag</source>
         <target state="new">Enter a tag</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">150</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">163</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">150</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">163</context></context-group></trans-unit>
       <trans-unit id="8389e9cde2928cc27aaecbdee818a255bf7984b0">
         <source>Enter a new tag</source>
         <target>Engadir nova etiqueta</target>
         <context-group name="null">
           <context context-type="linenumber">30</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="eec715de352a6b114713b30b640d319fa78207a0">
         <source>Description</source>
         <target>Descrición</target>
         <context-group name="null">
           <context context-type="linenumber">55</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">39</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">38</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">17</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">44</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">44</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">64</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">64</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">39</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context><context context-type="linenumber">17</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">44</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">44</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">64</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">64</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">55</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit>
       <trans-unit id="3b86a740c713742c3f7538c60b890fccdd0a5caf" datatype="html">
         <source>Video descriptions are truncated by default and require manual action to expand them.</source>
         <target state="new">
                     Video descriptions are truncated by default and require manual action to expand them.
                   </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">43</context></context-group></trans-unit>
       <trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071">
         <source>Channel</source>
         <target>Canle</target>
         <context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">59</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">70</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">70</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">70</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">70</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">59</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427">
         <source>Privacy</source>
         <target>Intimidade</target>
         <context-group name="null">
           <context context-type="linenumber">33</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">110</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">31</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">20</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">36</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">187</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">57</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">57</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlist-edit.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">110</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">36</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">20</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">187</context></context-group></trans-unit>
       <trans-unit id="4b6dbf2d92858e82bcf6ae5dbc8dfb4b29d82ad0" datatype="html">
         <source>FAQ</source>
         <target state="new">FAQ</target>
@@ -2323,104 +2267,104 @@
         <context-group name="null">
           <context context-type="linenumber">122</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">125</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">125</context></context-group></trans-unit>
       <trans-unit id="5ef7108218e096d09f4ee8525a05a8c90d7b95ee">
         <source>This video contains mature or explicit content</source>
         <target>O vídeo contén contido explícito ou adulto</target>
         <context-group name="null">
           <context context-type="linenumber">136</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">139</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">139</context></context-group></trans-unit>
       <trans-unit id="9daabdcaa2bbd83597099b10db22d056cf491644">
         <source>Some instances do not list videos containing mature or explicit content by default.</source>
         <target>Algunhas instancias por omisión non listan vídeos con contido explícito ou adulto.</target>
         <context-group name="null">
           <context context-type="linenumber">140</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">143</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">143</context></context-group></trans-unit>
       <trans-unit id="7e549f41b715552ffe69b85c14a690d9d81c85f0">
         <source>Wait transcoding before publishing the video</source>
         <target>Agardar a recodificación antes de publicar o vídeo</target>
         <context-group name="null">
           <context context-type="linenumber">146</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">149</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">149</context></context-group></trans-unit>
       <trans-unit id="24f468ce1148a096477d8dd0d00f0d1fd88d6c63">
         <source>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</source>
         <target>Se decide non agardar pola recodificación antes de publicar o vídeo, podería non ser reproducible ate rematala.</target>
         <context-group name="null">
           <context context-type="linenumber">150</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">153</context></context-group></trans-unit>
       <trans-unit id="c7742322b1d3dbc921362058d1747c7ec2adbec7">
         <source>Basic info</source>
         <target>Info básica</target>
         <context-group name="null">
           <context context-type="linenumber">4</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="92bcfd1d237a2bfe48dc9f46d074ed26abc8df22">
         <source>Add another caption</source>
         <target>Engadir outros subtítulos</target>
         <context-group name="null">
           <context context-type="linenumber">166</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">171</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">171</context></context-group></trans-unit>
       <trans-unit id="a46a7503167b77b3ec4e28274a3d1dda637617ed">
         <source>See the subtitle file</source>
         <target>Ver o ficheiro de subtítulos</target>
         <context-group name="null">
           <context context-type="linenumber">175</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">180</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">180</context></context-group></trans-unit>
       <trans-unit id="e687f6387adbaf61ce650b58f0e60ca42d843cee">
         <source>Already uploaded        ✔</source>
         <target>Xa subido       ✔</target>
         <context-group name="null">
           <context context-type="linenumber">179</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">184</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">184</context></context-group></trans-unit>
       <trans-unit id="ca4588e185413b2fc77dbe35c861cc540b11b9ad">
         <source>Will be created on update</source>
         <target>Será creado tras a subida</target>
         <context-group name="null">
           <context context-type="linenumber">187</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">192</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">192</context></context-group></trans-unit>
       <trans-unit id="308a79679d012938a625e41fdd4b804fe42b57b9">
         <source>Cancel create</source>
         <target>Cancelar a creación</target>
         <context-group name="null">
           <context context-type="linenumber">189</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">194</context></context-group></trans-unit>
       <trans-unit id="b6bfdd386cb0b560d697c93555d8cd8cab00c393">
         <source>Will be deleted on update</source>
         <target>Será borrado tras actualizar</target>
         <context-group name="null">
           <context context-type="linenumber">195</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">200</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">200</context></context-group></trans-unit>
       <trans-unit id="88395fc0137e46a9853cf16762bf5a87687d0d0c">
         <source>Cancel deletion</source>
         <target>Deter a eliminación</target>
         <context-group name="null">
           <context context-type="linenumber">197</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">202</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">202</context></context-group></trans-unit>
       <trans-unit id="82f867b2607d45ba36de11d4c8b53d7177122ee0">
         <source>No captions for now.</source>
         <target>
@@ -2429,89 +2373,89 @@
         <context-group name="null">
           <context context-type="linenumber">202</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">207</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">207</context></context-group></trans-unit>
       <trans-unit id="0c720e0dd9e6c60095f961cb714f47e8c0090f93">
         <source>Captions</source>
         <target>Subtítulos</target>
         <context-group name="null">
           <context context-type="linenumber">159</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">163</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">163</context></context-group></trans-unit>
       <trans-unit id="fc7600ad500918cb091064cb7129a5d13657a430">
         <source>Video preview</source>
         <target>Vista previa</target>
         <context-group name="null">
           <context context-type="linenumber">216</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">223</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">223</context></context-group></trans-unit>
       <trans-unit id="b5629d298ff1a69b8db19a4ba2995c76b52da604">
         <source>Support</source>
         <target>Axuda</target>
         <context-group name="null">
           <context context-type="linenumber">78</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">232</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">232</context></context-group></trans-unit>
       <trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0">
         <source>Short text to tell people how they can support you (membership platform...).</source>
         <target>Mostrar un texto para dicirlle a xente cómo te poden axudar (plataforma de doazóns ...).</target>
         <context-group name="null">
           <context context-type="linenumber">226</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">233</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">233</context></context-group></trans-unit>
       <trans-unit id="50d14e019ef14b4180e247e0b3a45386a8a78bf6">
         <source>Original publication date</source>
         <target>Data da publicación orixinal</target>
         <context-group name="null">
           <context context-type="linenumber">239</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">246</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">246</context></context-group></trans-unit>
       <trans-unit id="4f6ce709bf09f9f24c161840ae983971a09fb12c">
         <source>This is the date when the content was originally published (e.g. the release date for a film)</source>
         <target>Esta é a data cando foi publicado orinixalmente o contido (ex. a data de estrea dunha película)</target>
         <context-group name="null">
           <context context-type="linenumber">240</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">247</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">247</context></context-group></trans-unit>
       <trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a">
         <source>Enable video comments</source>
         <target>Activar comentarios ao vídeo</target>
         <context-group name="null">
           <context context-type="linenumber">254</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">261</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">261</context></context-group></trans-unit>
       <trans-unit id="0b365218ce1ae736f9066fd3d47278cc8f3ed1d0">
         <source>Enable download</source>
         <target>Activar descarga</target>
         <context-group name="null">
           <context context-type="linenumber">259</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">266</context></context-group></trans-unit>
       <trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1">
         <source>Advanced settings</source>
         <target>Axustes avanzados</target>
         <context-group name="null">
           <context context-type="linenumber">210</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">216</context></context-group></trans-unit>
       <trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6">
         <source>URL</source>
         <target>URL</target>
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">6</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">6</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="d49ca01a7d3c689add2eb58a469a3919c7ee9af7" datatype="html">
         <source>
             You can import any URL <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>supported by youtube-dl<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
@@ -2523,21 +2467,18 @@
             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.
           </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="385811ab5a5c3e96e0db46c9ce1fc3147d8cd4c7">
         <source>Sorry, but something went wrong</source>
         <target>Lamentámolo, pero algo fallou</target>
         <context-group name="null">
           <context context-type="linenumber">53</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">48</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">63</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">52</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">48</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit>
       <trans-unit id="63d6bf87c9f30441175648dfd3ef6a19292287c2">
         <source>Congratulations, the video behind <x id="INTERPOLATION" equiv-text="{{ targetUrl }}"/> will be imported! You can already add information about this video. </source>
         <target>
@@ -2546,43 +2487,43 @@
         <context-group name="null">
           <context context-type="linenumber">52</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">52</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">52</context></context-group></trans-unit>
       <trans-unit id="047f50bc5b5d17b5bec0196355953e1a5c590ddb">
         <source>Update</source>
         <target>Actualizar</target>
         <context-group name="null">
           <context context-type="linenumber">17</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">69</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">73</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.html</context><context context-type="linenumber">3</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.html</context><context context-type="linenumber">18</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">73</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">69</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.html</context><context context-type="linenumber">3</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9">
         <source>Select the file to upload</source>
         <target>Escoller ficheiro a subir</target>
         <context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">6</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="5e420747842373fa99a75a7a18df068cc81e46fb">
         <source>Scheduled</source>
         <target>Programado</target>
         <context-group name="null">
           <context context-type="linenumber">25</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">24</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">24</context></context-group></trans-unit>
       <trans-unit id="5d6a58637313a6b2375e3af59534f788c8f8657d">
         <source>Video background image</source>
         <target>Imaxe de fondo do vídeo</target>
         <context-group name="null">
           <context context-type="linenumber">32</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="1860b3f71e0b82e9c10e1eaf0ff073216ed896cc">
         <source>
           Image that will be merged with your audio file.
@@ -2597,57 +2538,51 @@
         <context-group name="null">
           <context context-type="linenumber">34</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="dfd046dad933ba0a50926b9ab3c1b579c802312e" datatype="html">
         <source>Processing…</source>
         <target state="new">Processing…</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">55</context></context-group></trans-unit>
       <trans-unit id="a81bfce50be151484f8e59b34829ab07ef97982b" datatype="html">
         <source>Total video quota</source>
         <target state="new">Total video quota</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">53</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">12</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">53</context></context-group></trans-unit>
       <trans-unit id="6357683911e256c566259880de43ea9403de00d3" datatype="html">
         <source>Congratulations! Your video is now available in your private library.</source>
         <target state="new">
   Congratulations! Your video is now available in your private library.
 </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">67</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">67</context></context-group></trans-unit>
       <trans-unit id="f7ac2376749c7985f94f0fc89ba75ea624de1215" datatype="html">
         <source>Publish will be available when upload is finished</source>
         <target state="new">Publish will be available when upload is finished</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">80</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">80</context></context-group></trans-unit>
       <trans-unit id="223aae0477f79f0bc4436c1c57619415f04cbbb3" datatype="html">
         <source>Publish</source>
         <target state="new">Publish</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">87</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
       <trans-unit id="2fcbf437e001f47974d45bd03a19e0d9245fdb3b" datatype="html">
         <source>Select the torrent to import</source>
         <target state="new">Select the torrent to import</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="63f5d0ec23e3cf4abf6d5221107633c90d8d4a15" datatype="html">
         <source>OR</source>
         <target state="new">OR</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="0d6558176587662e9bb3b79cca57d42591cf82f9" datatype="html">
         <source>Paste magnet URI</source>
         <target state="new">Paste magnet URI</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">13</context></context-group></trans-unit>
       <trans-unit id="e39797d5be895f1b0c9ca9ba4e45429f9b95aa52" datatype="html">
         <source>
             You can import any torrent file that points to a mp4 file.
@@ -2657,15 +2592,15 @@
             You can import any torrent file that points to a 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.
           </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="7cb3731472edd9edf6a6d036498c2c8388157266" datatype="html">
         <source>Congratulations, the video will be imported with BitTorrent! You can already add information about this video.</source>
         <target state="new">
   Congratulations, the video will be imported with BitTorrent! You can already add information about this video.
 </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">56</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html</context><context context-type="linenumber">56</context></context-group></trans-unit>
       <trans-unit id="ebe5234338205e30a59cf703e2a2b6ef49fb75f8" datatype="html">
         <source>
     We recommend you to not use the <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>root<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> user to publish your videos, since it's the super-admin account of your instance.
@@ -2677,488 +2612,384 @@
     <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
     Instead, <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>create a dedicated account<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> to upload your videos.
   </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context>
-          <context context-type="linenumber">2</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit>
       <trans-unit id="0b60d939cf0f1af9fe513f31164d198abf671860" datatype="html">
         <source>Import <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></source>
         <target state="new">Import <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">9</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="e9cfe8bd050660077212af5c02f5be24821f28d5" datatype="html">
         <source>Upload <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></source>
         <target state="new">Upload <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="4faf57baebf0fb754a91af0c39521a30cbb1def3" datatype="html">
         <source>Upload a file</source>
         <target state="new">Upload a file</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="fc865859d33eab6fa0a8015233e4686cd544d470" datatype="html">
         <source>Import with URL</source>
         <target state="new">Import with URL</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="752c401d7dcd708944eef60e411187f71d882340" datatype="html">
         <source>Import with torrent</source>
         <target state="new">Import with torrent</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context><context context-type="linenumber">36</context></context-group></trans-unit>
       <trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
         <source>Other videos</source>
         <target state="new">
         Other videos
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/recommendations/recommended-videos.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/recommendations/recommended-videos.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="70155053814b6999f8abce4f89bab85afc76e538" datatype="html">
         <source>AUTOPLAY</source>
         <target state="new">AUTOPLAY</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/recommendations/recommended-videos.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/recommendations/recommended-videos.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="0bd8b27f60a1f098a53e06328426d818e3508ff9" datatype="html">
         <source>Share</source>
         <target state="new">Share</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">3</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="71420314c00d8b709ea1aad8f608498f8db92258" datatype="html">
         <source>Share the playlist</source>
         <target state="new">Share the playlist</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="dfc8701a2a6898d6784db0ebf9d3191552d81d89" datatype="html">
         <source>Share the playlist at this video position</source>
         <target state="new">Share the playlist at this video position</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="51f7d84d38a304f7f056d2dcaf6d733c3ade35f9" datatype="html">
         <source>Share the video</source>
         <target state="new">Share the video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">28</context></context-group></trans-unit>
       <trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f" datatype="html">
         <source>QR-Code</source>
         <target state="new">QR-Code</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">43</context></context-group></trans-unit>
       <trans-unit id="08c1bbb22df74b12c362fd114d0aa5a230ee4656" datatype="html">
         <source>The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).</source>
         <target state="new">
                 The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
               </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">59</context></context-group></trans-unit>
       <trans-unit id="d3b15c3bf4a7ea38d6002d2d2c4781642d30e79c" datatype="html">
         <source>Embed</source>
         <target state="new">Embed</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">53</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">53</context></context-group></trans-unit>
       <trans-unit id="9adb13e2ba5160c8b0b100dc3f4cbe6051b5af9b" datatype="html">
         <source>Auto select subtitle</source>
         <target state="new">Auto select subtitle</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit>
       <trans-unit id="f0e9c70583e8264cda79a8151de51cbb1ecb02ef" datatype="html">
         <source>More customization</source>
         <target state="new">
               More customization
             </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">170</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">170</context></context-group></trans-unit>
       <trans-unit id="cfad9c5d4357d7c4ac99cc2ce63c54c9738901d7" datatype="html">
         <source>Less customization</source>
         <target state="new">
               Less customization
             </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">178</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">178</context></context-group></trans-unit>
       <trans-unit id="0c2e76c41af25effefd456fb1e86143e0cfd1a4e" datatype="html">
         <source>Autoplay</source>
         <target state="new">Autoplay</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">121</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">121</context></context-group></trans-unit>
       <trans-unit id="71b6e75eb1d54bcd9a64b9af9b99121785a065d0" datatype="html">
         <source>Support <x id="INTERPOLATION" equiv-text="{{ video.account.displayName }}"/></source>
         <target state="new">Support <x id="INTERPOLATION" equiv-text="{{ video.account.displayName }}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-support.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-support.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="cb66498f1a530d9b29ee5bc6605628add658dd87" datatype="html">
         <source>Maybe later</source>
         <target state="new">Maybe later</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-support.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-support.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="62a557fcfdbd25a31d1a0332294f94a466fee809" datatype="html">
         <source>Muted</source>
         <target state="new">Muted</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">128</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">19</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">19</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">128</context></context-group></trans-unit>
       <trans-unit id="67732b09326ab7941ce983205a42d7819dd35668" datatype="html">
         <source>Loop</source>
         <target state="new">Loop</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">135</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">135</context></context-group></trans-unit>
       <trans-unit id="af3ab1a1035c222ccc88816baa236eb95cea7523" datatype="html">
         <source>Display video title</source>
         <target state="new">Display video title</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">144</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">144</context></context-group></trans-unit>
       <trans-unit id="cd0fb32d9b50b615bdce413ca955283df7ab0b74" datatype="html">
         <source>Display privacy warning</source>
         <target state="new">Display privacy warning</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">151</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">151</context></context-group></trans-unit>
       <trans-unit id="3e10c53d0372db827bf38571e56d166f1df963bf" datatype="html">
         <source>Display player controls</source>
         <target state="new">Display player controls</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">158</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context><context context-type="linenumber">158</context></context-group></trans-unit>
       <trans-unit id="3c4c080864b313cfdff5fdea6aae5da276246d99" datatype="html">
         <source>Public</source>
         <target state="new">Public</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.html</context>
-          <context context-type="linenumber">8</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">8</context></context-group></trans-unit>
       <trans-unit id="38e66e2d779d6d819cd7703ab73ab1bab75f8614" datatype="html">
         <source>The video is being imported, it will be available when the import is finished.</source>
         <target state="new">
       The video is being imported, it will be available when the import is finished.
     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="d2a8e8e4e5345201c07ba03a7fafe8b663230246" datatype="html">
         <source>The video is being transcoded, it may not work properly.</source>
         <target state="new">
       The video is being transcoded, it may not work properly.
     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">23</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="2dd4add38e83d8ec58e37735e76090e9738c974a" datatype="html">
         <source>This video will be published on <x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: 'full' }}"/>. </source>
         <target state="new">
       This video will be published on <x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: 'full' }}"/>.
     </target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">27</context></context-group></trans-unit><trans-unit id="bbb57efb2edd572de832c8fff03bc85d7723abd3" datatype="html">
+        <source>This video is blocked.</source><target state="new">This video is blocked.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">27</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="bd7055d3e38beff538463e75d508d1c75c683710" datatype="html">
-        <source>This video is blacklisted.</source>
-        <target state="new">This video is blacklisted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context>
           <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="82bf4d36722689b7c0058ed18e50d7b550d6d8b6" datatype="html">
         <source>Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;/my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/> • <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/> </source>
         <target state="new">
               Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;/my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/> • <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
             </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">45</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">45</context></context-group></trans-unit>
       <trans-unit id="04aabb1507157d38b070f1a7ed5271bcea041404" datatype="html">
         <source>Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;/my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/> • <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/> </source>
         <target state="new">
                 Published <x id="START_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;my-date-toggle>"/><x id="CLOSE_TAG_MY-DATE-TOGGLE" ctype="x-my-date-toggle" equiv-text="&lt;/my-date-toggle>"/> <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/> • <x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
               </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">56</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">56</context></context-group></trans-unit>
       <trans-unit id="74059c5dce671d464259e3ce37a5d408c3fd7720" datatype="html">
         <source>SUPPORT</source>
         <target state="new">SUPPORT</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">87</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
       <trans-unit id="83ea0f7a6f84393af198d48193e01a96f3fcbc9a" datatype="html">
         <source>SHARE</source>
         <target state="new">SHARE</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">92</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">92</context></context-group></trans-unit>
       <trans-unit id="cf272d006ff8c0b60e61b14e17fa6a39b30d614a" datatype="html">
         <source>SAVE</source>
         <target state="new">SAVE</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">103</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">103</context></context-group></trans-unit>
       <trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced" datatype="html">
         <source>Like this video</source>
         <target state="new">Like this video</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509" datatype="html">
         <source>Dislike this video</source>
         <target state="new">Dislike this video</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d9b40e01fa146a1fbd189c13b01815a1d41c68ab" datatype="html">
         <source>Support options for this video</source>
         <target state="new">Support options for this video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33" datatype="html">
-        <source>Go the channel page</source>
-        <target state="new">Go the channel page</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/channel/avatar.component.html</context><context context-type="linenumber">2</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">150</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      
       <trans-unit id="0b7f242da10ece3f2995095c455b9a92ebcdd3b4" datatype="html">
         <source>By <x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></source>
         <target state="new">By <x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">154</context></context-group>
-      </trans-unit>
-      <trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c" datatype="html">
-        <source>Go to the account page</source>
-        <target state="new">Go to the account page</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/channel/avatar.component.html</context><context context-type="linenumber">5</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">153</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">154</context></context-group></trans-unit>
+      
       <trans-unit id="d0336848b0c375a1c25ba369b3481ee383217a4f" datatype="html">
         <source>Subscribe</source>
         <target state="new">Subscribe</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="6e215e23505768151b501b7e11dd5b864e604fd9" datatype="html">
         <source>Subscribe to all channels</source>
         <target state="new">Subscribe to all channels</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="c33a843e309de9d67771aa5e666f61e92f4c6216" datatype="html">
         <source>channels subscribed</source>
         <target state="new">channels subscribed</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">11</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="e01bfa3629e2133dbf307975446bde047eb8bd1f" datatype="html">
         <source>{VAR_SELECT, select, undefined {Unsubscribe} other {Unsubscribe from all channels} }</source>
         <target state="new">{VAR_SELECT, select, undefined {Unsubscribe} other {Unsubscribe from all channels} }</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b" datatype="html">
         <source>Show more</source>
         <target state="new">Show more</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">174</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">174</context></context-group></trans-unit>
       <trans-unit id="5403a767248e304199592271bba3366d2ca3f903" datatype="html">
         <source>Show less</source>
         <target state="new">Show less</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">180</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">180</context></context-group></trans-unit>
       <trans-unit id="57bfd54c230fc20caff1f0b321ad42be3bf859a6" datatype="html">
         <source>Origin instance</source>
         <target state="new">Origin instance</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">192</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">192</context></context-group></trans-unit>
       <trans-unit id="284b55e2ae9f6e5bc78c92a18ef26da02f380079" datatype="html">
         <source>Originally published</source>
         <target state="new">Originally published</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">197</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">197</context></context-group></trans-unit>
       <trans-unit id="4c0ba3cde3b3c58b855ffb4beaa5804a2fc3826b" datatype="html">
         <source>Friendly Reminder:</source>
         <target state="new">Friendly Reminder: </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">261</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">260</context></context-group></trans-unit>
       <trans-unit id="89707647cc7c304e499ae46a5a0c5b508c3c80a0" datatype="html">
         <source>the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.</source>
         <target state="new">
           the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">262</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">261</context></context-group></trans-unit>
       <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e" datatype="html">
         <source>More information</source>
         <target state="new">More information</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">266</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">35</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">50</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">39</context></context-group>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">48</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">50</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">39</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">265</context></context-group></trans-unit><trans-unit id="75d9bb7a2e6256268cd0653aac75a8b994d3cf1f" datatype="html">
+        <source>The video was blocked due to automatic blocking of new videos</source><target state="new">The video was blocked due to automatic blocking of new videos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318" datatype="html">
         <source>Get more information</source>
         <target state="new">Get more information</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">265</context></context-group></trans-unit>
       <trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>OK</source>
         <target state="new">
       OK
     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">269</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">268</context></context-group></trans-unit>
       <trans-unit id="a8db53a47543132da1a68066f0a9cba0551a8933" datatype="html">
         <source>1 Comment</source>
         <target state="new">1 Comment</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="8164af7bbe7fb9a3d2064ddf2627a7a4d5446575" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> Comments</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> Comments</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="c5bb9f8936cb33db2ca351a1b87a984fdf11917c" datatype="html">
         <source>Comments</source>
         <target state="new">Comments</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="a87cd0a1633f944e697fa2ee68362d8bc11c41ee" datatype="html">
         <source>SORT BY</source>
         <target state="new">
         SORT BY
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
       <trans-unit id="6d355ab9a2c6af4f7ffcb44dd8ca0c5572f958ca" datatype="html">
         <source>Most recent first (default)</source>
         <target state="new">Most recent first (default)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="df2d2cca87a54e75abb4196d10358579dd0321b4" datatype="html">
         <source>Most replies first</source>
         <target state="new">Most replies first</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">20</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="17810e68b0ba21e62e61eecfaf0a93b2c91033b4" datatype="html">
         <source>No comments.</source>
         <target state="new">No comments.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">32</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="ce6445567d33993fced14aae3456db909121d12e" datatype="html">
         <source>View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies from <x id="INTERPOLATION_1" equiv-text="{{ video?.account?.displayName || 'the author' }}"/> and others </source>
         <target state="new">
                 View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies from <x id="INTERPOLATION_1" equiv-text="{{ video?.account?.displayName || 'the author' }}"/> and others
               </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">78</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">78</context></context-group></trans-unit>
       <trans-unit id="8487d97def3c5336b1cde21c7da14e61a9633061" datatype="html">
         <source>View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies from <x id="INTERPOLATION_1" equiv-text="{{ video?.account?.displayName || 'the author' }}"/> </source>
         <target state="new">
                 View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies from <x id="INTERPOLATION_1" equiv-text="{{ video?.account?.displayName || 'the author' }}"/>
               </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">81</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">81</context></context-group></trans-unit>
       <trans-unit id="dce85627dad907cb2013d06f97f82ad7bf87b0a6" datatype="html">
         <source>View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies</source>
         <target state="new">View <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">85</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">85</context></context-group></trans-unit>
       <trans-unit id="b7fccd922d6473725247ed85a9fdf96fe6794828" datatype="html">
         <source>Comments are disabled.</source>
         <target state="new">
     Comments are disabled.
   </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">95</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comments.component.html</context><context context-type="linenumber">95</context></context-group></trans-unit>
       <trans-unit id="db79255cb8757e9e945ba5f901a2b67e4189016e" datatype="html">
         <source>Add comment...</source>
         <target state="new">Add comment...</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="8956c0f4c6974289fc63f1ab6b54f5b32ed65eeb" datatype="html">
         <source>Reply</source>
         <target state="new">
       Reply
     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context>
-          <context context-type="linenumber">23</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="8b2bb53dfb5f059f2b68cc4ac00661a865909135" datatype="html">
         <source>You are one step away from commenting</source>
         <target state="new">You are one step away from commenting</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="2c6453cc150c9f652a7f1238d2f172e625f0f117" datatype="html">
         <source>
       You can comment using an account on any ActivityPub-compatible instance.
@@ -3170,38 +3001,35 @@
       On most platforms, you can find the video by typing its URL in the search bar and then comment it
       from within the software's interface.
     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="968b02fbc645be799727de0d1ec3c6f9b11b20eb" datatype="html">
         <source>If you have an account on Mastodon or Pleroma, you can open it directly in their interface:</source>
         <target state="new">
       If you have an account on Mastodon or Pleroma, you can open it directly in their interface:
     </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
       <trans-unit id="413bcc4a4c824366e17673f38cb2af4619e940e2" datatype="html">
         <source>Login to comment</source>
         <target state="new">Login to comment</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">52</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment-add.component.html</context><context context-type="linenumber">52</context></context-group></trans-unit>
       <trans-unit id="a607fab03e11b0e07c1640e11a1b02d7af06b285" datatype="html">
         <source>Highlighted comment</source>
         <target state="new">Highlighted comment</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="cb23d4d98007aa4d7123837f4c17a671848377d6" datatype="html">
         <source>Reply</source>
         <target state="new">Reply</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">44</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">44</context></context-group></trans-unit>
       <trans-unit id="3dc4cf221502c170c7fcd4b2bffc9b3aa46b84bb" datatype="html">
         <source>This comment has been deleted</source>
         <target state="new">This comment has been deleted</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">61</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">61</context></context-group></trans-unit>
       <trans-unit id="fee25862814afd08fca2abe1452e6841e8b57b1e" datatype="html">
         <source>Follows &amp; redundancies</source>
         <target state="new">Follows &amp; redundancies</target>
@@ -3231,8 +3059,8 @@
       <trans-unit id="4e8635c108375983b42229df44bda8c0af84f396" datatype="html">
         <source>1 host (without "http://") per line</source>
         <target state="new">1 host (without "http://") per line</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-modal.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/batch-domains-modal.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="3a23875897fb8099f85410700fcca415626621a3" datatype="html">
         <source>Follow domain</source>
         <target state="new">Follow domain</target>
@@ -3241,46 +3069,25 @@
       <trans-unit id="25925fc5826bc5b3eeae7c45b08b0ed74b9e2954" datatype="html">
         <source>Filter...</source>
         <target state="new">Filter...</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">30</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">12</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">11</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">30</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">24</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">11</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="1e5e23363e949f7dcbaf034bdb141a561132a10e" datatype="html">
         <source>Clear filters</source>
         <target state="new">Clear filters</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
-          <context context-type="linenumber">34</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
-          <context context-type="linenumber">31</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">34</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
       <trans-unit id="45cc8ca94b5a50842a9a8ef804a5ab089a38ae5c" datatype="html">
         <source>ID</source>
         <target state="new">ID</target>
@@ -3294,14 +3101,16 @@
       <trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b" datatype="html">
         <source>State</source>
         <target state="new">State</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">32</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit>
-      <trans-unit id="029bd95d7fe7f3660953c216bf96f6b5243b30ec" datatype="html">
-        <source>Delayed.</source>
-        <target state="new">Delayed.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">47</context></context-group>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">32</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit><trans-unit id="c107d625f06dc3b494d0a22546e6a0609360007d" datatype="html">
+        <source>Delayed</source><target state="new">Delayed</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context>
+          <context context-type="linenumber">47</context>
+        </context-group>
       </trans-unit>
+      
       <trans-unit id="03d7f3be3358b206b0cf38f0149836526f2e97ab" datatype="html">
         <source>Will start soon...</source>
         <target state="new">Will start soon...</target>
@@ -3325,13 +3134,13 @@
       <trans-unit id="ff3173170e5b03536dd3b3e1afbae1f55356eb1b" datatype="html">
         <source>Created <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></source>
         <target state="new">Created <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">25</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">28</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">50</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">42</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">31</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">12</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">25</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">50</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">42</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/jobs/jobs.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">13</context></context-group></trans-unit>
       <trans-unit id="9c9e0eb0ce8abea8b4c7c5dbb6e80a9a5f5b4193" datatype="html">
         <source>Open actor page in a new tab</source>
         <target state="new">Open actor page in a new tab</target>
@@ -3355,15 +3164,15 @@
       <trans-unit id="6fc5e65900ae1415d3170d5d2842f0dcae1b6645" datatype="html">
         <source>Accept</source>
         <target state="new">Accept</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">47</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">41</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">47</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="4a5613f6b472c1ed863dff1be932913a251f27a2" datatype="html">
         <source>Refuse</source>
         <target state="new">Refuse</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">48</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">42</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">48</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">43</context></context-group></trans-unit>
       <trans-unit id="ff772a40114c96a96d8f2bfe0394658eda5a51ca" datatype="html">
         <source>No follower found matching current filters.</source>
         <target state="new">No follower found matching current filters.</target>
@@ -3385,11 +3194,8 @@
       <trans-unit id="270a185f179774aa3cee3120ed4f5650e8816b9f" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ action }}"/></source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{ action }}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-modal.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/batch-domains-modal.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="fe22ca53e651df951dac25b67c17894b0980f767" datatype="html">
         <source>Host</source>
         <target state="new">Host</target>
@@ -3403,15 +3209,9 @@
       <trans-unit id="8cffa679dff97a096d44fca9348eeaa1867d40aa" datatype="html">
         <source>Open instance in a new tab</source>
         <target state="new">Open instance in a new tab</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context>
-          <context context-type="linenumber">37</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">37</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">35</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="d9b4b939363bf385cbb7828c1535f2e2a5e0d362" datatype="html">
         <source>No host found matching current filters.</source>
         <target state="new">No host found matching current filters.</target>
@@ -3526,10 +3326,10 @@
       <trans-unit id="6ded52553dd8720fd3698b8fbc3a6d037c07b496" datatype="html">
         <source>Daily video quota</source>
         <target state="new">Daily video quota</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">155</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">155</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">18</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">155</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">155</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="a0f69dcdccf2174aa7fa17708ac63c3a3104456c" datatype="html">
         <source>Doesn't need review before a video goes public</source>
         <target state="new">Doesn't need review before a video goes public</target>
@@ -3615,10 +3415,10 @@
       <trans-unit id="ed64ec2b14251cfbe9ab28abde51d3f052fde1e7" datatype="html">
         <source>Open account in a new tab</source>
         <target state="new">Open account in a new tab</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">69</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">57</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">69</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="02ba1a65db92d1d0ab4ba380086e9be61891aaa5" datatype="html">
         <source>User's email must be verified to login</source>
         <target state="new">User's email must be verified to login</target>
@@ -3649,57 +3449,57 @@
           <context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="23a793ed0df2e10823dd469c5cea9b5c36be8f7e" datatype="html">
-        <source>Video abuses</source>
-        <target state="new">Video abuses</target>
+      </trans-unit><trans-unit id="8c516f7e68f4bb2020f6a9bd7df1ee5749c9d038" datatype="html">
+        <source>Video reports</source><target state="new">Video reports</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="6053443ad364f974301570cfadfa86ee0b43f1a9" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ autoBlacklistVideosEnabled ? 'Manually blacklisted videos' : 'Blacklisted videos' }}"/></source>
-        <target state="new"><x id="INTERPOLATION" equiv-text="{{ autoBlacklistVideosEnabled ? 'Manually blacklisted videos' : 'Blacklisted videos' }}"/></target>
+      </trans-unit><trans-unit id="d2e7333704502d1720b353742634630b71ea8bd7" datatype="html">
+        <source>Video blocks</source><target state="new">Video blocks</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/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>
-        <target state="new">Auto-blacklisted videos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/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>
         <target state="new">Muted accounts</target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
+      <trans-unit id="bd0611346af048015e0a1275091ef68ce98832d2" datatype="html">
+        <source>Muted servers</source>
+        <target state="new">Muted servers</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit><trans-unit id="2122599f5b51ab83849bc77fa5cafcdcd896ac72" datatype="html">
+        <source>Advanced block filters</source><target state="new">Advanced block filters</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">18</context>
         </context-group>
+      </trans-unit><trans-unit id="7d0cb3dbf192b9f3a5dbfb6d56d7609b200cbd4e" datatype="html">
+        <source>Automatic blocks</source><target state="new">Automatic blocks</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html</context>
-          <context context-type="linenumber">2</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">19</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="bd0611346af048015e0a1275091ef68ce98832d2" datatype="html">
-        <source>Muted servers</source>
-        <target state="new">Muted servers</target>
+      </trans-unit><trans-unit id="dfc11b6dc1387e59dbb79d248cf4c638fb9df3ea" datatype="html">
+        <source>Manual blocks</source><target state="new">Manual blocks</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit>
       <trans-unit id="91bd2d52b840951d3b1f5830b023bee8bca91293" datatype="html">
         <source>Video <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></source>
         <target state="new">Video <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">23</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">24</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">37</context></context-group></trans-unit>
       <trans-unit id="b7237eade678ae47485fbd27ec7f8c1079a8c6b7" datatype="html">
         <source>Total size</source>
         <target state="new">Total size</target>
@@ -3741,70 +3541,54 @@
       <trans-unit id="96dfa3efa02bfafc0bc6d4ab186ebef2813a9e8a" datatype="html">
         <source>Sensitive</source>
         <target state="new">Sensitive</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">25</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">38</context></context-group></trans-unit>
       <trans-unit id="b748c96a1ee98d2fa9a645fb71838f5d4938855b" datatype="html">
         <source>Unfederated</source>
         <target state="new">Unfederated</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit>
       <trans-unit id="a7f42da3bb4eea0b71b0a20a2aff6612a82cab99" datatype="html">
         <source>Date <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></source>
         <target state="new">Date <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="1c16132124fd96151ccf858aad5a98108df6c93a" datatype="html">
-        <source>Video was blacklisted</source>
-        <target state="new">Video was blacklisted</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">50</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
-          <context context-type="linenumber">89</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1cb8348c199d03e297d165e262237194f25fe3f5" datatype="html">
-        <source>Go to the video</source>
-        <target state="new">Go to the video</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">33</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit>
+      
+      
       <trans-unit id="030b4423b92167200e39519599f9b863b4f7c62c" datatype="html">
         <source>Actions</source>
         <target state="new">Actions</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">72</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">123</context></context-group>
-      </trans-unit>
-      <trans-unit id="7963019b5535b51efa399e6a62b163f3e04d296f" datatype="html">
-        <source>Blacklist reason:</source>
-        <target state="new">Blacklist reason:</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
-      <trans-unit id="88a2cc2d9ca0506186bbfab6c4e0c32c44a9ee98" datatype="html">
-        <source>No blacklisted video found matching current filters.</source>
-        <target state="new">No blacklisted video found matching current filters.</target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context><context context-type="linenumber">85</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">123</context></context-group></trans-unit><trans-unit id="d2a65fafac0e4e0a3289ec54627bd7f691d8020d" datatype="html">
+        <source>Block reason:</source><target state="new">Block reason:</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">95</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="294036a9ad4dd71531d3032678d9ff00d8ff9ebb" datatype="html">
-        <source>No blacklisted video found.</source>
-        <target state="new">No blacklisted video found.</target>
+      </trans-unit><trans-unit id="f8add432da83aa37b8cf03c5b907c3a9e51088fd" datatype="html">
+        <source>No blocked video found matching current filters.</source><target state="new">No blocked video found matching current filters.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">106</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="973655a52a60219d177a837cd2c75d640f7bc521" datatype="html">
-        <source>Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> blacklisted videos</source>
-        <target state="new">Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> blacklisted videos</target>
+      </trans-unit><trans-unit id="8d02797f76f99ad51f55e91ff82088e8772152e0" datatype="html">
+        <source>No blocked video found.</source><target state="new">No blocked video found.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
+          <context context-type="linenumber">107</context>
+        </context-group>
+      </trans-unit><trans-unit id="9f5c75bd513580d630817cd39179fd41e5ec36f6" datatype="html">
+        <source>Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> blocked videos</source><target state="new">Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> blocked videos</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit>
+      
+      
+      
+      
       <trans-unit id="bb863c794307735652d8695143e116eaee8a3c4f" datatype="html">
         <source>Moderation comment</source>
         <target state="new">Moderation comment</target>
@@ -3856,15 +3640,14 @@
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="1c33f537774e1418d848442439b6c0fc62d9af47" datatype="html">
-        <source>Reports with blacklisted videos</source>
-        <target state="new">Reports with blacklisted videos</target>
+      </trans-unit><trans-unit id="1f5ed7018178a08c8eb17305833874a976fa428c" datatype="html">
+        <source>Reports with blocked videos</source><target state="new">Reports with blocked videos</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="2f536bc37b142c0376631cefb992151fb733ce48" datatype="html">
         <source>Reports with deleted videos</source>
         <target state="new">Reports with deleted videos</target>
@@ -3882,10 +3665,10 @@
       <trans-unit id="2d1ea268a6a9f483dbc2cbfe19bf4256a57a6af4" datatype="html">
         <source>Video</source>
         <target state="new">Video</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">41</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">14</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">41</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">11</context></context-group></trans-unit>
       <trans-unit id="dee48932053451ee2dfafe5500a5262cd4220d5e" datatype="html">
         <source>This video has been reported multiple times.</source>
         <target state="new">This video has been reported multiple times.</target>
@@ -3893,6 +3676,16 @@
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">80</context>
         </context-group>
+      </trans-unit><trans-unit id="e9a289d014e33a5a45e1cf47131074f50abb7c18" datatype="html">
+        <source>The video was blocked</source><target state="new">The video was blocked</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
+          <context context-type="linenumber">88</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="70bedf516507a286eb030398795bdaef40500929" datatype="html">
         <source>by <x id="INTERPOLATION" equiv-text="{{ videoAbuse.video.channel?.displayName }}"/> on <x id="INTERPOLATION_1" equiv-text="{{ videoAbuse.video.channel?.host }}"/> </source>
@@ -3933,10 +3726,10 @@
       <trans-unit id="c1074e8c49b3cdfaeb7fcaf8cb27e44139389e29" datatype="html">
         <source>Open video in a new tab</source>
         <target state="new">Open video in a new tab</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">41</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context><context context-type="linenumber">42</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html</context><context context-type="linenumber">74</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">41</context></context-group></trans-unit>
       <trans-unit id="7e7ad19f1bcc2c33cdba4c1ad25e2b398ad453d9" datatype="html">
         <source>State <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></source>
         <target state="new">State <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
@@ -3949,11 +3742,7 @@
         <target state="new">Score <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">24</context></context-group>
       </trans-unit>
-      <trans-unit id="c6ab75e099e131d7a4f94e1732e7436d8fc386c7" datatype="html">
-        <source>Go to the account</source>
-        <target state="new">Go to the account</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">27</context></context-group>
-      </trans-unit>
+      
       <trans-unit id="8d1011bd5b502c857858a97d074118377d8fe714" datatype="html">
         <source>Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> reports</source>
         <target state="new">Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> reports</target>
@@ -4014,73 +3803,53 @@
           <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff" datatype="html">
-        <source>Unblacklist</source>
-        <target state="new">Unblacklist</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-      </trans-unit>
+      
       <trans-unit id="a3ae5c724857d00c006273db314041ab0664c269" datatype="html">
         <source>Mute domain</source>
         <target state="new">Mute domain</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">19</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">19</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="ff78f059449d44322f627d0f66df07abe476962b">
         <source>Instance</source>
         <target>Instancia</target>
         <context-group name="null">
           <context context-type="linenumber">5</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">26</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html</context><context context-type="linenumber">12</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.html</context><context context-type="linenumber">175</context></context-group></trans-unit>
       <trans-unit id="079e99cce11c87b142e80fdd14dae98a61012fc4" datatype="html">
         <source>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></source>
         <target state="new">Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">27</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context><context context-type="linenumber">23</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html</context><context context-type="linenumber">13</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html</context><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">27</context></context-group></trans-unit>
       <trans-unit id="1f689fada9748a830117f5b429a88ef8629082a8" datatype="html">
         <source>Unmute</source>
         <target state="new">Unmute</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">42</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context><context context-type="linenumber">49</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html</context><context context-type="linenumber">23</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">42</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">49</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">49</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="4cac34ce105daa25964c217fdf0515a0a6ee5db9" datatype="html">
         <source>No server found matching current filters.</source>
         <target state="new">No server found matching current filters.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context>
-          <context context-type="linenumber">51</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">51</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">51</context></context-group></trans-unit>
       <trans-unit id="0ba22bd964baaf0c2f85d6731fccca31dbf06dae" datatype="html">
         <source>No server found.</source>
         <target state="new">No server found.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context>
-          <context context-type="linenumber">52</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">52</context></context-group></trans-unit>
       <trans-unit id="60cdb933d2c7051f3b5b23f9e5f8c83fa861b220" datatype="html">
         <source>Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> muted instances</source>
         <target state="new">Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> muted instances</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="2aebea85561b74dd33ae2481bb942b8c4beb5524" datatype="html">
         <source>It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers.</source>
         <target state="new">
@@ -4091,38 +3860,29 @@
       <trans-unit id="c7b73cded84adfa978aae675417f4bb688631a71" datatype="html">
         <source>Mute domains</source>
         <target state="new">Mute domains</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.html</context><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">59</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.html</context><context context-type="linenumber">59</context></context-group></trans-unit>
       <trans-unit id="29881a45dafbe5aa05cd9d0441a4c0c2fb06df92" datatype="html">
         <source>Account</source>
         <target state="new">Account</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context><context context-type="linenumber">22</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-blocklist.component.html</context><context context-type="linenumber">12</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">22</context></context-group></trans-unit>
       <trans-unit id="33c4091a2a2438ba655caa47ede7f7a82f5f0297" datatype="html">
         <source>No account found matching current filters.</source>
         <target state="new">No account found matching current filters.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context>
-          <context context-type="linenumber">58</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">58</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">58</context></context-group></trans-unit>
       <trans-unit id="5d3b267bc054bb6b5743dd3d46ee58cff5141697" datatype="html">
         <source>No account found.</source>
         <target state="new">No account found.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context>
-          <context context-type="linenumber">59</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">59</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">59</context></context-group></trans-unit>
       <trans-unit id="6c3f125145d398f0cbc07c5161b41f08116dbf01" datatype="html">
         <source>Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> muted accounts</source>
         <target state="new">Showing <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> to <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> of <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> muted accounts</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="d204665b42241ca94ecad49df699cc60df43a7b5" datatype="html">
         <source>Plugins/Themes</source>
         <target state="new">Plugins/Themes</target>
@@ -4138,46 +3898,47 @@
           <context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
+      </trans-unit><trans-unit id="5a329cfc387d2231434afc2842ff649392da8921" datatype="html">
+        <source>Plugin homepage (new window)</source><target state="new">Plugin homepage (new window)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="7e892ba15f2c6c17e83510e273b3e10fc32ea016" datatype="html">
         <source>Search</source>
         <target state="new">Search</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context><context context-type="linenumber">96</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context><context context-type="linenumber">7</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">97</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="82c6fc1dfd67a87c2a9f54c221907d0d61c63b88" datatype="html">
         <source>Users can resolve distant content</source>
         <target state="new">Users can resolve distant content</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.html</context>
-          <context context-type="linenumber">100</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1cb86e649ad2e5cfc86efb2d28c06b1d959f8aa6" datatype="html">
-        <source>Homepage</source>
-        <target state="new">Homepage</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/app.component.html</context><context context-type="linenumber">11</context></context-group>
-      </trans-unit><trans-unit id="0fab2b1e25b97842c52a6b95f139bda7e416fde6" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">101</context></context-group></trans-unit>
+      <trans-unit id="0fab2b1e25b97842c52a6b95f139bda7e416fde6" datatype="html">
         <source>Close this message</source><target state="new">Close this message</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/app.component.html</context>
           <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4962915f14d9b61bdd1b96b81c27e3f9d8910768" datatype="html">
-        <source>Go to the plugin homepage</source>
-        <target state="new">Go to the plugin homepage</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context><context context-type="linenumber">17</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context><context context-type="linenumber">21</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
+      
       <trans-unit id="121cc5391cd2a5115bc2b3160379ee5b36cd7716" datatype="html">
         <source>Settings</source>
         <target state="new">Settings</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">3</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">144</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">3</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">144</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3b79d221458541611e8508d3551dd1ddd76b49d9" datatype="html">
         <source>Display settings</source>
         <target state="new">Display settings</target>
@@ -4219,9 +3980,9 @@
       <trans-unit id="16e81be2315b29492395d99ba53a83e770430494" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {result} other {results} }</source>
         <target state="new">{VAR_PLURAL, plural, =1 {result} other {results} }</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">5</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="b1363973a9482c7b0a7c4a1d066fd64625d40207" datatype="html">
         <source>No results.</source>
         <target state="new">
@@ -4231,15 +3992,14 @@
           <context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context>
           <context context-type="linenumber">28</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="1e395fc65f656ebaf9384ca5452f0cc4e9512811" datatype="html">
-        <source>Go to the plugin npm package</source>
-        <target state="new">Go to the plugin npm package</target>
+      </trans-unit><trans-unit id="fc06c11db79db253b0d0f1b070cf48e039e8a3a8" datatype="html">
+        <source>Plugin npm package (new window)</source><target state="new">Plugin npm package (new window)</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context>
           <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="ba504ef7da4384f035fc148de2d121322aaa7407" datatype="html">
         <source>This <x id="INTERPOLATION" equiv-text="{{ pluginTypeLabel }}"/> does not have settings. </source>
         <target state="new">
@@ -4318,90 +4078,90 @@
       <trans-unit id="3441b78841dad60f36576d99e38241ae7fefa933" datatype="html">
         <source>INSTANCE</source>
         <target state="new">INSTANCE</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">14</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
       <trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59">
         <source>Name</source>
         <target>Nome</target>
         <context-group name="null">
           <context context-type="linenumber">12</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">20</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">32</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">32</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">21</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">32</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="512b045163a7187b2fc5d554e5f59fb3e49e174b">
         <source>Short description</source>
         <target>Descrición curta</target>
         <context-group name="null">
           <context context-type="linenumber">22</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">29</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
       <trans-unit id="f14028bddcf7760c635464db8a9d2f69afd81b92" datatype="html">
         <source>Main instance categories</source>
         <target state="new">Main instance categories</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit>
       <trans-unit id="f871b41bfbdb193507cce2cd848c2d02bde77a03" datatype="html">
         <source>No results found</source>
         <target state="new">No results found</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">34</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">53</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">65</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">34</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">54</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">66</context></context-group></trans-unit>
       <trans-unit id="a8544bac210fd102d71c5aaf1bef79c1fc48c079" datatype="html">
         <source>The <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>sharing system<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> implies that some technical information about your system (such as a public IP address) can be sent to other peers, but greatly helps to reduce server load.</source>
         <target state="new">The <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>sharing system<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> implies that some technical information about your system (such as a public IP address) can be sent to other peers, but greatly helps to reduce server load.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">47</context></context-group></trans-unit>
       <trans-unit id="0f9a16c167ea4f043577304b13046c143692cb99" datatype="html">
         <source>Help share videos being played</source>
         <target state="new">Help share videos being played</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">44</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">44</context></context-group></trans-unit>
       <trans-unit id="8002f4cecaf491c2fa08a13cb18c8fda1996d92f" datatype="html">
         <source>When on a video page, directly start playing the video.</source>
         <target state="new">When on a video page, directly start playing the video.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">58</context></context-group></trans-unit>
       <trans-unit id="cd607ede7ce410c98c681f5ba435642fe25f5f9c" datatype="html">
         <source>Automatically play videos</source>
         <target state="new">Automatically play videos</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">55</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">55</context></context-group></trans-unit>
       <trans-unit id="6319d0030e9d382e5beb2baa5a399c0af3a27015" datatype="html">
         <source>When a video ends, follow up with the next suggested video.</source>
         <target state="new">When a video ends, follow up with the next suggested video.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">69</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">69</context></context-group></trans-unit>
       <trans-unit id="056097a75d29b732ec5ad97c2e90d6c9be6528e4" datatype="html">
         <source>Automatically start playing the next video</source>
         <target state="new">Automatically start playing the next video</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">66</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">66</context></context-group></trans-unit>
       <trans-unit id="ccb0ae7ba7f7a83045f1ad78d0c0044b5ed80629" datatype="html">
         <source>Main languages you/your moderators speak</source>
         <target state="new">Main languages you/your moderators speak</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">59</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">60</context></context-group></trans-unit>
       <trans-unit id="f27b192f4d3153db7dc7044bea37e71655bfb3ea" datatype="html">
         <source>MODERATION &amp; NSFW</source>
         <target state="new">MODERATION &amp; NSFW</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">75</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">76</context></context-group></trans-unit>
       <trans-unit id="f0716b4964f9dc6437aaed3ae0c78e94fd259fb9" datatype="html">
         <source>Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>users<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> to build a moderation team. </source>
         <target state="new">
                 Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>users<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> to build a moderation team.
               </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">76</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">77</context></context-group></trans-unit>
       <trans-unit id="aad49456e42847e2ea95fbaeb2f49387199e5634" datatype="html">
         <source>This instance is dedicated to sensitive or NSFW content</source>
         <target state="new">This instance is dedicated to sensitive or NSFW content</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">86</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
       <trans-unit id="55c4d3cc288701854147f69ccf3d86d316589968" datatype="html">
         <source>
                       Enabling it will allow other administrators to know that you are mainly federating sensitive content.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -4411,51 +4171,51 @@
                       Enabling it will allow other administrators to know that you are mainly federating sensitive content.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                       Moreover, the NSFW checkbox on video upload will be automatically checked by default.
                     </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">90</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">91</context></context-group></trans-unit>
       <trans-unit id="8551afadb69b3fef89e191f507e8ac84e624e8b9">
         <source>Policy on videos containing sensitive content</source>
         <target>Política para os vídeos con contido sensible</target>
         <context-group name="null">
           <context context-type="linenumber">81</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">99</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">100</context></context-group></trans-unit>
       <trans-unit id="8dccab3d8cadb847889ff89644d3f08ffee0d76e" datatype="html">
         <source>With <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Do not list<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> or <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Blur thumbnails<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, a confirmation will be requested to watch the video. </source>
         <target state="new">
                       With <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Do not list<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> or <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Blur thumbnails<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, a confirmation will be requested to watch the video.
                     </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">103</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">104</context></context-group></trans-unit>
       <trans-unit id="5e155c34fb3ed8159bf0a486a366cfbc6874f9fe">
         <source>Do not list</source>
         <target>Non listar</target>
         <context-group name="null">
           <context context-type="linenumber">14</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">15</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">112</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">15</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">113</context></context-group></trans-unit>
       <trans-unit id="aaa900149c2ca1575ac1918d1ded33fb69830ab2">
         <source>Blur thumbnails</source>
         <target>Emborrar icona</target>
         <context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">16</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">113</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">16</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">114</context></context-group></trans-unit>
       <trans-unit id="010d24ef3c43b2d8f45a4d6cba7d73e12ee1557e">
         <source>Display</source>
         <target>Mostrar</target>
         <context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">17</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">3</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">114</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">17</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.html</context><context context-type="linenumber">3</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">115</context></context-group></trans-unit>
       <trans-unit id="05f5612d42b02be4d6d9e0a99585ae7e30a91780" datatype="html">
         <source>Strategy</source>
         <target state="new">Strategy</target>
@@ -4467,209 +4227,184 @@
         <context-group name="null">
           <context context-type="linenumber">88</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">121</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">77</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">88</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">122</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">77</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">88</context></context-group></trans-unit>
       <trans-unit id="2c88654dd44fe8477ce6f85c1081cd24a590701b" datatype="html">
         <source>Code of conduct</source>
         <target state="new">Code of conduct</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">130</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">71</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">131</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">71</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">82</context></context-group></trans-unit>
       <trans-unit id="06119c0230042048f8a3fd6aa9260934b6fa5878" datatype="html">
         <source>Moderation information</source>
         <target state="new">Moderation information</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">139</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">65</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">76</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">140</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">65</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">76</context></context-group></trans-unit>
       <trans-unit id="d635f94dd3214d8e5fb83a2af04e7b96c861e91f" datatype="html">
         <source>Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</source>
         <target state="new">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">140</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">141</context></context-group></trans-unit>
       <trans-unit id="b222d95cb22ff8c295920ca10c188c5d94cb0aa9" datatype="html">
         <source>YOU AND YOUR INSTANCE</source>
         <target state="new">YOU AND YOUR INSTANCE</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">154</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">155</context></context-group></trans-unit>
       <trans-unit id="fdbabe6f967747b657518384b54bcc58d3913063" datatype="html">
         <source>Who is behind the instance?</source>
         <target state="new">Who is behind the instance?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">160</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">161</context></context-group></trans-unit>
       <trans-unit id="963707d11903100147b40788e4f67cc93a234308" datatype="html">
         <source>A single person? A non-profit? A company?</source>
         <target state="new">A single person? A non-profit? A company?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">161</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">162</context></context-group></trans-unit>
       <trans-unit id="fef7c7a74c5646fe219d94db60e0652d6b878af5" datatype="html">
         <source>Why did you create this instance?</source>
         <target state="new">Why did you create this instance?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">172</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/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="53fe4c724dc3f942c4d1eac4206a9686cbbf968e" datatype="html">
         <source>To share your personal videos? To open registrations and allow people to upload what they want?</source>
         <target state="new">To share your personal videos? To open registrations and allow people to upload what they want?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">173</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">174</context></context-group></trans-unit>
       <trans-unit id="ac6b554b2f923239f6d7c5fcef8a7cce7d6b43b6" datatype="html">
         <source>How long do you plan to maintain this instance?</source>
         <target state="new">How long do you plan to maintain this instance?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">183</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">184</context></context-group></trans-unit>
       <trans-unit id="09d61fa0397899a1b26d09123aef7e7bf5bd78e1" datatype="html">
         <source>It's important to know for users who want to register on your instance</source>
         <target state="new">It's important to know for users who want to register on your instance</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">184</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">185</context></context-group></trans-unit>
       <trans-unit id="1c0452d6bc62aace993630b59a085af1708a2f2d" datatype="html">
         <source>How will you finance the PeerTube server?</source>
         <target state="new">How will you finance the PeerTube server?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">194</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">195</context></context-group></trans-unit>
       <trans-unit id="1bb1ca2264b1ab8be73deee74852a4e6d40101c5" datatype="html">
         <source>With your own funds? With user donations? Advertising?</source>
         <target state="new">With your own funds? With user donations? Advertising?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">195</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">196</context></context-group></trans-unit>
       <trans-unit id="434d9f89497fe693bb5e4cdce02925dec8d0281f" datatype="html">
         <source>OTHER INFORMATION</source>
         <target state="new">OTHER INFORMATION</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">209</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">210</context></context-group></trans-unit>
       <trans-unit id="7dfc119f06b80d9324703c471b0c00118fa5849d" datatype="html">
         <source>What server/hardware does the instance run on?</source>
         <target state="new">What server/hardware does the instance run on?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">215</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">216</context></context-group></trans-unit>
       <trans-unit id="4a58b1d4aff414350b701aa587aeb39a1276307a" datatype="html">
         <source>i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.</source>
         <target state="new">i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">216</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">217</context></context-group></trans-unit>
       <trans-unit id="3070ae34708ac4b19ac0a2fdc2c0b82871754c7a" datatype="html">
         <source>Instance information</source>
         <target state="new">Instance information</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">6</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="e18e5566ca6266c849208665c731805571333a8b" datatype="html">
         <source>APPEARANCE</source>
         <target state="new">APPEARANCE</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">240</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">241</context></context-group></trans-unit>
       <trans-unit id="0aa2ad4efb780f946dd9a821fe7471dde20014c3" datatype="html">
         <source>Use <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>plugins &amp; themes<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> for more involved changes, or <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>add slight customizations<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </source>
         <target state="new">
               Use <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>plugins &amp; themes<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> for more involved changes, or <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>add slight customizations<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
             </target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">241</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">242</context></context-group></trans-unit>
       <trans-unit id="deca31fc7adad40d00bd63881d0c17124cd05beb" datatype="html">
         <source>default</source>
         <target state="new">default</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">254</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">255</context></context-group></trans-unit>
       <trans-unit id="a42daa4748e433f25a51f598627d10de9c88d5d3" datatype="html">
         <source>Landing page</source>
         <target state="new">Landing page</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">263</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">264</context></context-group></trans-unit>
       <trans-unit id="28aca3fd95c8d941f643c617058636715b6f87d9" datatype="html">
         <source>Discover videos</source>
         <target state="new">Discover videos</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">266</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">267</context></context-group></trans-unit>
       <trans-unit id="9091b36f8890eabbd2305789eb826d16e8f4641d" datatype="html">
         <source>Trending videos</source>
         <target state="new">Trending videos</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">267</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">268</context></context-group></trans-unit>
       <trans-unit id="4c65fb9a424be158237157c16778273550a38c70" datatype="html">
         <source>Most liked videos</source>
         <target state="new">Most liked videos</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">268</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">269</context></context-group></trans-unit>
       <trans-unit id="93d74eb49a5e5c2af5f815178909adf425000af8" datatype="html">
         <source>Recently added videos</source>
         <target state="new">Recently added videos</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">269</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">270</context></context-group></trans-unit>
       <trans-unit id="b6307f83d9f43bff8d5129a7888e89964ddc3f7f">
         <source>Local videos</source>
         <target>Vídeos en local</target>
         <context-group name="null">
           <context context-type="linenumber">223</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">270</context></context-group>
-      </trans-unit><trans-unit id="c5d4e7a320b88bdcf7fb2b670b81173048af3956" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">271</context></context-group></trans-unit><trans-unit id="c5d4e7a320b88bdcf7fb2b670b81173048af3956" datatype="html">
         <source>BROADCAST MESSAGE</source><target state="new">BROADCAST MESSAGE</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">281</context>
-        </context-group>
-      </trans-unit><trans-unit id="3a10a32f96683addb9e1335cdba7d6685587fe6e" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">282</context></context-group></trans-unit><trans-unit id="3a10a32f96683addb9e1335cdba7d6685587fe6e" datatype="html">
         <source>
               Display a message on your instance
             </source><target state="new">
               Display a message on your instance
             </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">282</context>
-        </context-group>
-      </trans-unit><trans-unit id="58be3e0a0ef272fbd6e715b44059c3d89b332d9b" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="58be3e0a0ef272fbd6e715b44059c3d89b332d9b" datatype="html">
         <source>Enable broadcast message</source><target state="new">Enable broadcast message</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">294</context>
-        </context-group>
-      </trans-unit><trans-unit id="6938c4a91284a1bc8b61b0d8085d9985e46c9f5b" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">295</context></context-group></trans-unit><trans-unit id="6938c4a91284a1bc8b61b0d8085d9985e46c9f5b" datatype="html">
         <source>Allow users to dismiss the broadcast message </source><target state="new">Allow users to dismiss the broadcast message </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">301</context>
-        </context-group>
-      </trans-unit><trans-unit id="dd24d21f2898608f623ae2513e1eb0a08a442f7a" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">302</context></context-group></trans-unit><trans-unit id="dd24d21f2898608f623ae2513e1eb0a08a442f7a" datatype="html">
         <source>Broadcast message level</source><target state="new">Broadcast message level</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">306</context>
-        </context-group>
-      </trans-unit><trans-unit id="ccac601bf473fa28c9ac46794f1cd40542f74347" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">307</context></context-group></trans-unit><trans-unit id="ccac601bf473fa28c9ac46794f1cd40542f74347" datatype="html">
         <source>Message</source><target state="new">Message</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">318</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">319</context></context-group></trans-unit>
       <trans-unit id="0ea3c4f671addedc1fff64ba63adbf0629fab06a" datatype="html">
         <source>NEW USERS</source>
         <target state="new">NEW USERS</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">333</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">334</context></context-group></trans-unit>
       <trans-unit id="eb55f6a974ace4bade90b976dba651c9545c979d" datatype="html">
         <source>Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>users<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> to set their quota individually. </source>
         <target state="new">
               Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>users<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> to set their quota individually.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">334</context></context-group></trans-unit>
-      <trans-unit id="ca53e66e68986546b7ef820c934145fd7c9c4247">
-        <source>Signup enabled</source>
-        <target>Rexistro activado</target>
-        <context-group name="null">
-          <context context-type="linenumber">235</context>
-        </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">345</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">335</context></context-group></trans-unit>
+      
       <trans-unit id="90f449b1f4787e6c9731198a96d35399c1b340a7" datatype="html">
         <source>Signup requires email verification</source>
         <target state="new">Signup requires email verification</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">353</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">354</context></context-group></trans-unit>
       <trans-unit id="68bda70e0dd4f7f91549462e55f1b2a1602d8402">
         <source>Signup limit</source>
         <target>Rexistro limitado</target>
@@ -4677,7 +4412,13 @@
           <context context-type="linenumber">247</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">357</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">358</context></context-group></trans-unit><trans-unit id="25de1b6d18bda68f72a31c4ce8aa1c493584764f" datatype="html">
+        <source>Enable Signup</source><target state="new">Enable Signup</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">346</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="4d13a9cd5ed3dcee0eab22cb25198d43886942be">
         <source>Users</source>
         <target>Usuarias</target>
@@ -4774,110 +4515,185 @@
       <trans-unit id="4a41f824a35ba01d5bd7be61aa06b3e8145209d0" datatype="html">
         <source>Configuration</source>
         <target state="new">Configuration</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/admin.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ec47d80e9b5608ecd396c32a46ca6b87601e7b20" datatype="html">
         <source>Default video quota per user</source>
         <target state="new">Default video quota per user</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">372</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">373</context></context-group></trans-unit>
       <trans-unit id="493c65a11deddda45b42a39f503fc4bb3f876cf2" datatype="html">
         <source>Default daily upload limit per user</source>
         <target state="new">Default daily upload limit per user</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">384</context></context-group></trans-unit>
-      <trans-unit id="e8835d4b5abe1ae304ffaaea6e96bf49805f54a2" datatype="html">
-        <source>NEW VIDEOS</source>
-        <target state="new">NEW VIDEOS</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">401</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">385</context></context-group></trans-unit>
+      
       <trans-unit id="6c65014c4ccf5a3ca7b0f4bdb17ff00578004420" datatype="html">
         <source>Allow import with HTTP URL (i.e. YouTube)</source>
         <target state="new">Allow import with HTTP URL (i.e. YouTube)</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">412</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">413</context></context-group></trans-unit>
       <trans-unit id="ec3d83c2ae784e843fbe96eb368f9e6e0f26cc2e" datatype="html">
         <source>Allow import with a torrent file or a magnet URI</source>
         <target state="new">Allow import with a torrent file or a magnet URI</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">419</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">420</context></context-group></trans-unit>
       <trans-unit id="c590ac6eba10ab6269e068156a910c7c58328cc5" datatype="html">
         <source>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</source>
         <target state="new">Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">436</context></context-group></trans-unit>
-      <trans-unit id="680ef3c95b9b6264dfb992c82e91d64312b133db" datatype="html">
-        <source>Blacklist new videos automatically</source>
-        <target state="new">Blacklist new videos automatically</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">433</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">437</context></context-group></trans-unit><trans-unit id="3097153cbaee3d44d0e298fbe9e8105b6e1fea0d" datatype="html">
+        <source>Block new videos automatically</source><target state="new">Block new videos automatically</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">434</context>
+        </context-group>
+      </trans-unit><trans-unit id="7b6494fa44035831e1215cd4a0284aec00f8cbbd" datatype="html">
+        <source>SEARCH</source><target state="new">SEARCH</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">451</context>
+        </context-group>
+      </trans-unit><trans-unit id="a97062f0bfb585b28058981d53fb047a2f2288c4" datatype="html">
+        <source>Allow <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>your users<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> to look up remote videos/actors by their URI, that may not be federated with your instance</source><target state="new">Allow <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>your users<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> to look up remote videos/actors by their URI, that may not be federated with your instance</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">465</context>
+        </context-group>
+      </trans-unit><trans-unit id="273341057700e25fb8a19896b5039dcf3f14b9ba" datatype="html">
+        <source>Allow users to do remote URI/handle search</source><target state="new">Allow users to do remote URI/handle search</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">462</context>
+        </context-group>
+      </trans-unit><trans-unit id="ffe92ff41a38a4407b1e1da41a015292497324c4" datatype="html">
+        <source>Allow <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>anonymous users<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> to look up remote videos/actors by their URI, that may not be federated with your instance</source><target state="new">Allow <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>anonymous users<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> to look up remote videos/actors by their URI, that may not be federated with your instance</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">476</context>
+        </context-group>
+      </trans-unit><trans-unit id="1a1dd78b1169f98fb2120c6af13e136aec2daf69" datatype="html">
+        <source>Allow anonymous to do remote URI/handle search</source><target state="new">Allow anonymous to do remote URI/handle search</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">473</context>
+        </context-group>
+      </trans-unit><trans-unit id="f3af9d2cf9a341ce634210908597e491e77e7376" datatype="html">
+        <source>⚠️ This functionality depends heavily on the moderation of instances followed by the search index you select.</source><target state="new">⚠️ This functionality depends heavily on the moderation of instances followed by the search index you select.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">490</context>
+        </context-group>
+      </trans-unit><trans-unit id="0c43b766533e99e88f65a9f1c8d63fb1926ab5cc" datatype="html">
+        <source>
+                        You should only use moderated search indexes in production, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
+                      </source><target state="new">
+                        You should only use moderated search indexes in production, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
+                      </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">492</context>
+        </context-group>
+      </trans-unit><trans-unit id="e5cd21a49e6eefd0610106b6afcd4ed56baab566" datatype="html">
+        <source>Search index URL</source><target state="new">Search index URL</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">499</context>
+        </context-group>
+      </trans-unit><trans-unit id="8c720eb4f32907db445c969a451e59a28a15e89c" datatype="html">
+        <source>Disable local search in search bar</source><target state="new">Disable local search in search bar</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">510</context>
+        </context-group>
+      </trans-unit><trans-unit id="3b2b04802c47e4af0057651b972f52dffc92e8e1" datatype="html">
+        <source>Otherwise the local search stays used by default</source><target state="new">Otherwise the local search stays used by default</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">520</context>
+        </context-group>
+      </trans-unit><trans-unit id="be8b7fa8a3193d5015561140328a1240190842c1" datatype="html">
+        <source>Search bar uses the global search index by default</source><target state="new">Search bar uses the global search index by default</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">517</context>
+        </context-group>
+      </trans-unit><trans-unit id="bcaa25583cd971359254080004fbbb71c2b97ad6" datatype="html">
+        <source>Enable global search</source><target state="new">Enable global search</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">487</context>
+        </context-group>
+      </trans-unit>
+      
       <trans-unit id="3f237e2a863d0308a21bdb0bb5d4b84e3376dbee" datatype="html">
         <source>FEDERATION</source>
         <target state="new">FEDERATION</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">450</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">538</context></context-group></trans-unit>
       <trans-unit id="2cc42a6b77d06f99a195ef8f3324d49267eedf87" datatype="html">
         <source>Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>relations<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> with other instances. </source>
         <target state="new">
               Manage <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>relations<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> with other instances.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">451</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">539</context></context-group></trans-unit>
       <trans-unit id="a7f09999dbd1438d803b28abe1eb769f75126b3e" datatype="html">
         <source>Other instances can follow yours</source>
         <target state="new">Other instances can follow yours</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">464</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">552</context></context-group></trans-unit>
       <trans-unit id="3d9ffce2b1f284cb60067de15a313d3ecde0875f" datatype="html">
         <source>Manually approve new instance followers</source>
         <target state="new">Manually approve new instance followers</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">471</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">559</context></context-group></trans-unit>
       <trans-unit id="9a3dd9c65ee3381ae3b78b9c56cc4e0d2e41f0e8" datatype="html">
         <source>Automatically follow back instances</source>
         <target state="new">Automatically follow back instances</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">484</context></context-group></trans-unit>
-      <trans-unit id="6d247698b32e560146200812155feea437c3bc98" datatype="html">
-        <source>You should only follow indexes you trust, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </source>
-        <target state="new">
-                          You should only follow indexes you trust, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">572</context></context-group></trans-unit><trans-unit id="f183764323fcffd1b3ba4d13cdc21ec8971472cc" datatype="html">
+        <source>
+                          You should only follow moderated indexes in production, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
+                        </source><target state="new">
+                          You should only follow moderated indexes in production, or <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>host your own<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
                         </target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">502</context></context-group></trans-unit>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">590</context>
+        </context-group>
+      </trans-unit>
+      
       <trans-unit id="9bef6fc7194e11d18fdcac6aaccc816fe9ffc5a7" datatype="html">
         <source>⚠️ This functionality requires a lot of attention and extra moderation.</source>
         <target state="new">⚠️ This functionality requires a lot of attention and extra moderation.</target>
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">348</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">487</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">500</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">349</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">575</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">588</context></context-group></trans-unit>
       <trans-unit id="764910b42b08b8342f7ba5907b258341ec044fa0" datatype="html">
         <source>Index URL</source>
         <target state="new">Index URL</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">509</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">597</context></context-group></trans-unit>
       <trans-unit id="62f023a56fd29518ab030384702362e6bf6a83e4" datatype="html">
         <source>Automatically follow instances of a public index</source>
         <target state="new">Automatically follow instances of a public index</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">497</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">585</context></context-group></trans-unit>
       <trans-unit id="5805ff22d19f43016e2b1a0f7eff12185c78e89d" datatype="html">
         <source>ADMINISTRATORS</source>
         <target state="new">ADMINISTRATORS</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">529</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">617</context></context-group></trans-unit>
       <trans-unit id="ca2283fc765b9f44b69f0175d685dc2443da6011">
         <source>Administrator</source>
         <target>Administración</target>
         <context-group name="null">
           <context context-type="linenumber">384</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/users/user.service.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/users/user.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="55a0f51e38679d3141841e8333da5779d349c587">
         <source>Admin email</source>
         <target>Correo-e da Admin</target>
@@ -4885,32 +4701,32 @@
           <context context-type="linenumber">387</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">535</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">623</context></context-group></trans-unit>
       <trans-unit id="f9bda6652199995a4bd4424f2e35b748eb0bda8a" datatype="html">
         <source>Enable contact form</source>
         <target state="new">Enable contact form</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">546</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">634</context></context-group></trans-unit>
       <trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5">
         <source>Basic configuration</source>
         <target>Configuración básica</target>
         <context-group name="null">
           <context context-type="linenumber">195</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">234</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">235</context></context-group></trans-unit>
       <trans-unit id="51d86d65a52d00976c7cce4bdf8e144f956ef888" datatype="html">
         <source>TWITTER</source>
         <target state="new">TWITTER</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">563</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">651</context></context-group></trans-unit>
       <trans-unit id="31f11266d05b7a427477a8a9056a717ce332cfe3" datatype="html">
         <source>Optional. If any, provide the Twitter account representing your instance to improve link previews.</source>
         <target state="new">
               Optional. If any, provide the Twitter account representing your instance to improve link previews.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">564</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">652</context></context-group></trans-unit>
       <trans-unit id="7fdb41bbf2ee042ec5f68725a1c16a1c97f3e524">
         <source>Your Twitter username</source>
         <target>O seu alcume na Twitter</target>
@@ -4918,32 +4734,33 @@
           <context context-type="linenumber">413</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">575</context></context-group></trans-unit>
-      <trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605">
-        <source>Instance whitelisted by Twitter</source>
-        <target>Instancia na lista blanca por Twitter</target>
-        <context-group name="null">
-          <context context-type="linenumber">431</context>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">663</context></context-group></trans-unit><trans-unit id="fcad8bedb9a3a3600c4f5c13e9f404e788dbf327" datatype="html">
+        <source>Instance allowed by Twitter</source><target state="new">Instance allowed by Twitter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">675</context>
         </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">587</context></context-group></trans-unit>
-      <trans-unit id="5c3526524f8f9f50390e39f56cb12e2091d883cd" datatype="html">
+      </trans-unit><trans-unit id="f0d14f556321dbae66c765d6a3b0062f3a150931" datatype="html">
         <source>
-                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
-                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                        If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                         <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://cards-dev.twitter.com/validator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
-                        to see if you instance is whitelisted.
-                      </source>
-        <target state="new">
-                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
-                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                        to see if you instance is allowed.
+                      </source><target state="new">
+                        If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                         Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                         <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>https://cards-dev.twitter.com/validator<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
-                        to see if you instance is whitelisted.
+                        to see if you instance is allowed.
                       </target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">591</context></context-group></trans-unit>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">679</context>
+        </context-group>
+      </trans-unit>
+      
+      
       <trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5">
         <source>Services</source>
         <target>Servizos</target>
@@ -4951,12 +4768,12 @@
           <context context-type="linenumber">405</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">557</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">645</context></context-group></trans-unit>
       <trans-unit id="9a6dbeb95c096daa71967ac36a043de69d0cf72b" datatype="html">
         <source>TRANSCODING</source>
         <target state="new">TRANSCODING</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">617</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">705</context></context-group></trans-unit>
       <trans-unit id="ee4b28ab2d3293d453dec75c6654c6425705283c" datatype="html">
         <source>
               Process uploaded videos so that they are in a streamable form that any device can play. Though costly in
@@ -4967,7 +4784,7 @@
               resources, this is a critical part of PeerTube, so tread carefully.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">618</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">706</context></context-group></trans-unit>
       <trans-unit id="fca29003c4ea1226ff8cbee89481758aab0e2be9">
         <source>Transcoding enabled</source>
         <target>Recodificación activada</target>
@@ -4975,7 +4792,7 @@
           <context context-type="linenumber">461</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">631</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">719</context></context-group></trans-unit>
       <trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f">
         <source>If you disable transcoding, many videos from your users will not work!</source>
         <target>Si desactiva a recodificación moitos vídeos das súas usuarias non funcionarán!</target>
@@ -4983,27 +4800,27 @@
           <context context-type="linenumber">465</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">635</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">723</context></context-group></trans-unit>
       <trans-unit id="3223b992b14f2fa5690676fa57317bffa7275f90" datatype="html">
         <source>Allows users to upload .mkv, .mov, .avi and .flv videos.</source>
         <target state="new">Allows users to upload .mkv, .mov, .avi and .flv videos.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">646</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">734</context></context-group></trans-unit>
       <trans-unit id="0050a55afb9c565df1f9b3f750c2d4adb697698f" datatype="html">
         <source>Allow additional extensions</source>
         <target state="new">Allow additional extensions</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">643</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">731</context></context-group></trans-unit>
       <trans-unit id="abdec139a0b513ddbd4549284c38dc60e96bb477" datatype="html">
         <source>Allows users to upload audio files that will be merged with the preview file on upload.</source>
         <target state="new">Allows users to upload audio files that will be merged with the preview file on upload.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">657</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">745</context></context-group></trans-unit>
       <trans-unit id="88cfa6e185dd938361d1d9c04314bbd3afb54fb6" datatype="html">
         <source>Allow audio files upload</source>
         <target state="new">Allow audio files upload</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">654</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">742</context></context-group></trans-unit>
       <trans-unit id="1f83d0ff227c35b5631a2b2f78067b3e915cdb59" datatype="html">
         <source>
                               <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Experimental, we suggest you to not disable webtorrent support for now<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>
@@ -5024,12 +4841,12 @@
                               <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>If disabled, breaks federation with PeerTube instances &lt; 2.1<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>
                             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">669</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">757</context></context-group></trans-unit>
       <trans-unit id="ff852c5a22beaff7a8c62447b0a96f9ced7c3ed6" datatype="html">
         <source>WebTorrent support enabled</source>
         <target state="new">WebTorrent support enabled</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">666</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">754</context></context-group></trans-unit>
       <trans-unit id="a0a116af355dfc3ac02f4501c2ffadb882768564" datatype="html">
         <source>
                               <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Requires ffmpeg >= 4.1<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>
@@ -5056,12 +4873,14 @@
                               <x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>If you also enabled WebTorrent support, it will multiply videos storage by 2<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/>
                             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">690</context></context-group></trans-unit>
-      <trans-unit id="94213e7007705d887db1d366b5abc163122d9202" datatype="html">
-        <source>HLS support enabled</source>
-        <target state="new">HLS support enabled</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">687</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">778</context></context-group></trans-unit><trans-unit id="5ac527cc856e9fa02927ccb0a6172688e07c1d7a" datatype="html">
+        <source>HLS with P2P support enabled</source><target state="new">HLS with P2P support enabled</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">775</context>
+        </context-group>
+      </trans-unit>
+      
       <trans-unit id="a33feadefbb776217c2db96100736314f8b765c2">
         <source>Transcoding threads</source>
         <target>Fíos de recodificación</target>
@@ -5069,46 +4888,46 @@
           <context context-type="linenumber">517</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">712</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">800</context></context-group></trans-unit>
       <trans-unit id="4f9162543288be617b88ad6fcae84325f11e31b6" datatype="html">
         <source>Resolutions to generate</source>
         <target state="new">Resolutions to generate</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">725</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">813</context></context-group></trans-unit>
       <trans-unit id="f05f4a8b97269a2da6d7fcc6e86fbfafd16e30bd" datatype="html">
         <source>CACHE</source>
         <target state="new">CACHE</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">751</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">839</context></context-group></trans-unit>
       <trans-unit id="3469b0eb5bd7b7f0e85c029cd82ae1912bb51677" datatype="html">
         <source>Some files are not federated, and fetched when necessary. Define their caching policies.</source>
         <target state="new">
               Some files are not federated, and fetched when necessary. Define their caching policies.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">752</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">840</context></context-group></trans-unit>
       <trans-unit id="e7845bb59f7887d60f1cf3b7b9fe5cfdb0b7e915" datatype="html">
         <source>Number of previews to keep in cache</source>
         <target state="new">Number of previews to keep in cache</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">761</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">849</context></context-group></trans-unit>
       <trans-unit id="478d017e2701ae21cefab20e7226702d77f15727" datatype="html">
         <source>Number of video captions to keep in cache</source>
         <target state="new">Number of video captions to keep in cache</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">770</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">858</context></context-group></trans-unit>
       <trans-unit id="ede5494c4a39e72d3e21a5fefdc3d966da4a3e00" datatype="html">
         <source>CUSTOMIZATIONS</source>
         <target state="new">CUSTOMIZATIONS</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">785</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">873</context></context-group></trans-unit>
       <trans-unit id="7473fbca4ff699b020fc8894bad4c88611c76f5c" datatype="html">
         <source>Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.</source>
         <target state="new">
               Slight modifications to your PeerTube instance for when creating a plugin or theme is overkill.
             </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">786</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">874</context></context-group></trans-unit>
       <trans-unit id="0da9752916950ce6890d897b835c923a71ad9c5c">
         <source>JavaScript</source>
         <target>JavaScript</target>
@@ -5116,14 +4935,14 @@
           <context context-type="linenumber">575</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">796</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">884</context></context-group></trans-unit>
       <trans-unit id="782afa7c58d912592d73fce888ffce8542a4acf3" datatype="html">
         <source>Write JavaScript code directly.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/> </source>
         <target state="new">
                         Write JavaScript code directly.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/>
                       </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">799</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">887</context></context-group></trans-unit>
       <trans-unit id="ef86c28e82ac4b08e6914d2a067e5455b4d4f4f7" datatype="html">
         <source>
                         Write CSS code directly. Example:<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -5150,7 +4969,7 @@
     <x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/>
                       </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">818</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">906</context></context-group></trans-unit>
       <trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab">
         <source>Advanced configuration</source>
         <target>Configuración avanzada</target>
@@ -5158,7 +4977,7 @@
           <context context-type="linenumber">452</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">611</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">699</context></context-group></trans-unit>
       <trans-unit id="dad5a5283e4c853c011a0f03d5a52310338bbff8">
         <source>Update configuration</source>
         <target>Actualizar configuración</target>
@@ -5166,130 +4985,94 @@
           <context context-type="linenumber">628</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">858</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">946</context></context-group></trans-unit>
       <trans-unit id="f8f8fca3139cba7d4fd6d9578d93e601f639cc83" datatype="html">
         <source>It seems like the configuration is invalid. Please search for potential errors in the different tabs.</source>
         <target state="new">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">856</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">944</context></context-group></trans-unit>
       <trans-unit id="824c2b28d0d9e771e3caf1d02021b740ac97076d" datatype="html">
         <source>PROFILE</source>
         <target state="new">PROFILE</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="e09928fe11389fd1ea310890ba5dc9df05d53509" datatype="html">
         <source>VIDEO SETTINGS</source>
         <target state="new">VIDEO SETTINGS</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">32</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="f70dbe547767b3a0f0006d44688beee60c884417" datatype="html">
         <source>NOTIFICATIONS</source>
         <target state="new">NOTIFICATIONS</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">43</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">44</context></context-group></trans-unit>
       <trans-unit id="8e4cafda991c13b5103e45195f7f2488974a913e" datatype="html">
         <source>INTERFACE</source>
         <target state="new">INTERFACE</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">53</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="ce43cc343ed3bd908e593db994ca3f6dbff079df" datatype="html">
         <source>PASSWORD</source>
         <target state="new">PASSWORD</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">63</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">64</context></context-group></trans-unit>
       <trans-unit id="d5e31741c591719630b5bba1ba38f8c1a04c10e3" datatype="html">
         <source>EMAIL</source>
         <target state="new">EMAIL</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
-          <context context-type="linenumber">73</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">74</context></context-group></trans-unit>
       <trans-unit id="e6c299a11dadb59bf789ecc5d85eb1a1ebff4613" datatype="html">
         <source>DANGER ZONE</source>
         <target state="new">DANGER ZONE</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">186</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">186</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">83</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">186</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">186</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context><context context-type="linenumber">84</context></context-group></trans-unit>
       <trans-unit id="994363f08f9fbfa3b3994ff7b35c6904fdff18d8" datatype="html">
         <source>Profile</source>
         <target state="new">Profile</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b284ee2481274869dfb81764f597da8a13a6813d" datatype="html">
         <source>Resolution</source>
         <target state="new">Resolution</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ef33a2dbcf359d6d0bf21cd9057241198657f1a0" datatype="html">
         <source>Aspect ratio</source>
         <target state="new">Aspect ratio</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6a584f96af92f3c88346004512fb62c1a2f77bf2" datatype="html">
         <source>Average frame rate</source>
         <target state="new">Average frame rate</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f5ef087f961138ca7624adf451532229eaf1d6d0" datatype="html">
         <source>Pixel format</source>
         <target state="new">Pixel format</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3a52aa4fd8b70b391767f9398322eeb13219f18c" datatype="html">
         <source>Sample rate</source>
         <target state="new">Sample rate</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3ca33ac04c81bb041501de891a9d7c8318f810a0" datatype="html">
         <source>Channel Layout</source>
         <target state="new">Channel Layout</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b5398623f87ee72ed23f5023918db1707771e925" datatype="html">
         <source>Video settings</source>
         <target state="new">Video settings</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">12</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="dc7b800a27960e33af36f16f6c25aaf5776464f7" datatype="html">
         <source>Interface settings</source>
         <target state="new">Interface settings</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/quick-settings-modal.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="739516c2ca75843d5aec9cf0e6b3e4335c4227b9" datatype="html">
         <source>Change password</source>
         <target state="new">Change password</target>
@@ -5329,43 +5112,31 @@
       <trans-unit id="20f62f24170d57b1efeb2387a0949f482cd4d129" datatype="html">
         <source>Default policy on videos containing sensitive content</source>
         <target state="new">Default policy on videos containing sensitive content</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="8fbbb5d7bbc4df74ac19fe046f7b9d4f2fd80737" datatype="html">
         <source>With <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Do not list<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> or <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Blur thumbnails<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, a confirmation will be requested to watch the video. </source>
         <target state="new">
           With <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Do not list<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> or <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Blur thumbnails<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, a confirmation will be requested to watch the video.
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="be05139c85b590f407c8204605601ab510247f9f" datatype="html">
         <source>Policy for sensitive videos</source>
         <target state="new">Policy for sensitive videos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">111</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">14</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">112</context></context-group></trans-unit>
       <trans-unit id="ea8e7b15807cce2fea74798db2396a4de016e5c7" datatype="html">
         <source>Only display videos in the following languages/subtitles</source>
         <target state="new">Only display videos in the following languages/subtitles</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="db930d0e3dbcb12963bec15cfec67fac6534542d" datatype="html">
         <source>In Recently added, Trending, Local, Most liked and Search pages</source>
         <target state="new">In Recently added, Trending, Local, Most liked and Search pages</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="dbcc539bd3ca0b962b87ea26855ca9d5d3c5cdf1" datatype="html">
         <source>Your current email is <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ user.email }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/> </source>
         <target state="new">
@@ -5421,25 +5192,25 @@
       <trans-unit id="27a56aad79d8b61269ed303f11664cc78bcc2522" datatype="html">
         <source>Theme</source>
         <target state="new">Theme</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html</context><context context-type="linenumber">4</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">250</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">251</context></context-group></trans-unit>
       <trans-unit id="2fb6d9783b2c3ce93df9cee3542cda87aa60a808" datatype="html">
         <source>instance default</source>
         <target state="new">instance default</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html</context><context context-type="linenumber">8</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.html</context><context context-type="linenumber">8</context></context-group></trans-unit>
       <trans-unit id="2aad0303b66062ca5fb031b72df15b2cbce6e35d" datatype="html">
         <source>peertube default</source>
         <target state="new">peertube default</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.html</context><context context-type="linenumber">9</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="2dc22fcebf6aaa76196d2def33a827a34bf910bf" datatype="html">
         <source>Change ownership</source>
         <target state="new">Change ownership</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">3</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.html</context><context context-type="linenumber">31</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/video-change-ownership/video-change-ownership.component.html</context><context context-type="linenumber">3</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
       <trans-unit id="046c4fa30411e6b1aa46dc51bf82d07b1adf14d4" datatype="html">
         <source>Select the next owner</source>
         <target state="new">Select the next owner</target>
@@ -5480,11 +5251,8 @@
       <trans-unit id="e98239d8a6be1100119ff4b5630c822b82786740" datatype="html">
         <source>Initiator</source>
         <target state="new">Initiator</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">14</context></context-group></trans-unit>
       <trans-unit id="b08d67fe4e192ea8352bebdc6aabbd1bb7abed02" datatype="html">
         <source>
         Created
@@ -5494,109 +5262,105 @@
         Created
         <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon>"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon>"/>
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="81b97b8ea996ad1e4f9fca8415021850214884b1" datatype="html">
         <source>Status</source>
         <target state="new">Status</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="1bd5e17c9582661e20763a7634ef07881e33bbd7" datatype="html">
         <source>Action</source>
         <target state="new">Action</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit><trans-unit id="bde01505620f59f773377f94034e4038e6bd50c0" datatype="html">
+        <source>Account page</source><target state="new">Account page</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">153</context>
+        </context-group>
+      </trans-unit><trans-unit id="e3ed3e7590c9242adfb9d2652d7df7732f287ad3" datatype="html">
+        <source>Video page</source><target state="new">Video page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
+          <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f4212e793d36e1aaa6ee1b09881677f783b5feff" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ videoChangeOwnership.status }}"/></source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{ videoChangeOwnership.status }}"/></target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">39</context></context-group></trans-unit><trans-unit id="d144ccb1e53a2c7fe4e4797a9aa7f60b397ba8ac" datatype="html">
+        <source>Imports</source><target state="new">Imports</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context>
+          <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="574cce019fb31925d11095591d4321847ff1c7a5" datatype="html">
         <source>Create video channel</source>
         <target state="new">Create video channel</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="30fcac6c20aac1f24e000efc4a889cbb93d4baf2" datatype="html">
-        <source>Go to the channel</source>
-        <target state="new">Go to the channel</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">10</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
+      
       <trans-unit id="8fef247fd0c5bf790151f7661cafc4b7fd0397f3">
         <source><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers</source>
         <target><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> suscritoras</target>
         <context-group name="null">
           <context context-type="linenumber">14</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">15</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="915d4704e1649016512cbf5eeac55b4dbf933558" datatype="html">
         <source>Example: my_channel</source>
         <target state="new">Example: my_channel</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">35</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">35</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">35</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="cc895c3d23ec739ac77d472ff979980195fd30c1" datatype="html">
         <source>CHANNEL</source>
         <target state="new">CHANNEL</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">26</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">26</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">26</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="66ad6eb3f06251c75325b780943a07f94c949df7" datatype="html">
         <source>Short text to tell people how they can support your channel (membership platform...).&lt;br />&lt;br />
     When you will upload a video in this channel, the video support field will be automatically filled by this text.</source>
         <target state="new">Short text to tell people how they can support your channel (membership platform...).&lt;br />&lt;br />
     When you will upload a video in this channel, the video support field will be automatically filled by this text.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">77</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">77</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">77</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">77</context></context-group></trans-unit>
       <trans-unit id="6ff0350d2659cdb4722370bf5dafbad651f441cd" datatype="html">
         <source>Overwrite support field of all videos of this channel</source>
         <target state="new">Overwrite support field of all videos of this channel</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">92</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">92</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">92</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">92</context></context-group></trans-unit>
       <trans-unit id="4b50f2ef2e8b9a24e674d12012ee310f378a5503" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ actor.followersCount }}"/> subscribers</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{ actor.followersCount }}"/> subscribers</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/shared/actor-avatar-info.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/actor-avatar-info.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="38baeb215c17af9d9e295e371a57f4a48ab4c191" datatype="html">
         <source>Target</source>
         <target state="new">Target</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">9</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="a5707e9905e079605243397ee111b8be449941aa" datatype="html">
         <source>See the error</source>
         <target state="new">See the error</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
       <trans-unit id="842b1f5e4942fb515ef790308ca9ea6a60b4b331" datatype="html">
         <source>This video was deleted</source>
         <target state="new">This video was deleted</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">37</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context><context context-type="linenumber">38</context></context-group></trans-unit>
       <trans-unit id="0b68f86015522b0dbd374822caefe74a62e3470f" datatype="html">
         <source>Once you delete your account, there is no going back. You will be asked to confirm this action.</source>
         <target state="new">Once you delete your account, there is no going back. You will be asked to confirm this action.</target>
@@ -5616,38 +5380,45 @@
       <trans-unit id="3a5d57052d13d2da1cbcffdbb8effb9874b1595a" datatype="html">
         <source>You don't have any subscriptions yet.</source>
         <target state="new">You don't have any subscriptions yet.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit><trans-unit id="f886abe6ca73a34403dde0578e71173cebe00428" datatype="html">
+        <source>Channel page</source><target state="new">Channel page</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">150</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c65641c36859c328928e6b0f14c3f913886f8add" datatype="html">
         <source>Created by <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></source>
         <target state="new">Created by <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">18</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit><trans-unit id="cd2d9bfd5a5f7bdc1d4f1242e8a35d74830b6ffe" datatype="html">
+        <source>Owner account page</source><target state="new">Owner account page</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="e006ed166ce188cab168e1ca90435b33d042d913" datatype="html">
         <source>Go the owner account page</source>
         <target state="new">Go the owner account page</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">17</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">30</context></context-group>
-      </trans-unit>
-      <trans-unit id="2bc7533f8c8e7d183950ba1094a0acd9efc22e5e" datatype="html">
-        <source>Muted instances</source>
-        <target state="new">Muted instances</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.html</context>
-          <context context-type="linenumber">2</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
+      
       <trans-unit id="cb6fc818d4547d66ac5ea65f2c5d5cbfb6ebc04e" datatype="html">
         <source>Video history</source>
         <target state="new">Video history</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="29c45bf49891748f930ef78b2e09857498b15131" datatype="html">
         <source>
     <x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon>"/><x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon>"/>
@@ -5657,19 +5428,13 @@
     <x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon>"/><x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon>"/>
     Delete history
   </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context><context context-type="linenumber">8</context></context-group></trans-unit>
       <trans-unit id="355c9f9d50ed1c6f12729332a44c1fd0f7576638" datatype="html">
         <source>You don't have any video history yet.</source>
         <target state="new">You don't have any video history yet.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context>
-          <context context-type="linenumber">14</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-history/my-account-history.component.html</context><context context-type="linenumber">15</context></context-group></trans-unit>
       <trans-unit id="9d2d802fa417a5a3f230cb5bcc975551a252c59c" datatype="html">
         <source>
     <x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon>"/><x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon>"/>
@@ -5679,16 +5444,13 @@
     <x id="START_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;my-global-icon>"/><x id="CLOSE_TAG_MY-GLOBAL-ICON" ctype="x-my-global-icon" equiv-text="&lt;/my-global-icon>"/>
     Notification preferences
   </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context>
-          <context context-type="linenumber">2</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="58479ebfcc980e1ee37a8102bc4f9a35eca2f680" datatype="html">
         <source>All read</source>
         <target state="new">All read</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">17</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-notifications/my-account-notifications.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="dd3b6c367381ddfa8f317b8e9b31c55368c65136" datatype="html">
         <source>Activities</source>
         <target state="new">Activities</target>
@@ -5885,92 +5647,65 @@
       <trans-unit id="87f77a03c185ea644ed8378a562a2d0225513974" datatype="html">
         <source>This account does not have channels.</source>
         <target state="new">This account does not have channels.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="f15780bbd2d7fa777071975f7445e98a33065e38" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {1 subscriber} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers} }</source>
         <target state="new">{VAR_PLURAL, plural, =1 {1 subscriber} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers} }</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context><context context-type="linenumber">20</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">12</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">28</context></context-group>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html</context><context context-type="linenumber">21</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">28</context></context-group></trans-unit><trans-unit id="21dc89cfca84c2af7fdeb584b34e2529d842b72a" datatype="html">
+        <source>{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.videosCount }}"/> videos} }</source><target state="new">{VAR_PLURAL, plural, =0 {No videos} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.videosCount }}"/> videos} }</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="d5f0913d08d01648d7e6165c168a99ccd06d1f4c" datatype="html">
         <source>My Channels</source>
         <target state="new">My Channels</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="dff0536e48bacc3a4b568f32f9ed8ffc14767cbb" datatype="html">
         <source>NEW CHANNEL</source>
         <target state="new">NEW CHANNEL</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
-          <context context-type="linenumber">25</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">25</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channel-edit.component.html</context><context context-type="linenumber">25</context></context-group></trans-unit>
       <trans-unit id="f36bd6a1570cb9b0a5023870f35160957cad2a8f">
         <source>See this video channel</source>
         <target>Ver esta canle de vídeo</target>
         <context-group name="null">
           <context context-type="linenumber">8</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">8</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">9</context></context-group></trans-unit>
       <trans-unit id="7bfe8fdef5d1a90e5bf286ec6ed4c079522a9b44" datatype="html">
         <source>This channel doesn't have any videos.</source>
         <target state="new">This channel doesn't have any videos.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context>
-          <context context-type="linenumber">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="5c2b42818f05eafa2690d5eac6bcde295c713097" datatype="html">
         <source>SHOW THIS CHANNEL</source>
         <target state="new">
         SHOW THIS CHANNEL
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context>
-          <context context-type="linenumber">27</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">28</context></context-group></trans-unit>
       <trans-unit id="4af6287e70a4a87329affe109839f14ae598f0ca" datatype="html">
         <source>DESCRIPTION</source>
         <target state="new">DESCRIPTION</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context>
-          <context context-type="linenumber">4</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="bfc87613409a6cfae59b79ead5d910d8d3c216f5" datatype="html">
         <source>STATS</source>
         <target state="new">STATS</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context>
-          <context context-type="linenumber">8</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context>
-          <context context-type="linenumber">16</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context><context context-type="linenumber">10</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/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="299f97b8ee9c62d45f2cc01961aa1e5101d6d05a">
         <source>Stats</source>
         <target>Estatísticas</target>
@@ -5979,19 +5714,15 @@
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">163</context></context-group>
       </trans-unit>
-      <trans-unit id="2a851f40f4a956fc4c3e0c3ed8dd33f10a4fa161" datatype="html">
-        <source>PeerTube license</source>
-        <target state="new">PeerTube license</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">175</context></context-group>
-      </trans-unit>
+      
       <trans-unit id="8bc634cd9d8c9b684dbfaaf17a522f894bedbffc">
         <source>Joined <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></source>
         <target>Uneuse <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></target>
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-about/account-about.component.html</context><context context-type="linenumber">12</context></context-group></trans-unit>
       <trans-unit id="f696d5719a2a79916d44a175743591dc0d5629fe" datatype="html">
         <source>Manage channel</source>
         <target state="new">
@@ -6013,37 +5744,29 @@
       <trans-unit id="b8bf6036a9fb05c08cdb190cdf4e3becc6e6fa0a" datatype="html">
         <source>SUPPORT THIS CHANNEL</source>
         <target state="new">SUPPORT THIS CHANNEL</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="5523952d0300c96cfba2ec5a693c95f923e90c40" datatype="html">
         <source>Created <x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/></source>
         <target state="new">Created <x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/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 <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> playlists </source>
-        <target state="new">
-  Created <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> playlists
-</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channel-about/video-channel-about.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit><trans-unit id="5ebd76e736e1c58a1850234d1d26f1ab8c9ad11f" datatype="html">
+        <source>
+    Created <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> playlists
+  </source><target state="new">
+    Created <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> playlists
+  </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="fbbe62dee434f0521e0dfb8e3957d92fc5fcd76f" datatype="html">
         <source>This channel does not have playlists.</source>
         <target state="new">This channel does not have playlists.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="6385c357c1de58ce92c0cf618ecf9cf74b917390">
         <source>PeerTube</source>
         <target>PeerTube</target>
@@ -6055,11 +5778,8 @@
       <trans-unit id="fc978c97e261ee6494db916622339aedb633da3a" datatype="html">
         <source>Follows</source>
         <target state="new">Follows</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about.component.html</context>
-          <context context-type="linenumber">9</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about.component.html</context><context context-type="linenumber">9</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit>
       <trans-unit id="5fea66be16da46ed7a0775e9a62b7b5e94b77473" datatype="html">
         <source>Contact <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> administrator</source>
         <target state="new">Contact <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> administrator</target>
@@ -6203,6 +5923,12 @@
           <context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">87</context>
         </context-group>
+      </trans-unit><trans-unit id="d84d2cd0e5c2053a4451e7f77b81269e157cc5af" datatype="html">
+        <source>FEATURES</source><target state="new">FEATURES</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context>
+          <context context-type="linenumber">94</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="fa48c3ddc2ef8e40e5c317e68bc05ae62c93b0c1">
         <source>Features found on this instance</source>
@@ -6210,9 +5936,9 @@
         <context-group name="null">
           <context context-type="linenumber">47</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-instance/about-instance.component.html</context><context context-type="linenumber">94</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">47</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">47</context></context-group></trans-unit>
       <trans-unit id="92538de0e2f6e64f1d05291132b93c32bed81237" datatype="html">
         <source>STATISTICS</source>
         <target state="new">STATISTICS</target>
@@ -6543,35 +6269,23 @@
       <trans-unit id="eebbc9b6d037b9c08225b769a5f3f333b2789500" datatype="html">
         <source>Followers instances</source>
         <target state="new">Followers instances</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context>
-          <context context-type="linenumber">3</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="39dabfebe4a70cc00aa454f790b81cf453d38304" datatype="html">
         <source>This instance does not have instances followers.</source>
         <target state="new">This instance does not have instances followers.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context>
-          <context context-type="linenumber">5</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context><context context-type="linenumber">6</context></context-group></trans-unit>
       <trans-unit id="d4f8e8ce89a1f258702ba0341d7321f972f60b32" datatype="html">
         <source>Followings instances</source>
         <target state="new">Followings instances</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context>
-          <context context-type="linenumber">13</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context><context context-type="linenumber">14</context></context-group></trans-unit>
       <trans-unit id="d0f0a0a5da1553964ae4891aaebd2b2c3e5ddae4" datatype="html">
         <source>This instance does not have instances followings.</source>
         <target state="new">This instance does not have instances followings.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context>
-          <context context-type="linenumber">15</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="3d2fb0ff92d3dd1e6040cd79b2a60edac6dea2da" datatype="html">
         <source>Developed with ❤ by <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Framasoft<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/></source>
         <target state="new">Developed with ❤ by <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Framasoft<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/></target>
@@ -6655,6 +6369,12 @@
           <context context-type="sourcefile">src/app/+signup/+register/register.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
+      </trans-unit><trans-unit id="041620337eaebda87971d345d05697639dfe78e4" datatype="html">
+        <source>Step</source><target state="new">Step</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+signup/+register/custom-stepper.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="6c7534a7c0265f2285e952978b4241211199172b" datatype="html">
         <source>
@@ -6928,27 +6648,15 @@
       <trans-unit id="baa5048f978a6fed563ab1d30a6bb965ea687ba8" datatype="html">
         <source>{{'{0} languages selected</source>
         <target state="new">{{'{0} languages selected</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="812a3c71b3a8e6bfc7f1c5e8690cb4738edb2224" datatype="html">
         <source>No language</source>
         <target state="new">No language</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="15375472822bfcc320ebccd648eae8c15e50fef0" datatype="html">
         <source>{{'{0} categories selected</source>
         <target state="new">{{'{0} categories selected</target>
@@ -6968,55 +6676,31 @@
       <trans-unit id="67e703146fe9f6fa41250bbdf27db405cee57607" datatype="html">
         <source>Process domains</source>
         <target state="new">Process domains</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-modal.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/batch-domains-modal.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2f9439e4f986c94ed2ab6fec2b3dd82de1c6176f" datatype="html">
         <source>Domain is required.</source>
         <target state="new">Domain is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/batch-domains-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a09570e386c8a76dd828525fde97eae2be1fc01c" datatype="html">
         <source>Domains entered are invalid.</source>
         <target state="new">Domains entered are invalid.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/batch-domains-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2a6c3f1941b3e864033afa93da9b14e2ae17510c" datatype="html">
         <source>Domains entered contain duplicates.</source>
         <target state="new">Domains entered contain duplicates.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/batch-domains-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="aa6fb95c355f172bda303de1ce2f38c251a149cf" datatype="html">
         <source>Unlimited</source>
         <target state="new">Unlimited</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/core/users/user.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="41d65a19d2dd012b4b3699a96cc252a06f43703b" datatype="html">
         <source>None - no upload possible</source>
         <target state="new">None - no upload possible</target>
@@ -7164,8 +6848,8 @@
       <trans-unit id="fc5731a28a99b25c62d43333ceebb250d60aff84" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{host}}"/> is not valid</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{host}}"/> is not valid</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/batch-domains-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="950f5111d567e5c0e971f07c26e8c2be1d919a8e" datatype="html">
         <source>Follow request(s) sent!</source>
         <target state="new">Follow request(s) sent!</target>
@@ -7262,27 +6946,24 @@
       <trans-unit id="53cc0f4a4566c4139c65f93b5dce2fe8302e78da" datatype="html">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</source>
         <target state="new">Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-account-blocklist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="468b52e3c04fb9a3d8c8213555dfcad0cbcae330" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="366c51268cf18a834e6207b2efe20b679f3796ef" datatype="html">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted.</source><target state="new">Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cf70037e436f2c5547cbdf1a02e1348c8642467a" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted by your instance.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted by your instance.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/instance-blocklist/instance-server-blocklist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="800cd3cdf47751b576587259ba3a1bc0a7f435b6" datatype="html">
         <source>Comment updated.</source>
         <target state="new">Comment updated.</target>
@@ -7290,15 +6971,52 @@
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="37682f69f05be054bd72b44947af150734e302c3" datatype="html">
-        <source>Internal actions</source>
-        <target state="new">Internal actions</target>
+      </trans-unit><trans-unit id="79b1fff8643eb798e40e0884336e0a6097b9aae6" datatype="html">
+        <source>Violent or Repulsive</source><target state="new">Violent or Repulsive</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="aa7674e269e625284916fbb9cc774e452d662eb9" datatype="html">
+        <source>Hateful or Abusive</source><target state="new">Hateful or Abusive</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="0362dc7817f753e462237d297942ff7453111575" datatype="html">
+        <source>Spam or Misleading</source><target state="new">Spam or Misleading</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="71022ef0f98bdf8879e22bc18b6b1333a3eb112a" datatype="html">
+        <source>Rights</source><target state="new">Rights</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="c3f2b3cc8e38a972f97d5be54b5f4e87fda1b964" datatype="html">
+        <source>Server rules</source><target state="new">Server rules</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="4b9a80734f29adc16ff657e4306e0e9ff724bee6" datatype="html">
+        <source>Thumbnails</source><target state="new">Thumbnails</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="37682f69f05be054bd72b44947af150734e302c3" datatype="html">
+        <source>Internal actions</source>
+        <target state="new">Internal actions</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0db581a9122258b2897ad3e915e2d00d7f6d33f5" datatype="html">
         <source>Delete report</source>
         <target state="new">Delete report</target>
@@ -7342,6 +7060,35 @@
       <trans-unit id="0e546f4a26ddb8a098fb5c8db211ab44d8f2966b" datatype="html">
         <source>Actions for the video</source>
         <target state="new">Actions for the video</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="58dc553e7a763631cf2d1229fb1ed9d04b6bc59a" datatype="html">
+        <source>Block video</source><target state="new">Block video</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="fe246ef2f8efb9a619c32dc9eda88f24cf466100" datatype="html">
+        <source>Video blocked.</source><target state="new">Video blocked.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-block.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="35cdda30548524f98df9f8fa858adf95e58f6010" datatype="html">
+        <source>Unblock video</source><target state="new">Unblock video</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="de8096f81390a7d5c13401ae9f50416302731ae8" datatype="html">
+        <source>Video unblocked.</source><target state="new">Video unblocked.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -7362,63 +7109,67 @@
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="36e4cdb23056253e5ef0c62b7d4bbeb3f759f611" datatype="html">
-        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from blacklist.</source>
-        <target state="new">Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from blacklist.</target>
+      </trans-unit><trans-unit id="5801b59834422f97fa2a5c930f079611ea040ccb" datatype="html">
+        <source>Switch video block to manual</source><target state="new">Switch video block to manual</target>
         <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="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="3d651e314544825348900b3120e2cd5ff38c7fa5" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{num}}"/> videos removed from blacklist.</source>
-        <target state="new"><x id="INTERPOLATION" equiv-text="{{num}}"/> videos removed from blacklist.</target>
+      </trans-unit><trans-unit id="47297c5c574f8d6fec71af7f24818b52761f9b21" datatype="html">
+        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> switched to manual block.</source><target state="new">Video <x id="INTERPOLATION" equiv-text="{{name}}"/> switched to manual block.</target>
         <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="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="0594812d4c50c2adbd1a892a3497c4e5c19e4b32" datatype="html">
-        <source>yes</source>
-        <target state="new">yes</target>
+      </trans-unit><trans-unit id="c435a94ca5b3b794e766ee715745bded1334a6e0" datatype="html">
+        <source>Do you really want to unblock this video? It will be available again in the videos list.</source><target state="new">Do you really want to unblock this video? It will be available again in the videos list.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="6320692861e01fa9c9d4e692d0d27b6c12b21c3b" datatype="html">
-        <source>no</source>
-        <target state="new">no</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="652845b2b32b2e117b9b02879b1af07859b0e223" datatype="html">
-        <source>Do you really want to remove this video from the blacklist? It will be available again in the videos list.</source>
-        <target state="new">Do you really want to remove this video from the blacklist? It will be available again in the videos list.</target>
+      </trans-unit><trans-unit id="350850e095bb1b8d7dcc99b520d5ec8132c710fb" datatype="html">
+        <source>Unblock</source><target state="new">Unblock</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="1585babc36806e20e225ac27dbba0e7c7cd09e0f" datatype="html">
-        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from the blacklist.</source>
-        <target state="new">Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from the blacklist.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+      </trans-unit><trans-unit id="0f39df26589693fe43b6bd5c4602bc4fc6ac1226" datatype="html">
+        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> unblocked.</source><target state="new">Video <x id="INTERPOLATION" equiv-text="{{name}}"/> unblocked.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      
+      
+      <trans-unit id="0594812d4c50c2adbd1a892a3497c4e5c19e4b32" datatype="html">
+        <source>yes</source>
+        <target state="new">yes</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/feature-boolean.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="6320692861e01fa9c9d4e692d0d27b6c12b21c3b" datatype="html">
+        <source>no</source>
+        <target state="new">no</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/feature-boolean.component.html</context><context context-type="linenumber">2</context></context-group></trans-unit>
+      
+      
       <trans-unit id="9ab7a3efed2b78a4d4fd4365eb1b3385ced0d523" datatype="html">
         <source>You don't have plugins installed yet.</source>
         <target state="new">You don't have plugins installed yet.</target>
@@ -7578,15 +7329,9 @@
       <trans-unit id="a8059e31694578c1b0344a76a345357dd60e8f01" datatype="html">
         <source>Warning</source>
         <target state="new">Warning</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/system/logs/logs.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/guards/can-deactivate-guard.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/logs/logs.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/core/routing/can-deactivate-guard.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6080b77234e92ad41bb52653b239c4c4f851317d" datatype="html">
         <source>Error</source>
         <target state="new">Error</target>
@@ -7670,71 +7415,35 @@
       <trans-unit id="a3f529c8552196571418065c5b81a44ae2f94972" datatype="html">
         <source>Videos will be deleted, comments will be tombstoned.</source>
         <target state="new">Videos will be deleted, comments will be tombstoned.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="319c89ebc6de62d35b794da23c9794af9b16514e" datatype="html">
         <source>User won't be able to login anymore, but videos and comments will be kept as is.</source>
         <target state="new">User won't be able to login anymore, but videos and comments will be kept as is.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="50dc7afa2305131cdbdb384cfc1f2a5f0f4647d8" datatype="html">
         <source>Unban</source>
         <target state="new">Unban</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="910ed85f550272401b134a40d019ab3359fe883f" datatype="html">
         <source>Set Email as Verified</source>
         <target state="new">Set Email as Verified</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ac401df84c5fa471700c3368de51c969ccb8bacf" datatype="html">
         <source>You cannot ban root.</source>
         <target state="new">You cannot ban root.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="98119091712a8ca72905e3b4c1cf60649af7565e" datatype="html">
         <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{num}}"/> users?</source>
         <target state="new">Do you really want to unban <x id="INTERPOLATION" equiv-text="{{num}}"/> users?</target>
@@ -7754,15 +7463,9 @@
       <trans-unit id="911fc197949e47aa5f0541627bc319f59edd9d11" datatype="html">
         <source>You cannot delete root.</source>
         <target state="new">You cannot delete root.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="9de914fe915cc730efc57e81c987188a24d3ac51" datatype="html">
         <source>If you remove these users, you will not be able to create others with the same username!</source>
         <target state="new">If you remove these users, you will not be able to create others with the same username!</target>
@@ -7790,27 +7493,15 @@
       <trans-unit id="2667ca38672421a0a7a22343d2a0060ee41246de" datatype="html">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted.</source>
         <target state="new">Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-blocklist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/account-blocklist.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c6af80b42938d4a49e6f6c4f60ce26228916994c" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-blocklist/my-account-server-blocklist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/server-blocklist.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="80057baa3b97a4349304bdaa0a880e6f4778561f" datatype="html">
         <source>My videos history</source>
         <target state="new">My videos history</target>
@@ -7938,11 +7629,8 @@
       <trans-unit id="59f77c7dc03357ef1d7a334df06dfc7f31c9a165" datatype="html">
         <source>Interface settings updated.</source>
         <target state="new">Interface settings updated.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-interface/my-account-interface-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-interface-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7c193bf704577e514b63497c4f366511afdb6585" datatype="html">
         <source>New video from your subscriptions</source>
         <target state="new">New video from your subscriptions</target>
@@ -7966,23 +7654,21 @@
           <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>
-        <target state="new">Video auto-blacklisted waiting review</target>
+      </trans-unit><trans-unit id="f4f29b22904c1ee350555ce58c2380ad58a39e06" datatype="html">
+        <source>Video blocked automatically waiting review</source><target state="new">Video blocked automatically waiting review</target>
         <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="abac8b7629cfcd85bff25770f83ea229f646f996" datatype="html">
-        <source>One of your video is blacklisted/unblacklisted</source>
-        <target state="new">One of your video is blacklisted/unblacklisted</target>
+      </trans-unit><trans-unit id="47f529a2dcb30ef1533d978ac01dbd361b0b6be7" datatype="html">
+        <source>One of your video is blocked/unblocked</source><target state="new">One of your video is blocked/unblocked</target>
         <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="f3eff4df9e4aa9dab411e6eb83833a33016a88bc" datatype="html">
         <source>Video published (after transcoding/scheduled update)</source>
         <target state="new">Video published (after transcoding/scheduled update)</target>
@@ -8058,95 +7744,61 @@
       <trans-unit id="1e003ad599ef836949b9f4dad3037a58ef3ff8d1" datatype="html">
         <source>Avatar changed.</source>
         <target state="new">Avatar changed.</target>
+        
+        
+      <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="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="9f4cdde6106d0d5ed669264f5a8777f079623eb0" datatype="html">
+        <source>Do you really want to delete <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? It will delete <x id="INTERPOLATION_1" equiv-text="{{videosCount}}"/> videos uploaded in this channel, and you will not be able to create another channel with the same name (<x id="INTERPOLATION_2" equiv-text="{{channelName}}"/>)!</source><target state="new">Do you really want to delete <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? It will delete <x id="INTERPOLATION_1" equiv-text="{{videosCount}}"/> videos uploaded in this channel, and you will not be able to create another channel with the same name (<x id="INTERPOLATION_2" equiv-text="{{channelName}}"/>)!</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <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>
       <trans-unit id="96d143e59c90c4f479eb7a3b55e2a24dc676b31f" datatype="html">
         <source>Unknown language</source>
         <target state="new">Unknown language</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="732fe7ff80eca196d9825b0ca16134ce8101e93e" datatype="html">
         <source>Video settings updated.</source>
         <target state="new">Video settings updated.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="9763d47eba525cfe3f0007f99e70b1dbc5e20c46" datatype="html">
         <source>Display/Video settings updated.</source>
         <target state="new">Display/Video settings updated.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-settings/user-video-settings.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3ef8bf973a9a481a08c6f0aaa875f0259b3ea645" datatype="html">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> created.</source>
         <target state="new">Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> created.</target>
-        <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="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <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="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f359f6adf6cccca7770019f947ed594169ee7d47" datatype="html">
         <source>This name already exists on this instance.</source>
         <target state="new">This name already exists on this instance.</target>
-        <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="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <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="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="98ab64f0af924a60a48b40835c1b655bd17c6559" datatype="html">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> updated.</source>
         <target state="new">Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> updated.</target>
-        <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="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="4e613272923d6f1976e3c73e8b857ac45c37b791" datatype="html">
-        <source>Do you really want to delete <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? It will delete all videos uploaded in this channel, and you will not be able to create another channel with the same name (<x id="INTERPOLATION_1" equiv-text="{{channelName}}"/>)!</source>
-        <target state="new">Do you really want to delete <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? It will delete all videos uploaded in this channel, and you will not be able to create another channel with the same name (<x id="INTERPOLATION_1" equiv-text="{{channelName}}"/>)!</target>
-        <context-group purpose="location">
-          <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>
+        
+      <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="linenumber">1</context></context-group></trans-unit>
+      
       <trans-unit id="3859ca2a7577ba8797058d7d97eb8054bc56ec99" datatype="html">
         <source>Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm</source>
         <target state="new">Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm</target>
-        <context-group purpose="location">
-          <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>
+        
+      <context-group purpose="location"><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>
       <trans-unit id="a81a33275b683729ad938b6102e7e34a057537a2" datatype="html">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> deleted.</source>
         <target state="new">Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> deleted.</target>
-        <context-group purpose="location">
-          <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>
+        
+      <context-group purpose="location"><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>
       <trans-unit id="690c61d85b87df8fab4fd958bceb3849b7f8c64b" datatype="html">
         <source>Views for the day</source>
         <target state="new">Views for the day</target>
-        <context-group purpose="location">
-          <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>
+        
+      <context-group purpose="location"><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>
       <trans-unit id="c7e4d8688bd06d723e512ab063c0c4fdf4a9804d" datatype="html">
         <source>Playlist <x id="INTERPOLATION" equiv-text="{{playlistName}}"/> created.</source>
         <target state="new">Playlist <x id="INTERPOLATION" equiv-text="{{playlistName}}"/> created.</target>
@@ -8218,15 +7870,9 @@
       <trans-unit id="d39a0bfa616a9a8473b2e379eefe17d8ed1af118" datatype="html">
         <source>Video <x id="INTERPOLATION" equiv-text="{{videoName}}"/> deleted.</source>
         <target state="new">Video <x id="INTERPOLATION" equiv-text="{{videoName}}"/> deleted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="740c53a50a618bf5c7a5bd5c3f7321f0bd1840dd" datatype="html">
         <source>Ownership change request sent.</source>
         <target state="new">Ownership change request sent.</target>
@@ -8238,11 +7884,8 @@
       <trans-unit id="8dd18d9047c4b2dc9786550dfd8fa99f3b14e17f" datatype="html">
         <source>My channels</source>
         <target state="new">My channels</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1d3408919f4d08414721cc22c4be39d93d6691d2" datatype="html">
         <source>My playlists</source>
         <target state="new">My playlists</target>
@@ -8278,11 +7921,8 @@
       <trans-unit id="73022f1676784c4f9b8cdbb322e52b02ccc800b7" datatype="html">
         <source>Ownership changes</source>
         <target state="new">Ownership changes</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="efad4be364b8fb5c73cbfcc7acccd542f9d84ad6" datatype="html">
         <source>My settings</source>
         <target state="new">My settings</target>
@@ -8302,9 +7942,9 @@
       <trans-unit id="de4bfcfa89604c153a4a07920642de55464425be" datatype="html">
         <source>max size</source>
         <target state="new">max size</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/shared/actor-avatar-info.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/images/preview-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/preview-upload.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/actor-avatar-info.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e58f5785ae64f23cd6a5e010b045511853ed84fa" datatype="html">
         <source>Now please check your emails to verify your account and complete signup.</source>
         <target state="new">Now please check your emails to verify your account and complete signup.</target>
@@ -8332,15 +7972,9 @@
       <trans-unit id="ccbf0490fb6b60d21e03bb2c9003df0ce1a58752" datatype="html">
         <source>Unable to find user id or verification string.</source>
         <target state="new">Unable to find user id or verification string.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/reset-password/reset-password.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2f03e577e8f81a9f8be0095f93e1f9376c6eedc9" datatype="html">
         <source>Published videos</source>
         <target state="new">Published videos</target>
@@ -8360,15 +7994,9 @@
       <trans-unit id="ff6becacbce7fc0943b0af0df4dd67e5e11bf598" datatype="html">
         <source>Subscribe to the account</source>
         <target state="new">Subscribe to the account</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-channels/video-channels.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="33e9ca3aab38821eeaf966493df042d4202414df" datatype="html">
         <source>VIDEO PLAYLISTS</source>
         <target state="new">VIDEO PLAYLISTS</target>
@@ -8509,27 +8137,18 @@
       <trans-unit id="247071f6c9233b7e5bc1d8f46795ab6b032f1fbe" datatype="html">
         <source>Incorrect username or password.</source>
         <target state="new">Incorrect username or password.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="39980cc1cf8df621d43f5480d001bdf5d4139338" datatype="html">
         <source>You account is blocked.</source>
         <target state="new">You account is blocked.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4bd9c01837da35babbbe3c7585161268e0ece095" datatype="html">
         <source>An email with the reset password instructions will be sent to <x id="INTERPOLATION" equiv-text="{{email}}"/>. The link will expire within 1 hour.</source>
         <target state="new">An email with the reset password instructions will be sent to <x id="INTERPOLATION" equiv-text="{{email}}"/>. The link will expire within 1 hour.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+login/login.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7d5d2f4e2aebe4977c5e3daff4283814f869c609" datatype="html">
         <source>any language</source>
         <target state="new">any language</target>
@@ -8573,1603 +8192,1025 @@
       <trans-unit id="b0f24b7136e551a0deba831f1525711245b31a26" datatype="html">
         <source>Your password has been successfully reset!</source>
         <target state="new">Your password has been successfully reset!</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/reset-password/reset-password.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+reset-password/reset-password.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="16d449549ab7bc61caf3d636372a4a56b5870383" datatype="html">
         <source>Any</source>
         <target state="new">Any</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7fb1099e29660162f9154d5b2feee7743a423df6" datatype="html">
         <source>Today</source>
         <target state="new">Today</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="02e0243b60007368f87dc01e083f232dd025096d" datatype="html">
         <source>Last 7 days</source>
         <target state="new">Last 7 days</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7668986b9f753fcd72ad4a00b1a0c4861d1f7fb8" datatype="html">
         <source>Last 30 days</source>
         <target state="new">Last 30 days</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a77b663fd9b94c38bc9c6493a51b5f3acacb9bca" datatype="html">
         <source>Last 365 days</source>
         <target state="new">Last 365 days</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d2f3bf121699ff08a25fa4859bfdf3996bf821cc" datatype="html">
         <source>Short (&lt; 4 min)</source>
         <target state="new">Short (&lt; 4 min)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f24d368d6be0fee70fb4503d2ad37a612e1b0889" datatype="html">
         <source>Medium (4-10 min)</source>
         <target state="new">Medium (4-10 min)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ac0fa1039f09ec0d917303658c5bb1ee813a4225" datatype="html">
         <source>Long (> 10 min)</source>
         <target state="new">Long (> 10 min)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ed073fec00d699b7a97bb65b4f3a722b203c5bca" datatype="html">
         <source>Relevance</source>
         <target state="new">Relevance</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1aee80ab35aa99508802cdec6306e110b2feaf9e" datatype="html">
         <source>Publish date</source>
         <target state="new">Publish date</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b7641aed03492978b4ec6843b1e53f30464294d9" datatype="html">
         <source>Views</source>
         <target state="new">Views</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+search/search-filters.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="f039113a417e475dcbfcf399ad290417d5f08090" datatype="html">
+        <source>Search index is unavailable. Retrying with instance results instead.</source><target state="new">Search index is unavailable. Retrying with instance results instead.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">src/app/+search/search.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="0b2054a863319d2cf59867addd125b6717cae41d" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</source>
-        <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</target>
+      </trans-unit><trans-unit id="0d2f91ea86a6d3ff1f6c69ae1928f74f483e36bb" datatype="html">
+        <source>Search error</source><target state="new">Search error</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
+          <context context-type="sourcefile">src/app/+search/search.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="0b2054a863319d2cf59867addd125b6717cae41d" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</source>
+        <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="68f47e5ec9c7efd3c2a5cd317634ace12c3717ee" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> year ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> year ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e622d3813449fe36371ea258281059306819199d" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> months ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> months ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2f8a5a5f7efb521d7d89dc659ff65dd13cb7b17b" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> month ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> month ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1d1a46543a29096d3c6676be2d561380a0bc94e1" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> weeks ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> weeks ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e1db0b98b6cdf817508195f3649c48475c32ae7e" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> week ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> week ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a7654c3ece96e777527606f1c2870d6ee0b180f7" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> days ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> days ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5b465235ae55091d32535e23dd180c407f1352d1" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> day ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> day ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="dc7addf53bd6405a9c746db6dfca665c33679a84" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hours ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> hours ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d54a610250ed38efccf0e3afdd0004f6ad83ea8d" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hour ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> hour ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="9704e5e3adce178c127ead05f7057d3fb827308a" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> min ago</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{interval}}"/> min ago</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1b3a33e41b333cfd5434d4c22f1e97ccbd130ae0" datatype="html">
         <source>just now</source>
         <target state="new">just now</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/from-now.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/angular/from-now.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d77271b9b87017d22ff6ed6611a7c893fd994f06" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{hours}}"/> h <x id="INTERPOLATION_1" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_2" equiv-text="{{seconds}}"/> sec</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{hours}}"/> h <x id="INTERPOLATION_1" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_2" equiv-text="{{seconds}}"/> sec</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/video-duration-formatter.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-duration-formatter.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="944a2981992f97de6285d03906ed88e6bef19c99" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_1" equiv-text="{{seconds}}"/> sec</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_1" equiv-text="{{seconds}}"/> sec</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/video-duration-formatter.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-duration-formatter.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c0b663b59790503f778a85d21ddeaef81758f681" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> sec</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{seconds}}"/> sec</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/angular/video-duration-formatter.pipe.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-duration-formatter.pipe.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="68e710782ccb5398b3acb8844caf0b199da2c3da" datatype="html">
         <source>Confirm</source>
         <target state="new">Confirm</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/confirm/confirm.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/modal/confirm.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b67c8e57904c67c4566610363b7f82c748d04323" datatype="html">
         <source>Instance name is required.</source>
         <target state="new">Instance name is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="10a248adb1ee12830355a04ac3cde2bad2d41d7d" datatype="html">
         <source>Short description should not be longer than 250 characters.</source>
         <target state="new">Short description should not be longer than 250 characters.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="356e63270712273da168072ec0fc78a969919bf1" datatype="html">
         <source>Twitter username is required.</source>
         <target state="new">Twitter username is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="dbb2ef02020afc05e146855f2e1dd7c9522d49b6" datatype="html">
         <source>Previews cache size is required.</source>
         <target state="new">Previews cache size is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="97836c6e698185b4ce357de9d4b2ab3e838f2459" datatype="html">
         <source>Previews cache size must be greater than 1.</source>
         <target state="new">Previews cache size must be greater than 1.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e7393dc4a4aa12d005582eb9e1ddc7e5ca5bebd3" datatype="html">
         <source>Previews cache size must be a number.</source>
         <target state="new">Previews cache size must be a number.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="545f5dea553b2d7c4a65920ccdcb1e9dbdc7f4d8" datatype="html">
         <source>Captions cache size is required.</source>
         <target state="new">Captions cache size is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a8d7131c0ca1eefe7b058e6081236ca1be364e2c" datatype="html">
         <source>Captions cache size must be greater than 1.</source>
         <target state="new">Captions cache size must be greater than 1.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c3decd47b03cf542df091c1a2fb25b756e59074e" datatype="html">
         <source>Captions cache size must be a number.</source>
         <target state="new">Captions cache size must be a number.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2cdd5a8c604ef16c2f9a17ed81d73f4f9509e828" datatype="html">
         <source>Signup limit is required.</source>
         <target state="new">Signup limit is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0ca9f7ec55c9896add6e82d2b52e9217e1140cf7" datatype="html">
         <source>Signup limit must be greater than 1.</source>
         <target state="new">Signup limit must be greater than 1.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="58c2f66ba74f1400914031ef4ed635938e9e8ced" datatype="html">
         <source>Signup limit must be a number.</source>
         <target state="new">Signup limit must be a number.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1245841647f9b42d3e7554903c1c50bdd80ab021" datatype="html">
         <source>Admin email is required.</source>
         <target state="new">Admin email is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3fd2feb77dfe57fe82573e3cdf996105e2fafc66" datatype="html">
         <source>Admin email must be valid.</source>
         <target state="new">Admin email must be valid.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f15f2e02b1f6a96553e98ea4a969045d17ec1400" datatype="html">
         <source>Transcoding threads is required.</source>
         <target state="new">Transcoding threads is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4166cc066b963a23829b48a09e394f73b453fabd" datatype="html">
         <source>Transcoding threads must be greater or equal to 0.</source>
         <target state="new">Transcoding threads must be greater or equal to 0.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="6975c8c2dac1982f393cb9a890e33ef95b758111" datatype="html">
-        <source>Index URL is required.</source>
-        <target state="new">Index URL is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      
       <trans-unit id="febc4795f39d34b901907a2718b0c5c21165eb36" datatype="html">
         <source>Index URL should be a URL</source>
         <target state="new">Index URL should be a URL</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="db7b7efed1c793079b2bf74cdfba73fed05f63ec" datatype="html">
+        <source>Search index URL should be a URL</source><target state="new">Search index URL should be a URL</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/custom-config-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b6f52e19f074f77866fa03fabe1ddd5cdae346f0" datatype="html">
         <source>Email is required.</source>
         <target state="new">Email is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-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/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bef8a36c3dffff15fb5faf3d20bdbbbc1af824c1" datatype="html">
         <source>Email must be valid.</source>
         <target state="new">Email must be valid.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-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/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ac451f128840b34804ea69c820dc3566f476fb33" datatype="html">
         <source>Your name is required.</source>
         <target state="new">Your name is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1fc4633008a2431fdec891d58efcc8b865d7de1a" datatype="html">
         <source>Your name must be at least 1 character long.</source>
         <target state="new">Your name must be at least 1 character long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c7b44b92c0ce3ccd2f804d001e13da399524e11b" datatype="html">
         <source>Your name cannot be more than 120 characters long.</source>
         <target state="new">Your name cannot be more than 120 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="73417de6b009e361996f9cd0e3b83d88bed368b6" datatype="html">
         <source>A subject is required.</source>
         <target state="new">A subject is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4f049fd004313524afeaf0ae25f98583a0ffd29b" datatype="html">
         <source>The subject must be at least 1 character long.</source>
         <target state="new">The subject must be at least 1 character long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d82f880ea1d0ee03c47bf1212a0fbcb23b3edf18" datatype="html">
         <source>The subject cannot be more than 120 characters long.</source>
         <target state="new">The subject cannot be more than 120 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="40b35cf927f9f9a59404a6c914ec4632690b69b2" datatype="html">
         <source>A message is required.</source>
         <target state="new">A message is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d8d4a23f467ee3e93ca0edb1198c233ed633cf64" datatype="html">
         <source>The message must be at least 3 characters long.</source>
         <target state="new">The message must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="07422f6141cfcabaf3c2ce77e3e063222849ef60" datatype="html">
         <source>The message cannot be more than 5000 characters long.</source>
         <target state="new">The message cannot be more than 5000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/instance-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5db300f6fba918a35597160183205ede13e8e149" datatype="html">
         <source>Username is required.</source>
         <target state="new">Username is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/login-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/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/login-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4eb39d69b74d7a56652ec84fa6826994ee26c0e5" datatype="html">
         <source>Password is required.</source>
         <target state="new">Password is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/login-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/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/login-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c90872a06666a51c2957c4b29724e68df5c67154" datatype="html">
         <source>Confirmation of the password is required.</source>
         <target state="new">Confirmation of the password is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/reset-password-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/reset-password-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6330d25a3bc6f55dfd5177da6e681d1d3b1a2b1a" datatype="html">
         <source>Username must be at least 1 character long.</source>
         <target state="new">Username must be at least 1 character long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="aaaf3d00c35f809eebc7fd68a3f7b8b0230b197a" datatype="html">
         <source>Username cannot be more than 50 characters long.</source>
         <target state="new">Username cannot be more than 50 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6f3e95be2538a22da07beaefc39bb2195683990c" datatype="html">
         <source>Username should be lowercase alphanumeric; dots and underscores are allowed.</source>
         <target state="new">Username should be lowercase alphanumeric; dots and underscores are allowed.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1fe26e49476ac701885abc59127e96a3760847f0" datatype="html">
         <source>Password must be at least 6 characters long.</source>
         <target state="new">Password must be at least 6 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0a154031f3e66985af96d5f903441cf84f0dc75e" datatype="html">
         <source>Password cannot be more than 255 characters long.</source>
         <target state="new">Password cannot be more than 255 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2db8f1f93a5485c32267762a3bf4da499832e732" datatype="html">
         <source>The new password and the confirmed password do not correspond.</source>
         <target state="new">The new password and the confirmed password do not correspond.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="abede840116d58f04a55d99a6cbd68da8a3e1bbf" datatype="html">
         <source>Video quota is required.</source>
         <target state="new">Video quota is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="93a6dc1d3aa0d3201c86ef1ec8adf5cf0ada3c80" datatype="html">
         <source>Quota must be greater than -1.</source>
         <target state="new">Quota must be greater than -1.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7e58d1fb4e86af94f5199660ef349d55811888bb" datatype="html">
         <source>Daily upload limit is required.</source>
         <target state="new">Daily upload limit is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e283cbc4469959ea664f9d545f15278e089a6f1e" datatype="html">
         <source>Daily upload limit must be greater than -1.</source>
         <target state="new">Daily upload limit must be greater than -1.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="545e77fd5d9526228a2133109447c23225ed9c85" datatype="html">
         <source>User role is required.</source>
         <target state="new">User role is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d531c2261dc0c2739bd7cbb2bb175946b7eeb3ae" datatype="html">
         <source>Description must be at least 3 characters long.</source>
         <target state="new">Description must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-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-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>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/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>
         <target state="new">Description cannot be more than 1000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-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-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>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/shared-forms/form-validators/video-playlist-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1d973f9ee250b94d31ceb5c763edcd9b255ea524" datatype="html">
         <source>You must agree with the instance terms in order to register on it.</source>
         <target state="new">You must agree with the instance terms in order to register on it.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6d2c3ebffd49b8933200a6d4e5b74712be49bf00" datatype="html">
         <source>Ban reason must be at least 3 characters long.</source>
         <target state="new">Ban reason must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="be32ff1dd6e464c5c085dd7d128316f476d2e0fd" datatype="html">
         <source>Ban reason cannot be more than 250 characters long.</source>
         <target state="new">Ban reason cannot be more than 250 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1c417b7aef730d6ef5d62fa8a0a7e25e3a2393e4" datatype="html">
         <source>Display name is required.</source>
         <target state="new">Display name is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-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-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>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/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>
         <target state="new">Display name must be at least 1 character long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-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-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>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/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>
         <target state="new">Display name cannot be more than 50 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/user-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-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/user-validators.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b3cf1889d2fdd6b15e697c270c9b80772fe2cae6" datatype="html">
         <source>Report reason is required.</source>
         <target state="new">Report reason is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="993f9f5703d449a1d467243db75253d288a2947e" datatype="html">
         <source>Report reason must be at least 2 characters long.</source>
         <target state="new">Report reason must be at least 2 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8c7d4c82b057aea5dbae811e16935f9bcae4c2aa" datatype="html">
         <source>Report reason cannot be more than 3000 characters long.</source>
         <target state="new">Report reason cannot be more than 3000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2fa41debd17a206d4a2a5e8d14bcd7055f6e5118" datatype="html">
         <source>Moderation comment is required.</source>
         <target state="new">Moderation comment is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="82e31d0837eaa69a4364e7434d253ce138b3c5c2" datatype="html">
         <source>Moderation comment must be at least 2 characters long.</source>
         <target state="new">Moderation comment must be at least 2 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="23c1c2e105a98b0b6728949418a256b026b8971c" datatype="html">
         <source>Moderation comment cannot be more than 3000 characters long.</source>
         <target state="new">Moderation comment cannot be more than 3000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="94b831c7e3684258f88e099c6cd3b8f73f8a2de6" datatype="html">
         <source>The channel is required.</source>
         <target state="new">The channel is required.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-accept-ownership-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="b19eeb7380a6bbb6dd791afdb262107749d8b990" datatype="html">
+        <source>Block reason must be at least 2 characters long.</source><target state="new">Block reason must be at least 2 characters long.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-accept-ownership-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="0776b05d442a0a16f083a5eefa52a166b9d514ca" datatype="html">
-        <source>Blacklist reason must be at least 2 characters long.</source>
-        <target state="new">Blacklist reason must be at least 2 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-blacklist-validators.service.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-block-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="5009443905b0b152915247799492bf5e164e7626" datatype="html">
-        <source>Blacklist reason cannot be more than 300 characters long.</source>
-        <target state="new">Blacklist reason cannot be more than 300 characters long.</target>
+      </trans-unit><trans-unit id="5ac23ab9399b1bf51cd2c71b033a3beec5b6d9f7" datatype="html">
+        <source>Block reason cannot be more than 300 characters long.</source><target state="new">Block reason cannot be more than 300 characters long.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-blacklist-validators.service.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-block-validators.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      
+      
       <trans-unit id="c9eadf8830b3bc09bd444d739af86414eed9bd9e" datatype="html">
         <source>Video caption language is required.</source>
         <target state="new">Video caption language is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-captions-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-captions-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="82083ae96724851ff37e1c7e4e9f907c25677963" datatype="html">
         <source>Video caption file is required.</source>
         <target state="new">Video caption file is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-captions-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-captions-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bd7fc070c728dc6dbf3959d49fe5bb27ce15d294" datatype="html">
         <source>The username is required.</source>
         <target state="new">The username is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-change-ownership-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-change-ownership-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c8465c3773699dd075e0147e264d2e232f605803" datatype="html">
         <source>You can only transfer ownership to a local account</source>
         <target state="new">You can only transfer ownership to a local account</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-change-ownership-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-change-ownership-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="541087322c34e8b26954fd67ff4fc80d1a6c1b33" datatype="html">
         <source>Name is required.</source>
         <target state="new">Name is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b8b59b6284a14fc71268cf722ed98c62c5af4a76" datatype="html">
         <source>Name must be at least 1 character long.</source>
         <target state="new">Name must be at least 1 character long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e14cd37d29f13eac7384c339e4f1df58d96e4e3d" datatype="html">
         <source>Name cannot be more than 50 characters long.</source>
         <target state="new">Name cannot be more than 50 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="135185da003b14cbb69521f570fa617a00bbbe18" datatype="html">
         <source>Name should be lowercase alphanumeric; dots and underscores are allowed.</source>
         <target state="new">Name should be lowercase alphanumeric; dots and underscores are allowed.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b" datatype="html">
         <source>Support text must be at least 3 characters long.</source>
         <target state="new">Support text must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="15ec53d9ee65cb930c5f5d10ae2e8dd3fd44fc85" datatype="html">
         <source>Support text cannot be more than 1000 characters long.</source>
         <target state="new">Support text cannot be more than 1000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-channel-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6ca60e0f6dfbc0073b0514bce7d273150b0b9e79" datatype="html">
         <source>Comment is required.</source>
         <target state="new">Comment is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-comment-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-comment-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f5a94cae76685e72f33541b977efdd7845cb0ed6" datatype="html">
         <source>Comment must be at least 2 characters long.</source>
         <target state="new">Comment must be at least 2 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-comment-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-comment-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7c194080446ee6901fd17a8b8648534ffe98b123" datatype="html">
         <source>Comment cannot be more than 3000 characters long.</source>
         <target state="new">Comment cannot be more than 3000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-comment-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-comment-validators.service.ts</context><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>
         <target state="new">Display name cannot be more than 120 characters long.</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Privacy is required.</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">The channel is required when the playlist is public.</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Video name is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c27cc734f76efd221663921dd0898ea7c8bcbb5c" datatype="html">
         <source>Video name must be at least 3 characters long.</source>
         <target state="new">Video name must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0320d0f7f8eec2341e27ca53d7875217a3d99695" datatype="html">
         <source>Video name cannot be more than 120 characters long.</source>
         <target state="new">Video name cannot be more than 120 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a627c58cf1849d7d838696e7f36c1bae1a8b31a4" datatype="html">
         <source>Video privacy is required.</source>
         <target state="new">Video privacy is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="97afb789c1ab09074495d49aaadb92a1c3e71a16" datatype="html">
         <source>Video channel is required.</source>
         <target state="new">Video channel is required.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="af5e2d5f3ac817c735fb7ff9ca16322789f66fef" datatype="html">
         <source>Video description must be at least 3 characters long.</source>
         <target state="new">Video description must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ce28a9403c2d7e5da2e59af27118f8b6d109e906" datatype="html">
         <source>Video description cannot be more than 10000 characters long.</source>
         <target state="new">Video description cannot be more than 10000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f1cffdc2e156716cd9880201d65ba457d11464f8" datatype="html">
         <source>A tag should be more than 2 characters long.</source>
         <target state="new">A tag should be more than 2 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="34a0811f9a2a7366cc9efcdad52ea59b105326ea" datatype="html">
         <source>A tag should be less than 30 characters long.</source>
         <target state="new">A tag should be less than 30 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="665092574f9af9fec262f8349b67b14192391ae6" datatype="html">
         <source>Video support must be at least 3 characters long.</source>
         <target state="new">Video support must be at least 3 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f17de746af56840511cae11559539b6d8b6955ad" datatype="html">
         <source>Video support cannot be more than 1000 characters long.</source>
         <target state="new">Video support cannot be more than 1000 characters long.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="453413bf387dea681958871319bab489dd5e6ec0" datatype="html">
         <source>A date is required to schedule video update.</source>
         <target state="new">A date is required to schedule video update.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-validators.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/video-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3b7ed22d0730d03b38c254332829d855ee7256c4" datatype="html">
         <source>This file is too large.</source>
         <target state="new">This file is too large.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/reactive-file.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/reactive-file.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2f5f2093f14679fed82ff76a0cd2a28145a83ca9" datatype="html">
         <source>PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>.</source>
         <target state="new">PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/forms/reactive-file.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/reactive-file.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0bf41abaa85526711f7952b4600e4044bc7f04a4" datatype="html">
         <source>All unsaved data will be lost, are you sure you want to leave this page?</source>
         <target state="new">All unsaved data will be lost, are you sure you want to leave this page?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/guards/can-deactivate-guard.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/routing/can-deactivate-guard.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8339364b054610983b7f2334bb807fff7613bddf" datatype="html">
         <source>Sunday</source>
         <target state="new">Sunday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a43c57a7cbebf57eb33a2eae5e994c91d9887596" datatype="html">
         <source>Monday</source>
         <target state="new">Monday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="48a2a35957ce394eb2c59ae35c99642360af70ee" datatype="html">
         <source>Tuesday</source>
         <target state="new">Tuesday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b0af441f9ba8b82952b9ec10fb8c62e8fec67df9" datatype="html">
         <source>Wednesday</source>
         <target state="new">Wednesday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="55c583b99c809818ec27df065ccf05357a6ac10b" datatype="html">
         <source>Thursday</source>
         <target state="new">Thursday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e91b54925dc5f490753f60f53ef6f8b4609e6215" datatype="html">
         <source>Friday</source>
         <target state="new">Friday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c0d2dd391a3eca8e841a5d0e035cd268280eb68e" datatype="html">
         <source>Saturday</source>
         <target state="new">Saturday</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6549890cd0d6b59fb0e1aa383b00483a68a55eef" datatype="html">
         <source>Sun</source>
         <target state="new">Sun</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3382aa5d7f520e197fb59a4995fe1beffca2d0ff" datatype="html">
         <source>Mon</source>
         <target state="new">Mon</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f883ec926274974df0fc46c037cbffd6a863ebc9" datatype="html">
         <source>Tue</source>
         <target state="new">Tue</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="242b4f4b5651e24f9a9007ef153a57981e4b989d" datatype="html">
         <source>Wed</source>
         <target state="new">Wed</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5a2c39d56b8f00a6a4670a63b53caacbda953be6" datatype="html">
         <source>Thu</source>
         <target state="new">Thu</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4cdf23d523a0e52e0dec9cd650ffd9bd6952792c" datatype="html">
         <source>Fri</source>
         <target state="new">Fri</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1283d165a942d7f4c469ba34f99dbb9e927d0261" datatype="html">
         <source>Sat</source>
         <target state="new">Sat</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2fba8448ff13105c57665a9a6ffcfe9615d855dd" datatype="html">
         <source>Su</source>
         <target state="new">Su</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="388144af7ac7651d2615b9be0e84f43ae71d9fb3" datatype="html">
         <source>Mo</source>
         <target state="new">Mo</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d96313e42b5f0751ce2676a31d309b4d322ab462" datatype="html">
         <source>Tu</source>
         <target state="new">Tu</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="06cc3d39f78c0615b707cef39cd4875599611fef" datatype="html">
         <source>We</source>
         <target state="new">We</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="790894436cca9d675d59be9a8aafd58acccde2cd" datatype="html">
         <source>Th</source>
         <target state="new">Th</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="42dfe37169f8471367c31489155229bbe1747ea5" datatype="html">
         <source>Fr</source>
         <target state="new">Fr</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1b64ea3e04ceeb512e8974eb0019dee4f211c7a0" datatype="html">
         <source>Sa</source>
         <target state="new">Sa</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Day name min</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e7815f1c4a6d3cc157a16407a48865023cc35ec0" datatype="html">
         <source>January</source>
         <target state="new">January</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0393a96b58df82af39a2ec83deec624749e42036" datatype="html">
         <source>February</source>
         <target state="new">February</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ea41ee3743ec5bdbbf863ab793bbdd6e6d9af96e" datatype="html">
         <source>March</source>
         <target state="new">March</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b87ee784d9e93b5557aca9bdc9464dbd4328920a" datatype="html">
         <source>April</source>
         <target state="new">April</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="862da1034ac2707cc44123ed963b2f42109b6b3e" datatype="html">
         <source>May</source>
         <target state="new">May</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2f234249d4c3c39e27c0f05d4a6b73a7959caeb2" datatype="html">
         <source>June</source>
         <target state="new">June</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="11447f95e83c8de675ab6c492150f88e4d9bd15e" datatype="html">
         <source>July</source>
         <target state="new">July</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ddd9a3d59a8db4e822e54e9473c05b571aca9829" datatype="html">
         <source>August</source>
         <target state="new">August</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e21dc41f9b3fdaf35ab6b2d9e2e5e8a926fb1938" datatype="html">
         <source>September</source>
         <target state="new">September</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="71f49c502d13e22079a958a5532afa28dbe98b3b" datatype="html">
         <source>October</source>
         <target state="new">October</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="64b5ce921faa5e3d277d6d528ddcfc8c2bfe9f52" datatype="html">
         <source>November</source>
         <target state="new">November</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2006e2aabb31714ebc684dc382539649f690ed5c" datatype="html">
         <source>December</source>
         <target state="new">December</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8270e687cfb5624b3f6fbb7991a2e916c96464b7" datatype="html">
         <source>Jan</source>
         <target state="new">Jan</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="23544170afbb981dd52750b641576841cf5dcf60" datatype="html">
         <source>Feb</source>
         <target state="new">Feb</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1f14355742459b7d6a0126a1564e1c18f39f86e7" datatype="html">
         <source>Mar</source>
         <target state="new">Mar</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="964a5f032bc846d32806a4838580a4f81cf14463" datatype="html">
         <source>Apr</source>
         <target state="new">Apr</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8f7274f606f71d9290ed01c5683092d701632d7f" datatype="html">
         <source>Jun</source>
         <target state="new">Jun</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7c3d8318d6d8d9920ae0a80350616732c33a3211" datatype="html">
         <source>Jul</source>
         <target state="new">Jul</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="be1335ffd1c606321e2c020b638dd3c84b434212" datatype="html">
         <source>Aug</source>
         <target state="new">Aug</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4f739d03be1c936c58978739c317d91566348204" datatype="html">
         <source>Sep</source>
         <target state="new">Sep</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6607cacb987a588530a13de7018d959240d19153" datatype="html">
         <source>Oct</source>
         <target state="new">Oct</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e597400ded12a366855615e18fcc8f9ac05b72e0" datatype="html">
         <source>Nov</source>
         <target state="new">Nov</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="adf2dfa2a9cb490d6a4a74510b7b0846b62d429e" datatype="html">
         <source>Dec</source>
         <target state="new">Dec</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Month name short</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46" datatype="html">
         <source>Clear</source>
         <target state="new">Clear</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8fb519ba47ea7806beeacdcd44829d85a2aa0cc5" datatype="html">
         <source>yy-mm-dd</source>
         <target state="new">yy-mm-dd </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        
         <note priority="1" from="description">Date format in this locale.</note>
-      </trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c09a68321f26f058b547021e6e2c167ae22c6e24" datatype="html">
         <source>Hidden</source>
         <target state="new">Hidden</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Blurred with confirmation request</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Displayed</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7296e9f7cc4956b6d57c541728b0826e76d108ba" datatype="html">
         <source>~ <x id="INTERPOLATION" equiv-text="{{minutes}}"/> <x id="ICU" equiv-text="{minutes, plural, =1 {...} other {...}}"/></source>
         <target state="new">~ <x id="INTERPOLATION" equiv-text="{{minutes}}"/> <x id="ICU" equiv-text="{minutes, plural, =1 {...} other {...}}"/></target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="cf9ddbb55b25178660e09346209aedc10108aa24" datatype="html">
         <source>{VAR_PLURAL, plural, =1 {minute} other {minutes} }</source>
         <target state="new">{VAR_PLURAL, plural, =1 {minute} other {minutes} }</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="10ffa5c3dbcee491d66f80d8d4dce3e119a6ec86" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of full HD videos</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of full HD videos</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="344ddae9f45b344e98e7b28cd5e33243982700f8" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="435c012df6dd990a1ccb7ee73dd79c488bde28b5" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-instance/instance-features-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="b465014f22a020c312b0eb26be64008e368ff618" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{name}}"/> (channel page)</source><target state="new"><x id="INTERPOLATION" equiv-text="{{name}}"/> (channel page)</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/instance/instance-features-table.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="457f161d3ca706b8de263b0cd58e493d54e7d4c5" datatype="html">
-        <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Markdown<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> compatible that supports:</source>
-        <target state="new"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Markdown<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> compatible that supports:</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="ab4426b60f13c00b61d6b714d390dc629f314980" datatype="html">
-        <source>Emphasis</source>
-        <target state="new">Emphasis</target>
+      </trans-unit><trans-unit id="2ae54a1b18fc8315f431aecc74f58fb12f066231" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{name}}"/> (account page)</source><target state="new"><x id="INTERPOLATION" equiv-text="{{name}}"/> (account page)</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="457f161d3ca706b8de263b0cd58e493d54e7d4c5" datatype="html">
+        <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Markdown<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> compatible that supports:</source>
+        <target state="new"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Markdown<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> compatible that supports:</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="ab4426b60f13c00b61d6b714d390dc629f314980" datatype="html">
+        <source>Emphasis</source>
+        <target state="new">Emphasis</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="dc60677d5a906e69f38a5cf9da7f2eb03931bea0" datatype="html">
         <source>Links</source>
         <target state="new">Links</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="80220239e07f36ea8d5f10118dc52ce4b13bc15a" datatype="html">
         <source>New lines</source>
         <target state="new">New lines</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b15e7bec5c7833d2d9634946ccbed68967b1bee1" datatype="html">
         <source>Lists</source>
         <target state="new">Lists</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b73f7f5060fb22a1e9ec462b1bb02493fa3ab866" datatype="html">
         <source>Images</source>
         <target state="new">Images</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/misc/help.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f9b4f2d8146c789cd40314f640ec4e88efbaf681" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{num}}"/> users banned.</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{num}}"/> users banned.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3ab99e62550869aebc85661fca2faf46785263dd" datatype="html">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> banned.</source>
         <target state="new">User <x id="INTERPOLATION" equiv-text="{{username}}"/> banned.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-ban-modal.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="faafee0c03ad25c8a43aa91bd5d98185b67ff734" datatype="html">
         <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</source>
         <target state="new">Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="925ba9946b7b256a586f0fcbe3e04fa7a0dee7bd" datatype="html">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> unbanned.</source>
         <target state="new">User <x id="INTERPOLATION" equiv-text="{{username}}"/> unbanned.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ad07d34d4aadfe03c964cec02ca1d3a921e6b603" datatype="html">
         <source>If you remove this user, you will not be able to create another with the same username!</source>
         <target state="new">If you remove this user, you will not be able to create another with the same username!</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="28220fae6799ab98ef6b41af449aa9680082357a" datatype="html">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> deleted.</source>
         <target state="new">User <x id="INTERPOLATION" equiv-text="{{username}}"/> deleted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="534202c90c6dcadd2989fc72c5030d5483e26096" datatype="html">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> email set as verified</source>
         <target state="new">User <x id="INTERPOLATION" equiv-text="{{username}}"/> email set as verified</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="33a6319f765848a22a155cef9f1d8e645202e249" datatype="html">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</source>
         <target state="new">Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="086eda792aeb1b0d131d633b50fdd1792f5f24c6" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bb72d6d1219e89d182e9fd09d853d83baf8d6499" datatype="html">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</source>
         <target state="new">Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="88aea4de1e1b6ebea31b665286b388d0efb3a84b" datatype="html">
         <source>Mute server</source>
         <target state="new">Mute server</target>
@@ -10189,491 +9230,376 @@
       <trans-unit id="8686834bc4afe42c1991c6c18f0bce174a0e17a6" datatype="html">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by the instance.</source>
         <target state="new">Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by the instance.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="35d3509161861a610b0895bf084c781e56ba2830" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="978aeec5613fa97e8a5336d3599cebb23ee5a90f" datatype="html">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</source>
         <target state="new">Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit><trans-unit id="e15db422c8eb20c7b5bfabf40b189469c5c98fa6" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="e15db422c8eb20c7b5bfabf40b189469c5c98fa6" datatype="html">
         <source>Are you sure you want to remove all the comments of this account?</source><target state="new">Are you sure you want to remove all the comments of this account?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit><trans-unit id="52f803962375daf7fc526ec0ee14a050c3d534c1" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="52f803962375daf7fc526ec0ee14a050c3d534c1" datatype="html">
         <source>Delete account comments</source><target state="new">Delete account comments</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit><trans-unit id="2100e5e8263ed1516f0160f2fe2acecc6f571fdd" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="2100e5e8263ed1516f0160f2fe2acecc6f571fdd" datatype="html">
         <source>Will remove comments of this account (may take several minutes).</source><target state="new">Will remove comments of this account (may take several minutes).</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="632e8b20c98e8eec4059a605a4b011bb476137af" datatype="html">
         <source>Edit user</source>
         <target state="new">Edit user</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f140baf295648e021385e7dd57fbbc7cee4ad4e6" datatype="html">
         <source>Change quota, role, and more.</source>
         <target state="new">Change quota, role, and more.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="95b95a9c79e4fd9ed41f6855e37b3b06af25bcab" datatype="html">
         <source>Delete user</source>
         <target state="new">Delete user</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="9b19e922648045e849419204513fe029db427b46" datatype="html">
         <source>Unban user</source>
         <target state="new">Unban user</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f7044a58ed834f7380eaac0e670dc817b19d9209" datatype="html">
         <source>Allow the user to login and create videos/comments again</source>
         <target state="new">Allow the user to login and create videos/comments again</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4a09bf8724e7659fbb5ec33647529cdef7614bdc" datatype="html">
         <source>Mute this account</source>
         <target state="new">Mute this account</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5f4ea46bfaffa09963d51fa969cb45b82a3c377f" datatype="html">
         <source>Hide any content from that user for you.</source>
         <target state="new">Hide any content from that user for you.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d666ca3261aef72b2ddcd649d7b32af488f59952" datatype="html">
         <source>Unmute this account</source>
         <target state="new">Unmute this account</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="896713adfa81db9a514ba3214ea1b9a7b59543bb" datatype="html">
         <source>Show back content from that user for you.</source>
         <target state="new">Show back content from that user for you.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="e17218983b1de76e5a920b04e1c2ecbdb6e3e06d" datatype="html">
         <source>Mute the instance</source>
         <target state="new">Mute the instance</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b67a9b47f49012501f2aa71c74d7fccc9e331cdb" datatype="html">
         <source>Hide any content from that instance for you.</source>
         <target state="new">Hide any content from that instance for you.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a23514d8aca2f8633622dda0e86b399dc576a2b9" datatype="html">
         <source>Unmute the instance</source>
         <target state="new">Unmute the instance</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7e80d54718404d853b9e51a3b8d5210a2bedaf6f" datatype="html">
         <source>Show back content from that instance for you.</source>
         <target state="new">Show back content from that instance for you.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="4df4e5587ea8aae55e12a63a63a14c201f5f1114" datatype="html">
+        <source>Remove comments from your videos</source><target state="new">Remove comments from your videos</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="4e53f57167a98f31ea7148dc310352018670e56d" datatype="html">
+        <source>Remove comments of this account from your videos.</source><target state="new">Remove comments of this account from your videos.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="4e4107055b44eee44b6954c41120de1cb4d46432" datatype="html">
+        <source>Mute this account by your instance</source>
+        <target state="new">Mute this account by your instance</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="ec993f2e1ecd979ff28871591b6f253afb3b3138" datatype="html">
+        <source>Hide any content from that user for you, your instance and its users.</source>
+        <target state="new">Hide any content from that user for you, your instance and its users.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="a51c59cb5ecb7004a6a8ddd2855b5c52266ad957" datatype="html">
+        <source>Unmute this account by your instance</source>
+        <target state="new">Unmute this account by your instance</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="a50c42119c5ffaa4ecb61e996c432f1ab0f8d0ff" datatype="html">
+        <source>Show back content from that user for you, your instance and its users.</source>
+        <target state="new">Show back content from that user for you, your instance and its users.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="588073e831cec240d6bb0db0b133e45dab69f178" datatype="html">
+        <source>Mute the instance by your instance</source>
+        <target state="new">Mute the instance by your instance</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="1a4ed1f8e28636212f1bcf06c36644d2627b682a" datatype="html">
+        <source>Hide any content from that instance for you, your instance and its users.</source>
+        <target state="new">Hide any content from that instance for you, your instance and its users.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="676221cdabd4805901343976988c028dbf71b20a" datatype="html">
+        <source>Unmute the instance by your instance</source>
+        <target state="new">Unmute the instance by your instance</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="d97d7d9b0c359f7b900652b547678841369691b1" datatype="html">
+        <source>Show back content from that instance for you, your instance and its users.</source>
+        <target state="new">Show back content from that instance for you, your instance and its users.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="f0442400e6f0859203b6c6e46c394cf5d922d881" datatype="html">
+        <source>Remove comments from your instance</source><target state="new">Remove comments from your instance</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="3d149a4d28670f94abf5130b9c4b125fe359a2f0" datatype="html">
+        <source>Remove comments of this account from your instance.</source><target state="new">Remove comments of this account from your instance.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="75f9d13b8aa48da40b53265afe4826b7c590fede" datatype="html">
+        <source>Violent or repulsive</source><target state="new">Violent or repulsive</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit><trans-unit id="4df4e5587ea8aae55e12a63a63a14c201f5f1114" datatype="html">
-        <source>Remove comments from your videos</source><target state="new">Remove comments from your videos</target>
+      </trans-unit><trans-unit id="4c78954b2e1a4c2a457fd10f87ac398a86db88f3" datatype="html">
+        <source>Contains offensive, violent, or coarse language or iconography.</source><target state="new">Contains offensive, violent, or coarse language or iconography.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit><trans-unit id="4e53f57167a98f31ea7148dc310352018670e56d" datatype="html">
-        <source>Remove comments of this account from your videos.</source><target state="new">Remove comments of this account from your videos.</target>
+      </trans-unit><trans-unit id="da98842df682acde758f4b18f4d67c43c8f2885b" datatype="html">
+        <source>Hateful or abusive</source><target state="new">Hateful or abusive</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="4e4107055b44eee44b6954c41120de1cb4d46432" datatype="html">
-        <source>Mute this account by your instance</source>
-        <target state="new">Mute this account by your instance</target>
+      </trans-unit><trans-unit id="338b2cbcea511d70613c96bbe942b9e2c4714cf1" datatype="html">
+        <source>Contains abusive, racist or sexist language or iconography.</source><target state="new">Contains abusive, racist or sexist language or iconography.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="ec993f2e1ecd979ff28871591b6f253afb3b3138" datatype="html">
-        <source>Hide any content from that user for you, your instance and its users.</source>
-        <target state="new">Hide any content from that user for you, your instance and its users.</target>
+      </trans-unit><trans-unit id="d540707e326c991a0b2eb05fe78ae5431c7b5f61" datatype="html">
+        <source>Spam, ad or false news</source><target state="new">Spam, ad or false news</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="a51c59cb5ecb7004a6a8ddd2855b5c52266ad957" datatype="html">
-        <source>Unmute this account by your instance</source>
-        <target state="new">Unmute this account by your instance</target>
+      </trans-unit><trans-unit id="9674483c674382618788ffabbc7c09c043f1db12" datatype="html">
+        <source>Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.</source><target state="new">Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="a50c42119c5ffaa4ecb61e996c432f1ab0f8d0ff" datatype="html">
-        <source>Show back content from that user for you, your instance and its users.</source>
-        <target state="new">Show back content from that user for you, your instance and its users.</target>
+      </trans-unit><trans-unit id="697e6f711173360c87a384af631fc8f13cd3d827" datatype="html">
+        <source>Privacy breach or doxxing</source><target state="new">Privacy breach or doxxing</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="588073e831cec240d6bb0db0b133e45dab69f178" datatype="html">
-        <source>Mute the instance by your instance</source>
-        <target state="new">Mute the instance by your instance</target>
+      </trans-unit><trans-unit id="a66c468cd15cd1c28f5116cf84371e5bbbd2a1ed" datatype="html">
+        <source>Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).</source><target state="new">Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="1a4ed1f8e28636212f1bcf06c36644d2627b682a" datatype="html">
-        <source>Hide any content from that instance for you, your instance and its users.</source>
-        <target state="new">Hide any content from that instance for you, your instance and its users.</target>
+      </trans-unit><trans-unit id="39820eec05bfb636e49daf19c3180d8951a8f4db" datatype="html">
+        <source>Intellectual property violation</source><target state="new">Intellectual property violation</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="676221cdabd4805901343976988c028dbf71b20a" datatype="html">
-        <source>Unmute the instance by your instance</source>
-        <target state="new">Unmute the instance by your instance</target>
+      </trans-unit><trans-unit id="90c817d59a020301296c13bc7b5afbc499f38861" datatype="html">
+        <source>Infringes my intellectual property or copyright, wrt. the regional rules with which the server must comply.</source><target state="new">Infringes my intellectual property or copyright, wrt. the regional rules with which the server must comply.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="d97d7d9b0c359f7b900652b547678841369691b1" datatype="html">
-        <source>Show back content from that instance for you, your instance and its users.</source>
-        <target state="new">Show back content from that instance for you, your instance and its users.</target>
+      </trans-unit><trans-unit id="3732f37956e36cea2271d2333b8b04a6ad417274" datatype="html">
+        <source>Breaks server rules</source><target state="new">Breaks server rules</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit><trans-unit id="f0442400e6f0859203b6c6e46c394cf5d922d881" datatype="html">
-        <source>Remove comments from your instance</source><target state="new">Remove comments from your instance</target>
+      </trans-unit><trans-unit id="32bf825b15b1d2888142514301b91454f23e82a5" datatype="html">
+        <source>Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.</source><target state="new">Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit><trans-unit id="3d149a4d28670f94abf5130b9c4b125fe359a2f0" datatype="html">
-        <source>Remove comments of this account from your instance.</source><target state="new">Remove comments of this account from your instance.</target>
+      </trans-unit><trans-unit id="027a3589ca1b92b000b183e249d9d7bea1dce727" datatype="html">
+        <source>The above can only be seen in thumbnails.</source><target state="new">The above can only be seen in thumbnails.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="0c0f5bbcd2386018ec057877f9d3c5c2c9880cac" datatype="html">
-        <source>Request is too large for the server. Please contact you administrator if you want to increase the limit size.</source>
-        <target state="new">Request is too large for the server. Please contact you administrator if you want to increase the limit size.</target>
+      </trans-unit><trans-unit id="148c963c0ecee2b9e6c8ce11e70ae62e36efaa36" datatype="html">
+        <source>The above can only be seen in captions (please describe which).</source><target state="new">The above can only be seen in captions (please describe which).</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/rest/rest-extractor.service.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="0c0f5bbcd2386018ec057877f9d3c5c2c9880cac" datatype="html">
+        <source>Request is too large for the server. Please contact you administrator if you want to increase the limit size.</source>
+        <target state="new">Request is too large for the server. Please contact you administrator if you want to increase the limit size.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/rest/rest-extractor.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="58546fd4d14b2d9635ce3d28c216ac68587bb25b" datatype="html">
         <source>Too many attempts, please try again after <x id="INTERPOLATION" equiv-text="{{minutesLeft}}"/> minutes.</source>
         <target state="new">Too many attempts, please try again after <x id="INTERPOLATION" equiv-text="{{minutesLeft}}"/> minutes.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/rest/rest-extractor.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/rest/rest-extractor.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ab783a52f2df9ff7a20139cab0da6d0764f3cc5d" datatype="html">
         <source>Too many attempts, please try again later.</source>
         <target state="new">Too many attempts, please try again later.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/rest/rest-extractor.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/rest/rest-extractor.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0f286a597f0053c3578a52e044769c204ee516fc" datatype="html">
         <source>Server error. Please retry later.</source>
         <target state="new">Server error. Please retry later.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/rest/rest-extractor.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/rest/rest-extractor.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4104d2ac06bd0103868795086100a871c8dbeb49" datatype="html">
         <source>Subscribed to all current channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</source>
         <target state="new">Subscribed to all current channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="71470cde6d46e469ed84c0c77b9662685cc830ab" datatype="html">
         <source>Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</source>
         <target state="new">Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1cadbf82f0e91611321c5abd282f0c23d8ccbfa1" datatype="html">
         <source>Subscribed</source>
         <target state="new">Subscribed</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3bd3791d3b0ab933981a0b884396af74b0c95e2a" datatype="html">
         <source>Unsubscribed from all channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></source>
         <target state="new">Unsubscribed from all channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3e7735fa326fcdc9e1188b6d9ff4b4329312fc26" datatype="html">
         <source>Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></source>
         <target state="new">Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="294395337b767af84f952ac28d58d54a13a11471" datatype="html">
         <source>Unsubscribed</source>
         <target state="new">Unsubscribed</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-user-subscription/subscribe-button.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="38c877fb0a5fdcadc379256953ad2d1eb8233fdf" datatype="html">
         <source>Moderator</source>
         <target state="new">Moderator</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/users/user.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/core/users/user.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5034e84fab7cd3d662d2483753e33caea0774b78" datatype="html">
         <source>Video removed from <x id="INTERPOLATION" equiv-text="{{name}}"/></source>
         <target state="new">Video removed from <x id="INTERPOLATION" equiv-text="{{name}}"/></target>
-        <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>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/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 <x id="INTERPOLATION" equiv-text="{{n}}"/> at timestamps <x id="INTERPOLATION_1" equiv-text="{{t}}"/></source>
         <target state="new">Video added in <x id="INTERPOLATION" equiv-text="{{n}}"/> at timestamps <x id="INTERPOLATION_1" equiv-text="{{t}}"/></target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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 <x id="INTERPOLATION" equiv-text="{{n}}"/></source>
         <target state="new">Video added in <x id="INTERPOLATION" equiv-text="{{n}}"/></target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Timestamps updated</target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new">Starts at </target>
-        <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>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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/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>
         <target state="new">Stops at </target>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/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>
         <target state="new"> and stops at </target>
-        <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="73c33d602da89a33d353d686f36c2fff39f0aee3" datatype="html">
-        <source>Video blacklisted.</source>
-        <target state="new">Video blacklisted.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-blacklist.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
-      <trans-unit id="c93a80b6a7d903886843ac3719b34b1794de171f" datatype="html">
-        <source>Unblacklist video</source>
-        <target state="new">Unblacklist video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="9382291d6ebed56e5ae95e020d6b91f39cff468a" datatype="html">
-        <source>Video unblacklisted.</source>
-        <target state="new">Video unblacklisted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-playlist/video-playlist-element-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      
+      
+      
       <trans-unit id="19e5e5956502d977d5dd28fe86cee763d5db2b77" datatype="html">
         <source>Delete video</source>
         <target state="new">Delete video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5f316500cde1925ffcdf053a7427b44795161f4e" datatype="html">
         <source>Encoder</source>
         <target state="new">Encoder</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c01d52b4f10668adeded397b0b1a9a4bfefd4f37" datatype="html">
         <source>Format name</source>
         <target state="new">Format name</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="7faaaa08f56427999f3be41df1093ce4089bbd75" datatype="html">
         <source>Size</source>
         <target state="new">Size</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c1226821b3c276dc443b3e5a2dce10e14dcd6244" datatype="html">
         <source>Bitrate</source>
         <target state="new">Bitrate</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="205c33d626f4654f36d9d7dcea6f9d9e9b2a7ec7" datatype="html">
         <source>Codec</source>
         <target state="new">Codec</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ef90545bc832876c0d7f9a10363c75137472bbb5" datatype="html">
         <source>Copied</source>
         <target state="new">Copied</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/forms/input-readonly-copy.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/modals/video-download.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/input-readonly-copy.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="fa2601e52cbf5725a13d33fe14458823b882ea50" datatype="html">
         <source>Video reported.</source>
         <target state="new">Video reported.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/modals/video-report.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/video-report.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f1abd89c9280323209e939fa9c30f6e5cda20c95" datatype="html">
         <source>Do you really want to delete this video?</source>
         <target state="new">Do you really want to delete this video?</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a36503b80133639322bcdb973f78bcadbd86b798" datatype="html">
         <source>Video deleted.</source>
         <target state="new">Video deleted.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-block-list/video-block-list.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f145e822837d0d1f741db7540dc6cb1cdacd8220" datatype="html">
         <source>Actions for the reporter</source>
         <target state="new">Actions for the reporter</target>
@@ -10693,498 +9619,319 @@
       <trans-unit id="c3ca1344a9cd638109e09c125e5185c1da3ca39c" datatype="html">
         <source>This video will be duplicated by your instance.</source>
         <target state="new">This video will be duplicated by your instance.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="7f5d0c10614e8a34f0e2dad33a0568277c50cf69" datatype="html">
+        <source>Block</source><target state="new">Block</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0f829293d953936450158c2dd7b483d6b960ed2b" datatype="html">
         <source>Save to playlist</source>
         <target state="new">Save to playlist</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
-      <trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61" datatype="html">
-        <source>Blacklist</source>
-        <target state="new">Blacklist</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      
       <trans-unit id="5bad8678a5115610ba1bf56a35256a13e6b07a7b" datatype="html">
         <source>Mirror</source>
         <target state="new">Mirror</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-actions-dropdown.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a" datatype="html">
         <source>Report</source>
         <target state="new">Report</target>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context><context context-type="linenumber">54</context></context-group>
-      </trans-unit>
-      <trans-unit id="5c54befce78d70e20c215f10a00e617245f53bc9" datatype="html">
-        <source>Note</source>
-        <target state="new">Note</target>
+      </trans-unit><trans-unit id="08a52c67462389568cf14a021ddecc0aedaa9613" datatype="html">
+        <source>Reported part</source><target state="new">Reported part</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5c54befce78d70e20c215f10a00e617245f53bc9" datatype="html">
+        <source>Note</source>
+        <target state="new">Note</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context><context context-type="linenumber">77</context></context-group></trans-unit>
       <trans-unit id="1d3402b0e60154aaa071f390c63437b701d9048c" datatype="html">
         <source>The video was deleted</source>
         <target state="new">The video was deleted</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="076960cf44b4a0e89cc5024a75963844b068b284" datatype="html">
-        <source>The video was blacklisted</source>
-        <target state="new">The video was blacklisted</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
+      
       <trans-unit id="dd9f3264feed4935008861c15d81c947124e4ac3" datatype="html">
         <source>Published</source>
         <target state="new">Published</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8e6d54c4f760d9e90518eef5334211c48c0b71e2" datatype="html">
         <source>Publication scheduled on</source>
         <target state="new">Publication scheduled on </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="4a7e91ebe1cf184db5f2bfecf9c16ff81c9e2c02" datatype="html">
         <source>Waiting transcoding</source>
         <target state="new">Waiting transcoding</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="21f1c9d5c67346c830aced4f670045fcf0aeb83a" datatype="html">
         <source>To transcode</source>
         <target state="new">To transcode</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="289fe8342e8b7df689c75026a24a60fd7f5e9392" datatype="html">
         <source>To import</source>
         <target state="new">To import</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="b41da527dd2f804519e13b78b5dae42897213545" datatype="html">
         <source>Add to watch later</source>
         <target state="new">Add to watch later</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-thumbnail.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-thumbnail/video-thumbnail.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2660edf82b9bf5d6ee25fbefd3bbb23172687ccc" datatype="html">
         <source>Remove from watch later</source>
         <target state="new">Remove from watch later</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video-thumbnail.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-thumbnail/video-thumbnail.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>
         <target state="new">Only I can see this video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/video/video.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="17b62592e5fcabb5235bb25c4883a827ab37cf70" datatype="html">
         <source>Only people with the private link can see this video</source>
         <target state="new">Only people with the private link can see this video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/video/video.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="15be15cbdc6e960f57e801f457c19165ab39632b" datatype="html">
         <source>Anyone can see this video</source>
         <target state="new">Anyone can see this video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/video/video.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ed3394ad721212bca2a1da43ad6063b6d4f9a008" datatype="html">
         <source>Only users of this instance can see this video</source>
         <target state="new">Only users of this instance can see this video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/video.service.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/video/video.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="320c9c3482a0ebe46da42ce9e0cbdc5ba26ea8bb" datatype="html">
         <source>Video to import updated.</source>
         <target state="new">Video to import updated.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0e907e5a96537e464b192f8adce79ce6487cbb1c" datatype="html">
         <source>Your video was uploaded to your account and is private.</source>
         <target state="new">Your video was uploaded to your account and is private.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="24840228f2826b66252cfcaab9820b1c7e0da264" datatype="html">
         <source>But associated data (tags, description...) will be lost, are you sure you want to leave this page?</source>
         <target state="new">But associated data (tags, description...) will be lost, are you sure you want to leave this page?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5af84926d631326e548573ebf0f6dff07845aeb4" datatype="html">
         <source>Your video is not uploaded yet, are you sure you want to leave this page?</source>
         <target state="new">Your video is not uploaded yet, are you sure you want to leave this page?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bef4ec92fa80e7b7ac03f8ad2b49d2a126f0cc71" datatype="html">
         <source>Upload <x id="INTERPOLATION" equiv-text="{{videofileName}}"/></source>
         <target state="new">Upload <x id="INTERPOLATION" equiv-text="{{videofileName}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c5cb19aeb6447deda40cc1227ceca1359ab955e9" datatype="html">
         <source>Upload cancelled</source>
         <target state="new">Upload cancelled</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="972fc644f847cf84e4732ec012915c4cdaf865ce" datatype="html">
         <source>Video published.</source>
         <target state="new">Video published.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a6019e856f511dbe1fe658790c71c594b26930ee" datatype="html">
         <source>Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{videoQuotaUsed}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{videoQuota}}"/>)</source>
         <target state="new">Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{videoQuotaUsed}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{videoQuota}}"/>)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c980896ac8e08e9751545db1b7ef0e93fb8a52cd" datatype="html">
         <source>Your daily video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{quotaUsedDaily}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{quotaDaily}}"/>)</source>
         <target state="new">Your daily video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{videoSize}}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{quotaUsedDaily}}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{quotaDaily}}"/>)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-add-components/video-upload.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bfdf9de4bd9140f77feb6a5fe2b51f3f0565eaa4" datatype="html">
         <source>You have unsaved changes! If you leave, your changes will be lost.</source>
         <target state="new">You have unsaved changes! If you leave, your changes will be lost.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="757e9c083c8f3d578bd74f055cc337c72417e187" datatype="html">
         <source>Video updated.</source>
         <target state="new">Video updated.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="be448863f4919e200bdbc65ca95cb7bf208a30e7" datatype="html">
         <source>The deletion will be sent to remote instances so they can reflect the change.</source>
         <target state="new"> The deletion will be sent to remote instances so they can reflect the change.</target>
-        <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>
+        
+      <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>
         <target state="new"> It is a remote comment, so the deletion will only be effective on your instance.</target>
-        <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>
+        
+      <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="4334a60889af951a137a22cd862f2675daad3292" datatype="html">
         <source>Stop autoplaying next video</source>
         <target state="new">Stop autoplaying next video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0663c85b5bc0806356ab768f411299c29cf39360" datatype="html">
         <source>Autoplay next video</source>
         <target state="new">Autoplay next video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="77fde72fafe6a5272b7d5e3ffedd179ec2d7f8b0" datatype="html">
         <source>Stop looping playlist videos</source>
         <target state="new">Stop looping playlist videos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="54428deb88d7bc58721d6839d9406ff607eccef4" datatype="html">
         <source>Loop playlist videos</source>
         <target state="new">Loop playlist videos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch-playlist.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="74e95a8a42bc8e07d3459f86184ce798e6189ec6" datatype="html">
         <source>You need to be connected to rate this content.</source>
         <target state="new">You need to be connected to rate this content.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d5a4811e15319ad9354e1b62e9ca0131192b489e" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</source>
         <target state="new"><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ed013c2c29216501c688e9cb5f3a1c9fd9147b71" datatype="html">
         <source>This video contains mature or explicit content. Are you sure you want to watch it?</source>
         <target state="new">This video contains mature or explicit content. Are you sure you want to watch it?</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5ba3d522e4146eefcbd5c222247c1e2423d27cd8" datatype="html">
         <source>Mature or explicit content</source>
         <target state="new">Mature or explicit content</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="43ee7c4bd1ed4766ec0c13974a1e08881071c927" datatype="html">
         <source>Up Next</source>
         <target state="new">Up Next</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3a592fe9ee94c99deb20352edd7e994debf5c4c8" datatype="html">
         <source>Autoplay is suspended</source>
         <target state="new">Autoplay is suspended</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="fe51624a8ab9f682f7f21d485eb64fdb4b15e91e" datatype="html">
         <source>Enter/exit fullscreen (requires player focus)</source>
         <target state="new">Enter/exit fullscreen (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d5916006cb404a4d3663ac20ad299c45e57a30a6" datatype="html">
         <source>Play/Pause the video (requires player focus)</source>
         <target state="new">Play/Pause the video (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c797465d457fbb14d62c08c52be9115b60e5605c" datatype="html">
         <source>Mute/unmute the video (requires player focus)</source>
         <target state="new">Mute/unmute the video (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6ec9800a89e1489861dd08b93d0ff42fd5f20f50" datatype="html">
         <source>Skip to a percentage of the video: 0 is 0% and 9 is 90% (requires player focus)</source>
         <target state="new">Skip to a percentage of the video: 0 is 0% and 9 is 90% (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="567024b923c37475ef4b2632ec95d07c3f7263f5" datatype="html">
         <source>Increase the volume (requires player focus)</source>
         <target state="new">Increase the volume (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="bb7e8567023b189bba28de767769192f5fe28430" datatype="html">
         <source>Decrease the volume (requires player focus)</source>
         <target state="new">Decrease the volume (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="3fcdc3072de455c3816dc7976ff96ea1bf09eb7b" datatype="html">
         <source>Seek the video forward (requires player focus)</source>
         <target state="new">Seek the video forward (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ea2c30e5c87a4923cbf3cdcac9fc8818f79f9a0b" datatype="html">
         <source>Seek the video backward (requires player focus)</source>
         <target state="new">Seek the video backward (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="a06ba404b91694a9788bf243582ba437b2bd9490" datatype="html">
         <source>Increase playback rate (requires player focus)</source>
         <target state="new">Increase playback rate (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="68bb1ba6ae67f97934797d79e582fb6f7c3e825d" datatype="html">
         <source>Decrease playback rate (requires player focus)</source>
         <target state="new">Decrease playback rate (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0fc28c34013089209a65fadcad0a552094ef2104" datatype="html">
         <source>Navigate in the video frame by frame (requires player focus)</source>
         <target state="new">Navigate in the video frame by frame (requires player focus)</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0e65067fdcc9d8725a41896cb1e229d1415a45f6" datatype="html">
         <source>Like the video</source>
         <target state="new">Like the video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1a999e06e1aca0a70cd7d0e3e5c2c63d0e1885c8" datatype="html">
         <source>Dislike the video</source>
         <target state="new">Dislike the video</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1d9b6c0c66a4a5baa73617b1106c3746bc13f003" datatype="html">
         <source>When active, the next video is automatically played after the current one.</source>
         <target state="new">When active, the next video is automatically played after the current one.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/recommendations/recommended-videos.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8da38a1074a420611eac466a45ef2decbbb45ab8" datatype="html">
         <source>Videos that have the higher number of likes.</source>
         <target state="new">Videos that have the higher number of likes.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-most-liked.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-most-liked.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="5b94148c16fa19e3db89972d11e93f790a73a054" datatype="html">
         <source>Trending for the last 24 hours</source>
         <target state="new">Trending for the last 24 hours</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-trending.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6e9cb0b3b38312870471954abec8690170429a4e" datatype="html">
         <source>Trending videos are those totalizing the greatest number of views during the last 24 hours</source>
         <target state="new">Trending videos are those totalizing the greatest number of views during the last 24 hours</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-trending.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6da9ddede61711ecfeaa94fc61a6b7bb844ab3df" datatype="html">
         <source>Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</source>
         <target state="new">Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-trending.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="caa0a70f34df9b60a71ed0ad6c82de7b07c0c509" datatype="html">
         <source>Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</source>
         <target state="new">Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-trending.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="1b157e15c434469d91e56d027b78bf69c9983165" datatype="html">
         <source>Videos from your subscriptions</source>
         <target state="new">Videos from your subscriptions</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-user-subscriptions.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/video-list/video-user-subscriptions.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
     </body>
   </file>
 </xliff>